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

Fix spacing in discounts (#3350)

Browse source 
* Fix spacing in discounts

* Remove not needed spaces in vouchers and sales
This commit is contained in:
Paweł Chyła 2023-03-15 09:12:07 +01:00 committed by GitHub
parent d3c901f210
commit 9e6e6e39ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/discounts/components/SaleCreatePage/SaleCreatePage.tsx
View file

@ -1,12 +1,12 @@
import { validateSalePrice } from "@dashboard/channels/utils"; import { validateSalePrice } from "@dashboard/channels/utils";
import { TopNav } from "@dashboard/components/AppLayout/TopNav"; import { TopNav } from "@dashboard/components/AppLayout/TopNav";
import CardSpacer from "@dashboard/components/CardSpacer";
import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard"; import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard";
import Form from "@dashboard/components/Form"; import Form from "@dashboard/components/Form";
import { DetailPageLayout } from "@dashboard/components/Layouts"; import { DetailPageLayout } from "@dashboard/components/Layouts";
import Metadata, { MetadataFormData } from "@dashboard/components/Metadata"; import Metadata, { MetadataFormData } from "@dashboard/components/Metadata";
import Savebar from "@dashboard/components/Savebar"; import Savebar from "@dashboard/components/Savebar";
import { createSaleChannelsChangeHandler } from "@dashboard/discounts/handlers"; import { createSaleChannelsChangeHandler } from "@dashboard/discounts/handlers";
import { saleListUrl } from "@dashboard/discounts/urls";
import { SALE_CREATE_FORM_ID } from "@dashboard/discounts/views/SaleCreate/consts"; import { SALE_CREATE_FORM_ID } from "@dashboard/discounts/views/SaleCreate/consts";
import { import {
DiscountErrorFragment, DiscountErrorFragment,
@ -102,6 +102,7 @@ const SaleCreatePage: React.FC<SaleCreatePageProps> = ({
return ( return (
<DetailPageLayout> <DetailPageLayout>
<TopNav <TopNav
href={saleListUrl()}
title={intl.formatMessage({ title={intl.formatMessage({
id: "FWbv/u", id: "FWbv/u",
defaultMessage: "Create Discount", defaultMessage: "Create Discount",
@ -115,16 +116,13 @@ const SaleCreatePage: React.FC<SaleCreatePageProps> = ({
errors={errors} errors={errors}
onChange={change} onChange={change}
/> />
<CardSpacer />
<SaleType data={data} disabled={disabled} onChange={change} /> <SaleType data={data} disabled={disabled} onChange={change} />
<CardSpacer />
<SaleValue <SaleValue
data={data} data={data}
disabled={disabled} disabled={disabled}
errors={errors} errors={errors}
onChange={handleChannelChange} onChange={handleChannelChange}
/> />
<CardSpacer />
<DiscountDates <DiscountDates
data={data} data={data}
disabled={disabled} disabled={disabled}

3
src/discounts/components/SaleDetailsPage/SaleDetailsPage.tsx
View file

@ -191,9 +191,7 @@ const SaleDetailsPage: React.FC<SaleDetailsPageProps> = ({
errors={errors} errors={errors}
onChange={change} onChange={change}
/> />
<CardSpacer />
<SaleType data={data} disabled={disabled} onChange={change} /> <SaleType data={data} disabled={disabled} onChange={change} />
<CardSpacer />
<SaleValue <SaleValue
data={data} data={data}
disabled={disabled} disabled={disabled}
@ -300,7 +298,6 @@ const SaleDetailsPage: React.FC<SaleDetailsPageProps> = ({
</DetailPageLayout.Content> </DetailPageLayout.Content>
<DetailPageLayout.RightSidebar> <DetailPageLayout.RightSidebar>
<SaleSummary selectedChannelId={selectedChannelId} sale={sale} /> <SaleSummary selectedChannelId={selectedChannelId} sale={sale} />
<CardSpacer />
<ChannelsAvailabilityCard <ChannelsAvailabilityCard
managePermissions={[PermissionEnum.MANAGE_DISCOUNTS]} managePermissions={[PermissionEnum.MANAGE_DISCOUNTS]}
allChannelsCount={allChannelsCount} allChannelsCount={allChannelsCount}

6
src/discounts/components/VoucherCreatePage/VoucherCreatePage.tsx
View file

@ -1,6 +1,5 @@
import { ChannelVoucherData } from "@dashboard/channels/utils"; import { ChannelVoucherData } from "@dashboard/channels/utils";
import { TopNav } from "@dashboard/components/AppLayout/TopNav"; import { TopNav } from "@dashboard/components/AppLayout/TopNav";
import CardSpacer from "@dashboard/components/CardSpacer";
import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard"; import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard";
import Form from "@dashboard/components/Form"; import Form from "@dashboard/components/Form";
import { DetailPageLayout } from "@dashboard/components/Layouts"; import { DetailPageLayout } from "@dashboard/components/Layouts";
@ -134,7 +133,6 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
onChange={event => handleDiscountTypeChange(data, event)} onChange={event => handleDiscountTypeChange(data, event)}
variant="create" variant="create"
/> />
<CardSpacer />
<VoucherTypes <VoucherTypes
data={data} data={data}
disabled={disabled} disabled={disabled}
@ -143,7 +141,6 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
/> />
{data.discountType.toString() !== "SHIPPING" ? ( {data.discountType.toString() !== "SHIPPING" ? (
<> <>
<CardSpacer />
<VoucherValue <VoucherValue
data={data} data={data}
disabled={disabled} disabled={disabled}
@ -154,7 +151,6 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
/> />
</> </>
) : null} ) : null}
<CardSpacer />
<VoucherRequirements <VoucherRequirements
data={data} data={data}
disabled={disabled} disabled={disabled}
@ -162,7 +158,6 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
onChannelChange={handleChannelChange} onChannelChange={handleChannelChange}
onChange={change} onChange={change}
/> />
<CardSpacer />
<VoucherLimits <VoucherLimits
data={data} data={data}
initialUsageLimit={initialForm.usageLimit} initialUsageLimit={initialForm.usageLimit}
@ -172,7 +167,6 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
setData={set} setData={set}
isNewVoucher isNewVoucher
/> />
<CardSpacer />
<VoucherDates <VoucherDates
data={data} data={data}
disabled={disabled} disabled={disabled}

8
src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx
View file

@ -218,14 +218,12 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
onChange={change} onChange={change}
variant="update" variant="update"
/> />
<CardSpacer />
<VoucherTypes <VoucherTypes
data={data} data={data}
disabled={disabled} disabled={disabled}
errors={errors} errors={errors}
onChange={event => handleDiscountTypeChange(data, event)} onChange={event => handleDiscountTypeChange(data, event)}
/> />
<CardSpacer />
{data.discountType.toString() !== "SHIPPING" ? ( {data.discountType.toString() !== "SHIPPING" ? (
<VoucherValue <VoucherValue
data={data} data={data}
@ -236,7 +234,6 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
variant="update" variant="update"
/> />
) : null} ) : null}
<CardSpacer />
{data.type === VoucherTypeEnum.SPECIFIC_PRODUCT && {data.type === VoucherTypeEnum.SPECIFIC_PRODUCT &&
data.discountType.toString() !== "SHIPPING" ? ( data.discountType.toString() !== "SHIPPING" ? (
<> <>
@ -306,7 +303,6 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
)} )}
</> </>
) : null} ) : null}
<CardSpacer />
{data.discountType.toString() === "SHIPPING" ? ( {data.discountType.toString() === "SHIPPING" ? (
<CountryList <CountryList
countries={voucher?.countries} countries={voucher?.countries}
@ -334,7 +330,6 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
onCountryUnassign={onCountryUnassign} onCountryUnassign={onCountryUnassign}
/> />
) : null} ) : null}
<CardSpacer />
<VoucherRequirements <VoucherRequirements
data={data} data={data}
disabled={disabled} disabled={disabled}
@ -342,7 +337,6 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
onChange={change} onChange={change}
onChannelChange={handleChannelChange} onChannelChange={handleChannelChange}
/> />
<CardSpacer />
<VoucherLimits <VoucherLimits
data={data} data={data}
initialUsageLimit={initialForm.usageLimit} initialUsageLimit={initialForm.usageLimit}
@ -352,7 +346,6 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
setData={set} setData={set}
isNewVoucher={false} isNewVoucher={false}
/> />
<CardSpacer />
<DiscountDates <DiscountDates
data={data} data={data}
disabled={disabled} disabled={disabled}
@ -366,7 +359,6 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
voucher={voucher} voucher={voucher}
selectedChannelId={selectedChannelId} selectedChannelId={selectedChannelId}
/> />
<CardSpacer />
<ChannelsAvailabilityCard <ChannelsAvailabilityCard
managePermissions={[PermissionEnum.MANAGE_DISCOUNTS]} managePermissions={[PermissionEnum.MANAGE_DISCOUNTS]}
allChannelsCount={allChannelsCount} allChannelsCount={allChannelsCount}