The-Creative-Programming-Group · FleetAdmiralJakob · Jan 31, 2024 · Jan 31, 2024 · Feb 2, 2024 · Feb 2, 2024
diff --git a/.env.example b/.env.example
@@ -18,4 +18,5 @@ UPSTASH_RATELIMITER_EXCLUDED_IPS="..." // List of IPs separated by comma
 RESEND_API_KEY="re_..."
 QWEATHER_API_KEY="..."
 API_NINJA_API_KEY="..."
+BASEHUB_TOKEN="bshb_pk_..."
 NEXT_PUBLIC_CONVEX_URL="https://..."
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,7 @@ env:
   FORCE_COLOR: 3
   TURBO_TEAM: ${{ vars.TURBO_TEAM }}
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+  BASEHUB_TOKEN: ${{ secrets.BASEHUB_TOKEN }}
 
 jobs:
   lint:

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -15,6 +15,7 @@ env:
   QWEATHER_API_KEY: ${{ secrets.QWEATHER_API_KEY }}
   API_NINJA_API_KEY: ${{ secrets.API_NINJA_API_KEY }}
   NEXT_PUBLIC_CONVEX_URL: ${{ secrets.NEXT_PUBLIC_CONVEX_URL_PROD }}
+  BASEHUB_TOKEN: ${{ secrets.BASEHUB_TOKEN }}
 
 jobs:
   test:

diff --git a/.github/workflows/update-convex.yml b/.github/workflows/update-convex.yml
@@ -11,6 +11,7 @@ env:
   FORCE_COLOR: 3
   TURBO_TEAM: ${{ vars.TURBO_TEAM }}
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+  BASEHUB_TOKEN: ${{ secrets.BASEHUB_TOKEN }}
 
 jobs:
     update-city-data:

diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ coverage
 .next/
 out/
 next-env.d.ts
+analyze
 
 # production
 build

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -10,7 +10,8 @@
     "lint": "dotenv -v SKIP_ENV_VALIDATION=1 next lint",
     "start": "pnpm with-env next start",
     "typecheck": "tsc --noEmit",
-    "with-env": "dotenv -e ../../.env --"
+    "with-env": "dotenv -e ../../.env --",
+    "postinstall": "basehub"
   },
   "dependencies": {
     "@ducanh2912/next-pwa": "^10.2.5",
@@ -30,6 +31,7 @@
     "@weatherio/city-data": "workspace:^0.1.0",
     "@weatherio/types": "workspace:^0.1.0",
     "@weatherio/ui": "workspace:^0.1.0",
+    "basehub": "^1.3.10",
     "clsx": "^2.1.0",
     "convex": "^1.10.0",
     "dayjs": "^1.11.10",

diff --git a/apps/web/src/app/blog/page.tsx b/apps/web/src/app/blog/page.tsx
@@ -0,0 +1,55 @@
+import type { Metadata } from "next";
+import Link from "next/link";
+import { basehub } from "basehub";
+
+export const revalidate = 60;
+export const dynamic = "force-static";
+
+export async function generateMetadata(): Promise<Metadata> {
+  const { weatherIoBlog } = await basehub().query({
+    weatherIoBlog: {
+      _title: true,
+      title: true,
+      subtitle: true,
+    },
+  });
+
+  return {
+    title: weatherIoBlog._title,
+    description: weatherIoBlog.subtitle,
+    // etc...
+  };
+}
+
+const BlogPage = async () => {
+  const { weatherIoBlog } = await basehub({ next: { revalidate: 60 } }).query({
+    weatherIoBlog: {
+      title: true,
+      subtitle: true,
+      blogPosts: {
+        items: {
+          _id: true,
+          _title: true,
+          _slug: true,
+        },
+      },
+    },
+  });
+
+  return (
+    <div className="container">
+      <div>{weatherIoBlog.subtitle}</div>
+      <ul>
+        {weatherIoBlog.blogPosts.items.map((post) => {
+          return (
+            <li key={post._id}>
+              <Link href={`/blog/${post._slug}`}>{post._title}</Link>
+            </li>
+          );
+        })}
+      </ul>
+    </div>
+  );
+};
+
+export default BlogPage;
diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
@@ -0,0 +1,33 @@
+import "~/styles/globals.css";
+
+import { Inter } from "next/font/google";
+import Image from "next/image";
+
+import image from "~/assets/icon-512x-512-any.png";
+
+const inter = Inter({
+  subsets: ["latin"],
+  variable: "--font-sans",
+});
+
+export default function RootLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <html lang="en">
+      <body className={`font-sans ${inter.variable}`}>
+        <nav className="container z-50 mb-7 flex h-16 items-center border-b bg-background">
+          <div className="mr-8 hidden items-center md:flex">
+            <Image src={image} alt="Logo" className="mr-2 h-6 w-6" />
+            <span className="text-lg font-bold tracking-tight">
+              Weather.io&apos;s Blog
+            </span>
+          </div>
+        </nav>
+        {children}
+      </body>
+    </html>
+  );
+}
diff --git a/apps/web/src/assets/icon-512x-512-any.png b/apps/web/src/assets/icon-512x-512-any.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ coverage @@
     .next/
     out/
     next-env.d.ts
+    analyze
     # production
     build
@@ Expand Down @@