Skip to content

Commit

Permalink
Merge branch 'main' into sun/fdr-37-emegency-contact
Browse files Browse the repository at this point in the history
  • Loading branch information
TeeGoood authored Jun 29, 2024
2 parents d2b23cc + 2b78495 commit 0227a8f
Show file tree
Hide file tree
Showing 19 changed files with 5,496 additions and 1 deletion.
5,376 changes: 5,376 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
},
"dependencies": {
"@iconify/react": "^5.0.1",
"clsx": "^2.1.1",
"next": "14.2.4",
"react": "^18",
"react-dom": "^18"
"react-dom": "^18",
"tailwind-merge": "^2.3.0"
},
"devDependencies": {
"@iconify/react": "^5.0.1",
Expand Down
28 changes: 28 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/comingsoon.svg
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 public/fonts/Egizio Regular.otf
Binary file not shown.
Binary file added public/fonts/Pind Bold.ttf
Binary file not shown.
Binary file added public/fonts/Pind text.ttf
Binary file not shown.
Binary file added public/fonts/Pind.ttf
Binary file not shown.
Binary file added public/fonts/Sarun_s Sunthon.ttf
Binary file not shown.
Binary file added public/fonts/theseasons-bd.otf
Binary file not shown.
Binary file added public/fonts/theseasons-bdit.otf
Binary file not shown.
Binary file added public/fonts/theseasons-it.otf
Binary file not shown.
Binary file added public/fonts/theseasons-lt.otf
Binary file not shown.
Binary file added public/fonts/theseasons-ltit.otf
Binary file not shown.
Binary file added public/fonts/theseasons-reg.otf
Binary file not shown.
33 changes: 33 additions & 0 deletions src/app/comingsoon/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import Image from 'next/image';
import Border from '@/components/Border';
import Back_To_Menu from '@/components/comingsoon/back_to_menu';
import Welcome from '@/components/Welcome';
import comingsoon from '../../../public/comingsoon.svg';

export default function Home() {
return (
<main className="w-full h-screen flex justify-center items-center flex-col">
<Border
variant="transparent"
className="flex flex-col"
>
{' '}
<Welcome />
<h1 className="text-2xl text-center font-semibold text-project-light-gray mb-7">
รับเพื่อนก้าวใหม่ 2024
</h1>
<Image
src={comingsoon}
alt="Coming Soon"
className="w-64 h-14 mb-6"
/>
<h1 className="text-xl text-center font-semibold text-project-light-gray mb-10">
พร้อมให้ลงทะเบียน
<br />
ในวันที่ 18 กรกฎาคม 2567
</h1>
<Back_To_Menu />
</Border>
</main>
);
}
33 changes: 33 additions & 0 deletions src/components/Welcome.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import React from 'react';
import { cn } from '../lib/utils';

interface WelcomeProps {
containerClassName?: string; // Optional string prop
welcomeClassName?: string;
cuClassName?: string;
}

export default function Welcome({
containerClassName,
welcomeClassName,
cuClassName,
}: WelcomeProps) {
return (
<div
className={cn(
'text-center font-season italic mt-8 mb-28',
containerClassName
)}
>
<h1 className={cn('text-4xl mb-1', welcomeClassName)}>Welcome,</h1>
<h1
className={cn(
'text-3xl bg-gradient-to-t bg-clip-text text-transparent from-project-fuchsia from-30% via-80% to-95% to-project-cream',
cuClassName
)}
>
CU108
</h1>
</div>
);
}
14 changes: 14 additions & 0 deletions src/components/comingsoon/back_to_menu.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react';
import Link from 'next/link';
export default function Back_To_Menu() {
return (
<div className="flex text-center justify-center ">
<Link
href="/"
className="bg-project-fuchsia text-xl text-white py-2 px-2 w-60 h-12 rounded-md"
>
กลับสู่หน้าหลัก
</Link>
</div>
);
}
6 changes: 6 additions & 0 deletions src/lib/utils.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { ClassValue, clsx } from 'clsx';
import { twMerge } from 'tailwind-merge';

export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs));
}

0 comments on commit 0227a8f

Please sign in to comment.