Feature/team and navbar (#182)

* add server-only * add client-only * Move to RSC * remove logging * fix typings * fix typings * add LoginGridProps * Fix possibly null * Add types * Check nulls * fix possible nulls * ignore errors in lightly used api * Set conditionally * Check null * check null * fix typings * fix null errors * fix null * add typings * fix props passing * Add typing * Add typing * fix typings * Fix typing errors * use nonnull assertion * Add styles * Move to app folder * Adhere to app api route * Make it non default * upgrade next-auth * restore session provider * Fixes in adapter * move auth to pages to test use * Fix login route * fix import * Pass authprovider * Added sidebar test * Add sidebar * Fix navbar, extract navbar * Fix layout * Hide elements if no session * Update Navbar.tsx * Fix layout * Make app dark * Extract form * Extract navbar * Move to app * Move layout out * Remove logging * REmove logging * Move logingrid to RSC * Remove logingrid * Add layout * Remove logging * Remove logging * Create getTeammates.ts * Create Team page * Fix heading * Delete github.tsx * Move to App router * Update README.md, add title (#180) * Update README.md, add title * Update README.md * Update README.md * Update README.md (#181) * Move to RSC * Fix Try app ui * Remove data logging * Make card details a page * Move layout to master layout * Fix type * Fix layout order * Remove billing link
watermelontools · Aug 7, 2023 · b743b72 · b743b72
1 parent a23281a
commit b743b72
Show file tree

Hide file tree

Showing 9 changed files with 485 additions and 771 deletions.
diff --git a/app/api/actions/github/route.ts b/app/api/actions/github/route.ts
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -1,46 +1,33 @@
 import "@primer/css/index.scss";
 
-import { getServerSession } from "next-auth";
-
+import AuthProvider from "../lib/auth/AuthProvider";
 import Navbar from "../components/Navbar";
+import { getServerSession } from "next-auth";
 import Header from "../components/Header";
-import LogInBtn from "../components/login-btn";
-
-import AuthProvider from "../lib/auth/AuthProvider";
-
 import { authOptions } from "./api/auth/[...nextauth]/route";
-import { ReactNode, Suspense } from "react";
-
+import LogInBtn from "../components/login-btn";
 export const metadata = {
-  title: {
-    template: "%s | Watermelon",
-    default: "Watermelon",
-  },
+  title: "Watermelon",
   description: "Get context on each PR",
 };
 
 export default async function RootLayout({
   children,
 }: {
-  children: ReactNode;
+  children: React.ReactNode;
 }) {
   const session = await getServerSession(authOptions);
   let userEmail = session?.user?.email;
   let userName = session?.user?.name;
+  if (!session) return <LogInBtn />;
 
   return (
     <html lang="en" data-color-mode="dark" data-dark-theme="dark">
-      <body style={{ minHeight: "100vh" }}>
-        {userEmail ? (
-          <>
-            <Header userEmail={userEmail} userToken={userName} />
-            <Navbar>
-              <AuthProvider>{children}</AuthProvider>
-            </Navbar>
-          </>
-        ) : (
-          <LogInBtn />
-        )}
+      <body>
+        <Header />
+        <Navbar>
+          <AuthProvider>{children}</AuthProvider>
+        </Navbar>
       </body>
     </html>
   );

diff --git a/components/Header.tsx b/components/Header.tsx
@@ -1,14 +1,7 @@
 "use client";
 import Image from "next/image";
-import { useSession, signOut } from "next-auth/react";
-import { useEffect, useState } from "react";
-export default function Header() {
-  const [userEmail, setUserEmail] = useState<string | null | undefined>(null);
-  const { data } = useSession();
-
-  useEffect(() => {
-    setUserEmail(data?.user?.email);
-  }, [data]);
+import HeaderSignOut from "./HeaderSignOut";
+export default function Header({ userEmail, userToken }) {
   return (
     <div className="Header d-flex flex-items-center flex-justify-between">
       <a href="/" className="Header-link">
@@ -48,7 +41,7 @@ export default function Header() {
                   className="dropdown-item"
                   href={`vscode://watermelontools.watermelon-tools?email=${
                     userEmail ?? ""
-                  }&token=${data?.user?.name ? data.user.name : ""}`}
+                  }&token=${userToken ? userToken : ""}`}
                 >
                   VSCode Extension
                 </a>

diff --git a/components/loginGrid.tsx b/components/loginGrid.tsx
@@ -1,5 +1,3 @@
-import { useEffect, useState } from "react";
-
 import InfoPanel from "../components/dashboard/InfoPanel";
 import JiraLoginLink from "../components/JiraLoginLink";
 import SlackLoginLink from "../components/SlackLoginLink";

diff --git a/components/sidebar.tsx b/components/sidebar.tsx
@@ -0,0 +1,16 @@
+import Link from "next/link";
+
+const sidebar = (
+  <nav className="SideNav border">
+    <Link className="SideNav-item" href="/">
+      Home
+    </Link>
+    <Link className="SideNav-item" href="/settings" aria-current="page">
+      Settings
+    </Link>
+    <Link className="SideNav-item" href="/billing">
+      Billing
+    </Link>
+  </nav>
+);
+export default sidebar;
diff --git a/pages/actions/github.tsx b/pages/actions/github.tsx