Skip to content

do not merge: prototyping of v2 workspaces of page #219

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

Closed
wants to merge 14 commits into from
Closed

do not merge: prototyping of v2 workspaces of page #219

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a512f16
Workspace stub
bryphe-coder Jan 27, 2022
fa6c8c3
More prototyping
bryphe-coder Jan 29, 2022
3c16b95
Merge branch 'main' into bryphe/prototype/workspaces-page
bryphe-coder Jan 31, 2022
0e933bb
Route to correct path
bryphe-coder Jan 31, 2022
ad56a13
Port over QuestionHelp component
bryphe-coder Jan 31, 2022
07d5711
Add spinner
bryphe-coder Jan 31, 2022
48bb588
Model workspace with static data
bryphe-coder Feb 1, 2022
8b73c2c
Update timeline and components
bryphe-coder Feb 1, 2022
53ff325
More prototyping
bryphe-coder Feb 1, 2022
de7d79b
Tweaks
bryphe-coder Feb 1, 2022
f601be7
Merge branch 'main' into bryphe/prototype/workspaces-page
bryphe-coder Feb 2, 2022
dd38938
Experiment with resource monitor
bryphe-coder Feb 2, 2022
cc11f71
Merge branch 'main' into bryphe/prototype/workspaces-page
bryphe-coder Feb 4, 2022
89947c9
Merge main
bryphe-coder Feb 9, 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
Port over QuestionHelp component
  • Loading branch information
@bryphe-coder
bryphe-coder committed Jan 31, 2022
commit ad56a134d46ddc50ab8b188b513c3bc55c7f4980
23 changes: 23 additions & 0 deletions site/components/QuestionHelp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { makeStyles } from "@material-ui/core/styles"
import HelpIcon from "@material-ui/icons/Help"
import * as React from "react"

export const QuestionHelp: React.FC = () => {
const styles = useStyles()
return (
<HelpIcon className={styles.icon} />
)
}

const useStyles = makeStyles((theme) => ({
icon: {
display: "block",
height: 20,
width: 20,
color: theme.palette.text.secondary,
opacity: 0.5,
"&:hover": {
opacity: 1,
},
},
}))
3 changes: 2 additions & 1 deletion site/components/Workspace/Workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ import TimelineSeparator from '@material-ui/lab/TimelineSeparator';
import TimelineConnector from '@material-ui/lab/TimelineConnector';
import TimelineContent from '@material-ui/lab/TimelineContent';
import TimelineDot from '@material-ui/lab/TimelineDot';
import { QuestionHelp } from "../QuestionHelp"

export const WorkspaceTimeline: React.FC = () => {
return <Timeline>
Expand Down Expand Up @@ -168,7 +169,7 @@ export const Workspace: React.FC<WorkspaceProps> = ({ workspace }) => {
<div className={styles.horizontal}>
<div className={styles.sideBar}>
<Paper elevation={0} className={styles.section}>
<Title>Applications</Title>
<Title><span>Applications</span><QuestionHelp /></Title>

<div className={styles.vertical}>
<ResourceRow name={"Code Web"} icon={"/static/vscode.svg"} status={"active"} />
Expand Down
1 change: 1 addition & 0 deletions site/components/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export * from "./Button"
export * from "./EmptyState"
export * from "./Page"
export * from "./QuestionHelp"
export * from "./Redirect"