8000 feat: Redesign workspaces page by kylecarbs · Pull Request #1450 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat: Redesign workspaces page #1450

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 24 commits into from
May 16, 2022
Merged

feat: Redesign workspaces page #1450

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
1a667d9
feat: Improve navbar to be more compact
kylecarbs May 13, 2022
dc47ae0
Attempt to remove overrides
kylecarbs May 13, 2022
c34ad45
Update theme
kylecarbs May 14, 2022
104b1d9
Add text field
kylecarbs May 14, 2022
52a4e76
Merge branch 'main' into workspacepage
kylecarbs May 14, 2022
83397e0
Update theme to dark!
kylecarbs May 14, 2022
d19c124
Fix import ordering
kylecarbs May 14, 2022
db820ce
Fix page location
kylecarbs May 14, 2022
851111b
Fix requested changes
kylecarbs May 16, 2022
190b7d1
Add storybook for workspaces page view
kylecarbs May 16, 2022
cbc1015
Add empty view
kylecarbs May 16, 2022
169d733
Add tests for empty view
kylecarbs May 16, 2022
53781e9
Remove templates page
kylecarbs May 16, 2022
f606a51
Merge branch 'main' into workspacepage
kylecarbs May 16, 2022
09ce0ec
Fix local port
kylecarbs May 16, 2022
71bf439
Remove templates from nav
kylecarbs May 16, 2022
82641ab
Fix e2e test
kylecarbs May 16, 2022
82cdace
Remove time.ts
kylecarbs May 16, 2022
6044d91
Remove dep
kylecarbs May 16, 2022
bd50c9f
Merge branch 'main' into workspacepage
kylecarbs May 16, 2022
191c9d7
Add background color to margins
kylecarbs May 16, 2022
fccacfe
Merge status checking from workspace page
kylecarbs May 16, 2022
f87c8e7
Fix requested changes
kylecarbs May 16, 2022
a058b8c
Fix workspace status tests
kylecarbs May 16, 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
< 8000 details-toggle>
Diff view
Prev Previous commit
Next Next commit
Attempt to remove overrides
  • Loading branch information
@kylecarbs
kylecarbs committed May 13, 2022
commit dc47ae080d34d32b2fc250f34612276629238cc2
2 changes: 1 addition & 1 deletion site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"typegen": "xstate typegen 'src/**/*.ts'"
},
"dependencies": {
"@fontsource/fira-code": "4.5.9",
"@fontsource/ibm-plex-mono": "^4.5.9",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: Can you pin this dependency to 4.5.9? You run the upgrade command to do it:

cd site
yarn upgrade @fontsource/ibm-plex-mono@4.5.9

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vapurrmaid I notice we have yarn.lock - what's the thought process behind pinning dependencies?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll answer those two questions separately:

  • Why do we want them pinned

vs

  • Why pin in package.json

For the former: We have a RFC and guide covering, but the TL:DR is more incremental upgrades w depend-a-bot
For the latter: I don't know if having them unpinned interferes with depend-a-bot or any other tool, but simply for precision. I shouldn't have to hunt down the actual version in yarn.lock to answer what version of X we're on.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, will look at the guide!

"@fontsource/inter": "4.5.7",
"@material-ui/core": "4.9.4",
"@material-ui/icons": "4.5.1",
Expand Down
4 changes: 3 additions & 1 deletion site/src/components/WorkspacesPage/WorkspacesPage.tsx
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { makeStyles } from "@material-ui/core"
import { Button } from "@material-ui/core"
import { makeStyles } from "@material-ui/core/styles"
import { useMachine } from "@xstate/react"
import React from "react"
import { Margins } from "../../components/Margins/Margins"
Expand All @@ -19,6 +20,7 @@ export const WorkspacesPage: React.FC = () => {
<Stack spacing={4}>
<Margins>
<img className={styles.boxes} alt="boxes" src="/boxes.png" />
<Button>test</Button>
</Margins>
</Stack>
)
Expand Down
2 changes: 1 addition & 1 deletion site/src/theme/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export const spacing = 8
export const borderRadius = 4
export const buttonBorderWidth = 2
export const MONOSPACE_FONT_FAMILY =
"'Fira Code', 'Lucida Console', 'Lucida Sans Typewriter', 'Liberation Mono', 'Monaco', 'Courier New', Courier, monospace"
"'IBM Plex Mono', 'Lucida Console', 'Lucida Sans Typewriter', 'Liberation Mono', 'Monaco', 'Courier New', Courier, monospace"
export const BODY_FONT_FAMILY = `"Inter", sans-serif`
export const lightButtonShadow = "0 2px 2px rgba(0, 23, 121, 0.08)"
export const emptyBoxShadow = "none"
Expand Down
4 changes: 2 additions & 2 deletions site/src/theme/globalFonts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Monospace fonts used for code, button styles, and banners
import "@fontsource/fira-code/400.css"
import "@fontsource/fira-code/600.css"
import "@fontsource/ibm-plex-mono/400.css"
import "@fontsource/ibm-plex-mono/600.css"
// Main body copy font
import "@fontsource/inter/300.css"
import "@fontsource/inter/400.css"
Expand Down
Loading
0