SyntaxSquad/DADProject#16 fix: merge conflics fixed

This commit is contained in:
AfonsoCMSousa
2026-01-03 13:25:21 +00:00
11 changed files with 384 additions and 1718 deletions
+2 -37
View File
@@ -1,13 +1,7 @@
import HomePage from '@/pages/home/HomePage.vue'
import LoginPage from '@/pages/login/LoginPage.vue'
import LaravelPage from '@/pages/testing/LaravelPage.vue'
import WebsocketsPage from '@/pages/testing/WebsocketsPage.vue'
import UserPage from '@/pages/user/UserPage.vue'
import { createRouter, createWebHistory } from 'vue-router'
import TestAnimations from '@/pages/TestAnimations.vue'
import TestDealing from '@/pages/TestDealing.vue'
import TestAllAnimations from '@/pages/TestAllAnimations.vue'
import TestGameBoard from '@/pages/TestGameBoard.vue'
import SinglePlayerGamePage from '@/pages/game/SinglePlayerGamePage.vue'
import MultiplayerGamePage from '@/pages/game/MultiplayerGamePage.vue'
import MultiplayerMatchPage from '@/pages/game/MultiplayerMatchPage.vue'
@@ -23,7 +17,7 @@ const router = createRouter({
path: '/',
name: 'home',
component: HomePage,
meta: { requiresAdmin: false }
meta: { requiresAdmin: false },
},
{
path: '/login',
@@ -53,7 +47,7 @@ const router = createRouter({
path: '/game/multiplayer/:id',
name: 'multiplayer-game',
component: MultiplayerGamePage,
meta: { requiresAuth: true }
meta: { requiresAuth: true },
},
{
path: '/match/:id',
@@ -77,35 +71,6 @@ const router = createRouter({
component: AdminPage,
meta: { requiresAuth: true, requiresAdmin: true },
},
{
path: '/testing',
children: [
{
path: 'laravel',
component: LaravelPage,
},
{
path: 'websockets',
component: WebsocketsPage,
},
{
path: 'animations',
component: TestAnimations,
},
{
path: 'dealing',
component: TestDealing,
},
{
path: 'all-animations',
component: TestAllAnimations,
},
{
path: 'gameboard',
component: TestGameBoard,
},
],
},
],
})