starnakin/42_ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing merge conflicts

Browse Source
This commit is contained in:
Kbz-8
2024-02-21 16:43:44 +01:00
parent c7cd9202f4 de2488589c
commit a85827ce08
12 changed files with 457 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/static/js/index.js
View File

@ -5,7 +5,8 @@ import Search from "./views/Search.js";
import HomeView from "./views/HomeView.js";
import LogoutView from "./views/accounts/LogoutView.js";
import GameOfflineView from "./views/GameOfflineView.js";
import GameView from "./views/GameView.js";
import GameView2D from "./views/GameView.js";
import GameView3D from "./views/GameView3D.js";
import PageNotFoundView from './views/PageNotFoundView.js' ;
@ -88,8 +89,9 @@ const router = async(uri) => {
{ path: "/settings", view: SettingsView },
{ path: "/matchmaking", view: MatchMakingView },
{ path: "/games/offline", view: GameOfflineView },
{ path: "/games/:id", view: GameView },
{ path: "/tictactoe", view: TicTacToeView },
{ path: "/games/0/:id", view: GameView2D },
{ path: "/games/1/:id", view: GameView3D },
];
// Test each route for potential match