Merge branch 'development' into main

This commit is contained in:
Elias Schneider
2022-10-11 09:04:30 +02:00
2 changed files with 21 additions and 22 deletions

View File

@@ -5,7 +5,7 @@ import authService from "../../services/auth.service";
const ActionAvatar = () => { const ActionAvatar = () => {
return ( return (
<Menu> <Menu position="bottom-start" withinPortal>
<Menu.Target> <Menu.Target>
<ActionIcon> <ActionIcon>
<Avatar size={28} radius="xl" /> <Avatar size={28} radius="xl" />

View File

@@ -114,10 +114,9 @@ const CreateUploadModalBody = ({
]} ]}
/> />
<Accordion> <Accordion>
<Accordion.Item <Accordion.Item value="security" sx={{ borderBottom: "none" }}>
value="Security options" <Accordion.Control>Security options</Accordion.Control>
sx={{ borderBottom: "none" }} <Accordion.Panel>
>
<Stack align="stretch"> <Stack align="stretch">
<PasswordInput <PasswordInput
variant="filled" variant="filled"
@@ -125,7 +124,6 @@ const CreateUploadModalBody = ({
label="Password protection" label="Password protection"
{...form.getInputProps("password")} {...form.getInputProps("password")}
/> />
<NumberInput <NumberInput
min={1} min={1}
type="number" type="number"
@@ -135,6 +133,7 @@ const CreateUploadModalBody = ({
{...form.getInputProps("maxViews")} {...form.getInputProps("maxViews")}
/> />
</Stack> </Stack>
</Accordion.Panel>
</Accordion.Item> </Accordion.Item>
</Accordion> </Accordion>
<Button type="submit">Share</Button> <Button type="submit">Share</Button>