Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update parent sign up error dialog and remove back button post-submission #1026

Merged
merged 12 commits into from
Feb 12, 2025
Merged

update parent sign up error dialog and remove back button post-submission #1026

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
75518ba
update parent sign up error dialog
lucasxsong Feb 4, 2025
1c683e8
Merge branch 'main' into fix/parent-signup-fixes
Emily-ejag Feb 4, 2025
e804858
Merge branch 'main' into fix/parent-signup-fixes
Emily-ejag Feb 6, 2025
07eca27
remove back button after submission
lucasxsong Feb 6, 2025
24cb8bb
Merge branch 'main' into fix/parent-signup-fixes
Emily-ejag Feb 6, 2025
2829155
Merge branch 'main' into fix/parent-signup-fixes
Emily-ejag Feb 6, 2025
a9897b5
Merge branch 'main' into fix/parent-signup-fixes
Emily-ejag Feb 10, 2025
741a7a4
Update src/components/auth/RegisterChildren.vue
lucasxsong Feb 11, 2025
d6af611
use loading to disable button instead of removing
lucasxsong Feb 11, 2025
a833304
Update src/components/auth/RegisterChildren.vue
lucasxsong Feb 11, 2025
c440aff
Update src/pages/RegisterFamilyUsers.vue
lucasxsong Feb 11, 2025
a71d933
Merge branch 'main' into fix/parent-signup-fixes
lucasxsong Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/components/auth/RegisterChildren.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,10 +651,9 @@ const validateCode = async (studentCode, outerIndex = 0) => {
console.error('Failed to validate activation code', error);

if (!state.students[outerIndex].noActivationCode || props.code) {
dialogMessage.value = `The code ${studentCode} does not belong to any organization \n please enter a valid code or select: "I do not have a code"`;
dialogMessage.value = `The code ${studentCode} does not belong to any organization. Please enter a valid code.`;
} else {
dialogMessage.value =
'The code does not belong to any organization \n Please enter a valid code or select: \n "I don\'t have a code"';
dialogMessage.value = 'The code does not belong to any organization. Please enter a valid code."';
}

showErrorDialog();
Expand Down
1 change: 1 addition & 0 deletions src/pages/RegisterFamilyUsers.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
class="justify-start z-1 bg-white text-primary text-center justify-content-center border-none border-round p-2 h-3rem hover:surface-300 hover:text-900 border-none"
style="width: 8rem; margin-left: 1rem"
@click="activeIndex = 0"
:loading="spinner"
lucasxsong marked this conversation as resolved.
Show resolved Hide resolved
><i class="pi pi-arrow-left mr-2"></i> Back
</PvButton>
</div>
Expand Down
Loading