Skip to content

feat: add license settings UI #7210

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 22 commits into from
Apr 26, 2023
Merged

feat: add license settings UI #7210

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d1e0377
wip: license page
rodrimaia Apr 14, 2023
16e0a5c
WIP
rodrimaia Apr 17, 2023
432456f
WIP
rodrimaia Apr 17, 2023
a26bdc1
wip
rodrimaia Apr 17, 2023
496f535
wip
rodrimaia Apr 18, 2023
bcb5d9a
wip
rodrimaia Apr 18, 2023
7adf2f1
wip
rodrimaia Apr 19, 2023
8ece196
wip
rodrimaia Apr 19, 2023
3774944
wip
rodrimaia Apr 19, 2023
5b782ce
Apply suggestions from code review
rodrimaia Apr 21, 2023
eaba405
wip: ui improvements
rodrimaia Apr 21, 2023
1d107d8
Merge branch 'main' into add_license_settings
rodrimaia Apr 21, 2023
ee583e1
wip: extract components
rodrimaia Apr 24, 2023
21a610e
wip: stories
rodrimaia Apr 24, 2023
fba262c
wip: stories
rodrimaia Apr 24, 2023
0922b5b
fixes from PR reviews
rodrimaia Apr 26, 2023
6ab9d3e
fix stories
rodrimaia Apr 26, 2023
8d55d98
fix empty license page
rodrimaia Apr 26, 2023
832f599
fix copy
rodrimaia Apr 26, 2023
c3a1141
fix
rodrimaia Apr 26, 2023
16a8445
wip
rodrimaia Apr 26, 2023
0322172
add golang test
rodrimaia Apr 26, 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
Prev Previous commit
Next Next commit
wip: stories
  • Loading branch information
@rodrimaia
rodrimaia committed Apr 24, 2023
commit fba262c58a7ebc5bdb33db86831a5b51c93ef2e5
17 changes: 0 additions & 17 deletions site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,21 +121,4 @@ const useStyles = makeStyles((theme) => ({
main: {
paddingTop: theme.spacing(5),
},
ctaButton: {
backgroundImage: `linear-gradient(90deg, ${theme.palette.secondary.main} 0%, ${theme.palette.secondary.dark} 100%)`,
width: theme.spacing(30),
marginBottom: theme.spacing(4),
},
formSectionRoot: {
alignItems: "center",
},
description: {
color: theme.palette.text.secondary,
lineHeight: "160%",
},
title: {
...theme.typography.h5,
fontWeight: 600,
marging: theme.spacing(1),
},
}))
22 changes: 17 additions & 5 deletions site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ export default {
const licensesTest: GetLicensesResponse[] = [
{
id: 1,
uploaded_at: "1682346425",
expires_at: "1682346425",
uuid: "1",
claims: {
trial: false,
all_features: true,
Expand All @@ -19,12 +22,21 @@ const licensesTest: GetLicensesResponse[] = [
},
]

const defaultArgs = {
showConfetti: false,
isLoading: false,
userLimitActual: 1,
userLimitLimit: 10,
licenses: licensesTest,
}

export const Default = {
args: defaultArgs,
}

export const Empty = {
args: {
showConfetti: false,
isLoading: false,
userLimitActual: 1,
userLimitLimit: 10,
licenses: licensesTest,
...defaultArgs,
licenses: [],
},
}
4 changes: 1 addition & 3 deletions site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ const useStyles = makeStyles((theme) => ({
backgroundImage: `linear-gradient(90deg, ${theme.palette.secondary.main} 0%, ${theme.palette.secondary.dark} 100%)`,
width: theme.spacing(30),
marginBottom: theme.spacing(4),
},
removeButtom: {
color: "red",
marginTop: theme.spacing(4),
},
}))

Expand Down