Skip to content
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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Dev #566

Merged
merged 7 commits into from
Jun 15, 2024
Merged

Dev #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
46fda09
Revert "Reset tailwind configuration. Use the default options #322"
treoden Jun 14, 2024
588ad99
Reset tailwind configuration. Use the default options #322
treoden Jun 15, 2024
4d04448
Fix invalid props type collection ID and category ID
treoden Jun 15, 2024
2aa25b1
Variant options before add to cart button
treoden Jun 15, 2024
454dc5d
Revert overflow-y on modal
treoden Jun 15, 2024
0b67232
Fix wrong title and search issue in category selector modal
treoden Jun 15, 2024
e2c7bb1
Fix wrong attribute ordering
treoden Jun 15, 2024
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
4 changes: 1 addition & 3 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
/*

# Except packages:
!/packages
!/themes
!/extensions
!/packages
2 changes: 1 addition & 1 deletion packages/evershop/src/components/admin/catalog/productEdit/category/CategoryItem.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function CategoryItem({ category, selectedCategory, setSelectedCategory }) {
}
return (
<li>
<div className="flex justify-start gap-1 items-center">
<div className="flex justify-start gap-4 items-center">
{!category.children && (
<a
href="#"
Expand Down
8 changes: 4 additions & 4 deletions packages/evershop/src/components/admin/catalog/productEdit/category/CategoryTree.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,28 @@ function CategoryTree({ selectedCategory, setSelectedCategory }) {

if (fetching) {
return (
<div className="category-tree-container absolute top-5 left-0 right-0 border rounded">
<div className="category-tree-container absolute top-full left-0 right-0 border rounded">
<Spinner width={30} height={30} />
</div>
);
}
if (error) {
return (
<div className="category-tree-container absolute top-5 left-0 right-0 border rounded">
<div className="category-tree-container absolute top-full left-0 right-0 border rounded">
<p className="text-critical">{error.message}</p>
</div>
);
}
if (data.categories.items.length === 0) {
return (
<div className="category-tree-container absolute top-5 left-0 right-0 border rounded">
<div className="category-tree-container absolute top-full left-0 right-0 border rounded">
<div>There is no category</div>
</div>
);
}

return (
<div className="category-tree-container absolute top-5 left-0 right-0 border rounded">
<div className="category-tree-container absolute top-full left-0 right-0 border rounded">
<ul className="category-tree">
{data.categories.items.map((category) => (
<CategoryItem
Expand Down
4 changes: 2 additions & 2 deletions packages/evershop/src/components/admin/catalog/productEdit/variants/CreateVariant.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function CreateVariant({

return (
<div>
<div className="mt-2">
<div className="mt-8">
<Button
title="Add Variant"
onAction={() => {
Expand All @@ -46,7 +46,7 @@ export function CreateVariant({
</Card.Session>
<Card.Session>
<div className="flex justify-end">
<div className="grid grid-cols-2 gap-1">
<div className="grid grid-cols-2 gap-4">
<SubmitButton
productId={productId}
attributes={variantGroup.attributes}
Expand Down
2 changes: 1 addition & 1 deletion packages/evershop/src/components/admin/catalog/productEdit/variants/CreateVariantGroup.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export function CreateVariantGroup({ createVariantGroupApi, setGroup }) {
}}
/>
))}
<div className="mt-2">
<div className="mt-8">
<a
className="text-interactive hover:underline"
href="#"
Expand Down
2 changes: 1 addition & 1 deletion packages/evershop/src/components/admin/catalog/productEdit/variants/EditVariant.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export function EditVariant({
</Card.Session>
<Card.Session>
<div className="flex justify-end">
<div className="grid grid-cols-2 gap-1">
<div className="grid grid-cols-2 gap-4">
<Button
title="Save"
variant="primary"
Expand Down
4 changes: 2 additions & 2 deletions packages/evershop/src/components/admin/catalog/productEdit/variants/New.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export function New({ createVariantGroupApi, setGroup }) {
{action === undefined && (
<div>
<div className="justify-center text-center">
<div className="mb-4">
<span className="pr-1">
<div className="mb-16">
<span className="pr-4">
This product has some variants like color or size?
</span>
<a
Expand Down
2 changes: 1 addition & 1 deletion packages/evershop/src/components/admin/catalog/productEdit/variants/Search.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function Search({ addVariant, variants }) {
};

return (
<div className="flex justify-between mt-1">
<div className="flex justify-between mt-4">
<div className="self-center">
<div className="autocomplete-search">
<Input
Expand Down
2 changes: 1 addition & 1 deletion packages/evershop/src/components/admin/catalog/productEdit/variants/SearchModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export function SearchModal({ keyword, variants, addVariant, searchAPI }) {
</div>
)}
{potentialVariants.length <= 0 && (
<div className="flex justify-center p-1">
<div className="flex justify-center p-4">
There is no product to show
</div>
)}
Expand Down
12 changes: 6 additions & 6 deletions packages/evershop/src/components/admin/catalog/productEdit/variants/VariantModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ export function VariantModal({
return <p className="text-critical">{error.message}</p>;
}
return (
<div className="variant-item pb-15 border-b border-solid border-divider mb-15 last:border-b-0 last:pb-0">
<div className="grid grid-cols-2 gap-x-1">
<div className="variant-item pb-6 border-b border-solid border-divider mb-6 last:border-b-0 last:pb-0">
<div className="grid grid-cols-2 gap-x-4">
<div className="col-span-1">
<ProductMediaManager
id="images"
Expand All @@ -72,9 +72,9 @@ export function VariantModal({
/>
</div>
<div className="col-span-1">
<div className="grid grid-cols-2 gap-x-1 border-b border-divider pb-15 mb-15">
<div className="grid grid-cols-2 gap-x-4 border-b border-divider pb-6 mb-6">
{data?.attributes?.items.map((a, index) => (
<div key={a.attributeId} className="mt-1 col">
<div key={a.attributeId} className="mt-4 col">
<div>
<label>{a.attributeName}</label>
</div>
Expand Down Expand Up @@ -106,7 +106,7 @@ export function VariantModal({
</div>
))}
</div>
<div className="grid grid-cols-3 gap-x-1 border-b border-divider pb-15 mb-15">
<div className="grid grid-cols-3 gap-x-4 border-b border-divider pb-6 mb-6">
<div>
<div>SKU</div>
<Field
Expand All @@ -128,7 +128,7 @@ export function VariantModal({
/>
</div>
</div>
<div className="grid grid-cols-3 gap-x-1">
<div className="grid grid-cols-3 gap-x-4">
<div>
<div>Status</div>
<Field
Expand Down
2 changes: 1 addition & 1 deletion packages/evershop/src/components/admin/catalog/productGrid/rows/ThumbnailRow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default function ThumbnailRow({ src, name }) {
return (
<td>
<div
className="grid-thumbnail text-border border border-divider p-075 rounded flex justify-center"
className="grid-thumbnail text-border border border-divider p-3 rounded flex justify-center"
style={{ width: '6rem', height: '6rem' }}
>
{src && <img className="self-center" src={src} alt={name} />}
Expand Down
12 changes: 6 additions & 6 deletions packages/evershop/src/components/admin/checkout/shippingSetting/Method.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ function Method({ method, getZones }) {
return (
<>
<>
<td className="border-none py-1">{method.name}</td>
<td className="border-none py-1">
<td className="border-none py-4">{method.name}</td>
<td className="border-none py-4">
{method.isEnabled ? 'Enabled' : 'Disabled'}
</td>
<td className="border-none py-1">
<td className="border-none py-4">
{method.cost?.text || (
<a
href="#"
Expand All @@ -28,14 +28,14 @@ function Method({ method, getZones }) {
</a>
)}
</td>
<td className="border-none py-1">
<td className="border-none py-4">
{method.conditionType
? `${method.min || 0} <= ${method.conditionType} <= ${
method.max || '∞'
}`
: 'None'}
</td>
<td className="border-none py-1">
<td className="border-none py-4">
<a
href="#"
className="text-interactive"
Expand All @@ -48,7 +48,7 @@ function Method({ method, getZones }) {
</a>
<a
href="#"
className="text-critical ml-2"
className="text-critical ml-8"
onClick={async (e) => {
e.preventDefault();
try {
Expand Down
8 changes: 4 additions & 4 deletions packages/evershop/src/components/admin/checkout/shippingSetting/MethodForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function Condition({ method }) {
const [type, setType] = React.useState(method?.conditionType || 'price');
return (
<div>
<div className="mb-1">
<div className="mb-4">
<Radio
name="condition_type"
options={[
Expand All @@ -40,7 +40,7 @@ function Condition({ method }) {
value={type}
/>
</div>
<div className="grid grid-cols-2 gap-2">
<div className="grid grid-cols-2 gap-8">
<div>
<Field
name="min"
Expand Down Expand Up @@ -175,7 +175,7 @@ function MethodForm({ saveMethodApi, closeModal, getZones, method }) {
value={shippingMethod}
/>
) : (
<div className="flex gap-1 justify-start items-center">
<div className="flex gap-4 justify-start items-center">
<Input
name="name"
type="text"
Expand Down Expand Up @@ -293,7 +293,7 @@ function MethodForm({ saveMethodApi, closeModal, getZones, method }) {
{hasCondition && <Condition method={method} />}
</Card.Session>
<Card.Session>
<div className="flex justify-end gap-1">
<div className="flex justify-end gap-4">
<Button
title="Cancel"
variant="secondary"
Expand Down
6 changes: 3 additions & 3 deletions packages/evershop/src/components/admin/checkout/shippingSetting/Methods.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import MethodForm from '@components/admin/checkout/shippingSetting/MethodForm';
export function Methods({ getZones, methods, addMethodApi }) {
const modal = useModal();
return (
<div className="my-2">
<div className="my-8">
<table className="border-collapse divide-y">
<thead>
<tr>
Expand All @@ -19,12 +19,12 @@ export function Methods({ getZones, methods, addMethodApi }) {
</tr>
</thead>
{methods.map((method) => (
<tr key={method.methodId} className="border-divider py-2">
<tr key={method.methodId} className="border-divider py-8">
<Method method={method} getZones={getZones} />
</tr>
))}
</table>
<div className="mt-1">
<div className="mt-4">
<a
href="#"
className="text-interactive"
Expand Down
4 changes: 2 additions & 2 deletions packages/evershop/src/components/admin/checkout/shippingSetting/PriceBasedPrice.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function PriceBasedPrice({ lines }) {
}))
);
return (
<div className="my-2">
<div className="my-8">
<table className="border-collapse divide-y">
<thead>
<tr>
Expand All @@ -23,7 +23,7 @@ export default function PriceBasedPrice({ lines }) {
<tbody>
{rows.map((row, index) => (
// Create a random key for each row
<tr key={row.key} className="border-divider py-2">
<tr key={row.key} className="border-divider py-8">
<td className="border-none">
<Field
name={`price_based_cost[${index}][min_price]`}
Expand Down
4 changes: 2 additions & 2 deletions packages/evershop/src/components/admin/checkout/shippingSetting/WeightBasedPrice.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function WeightBasedPrice({ lines }) {
}))
);
return (
<div className="my-2">
<div className="my-8">
<table className="border-collapse divide-y">
<thead>
<tr>
Expand All @@ -23,7 +23,7 @@ export default function WeightBasedPrice({ lines }) {
<tbody>
{rows.map((row, index) => (
// Create a random key for each row
<tr key={row.key} className="border-divider py-2">
<tr key={row.key} className="border-divider py-8">
<td className="border-none">
<Field
name={`weight_based_cost[${index}][min_weight]`}
Expand Down
14 changes: 7 additions & 7 deletions packages/evershop/src/components/admin/checkout/shippingSetting/Zone.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ function Zone({ zone, countries, getZones }) {
return (
<Card.Session
title={
<div className="flex justify-between items-center gap-2">
<div className="flex justify-between items-center gap-8">
<div>{zone.name}</div>
<div className="flex justify-between gap-2">
<div className="flex justify-between gap-8">
<a
href="#"
className="text-interactive"
Expand Down Expand Up @@ -58,11 +58,11 @@ function Zone({ zone, countries, getZones }) {
}
>
<div className="divide-y border rounded border-divider">
<div className="flex justify-start items-center border-divider mt-2">
<div className="p-2">
<div className="flex justify-start items-center border-divider mt-8">
<div className="p-8">
<MapIcon width={25} height={25} fill="#008060" />
</div>
<div className="flex-grow px-1">
<div className="flex-grow px-4">
<div>
<b>{zone.country?.name || 'Worldwide'}</b>
</div>
Expand All @@ -75,8 +75,8 @@ function Zone({ zone, countries, getZones }) {
</div>
</div>
</div>
<div className="flex justify-start items-center border-divider mt-2">
<div className="flex-grow px-1">
<div className="flex justify-start items-center border-divider mt-8">
<div className="flex-grow px-4">
<Methods
methods={zone.methods}
getZones={getZones}
Expand Down
2 changes: 1 addition & 1 deletion packages/evershop/src/components/admin/checkout/shippingSetting/ZoneForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function ZoneForm({
/>
</Card.Session>
<Card.Session>
<div className="flex justify-end gap-1">
<div className="flex justify-end gap-4">
<Button title="Cancel" variant="secondary" onAction={closeModal} />
<Button
title="Save"
Expand Down
6 changes: 3 additions & 3 deletions packages/evershop/src/components/admin/cms/Card.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function Card({ title, actions = [], subdued = false, children }) {
<div className="flex justify-between card-header">
{title && <h2 className="card-title">{title}</h2>}
{actions.length > 0 && (
<div className="flex space-x-075">
<div className="flex space-x-3">
{actions.map((action, index) => {
const className = {
primary: 'text-primary',
Expand Down Expand Up @@ -69,10 +69,10 @@ const Session = function Session({ actions = [], title, children }) {
return (
<div className="card-section border-b box-border">
{(title || actions.length > 0) && (
<div className="flex justify-between card-section-header mb-1">
<div className="flex justify-between card-section-header mb-4">
{title && <h3 className="card-session-title">{title}</h3>}
{actions.length > 0 && (
<div className="flex space-x-075">
<div className="flex space-x-3">
{actions.map((action, index) => {
const className = {
primary: 'text-primary',
Expand Down
6 changes: 3 additions & 3 deletions packages/evershop/src/components/admin/cms/PageHeading.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function BreadcrumbIcon({ backUrl }) {
return (
<a
href={backUrl}
className="breadcrum-icon border block border-border rounded mr-075"
className="breadcrum-icon border block border-border rounded mr-3"
>
<span className="flex items-center justify-center">
<svg
Expand Down Expand Up @@ -51,7 +51,7 @@ function PageHeading({ backUrl, heading }) {

return (
<div className="page-heading flex justify-between items-center">
<div className="flex justify-start space-x-1 items-center">
<div className="flex justify-start space-x-4 items-center">
<Area
id="pageHeadingLeft"
noOuter
Expand All @@ -75,7 +75,7 @@ function PageHeading({ backUrl, heading }) {
]}
/>
</div>
<div className="flex justify-end space-x-1 items-center">
<div className="flex justify-end space-x-4 items-center">
<Area id="pageHeadingRight" noOuter coreComponents={[]} />
</div>
</div>
Expand Down
Loading
Loading