SyntaxSquad/DADProject#15 fix: Merge Conflicts Fixed.
This commit is contained in:
@@ -12,6 +12,8 @@ import SinglePlayerGamePage from '@/pages/game/SinglePlayerGamePage.vue'
|
||||
import MultiplayerGamePage from '@/pages/game/MultiplayerGamePage.vue'
|
||||
import RegisterPage from '@/pages/register/RegisterPage.vue'
|
||||
import CoinsPurchasePage from '@/pages/purchase/CoinPurchasePage.vue'
|
||||
import { useAuthStore } from '@/stores/auth'
|
||||
import AdminPage from '@/pages/admin/AdminPage.vue'
|
||||
|
||||
const router = createRouter({
|
||||
history: createWebHistory(import.meta.env.BASE_URL),
|
||||
@@ -20,6 +22,7 @@ const router = createRouter({
|
||||
path: '/',
|
||||
name: 'home',
|
||||
component: HomePage,
|
||||
meta: { requiresAdmin: false }
|
||||
},
|
||||
{
|
||||
path: '/login',
|
||||
@@ -36,7 +39,7 @@ const router = createRouter({
|
||||
name: 'bisca3',
|
||||
component: SinglePlayerGamePage,
|
||||
props: { gameType: 3 },
|
||||
meta: { requiresAuth: true },
|
||||
meta: { requiresAuth: true, requiresAdmin: false },
|
||||
},
|
||||
{
|
||||
path: '/game/9',
|
||||
@@ -61,6 +64,12 @@ const router = createRouter({
|
||||
component: CoinsPurchasePage,
|
||||
meta: { requiresAuth: true },
|
||||
},
|
||||
{
|
||||
path: '/admin',
|
||||
name: 'admin',
|
||||
component: AdminPage,
|
||||
meta: { requiresAuth: true, requiresAdmin: true },
|
||||
},
|
||||
{
|
||||
path: '/testing',
|
||||
children: [
|
||||
@@ -95,6 +104,7 @@ const router = createRouter({
|
||||
|
||||
router.beforeEach((to, from, next) => {
|
||||
const requiresAuth = to.matched.some((record) => record.meta.requiresAuth)
|
||||
const requiresAdmin = to.matched.some((record) => record.meta.requiresAdmin)
|
||||
|
||||
if (requiresAuth) {
|
||||
const token = localStorage.getItem('token')
|
||||
@@ -103,6 +113,10 @@ router.beforeEach((to, from, next) => {
|
||||
return next({ name: 'login' })
|
||||
}
|
||||
}
|
||||
|
||||
if (useAuthStore().isAdmin && to.name === 'home') return next({ name: 'admin' })
|
||||
if (requiresAdmin && !useAuthStore().isAdmin) return next({ name: 'home' })
|
||||
|
||||
next()
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user