Skip to content

fix: push create workspace UX to templates page #2142

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 12 commits into from
Jun 9, 2022
Merged

fix: push create workspace UX to templates page #2142

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0e00ca7
fix: push create workspace UX to templates page
f0ssel Jun 7, 2022
b774c50
remove template selector
f0ssel Jun 7, 2022
7467669
make fmt
f0ssel Jun 7, 2022
0cbd765
move loader
f0ssel Jun 7, 2022
94d02b2
just text mock up
f0ssel Jun 8, 2022
64bc02b
make fmt
f0ssel Jun 9, 2022
e74f27d
fit loop
f0ssel Jun 9, 2022
4ec519e
fix storybook
f0ssel Jun 9, 2022
cbfc0f8
make fmt
f0ssel Jun 9, 2022
2a191ba
change url path
f0ssel Jun 9, 2022
8ee04b8
fix tst
f0ssel Jun 9, 2022
61dfc97
make fmt
f0ssel Jun 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
make fmt
  • Loading branch information
@f0ssel
f0ssel committed Jun 9, 2022
commit 64bc02b11683d23cb08b4443bd7ef583dc6b76dc
7 changes: 2 additions & 5 deletions site/src/pages/TemplatesPage/TemplatesPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import KeyboardArrowRight from "@material-ui/icons/KeyboardArrowRight"
import dayjs from "dayjs"
import relativeTime from "dayjs/plugin/relativeTime"
import { FC } from "react"
import { useNavigate, Link as RouterLink } from "react-router-dom"
import { useNavigate } from "react-router-dom"
import * as TypesGen from "../../api/typesGenerated"
import { AvatarData } from "../../components/AvatarData/AvatarData"
import { CodeExample } from "../../components/CodeExample/CodeExample"
Expand Down Expand Up @@ -85,11 +85,8 @@ export const TemplatesPageView: FC<TemplatesPageViewProps> = (props) => {
</Stack>
</PageHeaderTitle>
{props.templates && props.templates.length > 0 && (
<PageHeaderText>
Choose a template to create a new workspace.
</PageHeaderText>
<PageHeaderText>Choose a template to create a new workspace.</PageHeaderText>
)}

</PageHeader>

<Table>
Expand Down
12 changes: 5 additions & 7 deletions site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import TableRow from "@material-ui/core/TableRow"
import TextField from "@material-ui/core/TextField"
import AddCircleOutline from "@material-ui/icons/AddCircleOutline"
import KeyboardArrowRight from "@material-ui/icons/KeyboardArrowRight"
import ReplyIcon from "@material-ui/icons/Reply"
import SearchIcon from "@material-ui/icons/Search"
import useTheme from "@material-ui/styles/useTheme"
import dayjs from "dayjs"
Expand All @@ -33,7 +32,7 @@ import {
HelpTooltipTitle,
} from "../../components/HelpTooltip/HelpTooltip"
import { Margins } from "../../components/Margins/Margins"
import { PageHeader, PageHeaderTitle, PageHeaderText } from "../../components/PageHeader/PageHeader"
import { PageHeader, PageHeaderText, PageHeaderTitle } from "../../components/PageHeader/PageHeader"
import { Stack } from "../../components/Stack/Stack"
import { TableLoader } from "../../components/TableLoader/TableLoader"
import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
Expand Down Expand Up @@ -134,12 +133,11 @@ export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({ loading, works
<PageHeader
actions={
<PageHeaderText>
Create a new workspace from a <Link
component={RouterLink}
to="/templates"
>
Create a new workspace from a{" "}
<Link component={RouterLink} to="/templates">
Template
</Link>.
</Link>
.
</PageHeaderText>
}
>
Expand Down