bender/7dce0f8f-24c2-446b-b6f4-c803b545dc6f
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #4

Merged
bender merged 3 commits from version_2 into main 2026-03-04 15:45:50 +00:00
Conversation 0 Commits 3 Files Changed 3 +16 -45
3 changed files with 16 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/events/page.tsx
View File

@@ -132,4 +132,4 @@ export default function EventsPage() {
</div>
</ThemeProvider>
);
}
}

45
src/app/layout.tsx
View File

@@ -1,51 +1,23 @@
import type { Metadata } from "next";
import { DM_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import "./styles/variables.css";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Computer Club - Tech Community & Events",
description: "Join Computer Club: a vibrant community of tech enthusiasts, developers, and innovators. Attend workshops, hackathons, and networking events.",
keywords: "computer club, tech community, programming, coding, hackathon, networking, workshops",
openGraph: {
title: "Computer Club - Tech Community & Events",
description: "Join our thriving computer club community for workshops, hackathons, and tech networking events.",
siteName: "Computer Club",
type: "website",
},
twitter: {
card: "summary_large_image",
title: "Computer Club - Tech Community & Events",
description: "Join our thriving computer club community for workshops, hackathons, and tech networking events.",
},
};
title: "Computer Club", description: "Join the Computer Club community"};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${dmSans.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.variable}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1413,7 +1385,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}
}

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

@@ -10,15 +10,15 @@
--accent: #c68a62;;
--background-accent: #c68a62;; */
--background: #e3deea;;
--card: #ffffff;;
--foreground: #27231f;;
--primary-cta: #27231f;;
--background: #020617;;
--card: #0f172a;;
--foreground: #e2e8f0;;
--primary-cta: #c4d8f9;;
--primary-cta-text: #e3deea;;
--secondary-cta: #ffffff;;
--secondary-cta: #041633;;
--secondary-cta-text: #27231f;;
--accent: #c68a62;;
--background-accent: #c68a62;;
--accent: #2d30f3;;
--background-accent: #1d4ed8;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);