Skip to content

feat(site): Add Admin Dropdown menu #885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Apr 8, 2022
Merged

feat(site): Add Admin Dropdown menu #885

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d6dacf9
Start porting components for Admin menu
presleyp Apr 5, 2022
f040a07
Merge branch 'main' into admin/presleyp/591
presleyp Apr 5, 2022
a9e4dd4
More porting, wip
presleyp Apr 6, 2022
8944e10
Add icons
presleyp Apr 6, 2022
88bac07
Extract arrow components, navHeight
presleyp Apr 6, 2022
14b9e86
Add Admin Dropdown
presleyp Apr 6, 2022
b50b34d
Format
presleyp Apr 6, 2022
8b4834f
Delete types
presleyp Apr 6, 2022
25c5056
Merge branch 'main' into admin/presleyp/591
presleyp Apr 7, 2022
98ec516
Fix styles
presleyp Apr 7, 2022
4f7871e
Merge branch 'main' into admin/presleyp/591
presleyp Apr 7, 2022
1d4c94f
Lint
presleyp Apr 7, 2022
f134141
Add stub pages
presleyp Apr 7, 2022
db542ca
Use navHeight constant
presleyp Apr 7, 2022
a5ca439
Move files
presleyp Apr 7, 2022
6bb47e0
Add and organize stories
presleyp Apr 7, 2022
bc84caf
Storybook and organize text stories
presleyp Apr 7, 2022
675b195
Add test
presleyp Apr 7, 2022
a121c7e
Lint
presleyp Apr 7, 2022
babde57
Merge branch 'main' into admin/presleyp/591
presleyp Apr 7, 2022
466a43d
Lint
presleyp Apr 7, 2022
f6342da
Fix double navigation
presleyp Apr 8, 2022
c78fa88
Lint
presleyp Apr 8, 2022
9a06d69
Wrap new routes in AuthAndNav
presleyp Apr 8, 2022
f1dd2c8
Undo unrelated storybook changes
presleyp Apr 8, 2022
acc92f8
Refactor according to conventions
presleyp Apr 8, 2022
1dfb981
Merge branch 'main' into admin/presleyp/591
presleyp Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Lint
  • Loading branch information
@presleyp
presleyp committed Apr 7, 2022
commit 466a43d0c9c73960f29b9405fc8092bfe20b29b6
2 changes: 1 addition & 1 deletion site/src/AppRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import { CliAuthenticationPage } from "./pages/cli-auth"
import { HealthzPage } from "./pages/healthz"
import { SignInPage } from "./pages/login"
import { OrganizationsPage } from "./pages/orgs"
import { SettingsPage } from "./pages/settings"
import { PreferencesAccountPage } from "./pages/preferences/account"
import { PreferencesLinkedAccountsPage } from "./pages/preferences/linked-accounts"
import { PreferencesSecurityPage } from "./pages/preferences/security"
import { PreferencesSSHKeysPage } from "./pages/preferences/ssh-keys"
import { SettingsPage } from "./pages/settings"
import { TemplatesPage } from "./pages/templates"
import { TemplatePage } from "./pages/templates/[organization]/[template]"
import { CreateWorkspacePage } from "./pages/templates/[organization]/[template]/create"
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/TabPanel/TabSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import List from "@material-ui/core/List"
import ListItem from "@material-ui/core/ListItem"
import { makeStyles } from "@material-ui/core/styles"
import React from "react"
import { combineClasses } from "../../util/combineClasses"
import { NavLink } from "react-router-dom"
import { combineClasses } from "../../util/combineClasses"

export interface TabSidebarItem {
path: string
Expand Down