Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ajout router #9

Merged
merged 15 commits into from
Feb 5, 2025
Merged

ajout router #9

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4eeba69
ajout router
ticoq971 Feb 4, 2025
fc9b118
ajout router
ticoq971 Feb 4, 2025
57b6f76
Merge branch 'develop' into feature/router
ticoq971 Feb 4, 2025
bf24d6d
ajout router
ticoq971 Feb 4, 2025
6d26a1b
Merge branch 'feature/router' of github.com:WildCodeSchool/2024-12-or…
ticoq971 Feb 4, 2025
a0f2071
ajout router
ticoq971 Feb 4, 2025
091e55f
ajout router
ticoq971 Feb 4, 2025
dd47dc2
ajout router
ticoq971 Feb 4, 2025
4eca7b6
ajout router
ticoq971 Feb 4, 2025
483d7c2
ajout router
ticoq971 Feb 4, 2025
071f78a
router
ticoq971 Feb 5, 2025
6ea2c84
router
ticoq971 Feb 5, 2025
3ea1dd5
router
ticoq971 Feb 5, 2025
b158611
router
ticoq971 Feb 5, 2025
9c873a4
router
ticoq971 Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 31 additions & 21 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"husky": "^8.0.3",
"prettier": "^3.4.2",
"prettier-plugin-tailwindcss": "^0.5.5",
"react-router-dom": "^7.1.5",
"sass": "^1.83.4",
"vite": "^4.4.9"
}
Expand Down
19 changes: 13 additions & 6 deletions src/app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
import { Route, Routes } from 'react-router-dom';

import './app.scss';
import HomePage from './pages/home-page';
import ProfilePage from './pages/profile-page';
import Favorites from './components/favorites';
import Home from './components/home';
import Layout from './components/layout';
import Profile from './components/profile';

function App() {
return (
<>
<HomePage />
<ProfilePage />
</>
<Routes>
<Route element={<Layout />}>
<Route path='/' element={<Home />} />
<Route path='/favorites' element={<Favorites />} />
<Route path='/profilePage' element={<Profile />} />
</Route>
</Routes>
);
}

Expand Down
16 changes: 16 additions & 0 deletions src/components/Layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Outlet } from 'react-router-dom';

import Footer from './footer';
import NavBar from './navbar';

const Layout = () => {
return (
<>
<NavBar />

<Outlet />
<Footer />
</>
);
};
export default Layout;
40 changes: 24 additions & 16 deletions src/components/card.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
import { useState } from 'react';

import Modal from '../components/modal';
import '../style/card.scss';

function Card() {
const [isOpen, setIsOpen] = useState(false);
const toggleModal = () => {
setIsOpen(!isOpen);
};
const onClose = () => {
setIsOpen(false);
};

return (
<>
<body>
<Modal open={isOpen} onClose={onClose} />
<div className='flexBox'>
<div className='card'>
<div className='card' onClick={toggleModal}>
<img className='thanos' src='/pictures/thanos.png' alt='' />

<div>
<div className='rectangle'></div>
<h1>Thanos</h1>
</div>
</div>
<div className='card'>
<div className='card' onClick={toggleModal}>
<img className='thanos' src='/pictures/thanos.png' alt='' />

<div>
Expand All @@ -22,7 +34,7 @@ function Card() {
</div>
<div></div>
</div>
<div className='card'>
<div className='card' onClick={toggleModal}>
<img className='thanos' src='/pictures/thanos.png' alt='' />

<div>
Expand All @@ -31,7 +43,7 @@ function Card() {
</div>
<div></div>
</div>
<div className='card'>
<div className='card' onClick={toggleModal}>
<img className='thanos' src='/pictures/thanos.png' alt='' />

<div>
Expand All @@ -40,7 +52,7 @@ function Card() {
</div>
<div></div>
</div>
<div className='card'>
<div className='card' onClick={toggleModal}>
<img className='thanos' src='/pictures/thanos.png' alt='' />

<div>
Expand All @@ -49,15 +61,15 @@ function Card() {
</div>
<div></div>
</div>
<div className='card'>
<div className='card' onClick={toggleModal}>
<img className='thanos' src='/pictures/thanos.png' alt='' />

<div>
<div className='rectangle'></div>
<h1>Thanos</h1>
</div>
</div>
<div className='card'>
<div className='card' onClick={toggleModal}>
<img className='thanos' src='/pictures/thanos.png' alt='' />

<div>
Expand All @@ -66,7 +78,7 @@ function Card() {
</div>
<div></div>
</div>
<div className='card'>
<div className='card' onClick={toggleModal}>
<img className='thanos' src='/pictures/thanos.png' alt='' />

<div>
Expand All @@ -75,7 +87,7 @@ function Card() {
</div>
<div></div>
</div>
<div className='card'>
<div className='card' onClick={toggleModal}>
<img className='thanos' src='/pictures/thanos.png' alt='' />

<div>
Expand All @@ -84,7 +96,7 @@ function Card() {
</div>
<div></div>
</div>
<div className='card'>
<div className='card' onClick={toggleModal}>
<img className='thanos' src='/pictures/thanos.png' alt='' />

<div>
Expand All @@ -93,7 +105,7 @@ function Card() {
</div>
<div></div>
</div>
<div className='card'>
<div className='card' onClick={toggleModal}>
<img className='thanos' src='/pictures/thanos.png' alt='' />

<div>
Expand All @@ -102,7 +114,7 @@ function Card() {
</div>
<div></div>
</div>
<div className='card'>
<div className='card' onClick={toggleModal}>
<img className='thanos' src='/pictures/thanos.png' alt='' />

<div>
Expand All @@ -112,10 +124,6 @@ function Card() {
<div></div>
</div>
</div>
<nav className='arrow'>
<input type='image' id='image' alt='Login' src='/pictures/arrow-left.png' />
<input type='image' id='image' alt='Login' src='/pictures/arrow-right.png' />
</nav>
</body>
</>
);
Expand Down
Loading
Loading