diff --git a/src/components/ui/MediaView.tsx b/src/components/ui/MediaView.tsx index b717e09..aee97da 100644 --- a/src/components/ui/MediaView.tsx +++ b/src/components/ui/MediaView.tsx @@ -21,6 +21,7 @@ export function MediaView({ media }: Readonly<{ media?: MediaData }>) { display: "flex", flexGrow: 1, justifyContent: "center", + margin: "0 auto", }} > {media?.media_type === 1 && ( diff --git a/src/pages/article/list.tsx b/src/pages/article/list.tsx index 7540f00..fe2dc6a 100644 --- a/src/pages/article/list.tsx +++ b/src/pages/article/list.tsx @@ -18,7 +18,7 @@ export const ArticleList = observer(() => { const { dataGridProps } = useDataGrid({ resource: "article", - ...META_LANGUAGE(language) + ...META_LANGUAGE(language), }); const columns = React.useMemo( @@ -33,7 +33,7 @@ export const ArticleList = observer(() => { headerAlign: "left", }, { - field: "heading", + field: "service_name", headerName: "Заголовок", type: "string", minWidth: 300, @@ -43,6 +43,16 @@ export const ArticleList = observer(() => { flex: 1, }, // { + // field: "service_name", + // headerName: "Сервисное название (тест)", + // type: "string", + // minWidth: 300, + // display: "flex", + // align: "left", + // headerAlign: "left", + // flex: 1, + // }, + // { // field: 'body', // headerName: 'Контент', // type: 'string', @@ -66,10 +76,7 @@ export const ArticleList = observer(() => { <> - + ); }, diff --git a/src/pages/media/list.tsx b/src/pages/media/list.tsx index a43994f..d6e626e 100644 --- a/src/pages/media/list.tsx +++ b/src/pages/media/list.tsx @@ -1,88 +1,107 @@ -import {type GridColDef} from '@mui/x-data-grid' -import {CustomDataGrid} from '../../components/CustomDataGrid' -import {DeleteButton, EditButton, List, ShowButton, useDataGrid} from '@refinedev/mui' -import React from 'react' -import {MEDIA_TYPES} from '../../lib/constants' -import { observer } from "mobx-react-lite" +import { type GridColDef } from "@mui/x-data-grid"; +import { CustomDataGrid } from "../../components/CustomDataGrid"; +import { + DeleteButton, + EditButton, + List, + ShowButton, + useDataGrid, +} from "@refinedev/mui"; +import React from "react"; +import { MEDIA_TYPES } from "../../lib/constants"; +import { observer } from "mobx-react-lite"; -import {localeText} from '../../locales/ru/localeText' -import { languageStore, META_LANGUAGE } from '@stores' +import { localeText } from "../../locales/ru/localeText"; +import { languageStore, META_LANGUAGE } from "@stores"; export const MediaList = observer(() => { const { language } = languageStore; - const {dataGridProps} = useDataGrid({ - ...META_LANGUAGE(language) - }) + const { dataGridProps } = useDataGrid({ + ...META_LANGUAGE(language), + }); const columns = React.useMemo( () => [ { - field: 'id', - headerName: 'ID', - type: 'number', + field: "id", + headerName: "ID", + type: "number", minWidth: 350, - display: 'flex', - align: 'left', - headerAlign: 'left', + display: "flex", + align: "left", + headerAlign: "left", }, { - field: 'filename', - headerName: 'Название файла', - type: 'string', + field: "filename", + headerName: "Название файла", + type: "string", minWidth: 250, - display: 'flex', - align: 'left', - headerAlign: 'left', + display: "flex", + align: "left", + headerAlign: "left", }, { - field: 'media_name', - headerName: 'Название', - type: 'string', + field: "media_name", + headerName: "Название", + type: "string", minWidth: 150, - display: 'flex', - align: 'left', - headerAlign: 'left', + flex: 1, + display: "flex", + align: "left", + headerAlign: "left", }, { - field: 'media_type', - headerName: 'Тип', - type: 'string', - display: 'flex', - align: 'left', - headerAlign: 'left', + field: "media_type", + headerName: "Тип", + type: "string", + display: "flex", + align: "left", + headerAlign: "left", flex: 1, renderCell: (params) => { - const value = params.row.media_type - return MEDIA_TYPES.find((type) => type.value === value)?.label || value + const value = params.row.media_type; + return ( + MEDIA_TYPES.find((type) => type.value === value)?.label || value + ); }, }, { - field: 'actions', - headerName: 'Действия', + field: "actions", + headerName: "Действия", minWidth: 120, - display: 'flex', - align: 'right', - headerAlign: 'center', + display: "flex", + align: "right", + headerAlign: "center", sortable: false, filterable: false, disableColumnMenu: true, - renderCell: function render({row}) { + renderCell: function render({ row }) { return ( <> - + - ) + ); }, }, ], - [], - ) + [] + ); return ( - row.id} languageEnabled/> + row.id} + languageEnabled + /> - ) + ); }); diff --git a/src/pages/route/list.tsx b/src/pages/route/list.tsx index ecd183d..7ffdb91 100644 --- a/src/pages/route/list.tsx +++ b/src/pages/route/list.tsx @@ -60,6 +60,7 @@ export const RouteList = observer(() => { minWidth: 150, display: "flex", align: "left", + flex: 1, headerAlign: "left", }, { @@ -68,6 +69,7 @@ export const RouteList = observer(() => { type: "string", minWidth: 120, display: "flex", + align: "left", headerAlign: "left", }, diff --git a/src/pages/sight/edit.tsx b/src/pages/sight/edit.tsx index 6c882cc..01ffc43 100644 --- a/src/pages/sight/edit.tsx +++ b/src/pages/sight/edit.tsx @@ -782,21 +782,9 @@ export const SightEdit = observer(() => { bgcolor: "#806c59", }} > - - {leftArticleData?.media && ( - - )} - + {leftArticleData?.media && ( + + )} {/* Заголовок статьи */} { width: "30%", top: "178px", - minHeight: "600px", + maxHeight: "600px", + overflowY: "auto", right: 50, zIndex: 1000, borderRadius: 2, @@ -1246,14 +1235,56 @@ export const SightEdit = observer(() => { {creatingArticleHeading} - + theme.palette.mode === "dark" + ? "grey.300" + : "grey.800", + }, + "& a": { + color: "primary.main", + textDecoration: "none", + "&:hover": { + textDecoration: "underline", + }, + }, + "& blockquote": { + borderLeft: "4px solid", + borderColor: "primary.main", + pl: 2, + my: 2, + color: "text.secondary", + }, + "& code": { + bgcolor: (theme) => + theme.palette.mode === "dark" + ? "grey.900" + : "grey.100", + p: 0.5, + borderRadius: 0.5, + color: "primary.main", + }, + }} > - {creatingArticleBody} - + + {creatingArticleBody} + + )}