Merge pull request #44 from zainsci/main

feat(app): Migrate down to Pages Router
javaScriptKampala · Jan 19, 2024 · 7014e8e · 7014e8e
2 parents 032be32 + 5bfe0d5
commit 7014e8e
Show file tree

Hide file tree

Showing 34 changed files with 991 additions and 899 deletions.
diff --git a/app/about/page.tsx b/app/about/page.tsx
diff --git a/app/blog/[slug]/page.tsx b/app/blog/[slug]/page.tsx
diff --git a/app/events/[slug]/page.tsx b/app/events/[slug]/page.tsx
diff --git a/app/events/not-found.tsx b/app/events/not-found.tsx
diff --git a/app/jobs/page.tsx b/app/jobs/page.tsx
diff --git a/app/layout.tsx b/app/layout.tsx
diff --git a/app/page.tsx b/app/page.tsx
diff --git a/app/sponsors/page.tsx b/app/sponsors/page.tsx
diff --git a/app/team/page.tsx b/app/team/page.tsx
diff --git a/components.json b/components.json
@@ -1,16 +1,16 @@
 {
-  "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "new-york",
-  "rsc": true,
-  "tsx": true,
-  "tailwind": {
-    "config": "tailwind.config.js",
-    "css": "@/styles/globals.css",
-    "baseColor": "gray",
-    "cssVariables": true
-  },
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils"
-  }
-}
+	"$schema": "https://ui.shadcn.com/schema.json",
+	"style": "new-york",
+	"rsc": false,
+	"tsx": true,
+	"tailwind": {
+		"config": "tailwind.config.js",
+		"css": "@/styles/globals.css",
+		"baseColor": "gray",
+		"cssVariables": true
+	},
+	"aliases": {
+		"components": "@/components",
+		"utils": "@/lib/utils"
+	}
+}
diff --git a/components/footer/index.tsx b/components/footer/index.tsx
@@ -12,11 +12,7 @@ export default function Footer() {
 				</div>
 				<div className="flex-1 hidden md:flex flex-col items-end text-right">
 					<ul className="space-y-2">
-<<<<<<< HEAD
-						{["About", "Meetups", "Blog", "Gallery", "Sponsors"].map(
-=======
 						{["About", "Events", "Blog", "Gallery", "Sponsors"].map(
->>>>>>> 46d9fd6 (Meetups changed events in the footer)
 							(link: string) => (
 								<li>
 									<Link href={"/" + link.toLowerCase()}>

diff --git a/components/home/Blog.tsx b/components/home/Blog.tsx
@@ -1,15 +1,12 @@
 import Link from "next/link"
+import Image from "next/image"
 
+import { Post } from "@/lib/types"
 import { Button } from "@/components/ui/button"
 import { Card, CardContent, CardFooter } from "@/components/ui/card"
-import Image from "next/image"
 import { Avatar, AvatarFallback, AvatarImage } from "../ui/avatar"
-import { getSortedPostsData } from "@/lib/posts"
-import { Post } from "@/lib/types"
-
-export default function Blog() {
-	let blogPosts: Post[] = getSortedPostsData("blog", 3)
 
+export default function Blog({ blogPosts = [] }: { blogPosts?: Post[] }) {
 	return (
 		<section className="w-full my-12">
 			<h1 className="w-full text-center font-bold text-5xl mb-10">Blog</h1>

diff --git a/components/home/Meetups.tsx b/components/home/Meetups.tsx
@@ -1,12 +1,11 @@
 import Link from "next/link"
 
-import { Button } from "@/components/ui/button"
-import { Card, CardContent, CardFooter } from "@/components/ui/card"
-import { getSortedPostsData } from "@/lib/posts"
 import { Post } from "@/lib/types"
+import { Card, CardContent, CardFooter } from "@/components/ui/card"
+import { Button } from "@/components/ui/button"
 
-export default function Meetups() {
-	const eventsList: Post[] = getSortedPostsData("events", 3)
+export default function Meetups({ eventsList = [] }: { eventsList: Post[] }) {
+	console.log("eventsList", eventsList)
 
 	return (
 		<section className="w-full my-12">

diff --git a/components/layout.tsx b/components/layout.tsx
@@ -0,0 +1,42 @@
+import Footer from "@/components/footer"
+import TopNavigationBar from "@/components/navigation/TopNavigationBar"
+import { ThemeProvider } from "@/components/ui/theme-provider"
+import { Metadata } from "next"
+import { Ubuntu } from "next/font/google"
+import Head from "next/head"
+
+const inter = Ubuntu({ weight: ["400", "700"], subsets: ["cyrillic"] })
+
+export default function RootLayout({
+	children,
+	title,
+}: {
+	children: React.ReactNode
+	title: string
+}) {
+	return (
+		<>
+			<Head>
+				<title>JavaScript Kampala | {title}</title>
+			</Head>
+			<div
+				className={`${inter.className} w-screen min-h-screen overflow-x-hidden`}
+			>
+				<ThemeProvider
+					attribute="class"
+					defaultTheme="system"
+					enableSystem
+					disableTransitionOnChange
+				>
+					<TopNavigationBar />
+
+					<main className="container max-w-5xl mx-auto py-20 flex flex-col">
+						{children}
+					</main>
+
+					<Footer />
+				</ThemeProvider>
+			</div>
+		</>
+	)
+}