Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
rodrimaia merged 22 commits intomainfromadd_license_settings
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
22 commits
Select commitHold shift + click to select a range
d1e0377
wip: license page
rodrimaiaApr 14, 2023
16e0a5c
WIP
rodrimaiaApr 17, 2023
432456f
WIP
rodrimaiaApr 17, 2023
a26bdc1
wip
rodrimaiaApr 17, 2023
496f535
wip
rodrimaiaApr 18, 2023
bcb5d9a
wip
rodrimaiaApr 18, 2023
7adf2f1
wip
rodrimaiaApr 19, 2023
8ece196
wip
rodrimaiaApr 19, 2023
3774944
wip
rodrimaiaApr 19, 2023
5b782ce
Apply suggestions from code review
rodrimaiaApr 21, 2023
eaba405
wip: ui improvements
rodrimaiaApr 21, 2023
1d107d8
Merge branch 'main' into add_license_settings
rodrimaiaApr 21, 2023
ee583e1
wip: extract components
rodrimaiaApr 24, 2023
21a610e
wip: stories
rodrimaiaApr 24, 2023
fba262c
wip: stories
rodrimaiaApr 24, 2023
0922b5b
fixes from PR reviews
rodrimaiaApr 26, 2023
6ab9d3e
fix stories
rodrimaiaApr 26, 2023
8d55d98
fix empty license page
rodrimaiaApr 26, 2023
832f599
fix copy
rodrimaiaApr 26, 2023
c3a1141
fix
rodrimaiaApr 26, 2023
16a8445
wip
rodrimaiaApr 26, 2023
0322172
add golang test
rodrimaiaApr 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
PrevPrevious commit
NextNext commit
wip
  • Loading branch information
@rodrimaia
rodrimaia committedApr 18, 2023
commit496f535add938735b4240eb1b3bf53c7017fc638
2 changes: 2 additions & 0 deletionssite/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,13 +69,15 @@
"react": "18.2.0",
"react-chartjs-2": "4.3.1",
"react-color": "2.19.3",
"react-confetti": "^6.1.0",
"react-dom": "18.2.0",
"react-headless-tabs": "6.0.3",
"react-helmet-async": "1.3.0",
"react-i18next": "12.1.1",
"react-markdown": "8.0.3",
"react-router-dom": "6.4.1",
"react-syntax-highlighter": "15.5.0",
"react-use": "^17.4.0",
"react-virtualized-auto-sizer": "1.0.7",
"react-window": "1.8.8",
"remark-gfm": "3.0.1",
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,114 @@

import { Stack } from "components/Stack/Stack"
import { FC, PropsWithChildren, useState } from "react"
import { Header } from "components/DeploySettingsLayout/Header"
import { FormSection, HorizontalForm } from "components/Form/Form"
import { TextField, makeStyles, useTheme } from "@material-ui/core"
import Button from "@material-ui/core/Button"
import { DropzoneDialog } from "material-ui-dropzone"
import { Divider, Input, TextareaAutosize, makeStyles } from "@material-ui/core"
import { Fieldset } from "components/DeploySettingsLayout/Fieldset"
import { Header } from "components/DeploySettingsLayout/Header"
import { FormFields, FormSection } from "components/Form/Form"
import { Stack } from "components/Stack/Stack"
import { DropzoneDialog } from "material-ui-dropzone"
import { FC, PropsWithChildren, useState } from "react"
import Confetti from 'react-confetti'
import { useToggle } from 'react-use'
import useWindowSize from 'react-use/lib/useWindowSize'

const AddNewLicense: FC = () => {
const styles = useStyles()
const { width, height } = useWindowSize()
const [confettiOn, toggleConfettiOn] = useToggle(false)
const [isDialogOpen, toggleDialogOpen] = useToggle(false)
const [files, setFiles] = useState<File[]>([]);
const theme = useTheme()

function handleSave(files: File[]) {
setFiles(files);
console.log(files)
toggleDialogOpen()
toggleConfettiOn()
setTimeout(() => {
toggleConfettiOn(false)
}, 2000 )
}

return (
<>
<Confetti
width={width}
height={height}
run={confettiOn}
colors={[theme.palette.primary.main, theme.palette.secondary.main]}
/>
<Stack alignItems="baseline" direction="row" justifyContent="space-between">
<Header
title="Add your license"
description="Add a license to your account to unlock more features."
/>
<Button variant="outlined" color="primary" href="/deploy-settings/licenses">Back to licenses</Button>
</Stack>


<HorizontalForm
onSubmit={(data: unknown) => {
console.log(data)
}}
<Stack
spacing={4}
>
<FormSection
title="Upload license file"
description="please upload the license file you received when you purchased your license."
classes={{
root: styles.formSectionRoot
}}
>


<DropzoneDialogExample />
<Stack style={{
height: "100%",
}}>
<div>
<Button onClick={() => toggleDialogOpen()}>
Upload file
</Button>
<DropzoneDialog
open={isDialogOpen}
onSave={handleSave}
// acceptedFiles={['image/jpeg', 'image/png', 'image/bmp']}
showPreviews={false}
maxFileSize={1000000}
onClose={() => toggleDialogOpen(false)}
/>
</div>
</Stack>

</FormSection>
<FormFields>

<DividerWithText>or</DividerWithText>
<DividerWithText>or</DividerWithText>
</FormFields>

<Fieldset
title="Paste your license key"
onSubmit={(data: unknown) => { console.log(data) }}
>
<TextField placeholder="Paste your license key here" multiline rows={4} fullWidth />

</Fieldset>
</HorizontalForm>
</Fieldset>
</Stack>
</>
)
}

export default AddNewLicense


const useStyles = makeStyles(theme => ({
formSectionRoot: {
alignItems: "center",
},
description: {
color: theme.palette.text.secondary,
lineHeight: "160%",
},
title: {
...theme.typography.h5,
fontWeight: 600,
marging: theme.spacing(1)
},
container: {
display: "flex",
alignItems: "center"
Expand All@@ -65,8 +123,8 @@ const useStyles = makeStyles(theme => ({
paddingRight: theme.spacing(2),
paddingLeft: theme.spacing(2),
fontWeight: 500,
fontSize:theme.typography.h5.fontSize,
color:theme.palette.text.secondary
fontSize: theme.typography.h5.fontSize,
color: theme.palette.text.secondary
}
}));

Expand All@@ -80,37 +138,3 @@ const DividerWithText: FC<PropsWithChildren> = ({ children }) => {
</div>
);
};

const DropzoneDialogExample = (props) => {
const [open, setOpen] = useState(false);
const [files, setFiles] = useState([]);

function handleClose() {
setOpen(false);
}

function handleSave(files) {
setFiles(files);
setOpen(false);
}

function handleOpen() {
setOpen(true)
}

return (
<div>
<Button onClick={handleOpen}>
Add Image
</Button>
<DropzoneDialog
open={open}
onSave={handleSave}
acceptedFiles={['image/jpeg', 'image/png', 'image/bmp']}
showPreviews={true}
maxFileSize={5000000}
onClose={handleClose}
/>
</div>
);
}
Loading

[8]ページ先頭

©2009-2025 Movatter.jp