Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { RouterView } from 'vue-router';
<template>
<!-- Use key to re-generate the page view component on each navigation :key="$route.path" -->
<!-- Alteratively, use a watch() on each component to re-render dynamic data as needed -->
<Toast position="top-center" />
<Toast position="bottom-right" />
<RouterView v-slot="{ Component }">
<Suspense timeout="0">
<template #default>
Expand Down
2 changes: 2 additions & 0 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand All @@ -37,6 +38,7 @@ app.provide('colorMode', colorMode)
},
},
},
pt: globalPt,
})
.use(ToastService)
.component('Container', Container)
Expand Down
2 changes: 1 addition & 1 deletion src/components/DeleteUserModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ const deleteAccount = () => {
<template>
<Dialog
v-model:visible="modalOpen"
class="w-[40rem]"
position="center"
header="Are you sure you want to delete your account?"
:style="{ width: '40rem' }"
:draggable="false"
dismissableMask
modal
Expand Down
3 changes: 3 additions & 0 deletions src/layouts/app/HeaderLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ const toggleMobileUserMenu = (event) => {
</div>
</template>
</Drawer>
<ScrollTop
:buttonProps="{ class: 'fixed! right-4! bottom-4! md:right-8! md:bottom-8! z-[1000]!', rounded: true, raised: true }"
/>
</Teleport>
<div class="min-h-screen">
<!-- Primary Navigation Menu -->
Expand Down
3 changes: 3 additions & 0 deletions src/layouts/app/SidebarLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ const toggleMobileUserMenu = (event) => {
</div>
</template>
</Drawer>
<ScrollTop
:buttonProps="{ class: 'fixed! right-4! bottom-4! md:right-8! md:bottom-8! z-[1000]!', rounded: true, raised: true }"
/>
</Teleport>

<!-- Mobile Header -->
Expand Down
23 changes: 23 additions & 0 deletions src/theme/global-pt.js
Original file line number Diff line number Diff line change
@@ -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'
},
},
};
2 changes: 1 addition & 1 deletion src/views/auth/ForgotPassword.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const submit = () => {
};

const loading = computed(() => {
return submittingRequest.value || authStore.fetchingCsrfToken;
return submittingRequest.value || authStore.fetchingCsrfToken || authStore.fetchingUser;
});

onMounted(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/views/auth/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const submit = () => {
};

const loading = computed(() => {
return loggingIn.value || authStore.fetchingCsrfToken;
return loggingIn.value || authStore.fetchingCsrfToken || authStore.fetchingUser;
});

onMounted(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/views/auth/Register.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const submit = () => {
};

const loading = computed(() => {
return registering.value || authStore.fetchingCsrfToken;
return registering.value || authStore.fetchingCsrfToken || authStore.fetchingUser;
});

onMounted(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/views/auth/ResetPassword.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const submit = () => {
};

const loading = computed(() => {
return resetting.value || authStore.fetchingCsrfToken;
return resetting.value || authStore.fetchingCsrfToken || authStore.fetchingUser;
});

onMounted(() => {
Expand Down