feat: Add Footer to every page with nav (#1009)

presleyp · web-flow · commit 76f8ff9f21bf · 2022-04-14T13:58:53.000-04:00
* Add Footer to AuthAndNav, rename

* Fix in preferences layout

* Remove double footer
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"
diff --git a/site/src/components/Preferences/Layout.tsx b/site/src/components/Preferences/Layout.tsx
@@ -1,7 +1,7 @@
 import Box from "@material-ui/core/Box"
 import React from "react"
 import { Outlet } from "react-router-dom"
-import { AuthAndNav } from "../Page"
+import { AuthAndFrame } from "../AuthAndFrame/AuthAndFrame"
 import { TabPanel } from "../TabPanel"
 
 export const Language = {
@@ -21,14 +21,14 @@ const menuItems = [
 
 export const PreferencesLayout: React.FC = () => {
   return (
-    <AuthAndNav>
+    <AuthAndFrame>
       <Box display="flex" flexDirection="column">
         <Box style={{ maxWidth: "1380px", margin: "1em auto" }}>
           <TabPanel title={Language.preferencesLabel} menuItems={menuItems}>
             <Outlet />
           </TabPanel>
         </Box>
       </Box>
-    </AuthAndNav>
+    </AuthAndFrame>
   )
 }
diff --git a/site/src/pages/templates/[organization]/[template]/index.tsx b/site/src/pages/templates/[organization]/[template]/index.tsx
@@ -8,7 +8,6 @@ import { EmptyState } from "../../../../components/EmptyState"
 import { ErrorSummary } from "../../../../components/ErrorSummary"
 import { Header } from "../../../../components/Header"
 import { FullScreenLoader } from "../../../../components/Loader/FullScreenLoader"
-import { Footer } from "../../../../components/Page"
 import { Column, Table } from "../../../../components/Table"
 import { unsafeSWRArgument } from "../../../../util"
 import { firstOrItem } from "../../../../util/array"
@@ -98,7 +97,6 @@ export const TemplatePage: React.FC = () => {
       <Paper style={{ maxWidth: "1380px", margin: "1em auto", width: "100%" }}>
         <Table {...tableProps} />
       </Paper>
-      <Footer />
     </div>
   )
 }
diff --git a/site/src/pages/templates/index.tsx b/site/src/pages/templates/index.tsx
@@ -9,7 +9,6 @@ import { CodeExample } from "../../components/CodeExample/CodeExample"
 import { ErrorSummary } from "../../components/ErrorSummary"
 import { Header } from "../../components/Header"
 import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"
-import { Footer } from "../../components/Page"
 import { Column, Table } from "../../components/Table"
 
 export const TemplatesPage: React.FC = () => {
@@ -74,7 +73,6 @@ export const TemplatesPage: React.FC = () => {
       <Paper style={{ maxWidth: "1380px", margin: "1em auto", width: "100%" }}>
         <Table {...tableProps} />
       </Paper>
-      <Footer />
     </div>
   )
 }
diff --git a/site/src/pages/workspaces/[workspace].tsx b/site/src/pages/workspaces/[workspace].tsx
@@ -5,7 +5,6 @@ import useSWR from "swr"
 import * as Types from "../../api/types"
 import { ErrorSummary } from "../../components/ErrorSummary"
 import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"
-import { Footer } from "../../components/Page"
 import { Workspace } from "../../components/Workspace"
 import { unsafeSWRArgument } from "../../util"
 import { firstOrItem } from "../../util/array"
@@ -50,8 +49,6 @@ export const WorkspacePage: React.FC = () => {
       <div className={styles.inner}>
         <Workspace organization={organization} template={template} workspace={workspace} />
       </div>
-
-      <Footer />
     </div>
   )
 }

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"`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ import { CodeExample } from "../../components/CodeExample/CodeExample"`
`9`	`9`	`import { ErrorSummary } from "../../components/ErrorSummary"`
`10`	`10`	`import { Header } from "../../components/Header"`
`11`	`11`	`import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"`
`12`		`-import { Footer } from "../../components/Page"`
`13`	`12`	`import { Column, Table } from "../../components/Table"`
`14`	`13`
`15`	`14`	`export const TemplatesPage: React.FC = () => {`
`@@ -74,7 +73,6 @@ export const TemplatesPage: React.FC = () => {`
`74`	`73`	`<Paper style={{ maxWidth: "1380px", margin: "1em auto", width: "100%" }}>`
`75`	`74`	`<Table {...tableProps} />`
`76`	`75`	`</Paper>`
`77`		`- <Footer />`
`78`	`76`	`</div>`
`79`	`77`	`)`
`80`	`78`	`}`