djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix site settings layout (#3362)

Browse source
This commit is contained in:
Krzysztof Żuraw 2023-03-17 12:21:42 +01:00 committed by GitHub
parent 368678c7c4
commit 7a5b919ae4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx
View file

@ -2,7 +2,6 @@ import { createCountryHandler } from "@dashboard/components/AddressEdit/createCo
import { TopNav } from "@dashboard/components/AppLayout/TopNav"; import { TopNav } from "@dashboard/components/AppLayout/TopNav";
import CompanyAddressInput from "@dashboard/components/CompanyAddressInput"; import CompanyAddressInput from "@dashboard/components/CompanyAddressInput";
import Form from "@dashboard/components/Form"; import Form from "@dashboard/components/Form";
import Grid from "@dashboard/components/Grid";
import Hr from "@dashboard/components/Hr"; import Hr from "@dashboard/components/Hr";
import { DetailPageLayout } from "@dashboard/components/Layouts"; import { DetailPageLayout } from "@dashboard/components/Layouts";
import PageSectionHeader from "@dashboard/components/PageSectionHeader"; import PageSectionHeader from "@dashboard/components/PageSectionHeader";
@ -17,7 +16,7 @@ import { commonMessages } from "@dashboard/intl";
import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler";
import { mapCountriesToChoices } from "@dashboard/utils/maps"; import { mapCountriesToChoices } from "@dashboard/utils/maps";
import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui";
import { sprinkles } from "@saleor/macaw-ui/next"; import { Box } from "@saleor/macaw-ui/next";
import React from "react"; import React from "react";
import { useIntl } from "react-intl"; import { useIntl } from "react-intl";
@ -144,44 +143,48 @@ const SiteSettingsPage: React.FC<SiteSettingsPageProps> = props => {
title={intl.formatMessage(commonMessages.generalInformations)} title={intl.formatMessage(commonMessages.generalInformations)}
/> />
<DetailPageLayout.Content> <DetailPageLayout.Content>
<Grid <Box gap={5} paddingLeft={9}>
variant="inverted" <Box display="grid" __gridTemplateColumns="1fr 3fr">
className={sprinkles({ paddingLeft: 9 })} <PageSectionHeader
> title={intl.formatMessage(messages.sectionCheckoutTitle)}
<PageSectionHeader description={intl.formatMessage(
title={intl.formatMessage(messages.sectionCheckoutTitle)} messages.sectionCheckoutDescription,
description={intl.formatMessage( )}
messages.sectionCheckoutDescription, />
)} <SiteCheckoutSettingsCard
/> data={data}
<SiteCheckoutSettingsCard errors={errors}
data={data} disabled={disabled}
errors={errors} onChange={change}
disabled={disabled} />
onChange={change} </Box>
/>
<Hr className={classes.hr} /> <Hr className={classes.hr} />
<PageSectionHeader
title={intl.formatMessage(messages.sectionCompanyTitle)} <Box display="grid" __gridTemplateColumns="1fr 3fr">
description={intl.formatMessage( <PageSectionHeader
messages.sectionCompanyDescription, title={intl.formatMessage(messages.sectionCompanyTitle)}
)} description={intl.formatMessage(
/> messages.sectionCompanyDescription,
<CompanyAddressInput )}
data={data} />
displayCountry={displayCountry} <CompanyAddressInput
countries={countryChoices} data={data}
errors={[...errors, ...validationErrors]} displayCountry={displayCountry}
disabled={disabled} countries={countryChoices}
header={intl.formatMessage({ errors={[...errors, ...validationErrors]}
id: "+jCDvp", disabled={disabled}
defaultMessage: "Store Information", header={intl.formatMessage({
description: "section header", id: "+jCDvp",
})} defaultMessage: "Store Information",
onChange={change} description: "section header",
onCountryChange={handleCountrySelect} })}
/> onChange={change}
</Grid> onCountryChange={handleCountrySelect}
/>
</Box>
</Box>
<Savebar <Savebar
state={saveButtonBarState} state={saveButtonBarState}
disabled={!!isSaveDisabled} disabled={!!isSaveDisabled}