- {{ instructions }} -
+
{{ instructions }}
{{ $t("subscriptions.title") }}
diff --git a/components/complete_registration/LanguageForm.vue b/components/complete_registration/LanguageForm.vue index 7db7c166..cd4712ce 100644 --- a/components/complete_registration/LanguageForm.vue +++ b/components/complete_registration/LanguageForm.vue @@ -1,7 +1,7 @@ - + {{ t('complete_registration_lang.header', { name: firstName }) }} - + {{ t('complete_registration_lang.tagline') }} @@ -49,6 +49,7 @@ import LoadingIndicator from '@components/LoadingIndicator.vue'; import ThemedSelectInput from '../ThemedSelectInput.vue'; import ThemedButton from '../ThemedButton.vue'; import { DEFAULT_LANGUAGE } from '@server/helpers'; +import { Heading } from '@libretexts/davis-vue'; type Language = { id: number; diff --git a/components/complete_registration/NameForm.vue b/components/complete_registration/NameForm.vue index b699564d..2b7fde29 100644 --- a/components/complete_registration/NameForm.vue +++ b/components/complete_registration/NameForm.vue @@ -3,77 +3,52 @@ aria-live="polite" :aria-busy="loading" > - + {{ $t('complete_registration_name.header') }} - + {{ $t('complete_registration_name.tagline') }} - - - {{ $t('profile.firstname') }} - - - - - - {{ $t('profile.lastname') }} - - - - + + - - {{ $t('common.continue') }} - - - - - {{ $t('common.updating') }}... - - + {{ $t('common.continue') }} + {{ $t('complete_registration_name.updatelater') }} -
{{ t('complete_registration_lang.tagline') }}
{{ $t('complete_registration_name.tagline') }}
{{ $t('complete_registration_name.updatelater') }}
{{ $t('complete_registration_org.tagline') }}
{{ $t( @@ -30,19 +30,13 @@ leave-active-class="motion-safe:transition-transform motion-safe:ease-in motion-safe:duration-300" > - - + + {{ $t("complete_registration_role.student_user") }} - - + + {{ $t("complete_registration_role.instructor_user") }} - + {{ $t("complete_registration_role.instructor_info") }} @@ -51,17 +45,15 @@ - - + {{ $t(`complete_registration_role.adapt_special_roles.${role}`) }} - + - {{ $t("complete_registration_role.adapt_special_roles_desc") }} @@ -92,6 +83,7 @@ import { useAxios } from "@renderer/useAxios"; import { usePageContext } from "@renderer/usePageContext"; import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; import LoadingIndicator from "@components/LoadingIndicator.vue"; +import { Button, Heading } from "@libretexts/davis-vue"; import { ADAPT_SPECIAL_ROLES } from "@renderer/utils/auth"; const props = defineProps<{ uuid: string }>(); @@ -104,31 +96,18 @@ const axios = useAxios(); const loading = ref(false); const isInstructorType = ref(false); -/** - * Triggers submission of the 'student' role to the server. - */ function handleStudentClick() { submitRoleUpdate("student"); } -/** - * Triggers submission of the 'instructor' role to the server with additional ADAPT-specific role. - */ function handleAdaptSpecialRoleClick(adapt_role: string) { submitRoleUpdate("instructor", adapt_role); } -/** - * Submits the role to the server, then emits the 'role-update' event. - * - * @param role - Role identifier to submit. - */ async function submitRoleUpdate(role: string, adapt_role?: string) { loading.value = true; try { - await axios.patch(`/users/${props.uuid}`, { - user_type: role, - }); + await axios.patch(`/users/${props.uuid}`, { user_type: role }); loading.value = false; emit("role-update", role, adapt_role); } catch (e) { diff --git a/components/complete_registration/TimezoneForm.vue b/components/complete_registration/TimezoneForm.vue index 8cfee2b0..07b7baee 100644 --- a/components/complete_registration/TimezoneForm.vue +++ b/components/complete_registration/TimezoneForm.vue @@ -1,7 +1,7 @@ - + {{ $t("complete_registration_timezone.header") }} - + {{ $t("complete_registration_timezone.tagline") }} @@ -64,6 +64,7 @@ import ThemedButton from '../ThemedButton.vue'; import { TimezoneOpts } from '@renderer/utils/timezones'; import { ADAPT_SPECIAL_ROLES } from '@renderer/utils/auth'; +import { Heading } from '@libretexts/davis-vue'; // Local Types type TimezonePatch = { diff --git a/components/registration/AuthForm.vue b/components/registration/AuthForm.vue index 0e02fc66..fddb0f4e 100644 --- a/components/registration/AuthForm.vue +++ b/components/registration/AuthForm.vue @@ -3,9 +3,9 @@ aria-live="polite" :aria-busy="loading" > - + {{ $t('register.header') }} - + {{ $t('register.infoline') }} @@ -16,52 +16,35 @@ @submit="submitForm" > - - {{ $t('common.email') }} - - + v-model="email" + :error="emailErr" + required + /> - + - {{ $t('common.password') }} - - - - - - - {{ showPassword ? $t('common.hide') : $t('common.show') }} {{ $t('common.password') }} - - - + {{ showPassword ? $t('common.hide') : $t('common.show') }} {{ $t('common.password') }} + - + - - {{ $t('register.create') }} - - - Registering... - - + {{ $t('register.create') }} + @@ -197,7 +178,7 @@ import { computed, ref } from 'vue'; import { AxiosError } from 'axios'; import { useAxios } from '@renderer/useAxios'; - import LoadingIndicator from '@components/LoadingIndicator.vue'; + import { Heading, Input, Button } from '@libretexts/davis-vue'; import PasswordStrengthMeter from '@components/PasswordStrengthMeter.vue'; import { getPasswordStrength } from '@renderer/utils/auth'; @@ -224,26 +205,18 @@ const passStrength = computed(() => getPasswordStrength(password.value)); const invalidForm = computed(() => { return (email.value.trim().length < 3 || email.value.trim().length > 320 || !email.value.includes('@')) || - passStrength.value < 3;}); + passStrength.value < 3; + }); - /** - * Toggles the show/hide password state. - */ function toggleShowPassword() { showPassword.value = !showPassword.value; } - /** - * Resets any active error states in the form. - */ function resetFormErrors() { emailErr.value = false; passErr.value = false; } - /** - * Validates all fields in the form and sets error states, if necessary. - */ function validateForm() { let valid = true; if (email.value.trim().length < 3 || email.value.trim().length > 320 || !email.value.includes('@')) { @@ -257,17 +230,10 @@ return valid; } - /** - * Submits the data to the server if all form fields are valid, then emits the 'register' event. - * - * @param e - Form submission event. - */ async function submitForm(e: Event) { e.preventDefault(); resetFormErrors(); - if (!validateForm()) { - return; - } + if (!validateForm()) return; loading.value = true; try { const result = await axios.post('/auth/register', { @@ -287,5 +253,4 @@ } } } - - \ No newline at end of file + diff --git a/components/registration/VerifyEmail.vue b/components/registration/VerifyEmail.vue index edb1b84f..852e810a 100644 --- a/components/registration/VerifyEmail.vue +++ b/components/registration/VerifyEmail.vue @@ -3,9 +3,9 @@ aria-live="polite" :aria-busy="loading" > - + {{ $t('register.verify_header') }} - + - - - {{ $t('register.verify_code') }} - - - + {{ $t('register.verify_invalid') }} - - - {{ $t('common.continue') }} - - - - - {{ $t('register.registering') }} - - + {{ $t('common.continue') }} + {{ $t('register.verify_thanks') }} - - - @@ -71,7 +53,7 @@ import { ref } from 'vue'; import { useAxios } from '@renderer/useAxios'; import { usePageContext } from '@renderer/usePageContext'; - import LoadingIndicator from '@components/LoadingIndicator.vue'; + import { Heading, Input, Button } from '@libretexts/davis-vue'; import createPathWithLocale from '@locales/createPathWithLocale'; const props = defineProps<{ @@ -83,21 +65,13 @@ const code = ref(''); const codeErr = ref(false); const verifyErr = ref(false); - - const loading = ref(false); - /** - * Resets any active error states in the form. - */ function resetFormErrors() { codeErr.value = false; verifyErr.value = false; } - /** - * Validates all fields in the form and sets error states, if necessary. - */ function validateForm() { let valid = true; if (Number.isNaN(Number.parseInt(code.value))) { @@ -107,17 +81,10 @@ return valid; } - /** - * Submits the data to the server if all fields are valid and redirects to the onboarding URL. - * - * @param e - Form submission event. - */ async function submitForm(e: Event) { e.preventDefault(); resetFormErrors(); - if (!validateForm()) { - return; - } + if (!validateForm()) return; loading.value = true; try { await axios.post('/auth/verify-email', { @@ -125,7 +92,6 @@ code: code.value, }); loading.value = false; - const queryParams = new URLSearchParams(window.location.search); const queryString = queryParams.toString(); const newPath = createPathWithLocale('/complete-registration/index', pageContext); @@ -136,5 +102,4 @@ verifyErr.value = true; } } - - \ No newline at end of file + diff --git a/package-lock.json b/package-lock.json index 29a11ecb..3491d2a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,8 @@ "@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/vue-fontawesome": "^3.0.2", "@hapi/boom": "^10.0.0", + "@libretexts/davis-core": "^1.5.0", + "@libretexts/davis-vue": "^1.5.0", "@tabler/icons-vue": "^3.34.0", "@types/swagger-ui-express": "^4.1.6", "@vitejs/plugin-vue": "^5.2.1", @@ -2625,6 +2627,21 @@ "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" }, + "node_modules/@headlessui/vue": { + "version": "1.7.23", + "resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.7.23.tgz", + "integrity": "sha512-JzdCNqurrtuu0YW6QaDtR2PIYCKPUWq28csDyMvN4zmGccmE7lz40Is6hc3LA4HFeCI7sekZ/PQMTNmn9I/4Wg==", + "license": "MIT", + "dependencies": { + "@tanstack/vue-virtual": "^3.0.0-beta.60" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "vue": "^3.2.0" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -3253,6 +3270,39 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@libretexts/davis-core": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@libretexts/davis-core/-/davis-core-1.5.0.tgz", + "integrity": "sha512-uOIc5PGWI9ClcZCHhw0SXYcpUPvq2snU3NhpJUpWVs1TGBG/qxsgZvsalX/oSUBfvUEY9iYd1XyxBpEQfJIG/A==", + "license": "MIT", + "dependencies": { + "clsx": "^2.1.1", + "tailwind-variants": "^0.3.0" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/@libretexts/davis-vue": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@libretexts/davis-vue/-/davis-vue-1.5.0.tgz", + "integrity": "sha512-TTTatPUwPwyVKsKQIcU8OyeQh0Dxmpya8PaeEEuBbEco6bCy00lFwQ438wVDkztq4R5vYQIPAFkRya16QrK6kQ==", + "license": "MIT", + "dependencies": { + "@headlessui/vue": "^1.7.0", + "@libretexts/davis-core": "*", + "clsx": "^2.1.1", + "tailwind-merge": "^3.0.0", + "tailwind-variants": "^0.3.0" + }, + "engines": { + "node": ">=20" + }, + "peerDependencies": { + "tailwindcss": "^4.0.0", + "vue": "^3.4.0" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -5845,6 +5895,32 @@ "vite": "^5.2.0 || ^6 || ^7 || ^8" } }, + "node_modules/@tanstack/virtual-core": { + "version": "3.13.23", + "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.23.tgz", + "integrity": "sha512-zSz2Z2HNyLjCplANTDyl3BcdQJc2k1+yyFoKhNRmCr7V7dY8o8q5m8uFTI1/Pg1kL+Hgrz6u3Xo6eFUB7l66cg==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + } + }, + "node_modules/@tanstack/vue-virtual": { + "version": "3.13.23", + "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.23.tgz", + "integrity": "sha512-b5jPluAR6U3eOq6GWAYSpj3ugnAIZgGR0e6aGAgyRse0Yu6MVQQ0ZWm9SArSXWtageogn6bkVD8D//c4IjW3xQ==", + "license": "MIT", + "dependencies": { + "@tanstack/virtual-core": "3.13.23" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + }, + "peerDependencies": { + "vue": "^2.7.0 || ^3.0.0" + } + }, "node_modules/@tsconfig/node10": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", @@ -7306,6 +7382,15 @@ "node": ">=12" } }, + "node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -9882,7 +9967,7 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz", "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", - "devOptional": true, + "dev": true, "license": "MIT", "bin": { "jiti": "lib/jiti-cli.mjs" @@ -10105,7 +10190,7 @@ "version": "1.32.0", "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==", - "devOptional": true, + "dev": true, "license": "MPL-2.0", "dependencies": { "detect-libc": "^2.0.3" @@ -15667,6 +15752,42 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/tailwind-merge": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz", + "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, + "node_modules/tailwind-variants": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/tailwind-variants/-/tailwind-variants-0.3.1.tgz", + "integrity": "sha512-krn67M3FpPwElg4FsZrOQd0U26o7UDH/QOkK8RNaiCCrr052f6YJPBUfNKnPo/s/xRzNPtv1Mldlxsg8Tb46BQ==", + "license": "MIT", + "dependencies": { + "tailwind-merge": "2.5.4" + }, + "engines": { + "node": ">=16.x", + "pnpm": ">=7.x" + }, + "peerDependencies": { + "tailwindcss": "*" + } + }, + "node_modules/tailwind-variants/node_modules/tailwind-merge": { + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.4.tgz", + "integrity": "sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, "node_modules/tailwindcss": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.2.tgz", @@ -16115,7 +16236,7 @@ "version": "4.9.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", - "devOptional": true, + "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -18571,8 +18692,7 @@ "@csstools/css-calc": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz", - "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==", - "requires": {} + "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==" }, "@csstools/css-color-parser": { "version": "3.1.0", @@ -18586,8 +18706,7 @@ "@csstools/css-parser-algorithms": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz", - "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==", - "requires": {} + "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==" }, "@csstools/css-syntax-patches-for-csstree": { "version": "1.0.20", @@ -18813,8 +18932,7 @@ "@fortawesome/vue-fontawesome": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.2.tgz", - "integrity": "sha512-xHVtVY8ASUeEvgcA/7vULUesENhD+pi/EirRHdMBqooHlXBqK+yrV6d8tUye1m5UKQKVgYAHMhUBfOnoiwvc8Q==", - "requires": {} + "integrity": "sha512-xHVtVY8ASUeEvgcA/7vULUesENhD+pi/EirRHdMBqooHlXBqK+yrV6d8tUye1m5UKQKVgYAHMhUBfOnoiwvc8Q==" }, "@hapi/boom": { "version": "10.0.0", @@ -18844,6 +18962,14 @@ } } }, + "@headlessui/vue": { + "version": "1.7.23", + "resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.7.23.tgz", + "integrity": "sha512-JzdCNqurrtuu0YW6QaDtR2PIYCKPUWq28csDyMvN4zmGccmE7lz40Is6hc3LA4HFeCI7sekZ/PQMTNmn9I/4Wg==", + "requires": { + "@tanstack/vue-virtual": "^3.0.0-beta.60" + } + }, "@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -19151,6 +19277,27 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "@libretexts/davis-core": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@libretexts/davis-core/-/davis-core-1.5.0.tgz", + "integrity": "sha512-uOIc5PGWI9ClcZCHhw0SXYcpUPvq2snU3NhpJUpWVs1TGBG/qxsgZvsalX/oSUBfvUEY9iYd1XyxBpEQfJIG/A==", + "requires": { + "clsx": "^2.1.1", + "tailwind-variants": "^0.3.0" + } + }, + "@libretexts/davis-vue": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@libretexts/davis-vue/-/davis-vue-1.5.0.tgz", + "integrity": "sha512-TTTatPUwPwyVKsKQIcU8OyeQh0Dxmpya8PaeEEuBbEco6bCy00lFwQ438wVDkztq4R5vYQIPAFkRya16QrK6kQ==", + "requires": { + "@headlessui/vue": "^1.7.0", + "@libretexts/davis-core": "*", + "clsx": "^2.1.1", + "tailwind-merge": "^3.0.0", + "tailwind-variants": "^0.3.0" + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -21058,6 +21205,19 @@ "tailwindcss": "4.2.2" } }, + "@tanstack/virtual-core": { + "version": "3.13.23", + "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.23.tgz", + "integrity": "sha512-zSz2Z2HNyLjCplANTDyl3BcdQJc2k1+yyFoKhNRmCr7V7dY8o8q5m8uFTI1/Pg1kL+Hgrz6u3Xo6eFUB7l66cg==" + }, + "@tanstack/vue-virtual": { + "version": "3.13.23", + "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.23.tgz", + "integrity": "sha512-b5jPluAR6U3eOq6GWAYSpj3ugnAIZgGR0e6aGAgyRse0Yu6MVQQ0ZWm9SArSXWtageogn6bkVD8D//c4IjW3xQ==", + "requires": { + "@tanstack/virtual-core": "3.13.23" + } + }, "@tsconfig/node10": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", @@ -21448,8 +21608,7 @@ "@vitejs/plugin-vue": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.1.tgz", - "integrity": "sha512-cxh314tzaWwOLqVes2gnnCtvBDcM1UMdn+iFR+UjAn411dPT3tOmqrJjbMd7koZpMAmBM/GqeV4n9ge7JSiJJQ==", - "requires": {} + "integrity": "sha512-cxh314tzaWwOLqVes2gnnCtvBDcM1UMdn+iFR+UjAn411dPT3tOmqrJjbMd7koZpMAmBM/GqeV4n9ge7JSiJJQ==" }, "@vue/compiler-core": { "version": "3.2.45", @@ -21610,8 +21769,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "requires": {} + "dev": true }, "acorn-walk": { "version": "8.2.0", @@ -22232,6 +22390,11 @@ "wrap-ansi": "^7.0.0" } }, + "clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==" + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -22510,8 +22673,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz", "integrity": "sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==", - "dev": true, - "requires": {} + "dev": true }, "create-require": { "version": "1.1.1", @@ -24093,7 +24255,7 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz", "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", - "devOptional": true + "dev": true }, "joi": { "version": "17.7.0", @@ -24263,7 +24425,7 @@ "version": "1.32.0", "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==", - "devOptional": true, + "dev": true, "requires": { "detect-libc": "^2.0.3", "lightningcss-android-arm64": "1.32.0", @@ -26252,8 +26414,7 @@ "dependencies": { "fdir": { "version": "6.5.0", - "bundled": true, - "requires": {} + "bundled": true }, "picomatch": { "version": "4.0.3", @@ -26589,8 +26750,7 @@ "vue-demi": { "version": "0.13.11", "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz", - "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", - "requires": {} + "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==" } } }, @@ -27993,6 +28153,26 @@ "integrity": "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==", "dev": true }, + "tailwind-merge": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz", + "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==" + }, + "tailwind-variants": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/tailwind-variants/-/tailwind-variants-0.3.1.tgz", + "integrity": "sha512-krn67M3FpPwElg4FsZrOQd0U26o7UDH/QOkK8RNaiCCrr052f6YJPBUfNKnPo/s/xRzNPtv1Mldlxsg8Tb46BQ==", + "requires": { + "tailwind-merge": "2.5.4" + }, + "dependencies": { + "tailwind-merge": { + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.4.tgz", + "integrity": "sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==" + } + } + }, "tailwindcss": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.2.tgz", @@ -28121,8 +28301,7 @@ "fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", - "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", - "requires": {} + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==" }, "picomatch": { "version": "4.0.3", @@ -28296,7 +28475,7 @@ "version": "4.9.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", - "devOptional": true + "dev": true }, "uglify-js": { "version": "3.19.3", @@ -28515,8 +28694,7 @@ "fdir": { "version": "6.4.4", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", - "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", - "requires": {} + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==" }, "picomatch": { "version": "4.0.2", @@ -28685,8 +28863,7 @@ "ws": { "version": "8.18.3", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", - "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==", - "requires": {} + "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==" }, "xml-name-validator": { "version": "4.0.0", diff --git a/package.json b/package.json index 227cfa95..8a098496 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,8 @@ "@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/vue-fontawesome": "^3.0.2", "@hapi/boom": "^10.0.0", + "@libretexts/davis-core": "^1.5.0", + "@libretexts/davis-vue": "^1.5.0", "@tabler/icons-vue": "^3.34.0", "@types/swagger-ui-express": "^4.1.6", "@vitejs/plugin-vue": "^5.2.1", diff --git a/pages/passwordrecovery/+Page.vue b/pages/passwordrecovery/+Page.vue index 645a174d..ec14cf4f 100644 --- a/pages/passwordrecovery/+Page.vue +++ b/pages/passwordrecovery/+Page.vue @@ -19,39 +19,31 @@ {{ sourceText }} - + {{ $t('register.forgotpassword') }} {{ $t('passwordrecovery.forgottagline') }} - - - {{ $t('common.email') }} - - - - + - {{ $t('passwordrecovery.sendlink') }} - - - {{ $t('passwordrecovery.sending') }} - - + {{ $t('passwordrecovery.sendlink') }} + @@ -62,7 +54,7 @@ {{ sourceText }} - + {{ $t('passwordrecovery.checkemail') }} 320 || !email.value.includes('@')) { @@ -128,24 +114,15 @@ return valid; } - /** - * Submits the password reset request to the server. - * - * @param e - Form submission event. - */ async function submitForm(e: Event) { e.preventDefault(); resetFormErrors(); - if (!validateForm()) { - return; - } + if (!validateForm()) return; loading.value = true; try { await axios.post('/auth/passwordrecovery', { email: email.value, - ...(props.redirectURI && { - redirectURI: props.redirectURI, - }), + ...(props.redirectURI && { redirectURI: props.redirectURI }), }); loading.value = false; sent.value = true; @@ -154,5 +131,4 @@ alert(t('common.unknownerror')); } } - - \ No newline at end of file + diff --git a/pages/passwordrecovery/complete/+Page.vue b/pages/passwordrecovery/complete/+Page.vue index a539baf9..a6b41403 100644 --- a/pages/passwordrecovery/complete/+Page.vue +++ b/pages/passwordrecovery/complete/+Page.vue @@ -12,7 +12,7 @@ :aria-busy="loading" > - + {{ $t('passwordrecovery.completeheader') }} @@ -20,36 +20,24 @@ - + - {{ $t('passwordrecovery.newpassword') }} - - - - - - - {{ showPassword ? $t('common.hide') : $t('common.show') }} {{ $t('common.password') }} - - - + {{ showPassword ? $t('common.hide') : $t('common.show') }} {{ $t('common.password') }} + - + - + {{ $t('passwordrecovery.restart').toLocaleLowerCase() }} - - {{ $t('passwordrecovery.setpassword') }} - - - {{ $t('passwordrecovery.submitting') }} - - + {{ $t('passwordrecovery.setpassword') }} + - + {{ $t('passwordrecovery.completedheader') }} @@ -90,7 +73,7 @@ v-if="willRedirect" class="flex flex-col items-center justify-center mt-8" > - + {{ $t('passwordrecovery.redirecting') }} @@ -107,9 +90,7 @@ class="text-center ml-2" > - + {{ $t('common.signin') }} @@ -126,7 +107,7 @@ import { AxiosError } from 'axios'; import { useAxios } from '@renderer/useAxios'; import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'; - import LoadingIndicator from '@components/LoadingIndicator.vue'; + import { Input, Button, Spinner } from '@libretexts/davis-vue'; import PasswordStrengthMeter from '@components/PasswordStrengthMeter.vue'; import { getPasswordStrength } from '@renderer/utils/auth'; import { usePageProps } from '@renderer/usePageProps'; @@ -150,30 +131,19 @@ const passStrength = computed(() => getPasswordStrength(password.value)); const restartURI = computed(() => { const params = new URLSearchParams({ - ...(props.origRedirectURI && { - redirect_uri: props.origRedirectURI, - }), + ...(props.origRedirectURI && { redirect_uri: props.origRedirectURI }), }); return `/passwordrecovery?${params.toString()}`; }); - /** - * Toggles between the show and hide password states. - */ function toggleShowPassword() { showPassword.value = !showPassword.value; } - /** - * Resets any active error states in the form. - */ function resetFormErrors() { passErr.value = false; } - /** - * Validates all form fields and sets any error states, if necessary. - */ function validateForm() { let valid = true; if (passStrength.value < 3) { @@ -183,18 +153,10 @@ return valid; } - /** - * Submits the reset token and new password to the server, then handles redirect - * on success (if necessary). - * - * @param e - Form submission event. - */ async function submitForm(e: Event) { e.preventDefault(); resetFormErrors(); - if (!validateForm()) { - return; - } + if (!validateForm()) return; loading.value = true; try { await axios.post('/auth/passwordrecovery/complete', { @@ -220,5 +182,4 @@ } } } - - \ No newline at end of file + diff --git a/pages/profile/+Page.vue b/pages/profile/+Page.vue index 4539cbaf..827ecc46 100644 --- a/pages/profile/+Page.vue +++ b/pages/profile/+Page.vue @@ -2,9 +2,9 @@ - + {{ $t("profile.profile") }} - + {{ $t("profile.infoline") }} diff --git a/pages/security/+Page.vue b/pages/security/+Page.vue index 4c3e31f3..70607874 100644 --- a/pages/security/+Page.vue +++ b/pages/security/+Page.vue @@ -3,9 +3,9 @@ - + {{ $t("security.security") }} - + {{ $t("security.infoline") }} diff --git a/renderer/index.css b/renderer/index.css index 77e3af56..4292411a 100644 --- a/renderer/index.css +++ b/renderer/index.css @@ -1,4 +1,6 @@ @import "tailwindcss"; +@import "@libretexts/davis-vue/styles.css"; +@source "../node_modules/@libretexts/davis-vue/dist/index.js"; @theme { --color-primary: #127BC4;
{{ $t("complete_registration_role.instructor_info") }} @@ -51,17 +45,15 @@ - - + {{ $t(`complete_registration_role.adapt_special_roles.${role}`) }} - + - {{ $t("complete_registration_role.adapt_special_roles_desc") }} @@ -92,6 +83,7 @@ import { useAxios } from "@renderer/useAxios"; import { usePageContext } from "@renderer/usePageContext"; import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; import LoadingIndicator from "@components/LoadingIndicator.vue"; +import { Button, Heading } from "@libretexts/davis-vue"; import { ADAPT_SPECIAL_ROLES } from "@renderer/utils/auth"; const props = defineProps<{ uuid: string }>(); @@ -104,31 +96,18 @@ const axios = useAxios(); const loading = ref(false); const isInstructorType = ref(false); -/** - * Triggers submission of the 'student' role to the server. - */ function handleStudentClick() { submitRoleUpdate("student"); } -/** - * Triggers submission of the 'instructor' role to the server with additional ADAPT-specific role. - */ function handleAdaptSpecialRoleClick(adapt_role: string) { submitRoleUpdate("instructor", adapt_role); } -/** - * Submits the role to the server, then emits the 'role-update' event. - * - * @param role - Role identifier to submit. - */ async function submitRoleUpdate(role: string, adapt_role?: string) { loading.value = true; try { - await axios.patch(`/users/${props.uuid}`, { - user_type: role, - }); + await axios.patch(`/users/${props.uuid}`, { user_type: role }); loading.value = false; emit("role-update", role, adapt_role); } catch (e) { diff --git a/components/complete_registration/TimezoneForm.vue b/components/complete_registration/TimezoneForm.vue index 8cfee2b0..07b7baee 100644 --- a/components/complete_registration/TimezoneForm.vue +++ b/components/complete_registration/TimezoneForm.vue @@ -1,7 +1,7 @@ - + {{ $t("complete_registration_timezone.header") }} - + {{ $t("complete_registration_timezone.tagline") }} @@ -64,6 +64,7 @@ import ThemedButton from '../ThemedButton.vue'; import { TimezoneOpts } from '@renderer/utils/timezones'; import { ADAPT_SPECIAL_ROLES } from '@renderer/utils/auth'; +import { Heading } from '@libretexts/davis-vue'; // Local Types type TimezonePatch = { diff --git a/components/registration/AuthForm.vue b/components/registration/AuthForm.vue index 0e02fc66..fddb0f4e 100644 --- a/components/registration/AuthForm.vue +++ b/components/registration/AuthForm.vue @@ -3,9 +3,9 @@ aria-live="polite" :aria-busy="loading" > - + {{ $t('register.header') }} - + {{ $t('register.infoline') }} @@ -16,52 +16,35 @@ @submit="submitForm" > - - {{ $t('common.email') }} - - + v-model="email" + :error="emailErr" + required + /> - + - {{ $t('common.password') }} - - - - - - - {{ showPassword ? $t('common.hide') : $t('common.show') }} {{ $t('common.password') }} - - - + {{ showPassword ? $t('common.hide') : $t('common.show') }} {{ $t('common.password') }} + - + - - {{ $t('register.create') }} - - - Registering... - - + {{ $t('register.create') }} + @@ -197,7 +178,7 @@ import { computed, ref } from 'vue'; import { AxiosError } from 'axios'; import { useAxios } from '@renderer/useAxios'; - import LoadingIndicator from '@components/LoadingIndicator.vue'; + import { Heading, Input, Button } from '@libretexts/davis-vue'; import PasswordStrengthMeter from '@components/PasswordStrengthMeter.vue'; import { getPasswordStrength } from '@renderer/utils/auth'; @@ -224,26 +205,18 @@ const passStrength = computed(() => getPasswordStrength(password.value)); const invalidForm = computed(() => { return (email.value.trim().length < 3 || email.value.trim().length > 320 || !email.value.includes('@')) || - passStrength.value < 3;}); + passStrength.value < 3; + }); - /** - * Toggles the show/hide password state. - */ function toggleShowPassword() { showPassword.value = !showPassword.value; } - /** - * Resets any active error states in the form. - */ function resetFormErrors() { emailErr.value = false; passErr.value = false; } - /** - * Validates all fields in the form and sets error states, if necessary. - */ function validateForm() { let valid = true; if (email.value.trim().length < 3 || email.value.trim().length > 320 || !email.value.includes('@')) { @@ -257,17 +230,10 @@ return valid; } - /** - * Submits the data to the server if all form fields are valid, then emits the 'register' event. - * - * @param e - Form submission event. - */ async function submitForm(e: Event) { e.preventDefault(); resetFormErrors(); - if (!validateForm()) { - return; - } + if (!validateForm()) return; loading.value = true; try { const result = await axios.post('/auth/register', { @@ -287,5 +253,4 @@ } } } - - \ No newline at end of file + diff --git a/components/registration/VerifyEmail.vue b/components/registration/VerifyEmail.vue index edb1b84f..852e810a 100644 --- a/components/registration/VerifyEmail.vue +++ b/components/registration/VerifyEmail.vue @@ -3,9 +3,9 @@ aria-live="polite" :aria-busy="loading" > - + {{ $t('register.verify_header') }} - + - - - {{ $t('register.verify_code') }} - - - + {{ $t('register.verify_invalid') }} - - - {{ $t('common.continue') }} - - - - - {{ $t('register.registering') }} - - + {{ $t('common.continue') }} + {{ $t('register.verify_thanks') }} - - - @@ -71,7 +53,7 @@ import { ref } from 'vue'; import { useAxios } from '@renderer/useAxios'; import { usePageContext } from '@renderer/usePageContext'; - import LoadingIndicator from '@components/LoadingIndicator.vue'; + import { Heading, Input, Button } from '@libretexts/davis-vue'; import createPathWithLocale from '@locales/createPathWithLocale'; const props = defineProps<{ @@ -83,21 +65,13 @@ const code = ref(''); const codeErr = ref(false); const verifyErr = ref(false); - - const loading = ref(false); - /** - * Resets any active error states in the form. - */ function resetFormErrors() { codeErr.value = false; verifyErr.value = false; } - /** - * Validates all fields in the form and sets error states, if necessary. - */ function validateForm() { let valid = true; if (Number.isNaN(Number.parseInt(code.value))) { @@ -107,17 +81,10 @@ return valid; } - /** - * Submits the data to the server if all fields are valid and redirects to the onboarding URL. - * - * @param e - Form submission event. - */ async function submitForm(e: Event) { e.preventDefault(); resetFormErrors(); - if (!validateForm()) { - return; - } + if (!validateForm()) return; loading.value = true; try { await axios.post('/auth/verify-email', { @@ -125,7 +92,6 @@ code: code.value, }); loading.value = false; - const queryParams = new URLSearchParams(window.location.search); const queryString = queryParams.toString(); const newPath = createPathWithLocale('/complete-registration/index', pageContext); @@ -136,5 +102,4 @@ verifyErr.value = true; } } - - \ No newline at end of file + diff --git a/package-lock.json b/package-lock.json index 29a11ecb..3491d2a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,8 @@ "@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/vue-fontawesome": "^3.0.2", "@hapi/boom": "^10.0.0", + "@libretexts/davis-core": "^1.5.0", + "@libretexts/davis-vue": "^1.5.0", "@tabler/icons-vue": "^3.34.0", "@types/swagger-ui-express": "^4.1.6", "@vitejs/plugin-vue": "^5.2.1", @@ -2625,6 +2627,21 @@ "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" }, + "node_modules/@headlessui/vue": { + "version": "1.7.23", + "resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.7.23.tgz", + "integrity": "sha512-JzdCNqurrtuu0YW6QaDtR2PIYCKPUWq28csDyMvN4zmGccmE7lz40Is6hc3LA4HFeCI7sekZ/PQMTNmn9I/4Wg==", + "license": "MIT", + "dependencies": { + "@tanstack/vue-virtual": "^3.0.0-beta.60" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "vue": "^3.2.0" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -3253,6 +3270,39 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@libretexts/davis-core": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@libretexts/davis-core/-/davis-core-1.5.0.tgz", + "integrity": "sha512-uOIc5PGWI9ClcZCHhw0SXYcpUPvq2snU3NhpJUpWVs1TGBG/qxsgZvsalX/oSUBfvUEY9iYd1XyxBpEQfJIG/A==", + "license": "MIT", + "dependencies": { + "clsx": "^2.1.1", + "tailwind-variants": "^0.3.0" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/@libretexts/davis-vue": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@libretexts/davis-vue/-/davis-vue-1.5.0.tgz", + "integrity": "sha512-TTTatPUwPwyVKsKQIcU8OyeQh0Dxmpya8PaeEEuBbEco6bCy00lFwQ438wVDkztq4R5vYQIPAFkRya16QrK6kQ==", + "license": "MIT", + "dependencies": { + "@headlessui/vue": "^1.7.0", + "@libretexts/davis-core": "*", + "clsx": "^2.1.1", + "tailwind-merge": "^3.0.0", + "tailwind-variants": "^0.3.0" + }, + "engines": { + "node": ">=20" + }, + "peerDependencies": { + "tailwindcss": "^4.0.0", + "vue": "^3.4.0" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -5845,6 +5895,32 @@ "vite": "^5.2.0 || ^6 || ^7 || ^8" } }, + "node_modules/@tanstack/virtual-core": { + "version": "3.13.23", + "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.23.tgz", + "integrity": "sha512-zSz2Z2HNyLjCplANTDyl3BcdQJc2k1+yyFoKhNRmCr7V7dY8o8q5m8uFTI1/Pg1kL+Hgrz6u3Xo6eFUB7l66cg==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + } + }, + "node_modules/@tanstack/vue-virtual": { + "version": "3.13.23", + "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.23.tgz", + "integrity": "sha512-b5jPluAR6U3eOq6GWAYSpj3ugnAIZgGR0e6aGAgyRse0Yu6MVQQ0ZWm9SArSXWtageogn6bkVD8D//c4IjW3xQ==", + "license": "MIT", + "dependencies": { + "@tanstack/virtual-core": "3.13.23" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + }, + "peerDependencies": { + "vue": "^2.7.0 || ^3.0.0" + } + }, "node_modules/@tsconfig/node10": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", @@ -7306,6 +7382,15 @@ "node": ">=12" } }, + "node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -9882,7 +9967,7 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz", "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", - "devOptional": true, + "dev": true, "license": "MIT", "bin": { "jiti": "lib/jiti-cli.mjs" @@ -10105,7 +10190,7 @@ "version": "1.32.0", "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==", - "devOptional": true, + "dev": true, "license": "MPL-2.0", "dependencies": { "detect-libc": "^2.0.3" @@ -15667,6 +15752,42 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/tailwind-merge": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz", + "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, + "node_modules/tailwind-variants": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/tailwind-variants/-/tailwind-variants-0.3.1.tgz", + "integrity": "sha512-krn67M3FpPwElg4FsZrOQd0U26o7UDH/QOkK8RNaiCCrr052f6YJPBUfNKnPo/s/xRzNPtv1Mldlxsg8Tb46BQ==", + "license": "MIT", + "dependencies": { + "tailwind-merge": "2.5.4" + }, + "engines": { + "node": ">=16.x", + "pnpm": ">=7.x" + }, + "peerDependencies": { + "tailwindcss": "*" + } + }, + "node_modules/tailwind-variants/node_modules/tailwind-merge": { + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.4.tgz", + "integrity": "sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, "node_modules/tailwindcss": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.2.tgz", @@ -16115,7 +16236,7 @@ "version": "4.9.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", - "devOptional": true, + "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -18571,8 +18692,7 @@ "@csstools/css-calc": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz", - "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==", - "requires": {} + "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==" }, "@csstools/css-color-parser": { "version": "3.1.0", @@ -18586,8 +18706,7 @@ "@csstools/css-parser-algorithms": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz", - "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==", - "requires": {} + "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==" }, "@csstools/css-syntax-patches-for-csstree": { "version": "1.0.20", @@ -18813,8 +18932,7 @@ "@fortawesome/vue-fontawesome": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.2.tgz", - "integrity": "sha512-xHVtVY8ASUeEvgcA/7vULUesENhD+pi/EirRHdMBqooHlXBqK+yrV6d8tUye1m5UKQKVgYAHMhUBfOnoiwvc8Q==", - "requires": {} + "integrity": "sha512-xHVtVY8ASUeEvgcA/7vULUesENhD+pi/EirRHdMBqooHlXBqK+yrV6d8tUye1m5UKQKVgYAHMhUBfOnoiwvc8Q==" }, "@hapi/boom": { "version": "10.0.0", @@ -18844,6 +18962,14 @@ } } }, + "@headlessui/vue": { + "version": "1.7.23", + "resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.7.23.tgz", + "integrity": "sha512-JzdCNqurrtuu0YW6QaDtR2PIYCKPUWq28csDyMvN4zmGccmE7lz40Is6hc3LA4HFeCI7sekZ/PQMTNmn9I/4Wg==", + "requires": { + "@tanstack/vue-virtual": "^3.0.0-beta.60" + } + }, "@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -19151,6 +19277,27 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "@libretexts/davis-core": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@libretexts/davis-core/-/davis-core-1.5.0.tgz", + "integrity": "sha512-uOIc5PGWI9ClcZCHhw0SXYcpUPvq2snU3NhpJUpWVs1TGBG/qxsgZvsalX/oSUBfvUEY9iYd1XyxBpEQfJIG/A==", + "requires": { + "clsx": "^2.1.1", + "tailwind-variants": "^0.3.0" + } + }, + "@libretexts/davis-vue": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@libretexts/davis-vue/-/davis-vue-1.5.0.tgz", + "integrity": "sha512-TTTatPUwPwyVKsKQIcU8OyeQh0Dxmpya8PaeEEuBbEco6bCy00lFwQ438wVDkztq4R5vYQIPAFkRya16QrK6kQ==", + "requires": { + "@headlessui/vue": "^1.7.0", + "@libretexts/davis-core": "*", + "clsx": "^2.1.1", + "tailwind-merge": "^3.0.0", + "tailwind-variants": "^0.3.0" + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -21058,6 +21205,19 @@ "tailwindcss": "4.2.2" } }, + "@tanstack/virtual-core": { + "version": "3.13.23", + "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.23.tgz", + "integrity": "sha512-zSz2Z2HNyLjCplANTDyl3BcdQJc2k1+yyFoKhNRmCr7V7dY8o8q5m8uFTI1/Pg1kL+Hgrz6u3Xo6eFUB7l66cg==" + }, + "@tanstack/vue-virtual": { + "version": "3.13.23", + "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.23.tgz", + "integrity": "sha512-b5jPluAR6U3eOq6GWAYSpj3ugnAIZgGR0e6aGAgyRse0Yu6MVQQ0ZWm9SArSXWtageogn6bkVD8D//c4IjW3xQ==", + "requires": { + "@tanstack/virtual-core": "3.13.23" + } + }, "@tsconfig/node10": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", @@ -21448,8 +21608,7 @@ "@vitejs/plugin-vue": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.1.tgz", - "integrity": "sha512-cxh314tzaWwOLqVes2gnnCtvBDcM1UMdn+iFR+UjAn411dPT3tOmqrJjbMd7koZpMAmBM/GqeV4n9ge7JSiJJQ==", - "requires": {} + "integrity": "sha512-cxh314tzaWwOLqVes2gnnCtvBDcM1UMdn+iFR+UjAn411dPT3tOmqrJjbMd7koZpMAmBM/GqeV4n9ge7JSiJJQ==" }, "@vue/compiler-core": { "version": "3.2.45", @@ -21610,8 +21769,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "requires": {} + "dev": true }, "acorn-walk": { "version": "8.2.0", @@ -22232,6 +22390,11 @@ "wrap-ansi": "^7.0.0" } }, + "clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==" + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -22510,8 +22673,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz", "integrity": "sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==", - "dev": true, - "requires": {} + "dev": true }, "create-require": { "version": "1.1.1", @@ -24093,7 +24255,7 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz", "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", - "devOptional": true + "dev": true }, "joi": { "version": "17.7.0", @@ -24263,7 +24425,7 @@ "version": "1.32.0", "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==", - "devOptional": true, + "dev": true, "requires": { "detect-libc": "^2.0.3", "lightningcss-android-arm64": "1.32.0", @@ -26252,8 +26414,7 @@ "dependencies": { "fdir": { "version": "6.5.0", - "bundled": true, - "requires": {} + "bundled": true }, "picomatch": { "version": "4.0.3", @@ -26589,8 +26750,7 @@ "vue-demi": { "version": "0.13.11", "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz", - "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", - "requires": {} + "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==" } } }, @@ -27993,6 +28153,26 @@ "integrity": "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==", "dev": true }, + "tailwind-merge": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz", + "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==" + }, + "tailwind-variants": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/tailwind-variants/-/tailwind-variants-0.3.1.tgz", + "integrity": "sha512-krn67M3FpPwElg4FsZrOQd0U26o7UDH/QOkK8RNaiCCrr052f6YJPBUfNKnPo/s/xRzNPtv1Mldlxsg8Tb46BQ==", + "requires": { + "tailwind-merge": "2.5.4" + }, + "dependencies": { + "tailwind-merge": { + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.4.tgz", + "integrity": "sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==" + } + } + }, "tailwindcss": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.2.tgz", @@ -28121,8 +28301,7 @@ "fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", - "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", - "requires": {} + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==" }, "picomatch": { "version": "4.0.3", @@ -28296,7 +28475,7 @@ "version": "4.9.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", - "devOptional": true + "dev": true }, "uglify-js": { "version": "3.19.3", @@ -28515,8 +28694,7 @@ "fdir": { "version": "6.4.4", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", - "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", - "requires": {} + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==" }, "picomatch": { "version": "4.0.2", @@ -28685,8 +28863,7 @@ "ws": { "version": "8.18.3", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", - "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==", - "requires": {} + "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==" }, "xml-name-validator": { "version": "4.0.0", diff --git a/package.json b/package.json index 227cfa95..8a098496 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,8 @@ "@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/vue-fontawesome": "^3.0.2", "@hapi/boom": "^10.0.0", + "@libretexts/davis-core": "^1.5.0", + "@libretexts/davis-vue": "^1.5.0", "@tabler/icons-vue": "^3.34.0", "@types/swagger-ui-express": "^4.1.6", "@vitejs/plugin-vue": "^5.2.1", diff --git a/pages/passwordrecovery/+Page.vue b/pages/passwordrecovery/+Page.vue index 645a174d..ec14cf4f 100644 --- a/pages/passwordrecovery/+Page.vue +++ b/pages/passwordrecovery/+Page.vue @@ -19,39 +19,31 @@ {{ sourceText }} -
{{ $t("complete_registration_role.adapt_special_roles_desc") }} @@ -92,6 +83,7 @@ import { useAxios } from "@renderer/useAxios"; import { usePageContext } from "@renderer/usePageContext"; import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; import LoadingIndicator from "@components/LoadingIndicator.vue"; +import { Button, Heading } from "@libretexts/davis-vue"; import { ADAPT_SPECIAL_ROLES } from "@renderer/utils/auth"; const props = defineProps<{ uuid: string }>(); @@ -104,31 +96,18 @@ const axios = useAxios(); const loading = ref(false); const isInstructorType = ref(false); -/** - * Triggers submission of the 'student' role to the server. - */ function handleStudentClick() { submitRoleUpdate("student"); } -/** - * Triggers submission of the 'instructor' role to the server with additional ADAPT-specific role. - */ function handleAdaptSpecialRoleClick(adapt_role: string) { submitRoleUpdate("instructor", adapt_role); } -/** - * Submits the role to the server, then emits the 'role-update' event. - * - * @param role - Role identifier to submit. - */ async function submitRoleUpdate(role: string, adapt_role?: string) { loading.value = true; try { - await axios.patch(`/users/${props.uuid}`, { - user_type: role, - }); + await axios.patch(`/users/${props.uuid}`, { user_type: role }); loading.value = false; emit("role-update", role, adapt_role); } catch (e) { diff --git a/components/complete_registration/TimezoneForm.vue b/components/complete_registration/TimezoneForm.vue index 8cfee2b0..07b7baee 100644 --- a/components/complete_registration/TimezoneForm.vue +++ b/components/complete_registration/TimezoneForm.vue @@ -1,7 +1,7 @@ - + {{ $t("complete_registration_timezone.header") }} - + {{ $t("complete_registration_timezone.tagline") }} @@ -64,6 +64,7 @@ import ThemedButton from '../ThemedButton.vue'; import { TimezoneOpts } from '@renderer/utils/timezones'; import { ADAPT_SPECIAL_ROLES } from '@renderer/utils/auth'; +import { Heading } from '@libretexts/davis-vue'; // Local Types type TimezonePatch = { diff --git a/components/registration/AuthForm.vue b/components/registration/AuthForm.vue index 0e02fc66..fddb0f4e 100644 --- a/components/registration/AuthForm.vue +++ b/components/registration/AuthForm.vue @@ -3,9 +3,9 @@ aria-live="polite" :aria-busy="loading" > - + {{ $t('register.header') }} - + {{ $t('register.infoline') }} @@ -16,52 +16,35 @@ @submit="submitForm" > - - {{ $t('common.email') }} - - + v-model="email" + :error="emailErr" + required + /> - + - {{ $t('common.password') }} - - - - - - - {{ showPassword ? $t('common.hide') : $t('common.show') }} {{ $t('common.password') }} - - - + {{ showPassword ? $t('common.hide') : $t('common.show') }} {{ $t('common.password') }} + - + - - {{ $t('register.create') }} - - - Registering... - - + {{ $t('register.create') }} +
{{ $t("complete_registration_timezone.tagline") }}
{{ $t('register.infoline') }}
{{ $t('register.verify_invalid') }}
{{ $t('register.verify_thanks') }}
{{ $t('passwordrecovery.forgottagline') }}
@@ -20,36 +20,24 @@
@@ -90,7 +73,7 @@ v-if="willRedirect" class="flex flex-col items-center justify-center mt-8" > - +
{{ $t('passwordrecovery.redirecting') }}
{{ $t("profile.profile") }} - +
{{ $t("profile.infoline") }}
{{ $t("security.security") }} - +
{{ $t("security.infoline") }}