Force line endings and whitespace, and revamp logout via introduction of a new profile component.
This commit is contained in:
parent
f6df79d83f
commit
0e491ecabe
31 changed files with 4870 additions and 4797 deletions
|
@ -12,7 +12,7 @@ import { useAuthStore } from 'stores/auth'; // Import the auth store
|
|||
* with the Router instance.
|
||||
*/
|
||||
|
||||
export default defineRouter(function({ store /* { store, ssrContext } */ })
|
||||
export default defineRouter(function({ store /* { store, ssrContext } */ })
|
||||
{
|
||||
const createHistory = process.env.SERVER
|
||||
? createMemoryHistory
|
||||
|
@ -29,19 +29,19 @@ export default defineRouter(function({ store /* { store, ssrContext } */ })
|
|||
});
|
||||
|
||||
// Navigation Guard using Pinia store
|
||||
Router.beforeEach(async(to, from, next) =>
|
||||
Router.beforeEach(async(to, from, next) =>
|
||||
{
|
||||
const authStore = useAuthStore(store); // Get store instance
|
||||
|
||||
// Ensure auth status is checked, especially on first load or refresh
|
||||
// This check might be better placed in App.vue or a boot file
|
||||
if (!authStore.user && !authStore.loading)
|
||||
if (!authStore.user && !authStore.loading)
|
||||
{ // Check only if user is not loaded and not already loading
|
||||
try
|
||||
try
|
||||
{
|
||||
await authStore.checkAuthStatus();
|
||||
}
|
||||
catch (e)
|
||||
catch (e)
|
||||
{
|
||||
// console.error('Initial auth check failed', e);
|
||||
// Decide how to handle initial check failure (e.g., proceed, redirect to error page)
|
||||
|
@ -53,15 +53,15 @@ export default defineRouter(function({ store /* { store, ssrContext } */ })
|
|||
const isPublicPage = publicPages.includes(to.path);
|
||||
const isAuthenticated = authStore.isAuthenticated; // Get status from store
|
||||
|
||||
if (requiresAuth && !isAuthenticated)
|
||||
if (requiresAuth && !isAuthenticated)
|
||||
{
|
||||
next('/login');
|
||||
}
|
||||
else if (isPublicPage && isAuthenticated)
|
||||
else if (isPublicPage && isAuthenticated)
|
||||
{
|
||||
next('/');
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
next();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue