Add Footer to AuthAndNav, rename

presleyp · presleyp · commit 2e0a65083c88 · 2022-04-13T20:55:28.000Z
diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
@@ -1,6 +1,7 @@
 import React from "react"
 import { Route, Routes } from "react-router-dom"
-import { AuthAndNav, RequireAuth } from "./components"
+import { RequireAuth } from "./components"
+import { AuthAndFrame } from "./components/AuthAndFrame/AuthAndFrame"
 import { PreferencesLayout } from "./components/Preferences/Layout"
 import { IndexPage } from "./pages"
 import { NotFoundPage } from "./pages/404"
@@ -39,18 +40,18 @@ export const AppRouter: React.FC = () => (
         <Route
           index
           element={
-            <AuthAndNav>
+            <AuthAndFrame>
               <TemplatesPage />
-            </AuthAndNav>
+            </AuthAndFrame>
           }
         />
         <Route path=":organization/:template">
           <Route
             index
             element={
-              <AuthAndNav>
+              <AuthAndFrame>
                 <TemplatePage />
-              </AuthAndNav>
+              </AuthAndFrame>
             }
           />
           <Route
@@ -68,35 +69,35 @@ export const AppRouter: React.FC = () => (
         <Route
           path=":workspace"
           element={
-            <AuthAndNav>
+            <AuthAndFrame>
               <WorkspacePage />
-            </AuthAndNav>
+            </AuthAndFrame>
           }
         />
       </Route>
 
       <Route
         path="users"
         element={
-          <AuthAndNav>
+          <AuthAndFrame>
             <UsersPage />
-          </AuthAndNav>
+          </AuthAndFrame>
         }
       />
       <Route
         path="orgs"
         element={
-          <AuthAndNav>
+          <AuthAndFrame>
             <OrganizationsPage />
-          </AuthAndNav>
+          </AuthAndFrame>
         }
       />
       <Route
         path="settings"
         element={
-          <AuthAndNav>
+          <AuthAndFrame>
             <SettingsPage />
-          </AuthAndNav>
+          </AuthAndFrame>
         }
       />
 
diff --git a/site/src/components/AuthAndFrame/AuthAndFrame.tsx b/site/src/components/AuthAndFrame/AuthAndFrame.tsx
@@ -0,0 +1,21 @@
+import React from "react"
+import { Navbar } from "../Navbar"
+import { Footer } from "../Page/Footer"
+import { RequireAuth } from "../Page/RequireAuth"
+
+interface AuthAndFrameProps {
+  children: JSX.Element
+}
+
+/**
+ * Wraps page in RequireAuth and renders it between Navbar and Footer
+ */
+export const AuthAndFrame: React.FC<AuthAndFrameProps> = ({ children }) => (
+  <RequireAuth>
+    <>
+      <Navbar />
+      {children}
+      <Footer />
+    </>
+  </RequireAuth>
+)
diff --git a/site/src/components/Page/AuthAndNav.tsx b/site/src/components/Page/AuthAndNav.tsx
diff --git a/site/src/components/Page/index.tsx b/site/src/components/Page/index.tsx
@@ -1,3 +1,2 @@
-export * from "./AuthAndNav"
 export * from "./Footer"
 export * from "./RequireAuth"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`		`-export * from "./AuthAndNav"`
`2`	`1`	`export * from "./Footer"`
`3`	`2`	`export * from "./RequireAuth"`