Skip to content

Commit 2b1098c

Browse files
committed
updated favicon, updated logo svg, added logo to main page, better clouds
1 parent d760741 commit 2b1098c

File tree

6 files changed

+76
-73
lines changed

6 files changed

+76
-73
lines changed

app/favicon.ico

-4.2 KB
Binary file not shown.

app/login/page.tsx

Lines changed: 56 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,69 @@
11
import { signInWithGoogle } from "@/app/login/actions";
2-
import Balloon, { PurpleBalloon } from "@/shared/components/background/Balloon";
2+
import Balloon, {
3+
GreenBalloon,
4+
PurpleBalloon,
5+
} from "@/shared/components/background/Balloon";
6+
import CloudLeft from "@/shared/components/background/CloudLeft";
7+
import CloudRight from "@/shared/components/background/CloudRight";
38
import Star from "@/shared/components/background/Star";
49
import { StarsBackground } from "@/shared/components/background/StarBackground";
510
import StarSwoop from "@/shared/components/background/StarSwoop";
611
import GoogleSignInButton from "@/shared/components/GoogleSignInButton";
12+
import Logo from "@/shared/components/Logo";
713

814
export default async function LoginPage() {
915
return (
10-
<div className="relative flex min-h-screen w-full items-center justify-center overflow-clip text-center dark:bg-[linear-gradient(0deg,_#443461,_#130F5A_38%,_#1F1F1F)]">
11-
<div className="absolute left-0 top-0 h-[1080px] w-[1920px]">
12-
<StarSwoop className="invisible absolute right-[10%] top-[-30%] z-10 rotate-[15deg] scale-[0.3] dark:visible" />
13-
<Star className="invisible absolute left-[7%] top-[10%] z-10 scale-[0.4] dark:visible" />
14-
<Balloon className="absolute bottom-[40%] left-[5%] z-10 size-[10em]" />
15-
<PurpleBalloon className="absolute bottom-[200px] right-[40px] z-10 size-[15em]" />
16-
</div>
17-
<StarsBackground
18-
minTwinkleSpeed={0.8}
19-
twinkleProbability={0.9}
20-
className="z-[0]"
21-
/>
22-
<div className="relative z-20 flex content-center justify-center break-words">
23-
<div className="relative flex h-[50vh] min-h-fit min-w-[55vw] max-w-[80%] flex-col items-center justify-around rounded-xl bg-foreground/20 p-5">
24-
<div className="mb-3 flex flex-col gap-2">
25-
<h1 className="mb-3 text-5xl font-bold tracking-tight lg:text-8xl">
26-
Learn and grow
27-
</h1>
28-
<h2 className="text-2xl font-medium tracking-tight lg:text-4xl">
29-
with your personalized classroom agent
30-
</h2>
31-
</div>
32-
<div className="flex w-2/5 min-w-[50vw] flex-col items-center gap-10">
33-
<h3 className="text-lg italic lg:text-xl">
34-
A collaborative space for students and teachers to interact with
35-
the future of LLM-enhanced education.
36-
</h3>
37-
{/* <Button
38-
effect="hoverUnderlineWhiteExpand"
39-
icon={ArrowRightCircle}
40-
iconPlacement="right"
41-
className="h-12 w-full max-w-[20vw] bg-[#200092] text-white shadow-[0px_0px_45px_1px_#6083FF] hover:bg-[#200092]/90"
42-
>
43-
<Link href="classrooms" className="text-lg">
44-
Start your journey today
45-
</Link>
46-
</Button> */}
47-
<form action={signInWithGoogle}>
48-
<GoogleSignInButton className="h-12 w-full min-w-fit shadow-[0px_0px_45px_1px_#6083FF]" />
49-
</form>
16+
<>
17+
<CloudLeft className="absolute bottom-0 left-0 z-40 origin-bottom-left scale-[0.35] min-[500px]:scale-[0.25] min-[1270px]:scale-[0.15]" />
18+
<CloudRight className="absolute bottom-0 right-0 z-40 origin-bottom-right scale-[0.35] min-[500px]:scale-[0.25] min-[1270px]:scale-[0.15]" />
19+
<div className="relative flex min-h-screen w-full items-center justify-center overflow-clip text-center dark:bg-[linear-gradient(0deg,_#443461,_#130F5A_38%,_#1F1F1F)]">
20+
<div className="absolute left-0 top-0 h-[1080px] w-[1920px]">
21+
<StarSwoop className="absolute right-[10%] top-[-33%] z-10 rotate-[15deg] scale-[0.3] dark:visible" />
22+
<Star className="invisible absolute left-[7%] top-[10%] z-10 scale-[0.4] dark:visible" />
23+
<Balloon className="absolute bottom-[40%] left-[5%] z-10 size-[10em]" />
24+
<PurpleBalloon className="absolute bottom-[28%] right-[9%] z-10 size-[9em]" />
25+
<GreenBalloon className="absolute bottom-[29%] right-[45%] z-10 size-[3em]" />
26+
</div>
27+
<StarsBackground
28+
minTwinkleSpeed={0.8}
29+
twinkleProbability={0.9}
30+
className="z-[0]"
31+
/>
32+
<div className="relative z-20 flex content-center justify-center break-words">
33+
<div className="relative flex h-[50vh] min-h-fit min-w-[55vw] max-w-[80%] flex-col items-center justify-around rounded-xl bg-foreground/20 p-5">
34+
<div className="justify-content mb-3 flex flex-col items-center gap-2">
35+
<div className="w-fit rounded-xl border-[4px] border-border bg-muted/50 px-2 text-center dark:border-none dark:bg-inherit">
36+
<Logo className="size-[9vh] fill-foreground stroke-foreground stroke-[1em]" />
37+
</div>
38+
<h1 className="mb-3 text-5xl font-bold tracking-tight lg:text-8xl">
39+
Learn and grow
40+
</h1>
41+
<h2 className="text-2xl font-medium tracking-tight lg:text-4xl">
42+
with your personalized classroom agent
43+
</h2>
44+
</div>
45+
<div className="flex w-2/5 min-w-[50vw] flex-col items-center gap-10">
46+
<h3 className="text-lg italic lg:text-xl">
47+
A collaborative space for students and teachers to interact with
48+
the future of LLM-enhanced education.
49+
</h3>
50+
{/* <Button
51+
effect="hoverUnderlineWhiteExpand"
52+
icon={ArrowRightCircle}
53+
iconPlacement="right"
54+
className="h-12 w-full max-w-[20vw] bg-[#200092] text-white shadow-[0px_0px_45px_1px_#6083FF] hover:bg-[#200092]/90"
55+
>
56+
<Link href="classrooms" className="text-lg">
57+
Start your journey today
58+
</Link>
59+
</Button> */}
60+
<form action={signInWithGoogle}>
61+
<GoogleSignInButton className="h-12 w-full min-w-fit shadow-[0px_0px_45px_1px_#6083FF]" />
62+
</form>
63+
</div>
5064
</div>
5165
</div>
5266
</div>
53-
</div>
67+
</>
5468
);
5569
}

