Remove bottom bar from workspace page

BrunoQuaresma · BrunoQuaresma · commit a78d4cf77bc2 · 2024-01-09T16:34:27.000Z
diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
@@ -370,7 +370,6 @@ export const AppRouter: FC = () => {
 
               {/* In order for the 404 page to work properly the routes that start with
               top level parameter must be fully qualified. */}
-              <Route path="/:username/:workspace" element={<WorkspacePage />} />
               <Route
                 path="/:username/:workspace/builds/:buildNumber"
                 element={<WorkspaceBuildPage />}
@@ -413,6 +412,7 @@ export const AppRouter: FC = () => {
             </Route>
 
             {/* Pages that don't have the dashboard layout */}
+            <Route path="/:username/:workspace" element={<WorkspacePage />} />
             <Route
               path="/templates/:template/versions/:version/edit"
               element={<TemplateVersionEditorPage />}
diff --git a/site/src/pages/WorkspacePage/Workspace.tsx b/site/src/pages/WorkspacePage/Workspace.tsx
@@ -14,8 +14,6 @@ import {
 import { WorkspaceDeletedBanner } from "./WorkspaceDeletedBanner";
 import { WorkspaceTopbar } from "./WorkspaceTopbar";
 import { HistorySidebar } from "./HistorySidebar";
-import { dashboardContentBottomPadding, navHeight } from "theme/constants";
-import { bannerHeight } from "components/Dashboard/DeploymentBanner/DeploymentBannerView";
 import HistoryOutlined from "@mui/icons-material/HistoryOutlined";
 import { useTheme } from "@mui/material/styles";
 import { SidebarIconButton } from "components/FullPageLayout/Sidebar";
@@ -119,8 +117,6 @@ export const Workspace: FC<WorkspaceProps> = ({
           "topbar topbar topbar" auto
           "leftbar sidebar content" 1fr / auto auto 1fr
         `,
-        maxHeight: `calc(100vh - ${navHeight + bannerHeight}px)`,
-        marginBottom: `-${dashboardContentBottomPadding}px`,
       }}
     >
       <WorkspaceTopbar
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx
@@ -14,6 +14,7 @@ import { WorkspacePermissions, workspaceChecks } from "./permissions";
 import { watchWorkspace } from "api/api";
 import { Workspace } from "api/typesGenerated";
 import { useEffectEvent } from "hooks/hookPolyfills";
+import { Navbar } from "components/Dashboard/Navbar/Navbar";
 
 export const WorkspacePage: FC = () => {
   const queryClient = useQueryClient();
@@ -102,27 +103,26 @@ export const WorkspacePage: FC = () => {
     workspaceQuery.error ?? templateQuery.error ?? permissionsQuery.error;
   const isLoading = !workspace || !template || !permissions;
 
-  if (pageError) {
-    return (
-      <Margins>
-        <ErrorAlert
-          error={pageError}
-          css={{ marginTop: 16, marginBottom: 16 }}
-        />
-      </Margins>
-    );
-  }
-
-  if (isLoading) {
-    return <Loader />;
-  }
-
   return (
-    <WorkspaceReadyPage
-      workspace={workspace}
-      template={template}
-      permissions={permissions}
-    />
+    <div css={{ height: "100%" }}>
+      <Navbar />
+      {pageError ? (
+        <Margins>
+          <ErrorAlert
+            error={pageError}
+            css={{ marginTop: 16, marginBottom: 16 }}
+          />
+        </Margins>
+      ) : isLoading ? (
+        <Loader />
+      ) : (
+        <WorkspaceReadyPage
+          workspace={workspace}
+          template={template}
+          permissions={permissions}
+        />
+      )}
+    </div>
   );
 };
 
