Skip to content

refactor(site): add minor design improvements on the setup page #10511

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 2 commits into from
Nov 3, 2023
Merged

refactor(site): add minor design improvements on the setup page #10511

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8c67e0
refactor(site): add minor design improvements on the setup page
BrunoQuaresma Nov 3, 2023
c05b567
Uncheck trial as default and add link to the enterprise docs
BrunoQuaresma Nov 3, 2023
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
Next Next commit
refactor(site): add minor design improvements on the setup page
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Nov 3, 2023
commit a8c67e0ffd67d2e2d87096b6380fa364ce9c01a3
2 changes: 1 addition & 1 deletion site/src/components/Welcome/Welcome.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const Welcome: FC<
font-size: ${theme.spacing(4)};
font-weight: 400;
margin: 0;
margin-bottom: ${theme.spacing(2)};
margin-bottom: ${theme.spacing(4)};
margin-top: ${theme.spacing(2)};
line-height: 1.25;

Expand Down
111 changes: 79 additions & 32 deletions site/src/pages/SetupPage/SetupPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import Box from "@mui/material/Box";
import Checkbox from "@mui/material/Checkbox";
import TextField from "@mui/material/TextField";
import Typography from "@mui/material/Typography";
import { SignInLayout } from "components/SignInLayout/SignInLayout";
import { Stack } from "components/Stack/Stack";
import { Welcome } from "components/Welcome/Welcome";
import { type FormikContextType, useFormik } from "formik";
import {
getFormHelpers,
Expand All @@ -14,6 +10,8 @@ import {
import * as Yup from "yup";
import type * as TypesGen from "api/typesGenerated";
import LoadingButton from "@mui/lab/LoadingButton";
import { FormFields, VerticalForm } from "components/Form/Form";
import { CoderIcon } from "components/Icons/CoderIcon";

export const Language = {
emailLabel: "Email",
Expand Down Expand Up @@ -64,10 +62,40 @@ export const SetupPageView: React.FC<SetupPageViewProps> = ({

return (
<SignInLayout>
<Welcome message={Language.welcomeMessage} />
<form onSubmit={form.handleSubmit}>
<Stack>
<header
css={(theme) => ({
textAlign: "center",
marginBottom: theme.spacing(4),
})}
>
<CoderIcon
css={(theme) => ({
color: theme.palette.text.primary,
fontSize: theme.spacing(8),
})}
/>
<h1
css={(theme) => ({
fontWeight: 400,
margin: 0,
marginTop: theme.spacing(2),
})}
>
Welcome to <strong>Coder</strong>
</h1>
<div
css={(theme) => ({
marginTop: theme.spacing(1.5),
color: theme.palette.text.secondary,
})}
>
Let&lsquo;s create your first admin user account
</div>
</header>
<VerticalForm onSubmit={form.handleSubmit}>
<FormFields>
<TextField
autoFocus
{...getFieldHelpers("username")}
onChange={onChangeTrimmed(form)}
autoComplete="username"
Expand All @@ -89,40 +117,59 @@ export const SetupPageView: React.FC<SetupPageViewProps> = ({
label={Language.passwordLabel}
type="password"
/>
<div css={{ borderRadius: 16 }}>
<Box display="flex">
<div>
<Checkbox
id="trial"
name="trial"
defaultChecked
value={form.values.trial}
onChange={form.handleChange}
data-testid="trial"
/>
</div>

<Box>
<Typography variant="h6" style={{ fontSize: 14 }}>
Start a 30-day free trial of Enterprise
</Typography>
<Typography variant="caption" color="textSecondary">
Get access to high availability, template RBAC, audit logging,
quotas, and more.
</Typography>
</Box>
</Box>
</div>
<label
htmlFor="trial"
css={{
display: "flex",
cursor: "pointer",
alignItems: "flex-start",
gap: 4,
marginTop: -4,
marginBottom: 8,
}}
>
<Checkbox
id="trial"
name="trial"
defaultChecked
value={form.values.trial}
onChange={form.handleChange}
data-testid="trial"
size="small"
/>

<div css={{ fontSize: 14, paddingTop: 4 }}>
<span css={{ display: "block", fontWeight: 600 }}>
Start a 30-day free trial of Enterprise
</span>
<span
css={(theme) => ({
display: "block",
fontSize: 13,
color: theme.palette.text.secondary,
lineHeight: "1.6",
})}
>
Get access to high availability, template RBAC, audit logging,
quotas, and more.
</span>
</div>
</label>

<LoadingButton
fullWidth
loading={isLoading}
type="submit"
data-testid="create"
size="large"
variant="contained"
color="primary"
>
{Language.create}
</LoadingButton>
</Stack>
</form>
</FormFields>
</VerticalForm>
</SignInLayout>
);
};