Skip to content

Commit 2bcafdd

Browse files
liudmylasovetovsliudmylasovetovs
authored
Lso/feat/shop design (#252)
1 parent 2afb681 commit 2bcafdd

120 files changed

Lines changed: 642 additions & 1270 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎frontend/app/[locale]/shop/admin/orders/[id]/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
type CurrencyCode,
1111
} from '@/lib/shop/currency';
1212
import { fromDbMoney } from '@/lib/shop/money';
13-
import { ShopAdminTopbar } from '@/components/shop/admin/shop-admin-topbar';
13+
import { ShopAdminTopbar } from '@/components/shop/admin/ShopAdminTopbar';
1414
import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
1515
import { Metadata } from 'next';
1616

‎frontend/app/[locale]/shop/admin/orders/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {
88
type CurrencyCode,
99
} from '@/lib/shop/currency';
1010
import { fromDbMoney } from '@/lib/shop/money';
11-
import { ShopAdminTopbar } from '@/components/shop/admin/shop-admin-topbar';
12-
import { AdminPagination } from '@/components/shop/admin/admin-pagination';
11+
import { ShopAdminTopbar } from '@/components/shop/admin/ShopAdminTopbar';
12+
import { AdminPagination } from '@/components/shop/admin/AdminPagination';
1313
import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
1414
import { CSRF_FORM_FIELD, issueCsrfToken } from '@/lib/security/csrf';
1515
import { parsePage } from '@/lib/pagination';

‎frontend/app/[locale]/shop/admin/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Link } from '@/i18n/routing';
22
import { getTranslations } from 'next-intl/server';
33

4-
import { ShopAdminTopbar } from '@/components/shop/admin/shop-admin-topbar';
4+
import { ShopAdminTopbar } from '@/components/shop/admin/ShopAdminTopbar';
55
import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
66
import { Metadata } from 'next';
77

‎frontend/app/[locale]/shop/admin/products/[id]/edit/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { eq } from 'drizzle-orm';
33
import { z } from 'zod';
44

55
import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
6-
import { ShopAdminTopbar } from '@/components/shop/admin/shop-admin-topbar';
6+
import { ShopAdminTopbar } from '@/components/shop/admin/ShopAdminTopbar';
77

8-
import { ProductForm } from '../../_components/product-form';
8+
import { ProductForm } from '../../_components/ProductForm';
99
import { db } from '@/db';
1010
import { products, productPrices } from '@/db/schema';
1111
import type { CurrencyCode } from '@/lib/shop/currency';

frontend/app/[locale]/shop/admin/products/_components/product-form.tsx renamed to frontend/app/[locale]/shop/admin/products/_components/ProductForm.tsx

File renamed without changes.

‎frontend/app/[locale]/shop/admin/products/new/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { ShopAdminTopbar } from '@/components/shop/admin/shop-admin-topbar';
1+
import { ShopAdminTopbar } from '@/components/shop/admin/ShopAdminTopbar';
22
import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
33
import { issueCsrfToken } from '@/lib/security/csrf';
44

5-
import { ProductForm } from '../_components/product-form';
5+
import { ProductForm } from '../_components/ProductForm';
66
import { Metadata } from 'next';
77

88
export const metadata: Metadata = {

‎frontend/app/[locale]/shop/admin/products/page.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Link } from '@/i18n/routing';
22
import { and, desc, eq, sql } from 'drizzle-orm';
33
import { issueCsrfToken } from '@/lib/security/csrf';
4-
import { ShopAdminTopbar } from '@/components/shop/admin/shop-admin-topbar';
4+
import { ShopAdminTopbar } from '@/components/shop/admin/ShopAdminTopbar';
55
import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
6-
import { AdminProductDeleteButton } from '@/components/shop/admin/admin-product-delete-button';
7-
import { AdminProductStatusToggle } from '@/components/shop/admin/admin-product-status-toggle';
8-
import { AdminPagination } from '@/components/shop/admin/admin-pagination';
6+
import { AdminProductDeleteButton } from '@/components/shop/admin/AdminProductDeleteButton';
7+
import { AdminProductStatusToggle } from '@/components/shop/admin/AdminProductStatusToggle';
8+
import { AdminPagination } from '@/components/shop/admin/AdminPagination';
99
import { db } from '@/db';
1010
import {
1111
inventoryMoves,

‎frontend/app/[locale]/shop/cart/CartPageClient.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { useTranslations } from 'next-intl';
88
import { cn } from '@/lib/utils';
99
import { Minus, Plus, Trash2, ShoppingBag } from 'lucide-react';
1010

11-
import { useCart } from '@/components/shop/cart-provider';
11+
import { useCart } from '@/components/shop/CartProvider';
1212
import { generateIdempotencyKey } from '@/lib/shop/idempotency';
1313
import { formatMoney } from '@/lib/shop/currency';
1414
import {

‎frontend/app/[locale]/shop/checkout/payment/[orderId]/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Link } from '@/i18n/routing';
2-
import { ClearCartOnMount } from '@/components/shop/clear-cart-on-mount';
2+
import { ClearCartOnMount } from '@/components/shop/ClearCartOnMount';
33
import StripePaymentClient from '../StripePaymentClient';
44

55
import { formatMoney } from '@/lib/shop/currency';

‎frontend/app/[locale]/shop/checkout/success/page.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Link } from '@/i18n/routing';
22
import { getTranslations } from 'next-intl/server';
33

44
import OrderStatusAutoRefresh from './OrderStatusAutoRefresh';
5-
import { ClearCartOnMount } from '@/components/shop/clear-cart-on-mount';
5+
import { ClearCartOnMount } from '@/components/shop/ClearCartOnMount';
66
import { formatMoney } from '@/lib/shop/currency';
77
import { getOrderSummary } from '@/lib/services/orders';
88
import { OrderNotFoundError } from '@/lib/services/errors';
@@ -57,7 +57,6 @@ function shouldClearCart(params: SearchParams): boolean {
5757
return raw === 'true' || raw === '1';
5858
}
5959

60-
/** Small hero CTA (Link) */
6160
const SHOP_HERO_CTA_SM = cn(
6261
SHOP_CTA_BASE,
6362
SHOP_CTA_INTERACTIVE,

0 commit comments

Comments
 (0)