Merge pull request #2 from metrue/domain-binding

Read the github username from environment variable when deployment to own domain

app/blog/page.tsx

@@ -1,14 +1,37 @@
 import { getServerSession } from "next-auth/next";
 import { authOptions } from "@/lib/auth";
 import BlogList from "@/components/BlogList";
-import { getBlogPosts } from "@/lib/githubApi";
 import GitHubSignInButton from "@/components/GitHubSignInButton";
+import { getBlogPosts, getBlogPostsPublic } from "@/lib/githubApi";
+import { Octokit } from "@octokit/rest";
+import PublicBlogList from "@/components/PublicBlogList";
 
 export default async function BlogPage() {
   const session = await getServerSession(authOptions);
 
   if (!session || !session.accessToken) {
-    return <GitHubSignInButton />;
+    const username = process.env.GITHUB_USERNAME ?? '';
+
+    if (username) {
+      const octokit = new Octokit();
+      const blogPosts = await getBlogPostsPublic(
+        octokit,
+        username,
+        "tinymind-blog"
+      );
+
+      return (
+        <div className="max-w-4xl mx-auto px-4 py-8">
+          <div className="max-w-2xl mx-auto">
+            <PublicBlogList posts={blogPosts} username={username} />
+          </div>
+        </div>
+      );
+    } else {
+      return (
+        <GitHubSignInButton />
+      );
+    }
   }
 
   try {

app/editor/page.tsx

@@ -12,7 +12,11 @@ export default async function EditorPage({
   const defaultType = searchParams.type === "blog" ? "blog" : "thought";
 
   if (!session) {
-    return <GitHubSignInButton />;
+
+    const username = process.env.GITHUB_USERNAME;
+    if (!username) { 
+      return <GitHubSignInButton />;
+    }
   }
 
   return (

app/page.tsx

@@ -1,10 +1,12 @@
 import ThoughtsList from "@/components/ThoughtsList";
 
 export default function Home() {
+  const username = process.env.GITHUB_USERNAME ?? ''
+
   return (
     <div className="flex flex-col min-h-screen">
       <main className="flex-grow container mx-auto px-4 sm:px-6">
-        <ThoughtsList />
+        <ThoughtsList username={username} />
       </main>
     </div>
   );

app/thoughts/page.tsx

@@ -1,14 +1,36 @@
 import { getServerSession } from "next-auth/next";
 import { authOptions } from "@/lib/auth";
-import ThoughtsList from "@/components/ThoughtsList";
 import GitHubSignInButton from "@/components/GitHubSignInButton";
+import ThoughtsList from "@/components/ThoughtsList";
+import { getThoughtsPublic } from "@/lib/githubApi";
+import { Octokit } from "@octokit/rest";
+import PublicThoughtsList from "@/components/PublicThoughtsList";
 
 export default async function ThoughtsPage() {
   const session = await getServerSession(authOptions);
+  const username = process.env.GITHUB_USERNAME ?? '';
 
   if (!session || !session.accessToken) {
-    return <GitHubSignInButton />;
+    if (username) {
+      const octokit = new Octokit();
+      const blogPosts = await getThoughtsPublic(
+        octokit,
+        process.env.GITHUB_USERNAME ?? '',
+        "tinymind-blog"
+      );
+      return (
+        <div className="max-w-4xl mx-auto px-4 py-8">
+          <div className="max-w-2xl mx-auto">
+            <PublicThoughtsList thoughts={blogPosts} />
+          </div>
+        </div>
+      );
+    } else {
+      return (
+        <GitHubSignInButton />
+      ); 
+    }
   }
 
-  return <ThoughtsList />;
+  return <ThoughtsList username={username} />;
 }

components/ThoughtsList.tsx

@@ -2,7 +2,8 @@
 
 import { useState, useEffect } from "react";
 import { useSession } from "next-auth/react";
-import { getThoughts, Thought } from "@/lib/githubApi";
+import { getThoughts, getThoughtsPublic, Thought } from "@/lib/githubApi";
+import { Octokit } from "@octokit/rest";
 import GitHubSignInButton from "./GitHubSignInButton";
 import { useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
@@ -16,7 +17,7 @@ import {
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
+} from "@/components/ui/dropdown-menu"
 import { AiOutlineEllipsis } from "react-icons/ai";
 import { useToast } from "@/components/ui/use-toast";
 import {
@@ -33,7 +34,7 @@ import remarkMath from "remark-math";
 import rehypeKatex from "rehype-katex";
 import { formatTimestamp } from "@/utils/dateFormatting";
 
-export default function ThoughtsList() {
+export default function ThoughtsList({ username }: { username: string }) {
   const [thoughts, setThoughts] = useState<Thought[]>([]);
   const [error, setError] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState(true);
@@ -48,18 +49,16 @@ export default function ThoughtsList() {
     async function fetchThoughts() {
       if (status === "loading") return;
       if (status === "unauthenticated") {
-        setError("Please log in to view thoughts");
         setIsLoading(false);
-        return;
-      }
-      if (!session?.accessToken) {
-        setError("Access token not available");
-        setIsLoading(false);
-        return;
       }
 
       try {
-        const fetchedThoughts = await getThoughts(session.accessToken);
+        const octokit = new Octokit();
+        const fetchedThoughts = session?.accessToken
+          ? await getThoughts(session.accessToken)
+          : username
+          ? await getThoughtsPublic(octokit, username, "tinymind-blog")
+          : [];
         setThoughts(fetchedThoughts);
         setError(null);
       } catch (error) {
@@ -79,7 +78,7 @@ export default function ThoughtsList() {
     }
 
     fetchThoughts();
-  }, [session, status]);
+  }, [session, status, username]);
 
   const handleDeleteThought = async (id: string) => {
     if (!session?.accessToken) {
@@ -125,7 +124,9 @@ export default function ThoughtsList() {
   };
 
   if (status === "unauthenticated" || error === "authentication_failed") {
-    return <GitHubSignInButton />;
+    if (!username) {
+      return <GitHubSignInButton />;
+    }
   }
 
   if (error && error !== "authentication_failed") {