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.

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

feat(client): add home page and navbar #54

Merged
merged 8 commits into from
Apr 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions apps/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
},
"dependencies": {
"@repo/ui": "workspace:*",
"next": "^14.2.0",
"next": "^14.2.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@repo/biome-config": "workspace:*",
"@repo/typescript-config": "workspace:*",
"@types/node": "^20.12.7",
"@types/react": "^18.2.77",
"@types/react": "^18.2.78",
"@types/react-dom": "^18.2.25",
"autoprefixer": "^10.4.19",
"postcss": "^8.4.38",
Expand Down
2 changes: 1 addition & 1 deletion apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@hono/zod-validator": "^0.2.1",
"@repo/types": "workspace:*",
"@supabase/supabase-js": "^2.42.3",
"hono": "^4.2.3",
"hono": "^4.2.4",
"zod": "^3.22.4",
"zod-validation-error": "^3.1.0"
},
Expand Down
14 changes: 13 additions & 1 deletion apps/client/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import '@repo/ui/globals.css';
import { cn } from '@repo/ui/lib/utils';
import type { Metadata } from 'next';
import { Inter as FontSans } from 'next/font/google';
import { navLinks } from './lib/navlinks';
import { NavBar } from './ui/NavBar';

const fontSans = FontSans({
subsets: ['latin'],
Expand All @@ -20,7 +22,17 @@ export default function RootLayout({
}): JSX.Element {
return (
<html lang="en">
<body className={cn('min-h-screen bg-background font-sans antialiased', fontSans.variable)}>{children}</body>
<body
className={cn(
'min-h-screen bg-background font-sans antialiased p-6 flex flex-col items-center',
fontSans.variable,
)}
>
<div className="max-w-7xl">
<NavBar links={navLinks} />
{children}
</div>
</body>
</html>
);
}
7 changes: 7 additions & 0 deletions apps/client/app/lib/navlinks.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export const navLinks = [
{ name: 'Blog', href: '/blog' },
{ name: 'Marketplace', href: '/marketplace' },
{ name: 'Evenements', href: '/blog' },
{ name: 'Sports', href: '/sports' },
{ name: 'Quizz', href: '/quizz' },
];
76 changes: 74 additions & 2 deletions apps/client/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,81 @@
import { Button } from '@repo/ui/components/button';
import Image from 'next/image';
import Link from 'next/link';

export default function Page(): JSX.Element {
return (
<main>
<Button variant={'default'}>Hello Admin</Button>
<main className="flex flex-col items-center gap-y-8">
<section className="flex flex-col max-w-7xl gap-y-4">
<div className="flex gap-8 h-44 items-center justify-center">
<h1 className="font-semibold text-[144px]">Athlonix</h1>
<div className="h-[168px] max-w-[720px]">
<Image
src="/running_track.jpg"
alt="running track"
width={720}
height={168}
className="object-cover h-full rounded-tr-[96px]"
/>
</div>
</div>

<div className="flex gap-8 h-44 items-center justify-start flex-nowrap">
<div className="h-[168px] max-w-[492px]">
<Image
src="/ski.jpg"
alt="ski in mountains"
width={500}
height={168}
className="object-cover h-full rounded-[96px]"
/>
</div>
<h1 className="font-normal text-[144px] ">Association</h1>
</div>

<div className="flex gap-8 h-44 items-center justify-center">
<h1 className="font-semibold text-[144px]">Multisport</h1>
<div className="max-w-[545px] h-[168px]">
<Image
src="/kayak.jpg"
alt="kayaks"
width={720}
height={168}
className="object-cover h-full rounded-br-[96px]"
/>
</div>
</div>
</section>

<section className="flex items-center gap-6 justify-between w-full">
<div className="flex-1 max-w-[600px]">
<h1 className="mb-4">Qui sommes nous ?</h1>
<p className="mb-6">
Veniam ad anim et esse nulla pariatur. Do est enim dolore laboris. Lorem labore sint consequat ex eu mollit
est nostrud ad enim. Mollit proident et fugiat do ut labore aliqua quis eu laboris.
</p>
<Button asChild className="w-44">
<Link href="/">Deviens membre !</Link>
</Button>
</div>
<div className="max-w-[496px] flex-1">
<Image className="w-full h-auto" src="/sport_balls.png" alt="sport balls" width={800} height={482} />
</div>
</section>

<section className="w-full flex items-center justify-center gap-12">
<div className="flex flex-col gap-2 justify-center bg-secondary p-6 rounded-2xl max-w-72 w-full h-44">
<h1>42+</h1>
<p className="font-normal text-xl">sports présents</p>
</div>
<div className="flex flex-col gap-2 justify-center bg-secondary p-6 rounded-2xl max-w-72 w-full h-44">
<h1>10000+</h1>
<p className="font-normal text-xl">adherents inscrits</p>
</div>
<div className="flex flex-col gap-2 justify-center bg-secondary p-6 rounded-2xl max-w-72 w-full h-44">
<h1>125+</h1>
<p className="font-normal text-xl">evenements organises</p>
</div>
</section>
</main>
);
}
33 changes: 33 additions & 0 deletions apps/client/app/ui/NavBar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { Button } from '@repo/ui/components/button';
import Link from 'next/link';
import type React from 'react';

interface LinkProp {
name: string;
href: string;
}

interface NavBarProps {
links: LinkProp[];
}

export const NavBar: React.FC<NavBarProps> = ({ links }) => {
const navBarElements = links.map((link) => {
return (
<li key={link.name}>
<Button className="font-semibold hover:bg-slate-200 hover:text-black text-lg" variant={'ghost'} asChild>
<Link href={link.href}>{link.name}</Link>
</Button>
</li>
);
});

return (
<nav className="flex items-center justify-center mb-20">
<div className="w-full flex items-center justify-between">
<ul className="flex gap-4">{navBarElements}</ul>
<Button className="w-[120px]">Login</Button>
</div>
</nav>
);
};
6 changes: 3 additions & 3 deletions apps/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"scripts": {
"clean": "git clean -xdf .turbo node_modules dist",
"dev": "next dev --port 3102 --turbo",
"dev": "next dev --port 3102",
"build": "next build",
"start": "next start",
"lint": "biome check --apply .",
Expand All @@ -13,15 +13,15 @@
},
"dependencies": {
"@repo/ui": "workspace:*",
"next": "^14.2.0",
"next": "^14.2.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@repo/biome-config": "workspace:*",
"@repo/typescript-config": "workspace:*",
"@types/node": "^20.12.7",
"@types/react": "^18.2.77",
"@types/react": "^18.2.78",
"@types/react-dom": "^18.2.25",
"autoprefixer": "^10.4.19",
"postcss": "^8.4.38",
Expand Down
Binary file added apps/client/public/badminton_ball.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/client/public/kayak.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion apps/client/public/next.svg

This file was deleted.

Binary file added apps/client/public/running_track.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/client/public/ski.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/client/public/sport_balls.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 0 additions & 32 deletions apps/client/public/turborepo.svg

This file was deleted.

1 change: 0 additions & 1 deletion apps/client/public/vercel.svg

This file was deleted.

2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@repo/typescript-config": "workspace:*",
"@turbo/gen": "^1.13.2",
"@types/node": "^20.12.7",
"@types/react": "^18.2.77",
"@types/react": "^18.2.78",
"@types/react-dom": "^18.2.25",
"autoprefixer": "^10.4.19",
"postcss": "^8.4.38",
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/components/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const buttonVariants = cva(
secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80',
ghost: 'hover:bg-accent hover:text-accent-foreground',
link: 'text-primary underline-offset-4 hover:underline',
navLink: '',
},
size: {
default: 'h-10 px-4 py-2',
Expand Down
14 changes: 13 additions & 1 deletion packages/ui/src/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
--muted-foreground: 215.4 16.3% 46.9%;

--accent: 243 75% 59%;
--accent-foreground: 222.2 47.4% 11.2%;
--accent-foreground: 0, 0%, 100%;

--destructive: 0 84.2% 60.2%;
--destructive-foreground: 210 40% 98%;
Expand Down Expand Up @@ -70,6 +70,7 @@
* {
@apply border-border;
}

body {
@apply bg-background text-foreground;
}
Expand All @@ -78,4 +79,15 @@

* {
box-sizing: border-box;
}

h1 {
font-weight: 800;
font-size: 48px;
line-height: 48px;
}

p {
font-size: 16px;
line-height: 32px;
}
Loading
Loading