Merge branch 'refactor'

client/src/entities/catalog-slider/api/catalog-slider-api.ts

@@ -1,14 +1,5 @@
 import { apiClient } from '@/shared/api/client'
-
-export type CatalogSliderSlide = {
-  id: string
-  url: string
-  caption: string
-}
-
-export type AdminCatalogSliderSlide = CatalogSliderSlide & {
-  galleryImageId: string
-}
+import type { CatalogSliderSlide, AdminCatalogSliderSlide } from '../model/types'
 
 export async function fetchCatalogSlider(): Promise<{ slides: CatalogSliderSlide[] }> {
   const { data } = await apiClient.get<{ slides: CatalogSliderSlide[] }>('catalog-slider')

client/src/entities/catalog-slider/index.ts

@@ -0,0 +1,2 @@
+export { fetchCatalogSlider, fetchAdminCatalogSlider, putAdminCatalogSlider } from './api/catalog-slider-api'
+export type { CatalogSliderSlide, AdminCatalogSliderSlide } from './model/types'

client/src/entities/catalog-slider/model/types.ts

@@ -0,0 +1,9 @@
+export type CatalogSliderSlide = {
+  id: string
+  url: string
+  caption: string
+}
+
+export type AdminCatalogSliderSlide = CatalogSliderSlide & {
+  galleryImageId: string
+}

client/src/entities/gallery/index.ts

@@ -0,0 +1,3 @@
+export { fetchAdminGallery, deleteGalleryImage } from './api/gallery-api'
+export type { GalleryImageItem } from './model/types'
+export { GalleryGrid } from './ui/GalleryGrid'

client/src/entities/gallery/ui/GalleryGrid.tsx

@@ -0,0 +1,61 @@
+import DeleteOutlineOutlinedIcon from '@mui/icons-material/DeleteOutlineOutlined'
+import Box from '@mui/material/Box'
+import IconButton from '@mui/material/IconButton'
+import Tooltip from '@mui/material/Tooltip'
+import type { GalleryImageItem } from '../model/types'
+
+type Props = {
+  items: GalleryImageItem[]
+  deleting?: boolean
+  onDelete: (id: string) => void
+}
+
+export function GalleryGrid({ items, deleting, onDelete }: Props) {
+  return (
+    <Box
+      sx={{
+        display: 'grid',
+        gridTemplateColumns: 'repeat(auto-fill, minmax(140px, 1fr))',
+        gap: 2,
+      }}
+    >
+      {items.map((item) => (
+        <Box
+          key={item.id}
+          sx={{
+            position: 'relative',
+            borderRadius: 1,
+            overflow: 'hidden',
+            border: 1,
+            borderColor: 'divider',
+            aspectRatio: '1',
+          }}
+        >
+          <Box
+            component="img"
+            src={item.url}
+            alt=""
+            sx={{ width: '100%', height: '100%', objectFit: 'cover', display: 'block' }}
+          />
+          <Tooltip title="Удалить из галереи">
+            <IconButton
+              size="small"
+              color="error"
+              sx={{
+                position: 'absolute',
+                top: 4,
+                right: 4,
+                bgcolor: 'background.paper',
+                '&:hover': { bgcolor: 'error.light', color: 'error.contrastText' },
+              }}
+              disabled={deleting}
+              onClick={() => onDelete(item.id)}
+            >
+              <DeleteOutlineOutlinedIcon fontSize="small" />
+            </IconButton>
+          </Tooltip>
+        </Box>
+      ))}
+    </Box>
+  )
+}

client/src/entities/info/api/info-page-api.ts

@@ -1,15 +1,7 @@
 import { apiClient } from '@/shared/api/client'
+import type { InfoPageBlock } from '../model/types'
+
 
-export type InfoPageBlock = {
-  id: string
-  key: string
-  title: string
-  body: string
-  sort: number
-  published: boolean
-  createdAt: string
-  updatedAt: string
-}
 
 export async function fetchPublicInfoBlocks(): Promise<{ items: InfoPageBlock[] }> {
   const { data } = await apiClient.get<{ items: InfoPageBlock[] }>('info-page/blocks')

client/src/entities/info/index.ts

@@ -0,0 +1,8 @@
+export {
+  fetchPublicInfoBlocks,
+  fetchAdminInfoBlocks,
+  createInfoBlock,
+  updateInfoBlock,
+  deleteInfoBlock,
+} from './api/info-page-api'
+export type { InfoPageBlock } from './model/types'

client/src/entities/info/model/types.ts

@@ -0,0 +1,10 @@
+export type InfoPageBlock = {
+  id: string
+  key: string
+  title: string
+  body: string
+  sort: number
+  published: boolean
+  createdAt: string
+  updatedAt: string
+}

client/src/entities/order/api/order-api.ts

@@ -39,7 +39,7 @@ export type OrderDetailResponse = {
     }>
     messages: Array<{
       id: string
-      authorType: string
+      authorType: 'user' | 'admin'
       text: string
       attachmentUrl?: string | null
       createdAt: string