Skip to content

Commit

Permalink
Merge pull request #52 from Boyadjie/auth/feat/login-page
Browse files Browse the repository at this point in the history
feat(#45): add login page
  • Loading branch information
sologames7 authored May 28, 2024
2 parents 10904e7 + 3b8167c commit 5cd10dc
Show file tree
Hide file tree
Showing 44 changed files with 718 additions and 131 deletions.
26 changes: 26 additions & 0 deletions app/accueil/page.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#home {
.header {
background: var(--primary);

.navigation {
padding-inline: 35px;
padding-top: 50px;
display: flex;
justify-content: space-between;
align-items: center;

a {
width: 24px;
height: 24px;
}
}
}

.homeContentContainer {
padding: 50px 35px;

> div {
margin-bottom: 60px;
}
}
}
65 changes: 63 additions & 2 deletions app/accueil/page.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,71 @@
import Image from 'next/image';
import Link from 'next/link';

import {Slider} from '../../src/components/blocs/slider/Slider';
import {Navbar} from '../../src/components/navbar/Navbar';
import {Onboarding} from '../../src/components/onboarding/Onboarding';
import {Profile} from '../../src/components/profile/Profile';
import styles from './page.module.css';

const tempData = [
{
title: 'Préparer son voyage en 5 étapes',
date: new Date('2024-06-05'),
pictureUrl: '/user.jpg',
},
{
title: 'Vie locale : conseils pratiques',
date: new Date('2024-11-09'),
pictureUrl: '/user.jpg',
},
{
title: 'Où manger local ?',
date: new Date('2024-03-01'),
pictureUrl: '/user.jpg',
},
{
title: 'Transports et déplacements',
date: new Date('2024-03-23'),
pictureUrl: '/user.jpg',
},
];

export default function Home() {
return (
<>
<Onboarding />
<h1>Bienvenue sur UnVoy !</h1>
<div id={styles.home}>
<Onboarding />
<Navbar />
<section className={styles.header}>
<div className={styles.navigation}>
<div>
<Image
src="/icons/notifications.svg"
alt="Icône de notification"
width={24}
height={24}
/>
</div>
<Link href="/settings">
<Image
src="/icons/setting.svg"
alt="Icône de paramètre"
width={28}
height={28}
/>
</Link>
</div>
<Profile />
</section>
<div className={styles.homeContentContainer}>
<Slider
title="Articles conseillés"
items={tempData}
link="/accueil#"
/>
<Slider title="Actualités" items={tempData} link="/accueil#" />
</div>
</div>
</>
);
}
7 changes: 7 additions & 0 deletions app/login/login.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.container {
padding: 0 2rem;
p {
font-size: 14px;
color: #1b1b2e;
}
}
16 changes: 15 additions & 1 deletion app/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
'use client';
import ConnectionWith from '../../src/components/authentication/ConnectionWith';
import {LoginForm} from '../../src/components/authentication/LoginForm';
import LoginIllustration from '../../src/components/authentication/LoginIllustration';
import TextAndRoute from '../../src/components/authentication/TextAndRoute';
import Title from '../../src/components/authentication/Title';
import styles from './login.module.css';

export default function register() {
return (
<div>
<div className={styles.container}>
<Title iconUrl="icons/user.svg" text="LOGIN" />
<LoginIllustration />
<LoginForm />
<ConnectionWith />
<TextAndRoute
text="Don't have an account?"
route="/register"
routeText="Register"
/>
</div>
);
}
1 change: 0 additions & 1 deletion app/register/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
'use client';
import ConnectionWith from '../../src/components/authentication/ConnectionWith';
import {RegisterForm} from '../../src/components/authentication/RegisterForm';
import TextAndRoute from '../../src/components/authentication/TextAndRoute';
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@types/node": "18.15.11",
"@types/react": "18.0.34",
"@types/react-dom": "18.0.11",
"date-fns": "^3.6.0",
"firebase": "9.19.1",
"jest": "29.5.0",
"next": "^13.5.6",
Expand Down
7 changes: 7 additions & 0 deletions pnpm-lock.yaml

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

3 changes: 3 additions & 0 deletions public/icons/coeur.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/nav/articles.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/icons/nav/favoris.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/nav/home.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/nav/map.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/icons/nav/recherche.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/icons/notifications.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5cd10dc

Please sign in to comment.