From c992014d538fd4d9d77f4e4cc36595acc4cd4765 Mon Sep 17 00:00:00 2001 From: iMax Date: Thu, 5 Dec 2024 19:19:41 +0100 Subject: [PATCH 1/2] Mise en place du routeur --- front/package.json | 3 ++- front/src/main.tsx | 15 +++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/front/package.json b/front/package.json index aef88a9..8bd44d7 100644 --- a/front/package.json +++ b/front/package.json @@ -11,7 +11,8 @@ }, "dependencies": { "react": "^18.3.1", - "react-dom": "^18.3.1" + "react-dom": "^18.3.1", + "react-router": "^7.0.2" }, "devDependencies": { "@eslint/js": "^9.15.0", diff --git a/front/src/main.tsx b/front/src/main.tsx index bef5202..4de8dee 100644 --- a/front/src/main.tsx +++ b/front/src/main.tsx @@ -1,10 +1,17 @@ -import { StrictMode } from 'react' +import { BrowserRouter, Route, Routes } from "react-router"; import { createRoot } from 'react-dom/client' import './index.css' import App from './App.tsx' +import MainPage from "./pages/MainPage.tsx"; +import GamePage from "./pages/GamePage.tsx"; + createRoot(document.getElementById('root')!).render( - - - , + + + } /> + } /> + } /> + + , ) From 525ce0515c6289d2b95360c09207a11a6745cf28 Mon Sep 17 00:00:00 2001 From: iMax Date: Thu, 5 Dec 2024 21:46:04 +0100 Subject: [PATCH 2/2] remove vanilla css --- front/src/App.css | 42 ---------------------------- front/src/App.tsx | 35 ----------------------- front/src/index.css | 68 --------------------------------------------- front/src/main.tsx | 3 -- 4 files changed, 148 deletions(-) delete mode 100644 front/src/App.css delete mode 100644 front/src/App.tsx delete mode 100644 front/src/index.css diff --git a/front/src/App.css b/front/src/App.css deleted file mode 100644 index b9d355d..0000000 --- a/front/src/App.css +++ /dev/null @@ -1,42 +0,0 @@ -#root { - max-width: 1280px; - margin: 0 auto; - padding: 2rem; - text-align: center; -} - -.logo { - height: 6em; - padding: 1.5em; - will-change: filter; - transition: filter 300ms; -} -.logo:hover { - filter: drop-shadow(0 0 2em #646cffaa); -} -.logo.react:hover { - filter: drop-shadow(0 0 2em #61dafbaa); -} - -@keyframes logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} - -@media (prefers-reduced-motion: no-preference) { - a:nth-of-type(2) .logo { - animation: logo-spin infinite 20s linear; - } -} - -.card { - padding: 2em; -} - -.read-the-docs { - color: #888; -} diff --git a/front/src/App.tsx b/front/src/App.tsx deleted file mode 100644 index 3d7ded3..0000000 --- a/front/src/App.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import { useState } from 'react' -import reactLogo from './assets/react.svg' -import viteLogo from '/vite.svg' -import './App.css' - -function App() { - const [count, setCount] = useState(0) - - return ( - <> -
- - Vite logo - - - React logo - -
-

Vite + React

-
- -

- Edit src/App.tsx and save to test HMR -

-
-

- Click on the Vite and React logos to learn more -

- - ) -} - -export default App diff --git a/front/src/index.css b/front/src/index.css deleted file mode 100644 index 6119ad9..0000000 --- a/front/src/index.css +++ /dev/null @@ -1,68 +0,0 @@ -:root { - font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif; - line-height: 1.5; - font-weight: 400; - - color-scheme: light dark; - color: rgba(255, 255, 255, 0.87); - background-color: #242424; - - font-synthesis: none; - text-rendering: optimizeLegibility; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -a { - font-weight: 500; - color: #646cff; - text-decoration: inherit; -} -a:hover { - color: #535bf2; -} - -body { - margin: 0; - display: flex; - place-items: center; - min-width: 320px; - min-height: 100vh; -} - -h1 { - font-size: 3.2em; - line-height: 1.1; -} - -button { - border-radius: 8px; - border: 1px solid transparent; - padding: 0.6em 1.2em; - font-size: 1em; - font-weight: 500; - font-family: inherit; - background-color: #1a1a1a; - cursor: pointer; - transition: border-color 0.25s; -} -button:hover { - border-color: #646cff; -} -button:focus, -button:focus-visible { - outline: 4px auto -webkit-focus-ring-color; -} - -@media (prefers-color-scheme: light) { - :root { - color: #213547; - background-color: #ffffff; - } - a:hover { - color: #747bff; - } - button { - background-color: #f9f9f9; - } -} diff --git a/front/src/main.tsx b/front/src/main.tsx index 4de8dee..ce00332 100644 --- a/front/src/main.tsx +++ b/front/src/main.tsx @@ -1,7 +1,5 @@ import { BrowserRouter, Route, Routes } from "react-router"; import { createRoot } from 'react-dom/client' -import './index.css' -import App from './App.tsx' import MainPage from "./pages/MainPage.tsx"; import GamePage from "./pages/GamePage.tsx"; @@ -10,7 +8,6 @@ createRoot(document.getElementById('root')!).render( } /> - } /> } /> ,