Skip to content

Commit 2fc229d

Browse files
committed
Updated routes layout
1 parent cdb2453 commit 2fc229d

File tree

3 files changed

+59
-58
lines changed

3 files changed

+59
-58
lines changed

packages/cmsui/routes/auth/login.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ export default function Login() {
4444
const actionResult = useActionData<typeof action>();
4545

4646
return (
47-
<div className="mx-4 flex h-screen flex-1 flex-col justify-center">
47+
<main className="mx-4 flex h-screen flex-1 flex-col justify-center">
4848
<div
4949
className={`
5050
flex flex-col items-center
5151
sm:mx-auto sm:w-full sm:max-w-md
5252
`}
5353
>
54-
<div className="flex h-32 w-32 flex-col items-center rounded-full bg-quanta-sapphire p-8">
54+
<div className="bg-quanta-sapphire flex h-32 w-32 flex-col items-center rounded-full p-8">
5555
<img src={ploneSvg} alt="" />
5656
</div>
5757
<h2
@@ -93,6 +93,6 @@ export default function Login() {
9393
</Form>
9494
</div>
9595
</div>
96-
</div>
96+
</main>
9797
);
9898
}

packages/cmsui/routes/controlpanel.tsx

Lines changed: 54 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -117,59 +117,60 @@ export default function SingleControlPanel() {
117117
<Back />
118118
</Button>
119119
</Plug>
120-
121-
<Container width="default" className="route-controlpanel">
122-
<h1 className="documentFirstHeading">
123-
{controlpanel.title || 'a control panel'}
124-
</h1>
125-
<form>
126-
{schema.fieldsets.map((fieldset: ControlPanelFieldset) => (
127-
<Accordion defaultExpandedKeys={['default']} key={fieldset.id}>
128-
<AccordionItem id={fieldset.id} key={fieldset.id}>
129-
<AccordionItemTrigger>{fieldset.title}</AccordionItemTrigger>
130-
<AccordionPanel>
131-
{(fieldset.fields as DeepKeys<ControlPanelSchema>[]).map(
132-
(schemaField, index) => (
133-
<form.AppField
134-
name={schemaField}
135-
key={index}
136-
// eslint-disable-next-line react/no-children-prop
137-
children={(field) => (
138-
<field.Quanta
139-
{...schema.properties[schemaField]}
140-
className="mb-4"
141-
label={schema.properties[field.name].title}
142-
name={field.name}
143-
defaultValue={field.state.value}
144-
required={
145-
schema.required.indexOf(schemaField) !== -1
146-
}
147-
error={field.state.meta.errors}
148-
formAtom={formAtom}
149-
/>
150-
)}
151-
/>
152-
),
153-
)}
154-
</AccordionPanel>
155-
</AccordionItem>
156-
</Accordion>
157-
))}
158-
<Plug pluggable="toolbar-top" id="edit-save-button">
159-
<Button
160-
aria-label={t('cmsui.save')}
161-
type="submit"
162-
// Trigger the TS form submission
163-
onPress={() => form.handleSubmit()}
164-
variant="primary"
165-
accent
166-
size="L"
167-
>
168-
<Checkbox />
169-
</Button>
170-
</Plug>
171-
</form>
172-
</Container>
120+
<main>
121+
<Container width="default" className="route-controlpanel">
122+
<h1 className="documentFirstHeading">
123+
{controlpanel.title || 'a control panel'}
124+
</h1>
125+
<form>
126+
{schema.fieldsets.map((fieldset: ControlPanelFieldset) => (
127+
<Accordion defaultExpandedKeys={['default']} key={fieldset.id}>
128+
<AccordionItem id={fieldset.id} key={fieldset.id}>
129+
<AccordionItemTrigger>{fieldset.title}</AccordionItemTrigger>
130+
<AccordionPanel>
131+
{(fieldset.fields as DeepKeys<ControlPanelSchema>[]).map(
132+
(schemaField, index) => (
133+
<form.AppField
134+
name={schemaField}
135+
key={index}
136+
// eslint-disable-next-line react/no-children-prop
137+
children={(field) => (
138+
<field.Quanta
139+
{...schema.properties[schemaField]}
140+
className="mb-4"
141+
label={schema.properties[field.name].title}
142+
name={field.name}
143+
defaultValue={field.state.value}
144+
required={
145+
schema.required.indexOf(schemaField) !== -1
146+
}
147+
error={field.state.meta.errors}
148+
formAtom={formAtom}
149+
/>
150+
)}
151+
/>
152+
),
153+
)}
154+
</AccordionPanel>
155+
</AccordionItem>
156+
</Accordion>
157+
))}
158+
<Plug pluggable="toolbar-top" id="edit-save-button">
159+
<Button
160+
aria-label={t('cmsui.save')}
161+
type="submit"
162+
// Trigger the TS form submission
163+
onPress={() => form.handleSubmit()}
164+
variant="primary"
165+
accent
166+
size="L"
167+
>
168+
<Checkbox />
169+
</Button>
170+
</Plug>
171+
</form>
172+
</Container>
173+
</main>
173174
</InitAtoms>
174175
);
175176
}

packages/cmsui/routes/controlpanels.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default function ControlPanels() {
3535
const navigate = useNavigate();
3636
const { t } = useTranslation();
3737
return (
38-
<>
38+
<main>
3939
<Plug pluggable="toolbar-top" id="button-back">
4040
<Button aria-label="back" size="L" onPress={() => navigate('/')}>
4141
<Back />
@@ -46,6 +46,6 @@ export default function ControlPanels() {
4646
<ControlPanelsList controlpanels={controlpanels ?? []} />
4747
<VersionOverview {...systemInformation} />
4848
</Container>
49-
</>
49+
</main>
5050
);
5151
}

0 commit comments

Comments
 (0)