From 1d2c5f864bf4037d2187d780fa4f9332b6b5a94f Mon Sep 17 00:00:00 2001 From: Connor Abbas Date: Sun, 15 Jun 2025 19:48:50 +0000 Subject: [PATCH 1/3] feature: changes from inertia project --- src/app.js | 2 ++ src/components/DeleteUserModal.vue | 2 +- src/layouts/app/HeaderLayout.vue | 3 +++ src/layouts/app/SidebarLayout.vue | 3 +++ src/theme/global-pt.js | 23 +++++++++++++++++++++++ 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/theme/global-pt.js diff --git a/src/app.js b/src/app.js index fd1fd63..9a8cd73 100644 --- a/src/app.js +++ b/src/app.js @@ -16,6 +16,7 @@ import PageTitleSection from '@/components/PageTitleSection.vue'; import { useColorMode } from '@vueuse/core'; import themePreset from '@/theme/noir-preset'; +import globalPt from './theme/global-pt'; // Site light/dark mode const colorMode = useColorMode({ emitAuto: true }); @@ -37,6 +38,7 @@ app.provide('colorMode', colorMode) }, }, }, + pt: globalPt, }) .use(ToastService) .component('Container', Container) diff --git a/src/components/DeleteUserModal.vue b/src/components/DeleteUserModal.vue index cac234b..ab2f1d4 100644 --- a/src/components/DeleteUserModal.vue +++ b/src/components/DeleteUserModal.vue @@ -49,9 +49,9 @@ const deleteAccount = () => { +
diff --git a/src/layouts/app/SidebarLayout.vue b/src/layouts/app/SidebarLayout.vue index 2e550fd..4e5d655 100644 --- a/src/layouts/app/SidebarLayout.vue +++ b/src/layouts/app/SidebarLayout.vue @@ -70,6 +70,9 @@ const toggleMobileUserMenu = (event) => {
+ diff --git a/src/theme/global-pt.js b/src/theme/global-pt.js new file mode 100644 index 0000000..ff4f0b0 --- /dev/null +++ b/src/theme/global-pt.js @@ -0,0 +1,23 @@ +/** + * Global pass through styling for components + * https://primevue.org/passthrough/#global + */ +export default { + dialog: { + root: { + class: 'm-4 sm:m-0' + }, + mask: { + class: 'backdrop-blur-xs' + }, + }, + toast: { + root: { + // Full width/centered on mobile, bottom right desktop + class: 'fixed! left-4! right-4! bottom-4! w-auto! md:right-8! md:bottom-8! sm:w-[25rem]! sm:not-fixed! sm:left-auto! sm:ml-auto!' + }, + message: { + class: 'shadow-lg mb-0 mt-4' + }, + }, +}; \ No newline at end of file From 3473d00edefcb9713dbd41d4fdf12320c64f8456 Mon Sep 17 00:00:00 2001 From: Connor Abbas Date: Sun, 15 Jun 2025 19:53:14 +0000 Subject: [PATCH 2/3] fix: auth buttons loading --- src/views/auth/ForgotPassword.vue | 2 +- src/views/auth/Login.vue | 2 +- src/views/auth/Register.vue | 2 +- src/views/auth/ResetPassword.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/auth/ForgotPassword.vue b/src/views/auth/ForgotPassword.vue index b4e29af..a3e29ba 100644 --- a/src/views/auth/ForgotPassword.vue +++ b/src/views/auth/ForgotPassword.vue @@ -30,7 +30,7 @@ const submit = () => { }; const loading = computed(() => { - return submittingRequest.value || authStore.fetchingCsrfToken; + return submittingRequest.value || authStore.fetchingCsrfToken || authStore.fetchingUser; }); onMounted(() => { diff --git a/src/views/auth/Login.vue b/src/views/auth/Login.vue index 16c8570..b8740dd 100644 --- a/src/views/auth/Login.vue +++ b/src/views/auth/Login.vue @@ -43,7 +43,7 @@ const submit = () => { }; const loading = computed(() => { - return loggingIn.value || authStore.fetchingCsrfToken; + return loggingIn.value || authStore.fetchingCsrfToken || authStore.fetchingUser; }); onMounted(() => { diff --git a/src/views/auth/Register.vue b/src/views/auth/Register.vue index 1ff64a1..d353bef 100644 --- a/src/views/auth/Register.vue +++ b/src/views/auth/Register.vue @@ -33,7 +33,7 @@ const submit = () => { }; const loading = computed(() => { - return registering.value || authStore.fetchingCsrfToken; + return registering.value || authStore.fetchingCsrfToken || authStore.fetchingUser; }); onMounted(() => { diff --git a/src/views/auth/ResetPassword.vue b/src/views/auth/ResetPassword.vue index 4b8e935..5eabbf1 100644 --- a/src/views/auth/ResetPassword.vue +++ b/src/views/auth/ResetPassword.vue @@ -45,7 +45,7 @@ const submit = () => { }; const loading = computed(() => { - return resetting.value || authStore.fetchingCsrfToken; + return resetting.value || authStore.fetchingCsrfToken || authStore.fetchingUser; }); onMounted(() => { From c84590000716fbeebb17fec79ada492093446f7b Mon Sep 17 00:00:00 2001 From: Connor Abbas Date: Sun, 15 Jun 2025 19:59:24 +0000 Subject: [PATCH 3/3] toast fix --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 516b2b9..21a6473 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,7 +5,7 @@ import { RouterView } from 'vue-router';