From 1a667d9e5c01715f94632fcc6976abdd27ac9e74 Mon Sep 17 00:00:00 2001 From: kylecarbs Date: Fri, 13 May 2022 22:21:27 +0000 Subject: [PATCH 01/21] feat: Improve navbar to be more compact The navbar was unnecessarily large before, which made the UI feel a bit bloaty from my perspective. --- site/src/AppRouter.tsx | 9 +++ site/src/api/api.ts | 5 ++ site/src/app.tsx | 4 +- site/src/components/NavbarView/NavbarView.tsx | 28 ++++---- site/src/components/UserAvatar/UserAvatar.tsx | 15 ++++- .../WorkspacesPage/WorkspacesPage.tsx | 31 +++++++++ site/src/pages/index.tsx | 2 +- site/src/theme/constants.ts | 2 +- site/src/theme/palettes.ts | 8 +-- .../workspaces/workspacesXService.ts | 60 ++++++++++++++++++ site/static/boxes.png | Bin 0 -> 62970 bytes site/webpack.dev.ts | 3 +- 12 files changed, 145 insertions(+), 22 deletions(-) create mode 100644 site/src/components/WorkspacesPage/WorkspacesPage.tsx create mode 100644 site/src/xServices/workspaces/workspacesXService.ts create mode 100644 site/static/boxes.png diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx index 9b62bdebba2e7..819b92604f0c5 100644 --- a/site/src/AppRouter.tsx +++ b/site/src/AppRouter.tsx @@ -3,6 +3,7 @@ import { Route, Routes } from "react-router-dom" import { AuthAndFrame } from "./components/AuthAndFrame/AuthAndFrame" import { PreferencesLayout } from "./components/PreferencesLayout/PreferencesLayout" import { RequireAuth } from "./components/RequireAuth/RequireAuth" +import { WorkspacesPage } from "./components/WorkspacesPage/WorkspacesPage" import { IndexPage } from "./pages" import { NotFoundPage } from "./pages/404Page/404Page" import { CliAuthenticationPage } from "./pages/CliAuthPage/CliAuthPage" @@ -75,6 +76,14 @@ export const AppRouter: React.FC = () => ( + + + + } + /> => { + const response = await axios.get(`/api/v2/users/${userID}/workspaces`) + return response.data +} + export const getWorkspaceByOwnerAndName = async ( organizationID: string, username = "me", diff --git a/site/src/app.tsx b/site/src/app.tsx index f6d119ebeb634..a4f0bfa5b5b69 100644 --- a/site/src/app.tsx +++ b/site/src/app.tsx @@ -5,7 +5,7 @@ import { BrowserRouter as Router } from "react-router-dom" import { SWRConfig } from "swr" import { AppRouter } from "./AppRouter" import { GlobalSnackbar } from "./components/GlobalSnackbar/GlobalSnackbar" -import { light } from "./theme" +import { dark } from "./theme" import "./theme/globalFonts" import { XServiceProvider } from "./xServices/StateContext" @@ -31,7 +31,7 @@ export const App: React.FC = () => { }} > - + diff --git a/site/src/components/NavbarView/NavbarView.tsx b/site/src/components/NavbarView/NavbarView.tsx index b88a372419941..195b380957af5 100644 --- a/site/src/components/NavbarView/NavbarView.tsx +++ b/site/src/components/NavbarView/NavbarView.tsx @@ -21,10 +21,15 @@ export const NavbarView: React.FC = ({ user, onSignOut, display