bender/e5e847c8-9e48-47e3-8a98-245f189fa455
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_2
Branches Tags
bender:main bender:version_12 bender:version_11 bender:version_10 bender:version_9 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_4
Branches Tags
bender:main bender:version_12 bender:version_11 bender:version_10 bender:version_9 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

8 Commits
version_2 ... version_4

Author SHA1 Message Date
bender
95d3c1af0f Update src/app/styles/base.css 2026-03-01 16:19:24 +00:00
bender
efc39f0539 Update src/app/layout.tsx 2026-03-01 16:19:23 +00:00
bender
bce3805ae2 Merge version_3 into main 
Merge version_3 into main
 2026-03-01 16:16:04 +00:00
bender
5ae66c0b24 Update src/app/page.tsx 2026-03-01 16:16:00 +00:00
bender
b1d8567eb1 Update src/app/layout.tsx 2026-03-01 16:15:59 +00:00
bender
33a545a17f Merge version_2 into main 
Merge version_2 into main
 2026-03-01 16:13:05 +00:00
bender
452706960a Merge version_2 into main 
Merge version_2 into main
 2026-03-01 16:12:12 +00:00
bender
f36ab44f3c Merge version_2 into main 
Merge version_2 into main
 2026-03-01 16:10:50 +00:00
3 changed files with 16 additions and 26 deletions
Expand all files Collapse all files

12
src/app/layout.tsx
View File

@@ -1,12 +1,12 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Inter_Tight } from "next/font/google"; import { IBM_Plex_Sans } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
const interTight = Inter_Tight({ const ibmPlexSans = IBM_Plex_Sans({
variable: "--font-inter-tight", subsets: ["latin"], variable: "--font-ibm-plex-sans", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"], weight: ["100", "200", "300", "400", "500", "600", "700"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -28,7 +28,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${interTight.variable} antialiased`} className={`${ibmPlexSans.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}
@@ -1403,4 +1403,4 @@ export default function RootLayout({
</ServiceWrapper> </ServiceWrapper>
</html> </html>
); );
} }

26
src/app/page.tsx
View File

@@ -1,7 +1,7 @@
"use client"; "use client";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple'; import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import HeroSplitDualMedia from '@/components/sections/hero/HeroSplitDualMedia'; import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout'; import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
import FeatureCardNine from '@/components/sections/feature/FeatureCardNine'; import FeatureCardNine from '@/components/sections/feature/FeatureCardNine';
import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven'; import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven';
@@ -40,29 +40,19 @@ export default function LandingPage() {
</div> </div>
<div id="hero" data-section="hero"> <div id="hero" data-section="hero">
<HeroSplitDualMedia <HeroLogoBillboard
title="Connect. Code. Create. Together." logoText="Connect. Code. Create."
description="Join our thriving computer club where students collaborate on innovative projects, sharpen their coding skills, and build lasting connections with fellow tech enthusiasts." description="Join our thriving computer club where students collaborate on innovative projects, sharpen their coding skills, and build lasting connections with fellow tech enthusiasts."
tag="Welcome to CompClub"
tagIcon={Sparkles}
tagAnimation="slide-up"
background={{ variant: "sparkles-gradient" }}
buttons={[ buttons={[
{ text: "Join Our Club", href: "#contact" }, { text: "Join Our Club", href: "#contact" },
{ text: "Learn More", href: "#about" } { text: "Learn More", href: "#about" }
]} ]}
buttonAnimation="slide-up" buttonAnimation="slide-up"
mediaItems={[ background={{ variant: "sparkles-gradient" }}
{ imageSrc="http://img.b2bpic.net/free-photo/binary-code-digits-technology-software-concept_53876-120040.jpg"
imageSrc: "http://img.b2bpic.net/free-photo/binary-code-digits-technology-software-concept_53876-120040.jpg", imageAlt: "Computer workstation with development setup" imageAlt="Computer workstation with development setup"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/close-up-it-professional-using-tablet-building-ai-algorithms_482257-92639.jpg", imageAlt: "Collaborative coding session"
}
]}
mediaAnimation="slide-up" mediaAnimation="slide-up"
rating={5} frameStyle="card"
ratingText="Trusted by 200+ members"
/> />
</div> </div>
@@ -304,4 +294,4 @@ export default function LandingPage() {
</div> </div>
</ThemeProvider> </ThemeProvider>
); );
} }

4
src/app/styles/base.css
View File

@@ -11,7 +11,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-inter-tight), sans-serif; font-family: var(--font-ibm-plex-sans), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-inter-tight), sans-serif; font-family: var(--font-ibm-plex-sans), sans-serif;
} }