Skip to content

Commit

Permalink
cn utils, change absolute
Browse files Browse the repository at this point in the history
  • Loading branch information
dunkdunkdunk committed Jun 29, 2024
1 parent a2f02f6 commit 00b2fe3
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 8 deletions.
62 changes: 61 additions & 1 deletion package-lock.json

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

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
"lint:fix": "next lint --fix"
},
"dependencies": {
"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
4 changes: 2 additions & 2 deletions src/app/comingsoon/page.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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 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 justify-center items-center flex-col"
className="flex flex-col"
>
{' '}
<Welcome />
Expand Down
29 changes: 25 additions & 4 deletions src/components/Welcome.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
import React from 'react';
import { cn } from './lib/utils';

export default function Welcome() {
interface WelcomeProps {
containerClassName?: string; // Optional string prop
welcomeClassName?: string;
cuClassName?: string;
}

export default function Welcome({
containerClassName,
welcomeClassName,
cuClassName,
}: WelcomeProps) {
return (
<div className="absolute top-20 text-center font-season italic">
<h1 className="text-4xl mb-1">Welcome,</h1>
<h1 className="text-3xl bg-gradient-to-t bg-clip-text text-transparent from-project-fuchsia from-30% via-80% to-95% to-project-cream">
<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>
Expand Down
6 changes: 6 additions & 0 deletions src/components/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 00b2fe3

Please sign in to comment.