Fix sideways layout

kylecarbs · kylecarbs · commit 8933b493582e · 2023-06-28T00:49:26.000Z
diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
@@ -115,10 +115,7 @@ const NetworkSettingsPage = lazy(
       "./pages/DeploySettingsPage/NetworkSettingsPage/NetworkSettingsPage"
     ),
 )
-const GitAuthPage = lazy(() => import("./pages/GitAuthPage/GitAuthPageView"))
-const GitAuthDevicePage = lazy(
-  () => import("./pages/GitAuthDevicePage/GitAuthDevicePage"),
-)
+const GitAuthPage = lazy(() => import("./pages/GitAuthPage/GitAuthPage"))
 const TemplateVersionPage = lazy(
   () => import("./pages/TemplateVersionPage/TemplateVersionPage"),
 )
diff --git a/site/src/components/Dashboard/DashboardLayout.tsx b/site/src/components/Dashboard/DashboardLayout.tsx
@@ -111,5 +111,6 @@ const useStyles = makeStyles({
     flex: 1,
     paddingBottom: dashboardContentBottomPadding, // Add bottom space since we don't use a footer
     display: "flex",
+    flexDirection: "column",
   },
 })
diff --git a/site/src/pages/GitAuthPage/GitAuthPage.tsx b/site/src/pages/GitAuthPage/GitAuthPage.tsx
@@ -5,14 +5,14 @@ import {
   getGitAuthProvider,
 } from "api/api"
 import { usePermissions } from "hooks"
-import { useEffect } from "react"
+import { FC, useEffect } from "react"
 import { redirect, useParams } from "react-router-dom"
 import { REFRESH_GITAUTH_BROADCAST_CHANNEL } from "xServices/createWorkspace/createWorkspaceXService"
 import GitAuthPageView from "./GitAuthPageView"
 import { ApiErrorResponse } from "api/errors"
 import { isAxiosError } from "axios"
 
-const GitAuthPage = () => {
+const GitAuthPage: FC = () => {
   const { provider } = useParams()
   if (!provider) {
     throw new Error("provider must exist")
@@ -78,7 +78,7 @@ const GitAuthPage = () => {
     !getGitAuthProviderQuery.data.authenticated &&
     !getGitAuthProviderQuery.data.device
   ) {
-    return redirect(`/gitauth/${provider}/callback`)
+    redirect(`/gitauth/${provider}/callback`)
   }
 
   return (

Original file line number	Diff line number	Diff line change
`@@ -115,10 +115,7 @@ const NetworkSettingsPage = lazy(`
`115`	`115`	`"./pages/DeploySettingsPage/NetworkSettingsPage/NetworkSettingsPage"`
`116`	`116`	`),`
`117`	`117`	`)`
`118`		`-const GitAuthPage = lazy(() => import("./pages/GitAuthPage/GitAuthPageView"))`
`119`		`-const GitAuthDevicePage = lazy(`
`120`		`- () => import("./pages/GitAuthDevicePage/GitAuthDevicePage"),`
`121`		`-)`
	`118`	`+const GitAuthPage = lazy(() => import("./pages/GitAuthPage/GitAuthPage"))`
`122`	`119`	`const TemplateVersionPage = lazy(`
`123`	`120`	`() => import("./pages/TemplateVersionPage/TemplateVersionPage"),`
`124`	`121`	`)`