bender/26875581-3684-4968-8bee-a3a32daa7325
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_1
Branches Tags
bender:main bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_5
Branches Tags
bender:main bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

9 Commits
version_1 ... version_5

Author SHA1 Message Date
bender
694c300287 Update src/app/styles/base.css 2026-02-27 13:51:14 +00:00
bender
3363a711db Update src/app/layout.tsx 2026-02-27 13:51:13 +00:00
bender
9d45aa9dc5 Merge version_3 into main 
Merge version_3 into main
 2026-02-27 13:39:29 +00:00
bender
0ef3c2ef0f Update src/app/styles/variables.css 2026-02-27 13:39:25 +00:00
bender
4f56070dbe Update src/app/page.tsx 2026-02-27 13:39:24 +00:00
bender
bf06d5d28b Update src/app/layout.tsx 2026-02-27 13:39:24 +00:00
bender
5caa6b6be0 Merge version_2 into main 
Merge version_2 into main
 2026-02-27 13:37:39 +00:00
bender
94395a7251 Update src/app/page.tsx 2026-02-27 13:37:35 +00:00
bender
ab006f447d Merge version_1 into main 
Merge version_1 into main
 2026-02-27 13:34:56 +00:00
4 changed files with 29 additions and 30 deletions
Expand all files Collapse all files

9
src/app/layout.tsx
View File

@@ -1,11 +1,12 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Rubik } 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 rubik = Rubik({ const ibmPlexSans = IBM_Plex_Sans({
variable: "--font-rubik", subsets: ["latin"], variable: "--font-ibm-plex-sans", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -27,7 +28,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${rubik.variable} antialiased`} className={`${ibmPlexSans.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}

14
src/app/page.tsx
View File

@@ -1,7 +1,7 @@
"use client"; "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen'; import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import HeroCentered from '@/components/sections/hero/HeroCentered'; import HeroCentered from '@/components/sections/hero/HeroCentered';
import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout'; import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
import FeatureCardSix from '@/components/sections/feature/FeatureCardSix'; import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
@@ -28,7 +28,7 @@ export default function TechHubClubPage() {
headingFontWeight="semibold" headingFontWeight="semibold"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
<NavbarStyleFullscreen <NavbarStyleApple
navItems={[ navItems={[
{name: "Home", id: "hero"}, {name: "Home", id: "hero"},
{name: "About", id: "about"}, {name: "About", id: "about"},
@@ -37,8 +37,6 @@ export default function TechHubClubPage() {
{name: "Contact", id: "contact"} {name: "Contact", id: "contact"}
]} ]}
brandName="TechHub Club" brandName="TechHub Club"
bottomLeftText="Join the Community"
bottomRightText="hello@techhubclub.com"
/> />
</div> </div>
@@ -54,8 +52,8 @@ export default function TechHubClubPage() {
]} ]}
avatarText="Join 150+ passionate members" avatarText="Join 150+ passionate members"
buttons={[ buttons={[
{text: "Join Now", href: "#contact"}, {text: "Join Now", href: "contact"},
{text: "Learn More", href: "#about"} {text: "Learn More", href: "about"}
]} ]}
buttonAnimation="slide-up" buttonAnimation="slide-up"
/> />
@@ -70,8 +68,8 @@ export default function TechHubClubPage() {
]} ]}
useInvertedBackground={false} useInvertedBackground={false}
buttons={[ buttons={[
{text: "View Our Projects", href: "#features"}, {text: "View Our Projects", href: "features"},
{text: "Contact Us", href: "#contact"} {text: "Contact Us", href: "contact"}
]} ]}
buttonAnimation="slide-up" buttonAnimation="slide-up"
/> />

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-rubik), 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-rubik), sans-serif; font-family: var(--font-ibm-plex-sans), sans-serif;
} }

28
src/app/styles/variables.css
View File

@@ -2,23 +2,23 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #f5f5f5;; /* --background: #020617;;
--card: #ffffff;; --card: #0f172a;;
--foreground: #1c1c1c;; --foreground: #e2e8f0;;
--primary-cta: #1f514c;; --primary-cta: #2d30f3;;
--secondary-cta: #ffffff;; --secondary-cta: #041633;;
--accent: #159c49;; --accent: #1d4ed8;;
--background-accent: #a8e8ba;; */ --background-accent: #1d4ed8;; */
--background: #f5f5f5;; --background: #020617;;
--card: #ffffff;; --card: #0f172a;;
--foreground: #1c1c1c;; --foreground: #e2e8f0;;
--primary-cta: #1f514c;; --primary-cta: #2d30f3;;
--primary-cta-text: #f5f5f5;; --primary-cta-text: #f5f5f5;;
--secondary-cta: #ffffff;; --secondary-cta: #041633;;
--secondary-cta-text: #1c1c1c;; --secondary-cta-text: #1c1c1c;;
--accent: #159c49;; --accent: #1d4ed8;;
--background-accent: #a8e8ba;; --background-accent: #1d4ed8;;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);