app/page.tsx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,31 @@ import CloudLeft from "@/shared/components/background/CloudLeft";
66
import CloudRight from "@/shared/components/background/CloudRight";
77
import Star from "@/shared/components/background/Star";
88
import StarSwoop from "@/shared/components/background/StarSwoop";
9+
import Logo from "@/shared/components/Logo";
910
import { Button } from "@/shared/components/ui/button";
1011
import { ArrowRightCircle } from "lucide-react";
1112
import Link from "next/link";
1213

1314
export default function Home() {
1415
return (
1516
<>
16-
<CloudLeft className="z-9 absolute bottom-[0%] left-[0%] origin-bottom-left scale-[0.15] " />
17-
<CloudRight className="z-9 absolute bottom-[0%] right-[0%] origin-bottom-right scale-[0.15] " />
18-
{/* <CloudLeft className="z-9 absolute scale-x-[-1] bottom-[0%] left-[0%] origin-bottom-left scale-[0.15] overflow-visible group-data-[state=collapsed]:left-[0px]" /> */}
17+
<CloudLeft className="z-9 absolute bottom-0 left-0 origin-bottom-left scale-[0.35] min-[500px]:scale-[0.25] min-[1270px]:scale-[0.15]" />
18+
<CloudRight className="z-9 absolute bottom-0 right-0 origin-bottom-right scale-[0.35] min-[500px]:scale-[0.25] min-[1270px]:scale-[0.15]" />
19+
1920
<div className="relative flex w-full flex-1 items-center justify-center overflow-clip text-center">
2021
<div className="absolute left-[50px] h-[1080px] w-[1920px] overflow-visible">
21-
<StarSwoop className="absolute right-[25%] top-[-17%] z-10 rotate-[15deg] scale-[0.3] dark:visible" />
22-
<Star className="invisible absolute left-[3%] top-[20%] z-10 scale-[0.4] dark:visible" />
22+
<StarSwoop className="absolute right-[25%] top-[-19%] z-10 rotate-[15deg] scale-[0.3] dark:visible" />
23+
<Star className="invisible absolute left-[-5%] top-[20%] z-10 scale-[0.4] dark:visible" />
2324
<Balloon className="absolute bottom-[30%] left-[-2%] z-10 size-[10em]" />
2425
<PurpleBalloon className="absolute bottom-[25%] right-[25%] z-10 size-[9em]" />
2526
<GreenBalloon className="absolute bottom-[22%] left-[35%] z-10 size-[3em]" />
26-
{/* <CloudLeft className="absolute static -translate-x-3 bottom-[20%] z-9 left-[-5%] origin-bottom-left scale-[0.15] overflow-visible group-data-[state=collapsed]:left-[0px]" /> */}
2727
</div>
2828
<div className="relative z-20 flex content-center justify-center break-words">
2929
<div className="relative flex h-[50vh] min-h-fit min-w-[55vw] max-w-[80%] flex-col items-center justify-around rounded-xl bg-foreground/20 p-5">
30-
<div className="mb-3 flex flex-col gap-2">
30+
<div className="justify-content mb-3 flex flex-col items-center gap-2">
31+
<div className="w-fit rounded-xl border-[4px] border-border bg-muted/50 px-2 text-center dark:border-none dark:bg-inherit">
32+
<Logo className="size-[9vh] fill-foreground stroke-foreground stroke-[1em]" />
33+
</div>
3134
<h1 className="mb-3 text-5xl font-bold tracking-tight lg:text-8xl">
3235
Learn and grow
3336
</h1>

public/logo.svg

Lines changed: 1 addition & 12 deletions
Loading

shared/components/Logo.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import * as React from "react";
44
const LogoComponent = ({ className }: { className: string }) => (
55
<svg
66
xmlns="http://www.w3.org/2000/svg"
7-
viewBox="0 0 892.69 723.06"
7+
viewBox="100 100 700 550"
88
className={className}
99
>
10-
<path d="m 546 215 z M 382.15 419.42 c -1.54 0 -3.1 -0.17 -4.64 -0.51 c -5.51 -1.23 -10.21 -4.53 -13.23 -9.29 l -27.94 -43.98 c -3.02 -4.76 -4.02 -10.41 -2.79 -15.92 c 1.23 -5.5 4.53 -10.2 9.29 -13.23 l 187.12 -118.86 c 9.83 -6.25 22.91 -3.32 29.15 6.51 l 27.94 43.99 a 20.95 20.95 0 0 1 2.79 15.92 c -1.23 5.5 -4.53 10.2 -9.29 13.23 L 393.43 416.14 c -3.43 2.18 -7.32 3.3 -11.28 3.3 Z m 159.14 -184.69 c -0.14 0 -0.27 0.04 -0.39 0.11 L 353.79 353.7 c -0.06 0.04 -0.25 0.16 -0.32 0.46 c -0.07 0.29 0.06 0.48 0.1 0.54 l 27.94 43.99 c 0.04 0.06 0.16 0.26 0.45 0.32 c 0.28 0.06 0.49 -0.06 0.55 -0.1 l 187.12 -118.86 c 0.06 -0.04 0.25 -0.16 0.32 -0.46 c 0.07 -0.29 -0.06 -0.48 -0.1 -0.54 s -27.94 -43.99 -27.94 -43.99 a 0.733 0.733 0 0 0 -0.61 -0.34 Z" />{" "}
10+
<path d="M382.15 419.42c-1.54 0-3.1-.17-4.64-.51-5.51-1.23-10.21-4.53-13.23-9.29l-27.94-43.98c-3.02-4.76-4.02-10.41-2.79-15.92 1.23-5.5 4.53-10.2 9.29-13.23l187.12-118.86c9.83-6.25 22.91-3.32 29.15 6.51l27.94 43.99a20.95 20.95 0 0 1 2.79 15.92c-1.23 5.5-4.53 10.2-9.29 13.23L393.43 416.14c-3.43 2.18-7.32 3.3-11.28 3.3Zm159.14-184.69c-.14 0-.27.04-.39.11L353.79 353.7c-.06.04-.25.16-.32.46-.07.29.06.48.1.54l27.94 43.99c.04.06.16.26.45.32.28.06.49-.06.55-.1l187.12-118.86c.06-.04.25-.16.32-.46.07-.29-.06-.48-.1-.54s-27.94-43.99-27.94-43.99a.73.73 0 0 0-.61-.34Z" />
1111
<path d="M305.24 435.71c-6.62 0-12.81-3.33-16.5-9.13-4.46-7.03-4.09-15.84.96-22.46l46.56-61.07 16.22 12.36-45.35 59.49 73.12-15.77 6.55 20.29-77.31 15.83c-1.42.31-2.84.45-4.24.45Z" />
12-
<path d="M291.2 641.83h-.03c-10.97 0-20.65-6.94-25.27-18.08l-30.01-72.33h-45.94c-47.9 0-86.87-45.85-86.87-102.2V215.03c0-56.35 38.97-102.2 86.87-102.2h479.17c47.9 0 86.87 45.85 86.87 102.2H735.6c0-45.11-29.82-81.81-66.48-81.81H189.95c-36.66 0-66.48 36.7-66.48 81.81v234.19c0 45.11 29.82 81.81 66.48 81.81h59.56l35.23 84.91c1.42 3.44 3.84 5.5 6.46 5.5 2.63 0 5.06-2.06 6.5-5.51l35.22-84.9h120.61v20.39h-107l-30.01 72.33c-4.65 11.16-14.35 18.08-25.32 18.08Z" />
13-
<path d="M745.8 311.93c-27.28 0-49.48-22.2-49.48-49.48s22.2-49.48 49.48-49.48 49.48 22.2 49.48 49.48-22.2 49.48-49.48 49.48Zm0-78.57c-16.04 0-29.09 13.05-29.09 29.09s13.05 29.09 29.09 29.09 29.09-13.05 29.09-29.09-13.05-29.09-29.09-29.09ZM468.73 446.72h24.22v106.19h-24.22z" />
14-
<path d="M492.95 530.23h58.4v22.67h-58.4zM690.28 446.71v106.21h-24.22V476l-32.13 31.81h-11.95l-32.3-31.95v77.06h-24.22V446.71h24.22v.06l.09-.06 38.22 37.35 38.07-37.23.12-.12h24.1z" />
15-
<path d="m666.18 446.71-.12.12v-.12h.12zM506.928 247.16l6.706-4.361 41.077 63.157-6.706 4.362z" />
12+
<path d="M291.2 641.83h-.03c-10.97 0-20.65-6.94-25.27-18.08l-30.01-72.33h-45.94c-47.9 0-86.87-45.85-86.87-102.2V215.03c0-56.35 38.97-102.2 86.87-102.2h479.17c47.9 0 86.87 45.85 86.87 102.2H735.6c0-45.11-29.82-81.81-66.48-81.81H189.95c-36.66 0-66.48 36.7-66.48 81.81v234.19c0 45.11 29.82 81.81 66.48 81.81h59.56l35.23 84.91c1.42 3.44 3.84 5.5 6.46 5.5 2.63 0 5.06-2.06 6.5-5.51l35.22-84.9h120.61v20.39h-107l-30.01 72.33c-4.65 11.16-14.35 18.08-25.32 18.08" />
13+
<path d="M745.8 311.93c-27.28 0-49.48-22.2-49.48-49.48s22.2-49.48 49.48-49.48 49.48 22.2 49.48 49.48-22.2 49.48-49.48 49.48m0-78.57c-16.04 0-29.09 13.05-29.09 29.09s13.05 29.09 29.09 29.09 29.09-13.05 29.09-29.09-13.05-29.09-29.09-29.09M468.73 446.72h24.22v106.19h-24.22z" />
14+
<path d="M492.95 530.23h58.4v22.67h-58.4zm197.33-83.52v106.21h-24.22V476l-32.13 31.81h-11.95l-32.3-31.95v77.06h-24.22V446.71h24.22v.06l.09-.06 38.22 37.35 38.07-37.23.12-.12z" />
15+
<path d="m666.18 446.71-.12.12v-.12zM506.928 247.16l6.706-4.361 41.077 63.157-6.706 4.362z" />
1616
</svg>
1717
);
1818
export default LogoComponent;

shared/components/ui/sidebar/app-sidebar.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,8 @@ export function AppSidebar() {
216216
<SidebarMenuItem>
217217
<SidebarMenuButton size="lg" asChild className="p-0">
218218
<Link href="/" className="flex">
219-
<div className="flex aspect-square h-[100%] items-center justify-center rounded-xl bg-sidebar-primary text-sidebar-primary-foreground">
220-
{/* <div className="relative h-[90%] w-[90%] object-contain"> */}
221-
{/* <Image src={"/logo.svg"} fill alt="Logo" className="fill-red-600"/> */}
222-
<Logo className="fill-sidebar-primary-foreground size-full" />
223-
{/* </div> */}
219+
<div className="flex aspect-square h-[100%] items-center justify-center rounded-xl bg-sidebar-primary p-1 text-sidebar-primary-foreground">
220+
<Logo className="size-full fill-sidebar-primary-foreground" />
224221
</div>
225222
<div className="grid flex-1 text-left text-lg leading-tight">
226223
<span className="truncate font-semibold">ClassroomLM</span>
@@ -244,7 +241,7 @@ export function AppSidebar() {
244241
size="default"
245242
>
246243
<Link href={item.url}>
247-
{item.icon && <item.icon className="scale-150"/>}
244+
{item.icon && <item.icon className="scale-150" />}
248245
<span>{item.title}</span>
249246
</Link>
250247
</SidebarMenuButton>

0 commit comments

Comments
 (0)