From 8a5ff4441b16936995fbc6cd253f590bb5410e22 Mon Sep 17 00:00:00 2001 From: Tamara Date: Wed, 21 Dec 2022 15:04:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D0=BF=D1=82=D0=B8=D0=B2?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B4=D0=BB=D1=8F=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=20=D1=81=D0=BA=D0=B8=D0=B4?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=20=D0=BF=D1=80=D0=BE=D0=BC=D0=BE=D0=BA?= =?UTF-8?q?=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.tsx | 8 ++--- .../Authorization/index.tsx | 0 src/{Components => pages}/Error404/index.tsx | 0 src/{Components => pages}/Logo/index.tsx | 0 src/{Components => pages}/Sections/index.tsx | 0 .../dashboard}/Content/Discounts/index.tsx | 31 ++++++++++++++----- .../dashboard}/Content/Discounts/types.ts | 0 .../dashboard}/Content/Entities/index.tsx | 0 .../dashboard}/Content/Promocode/index.tsx | 5 +-- .../dashboard}/Content/Promocode/types.ts | 0 .../Content/Support/Pagination/index.tsx | 0 .../dashboard}/Content/Support/index.tsx | 0 .../Content/Tariffs/Contractor/index.tsx | 0 .../Content/Tariffs/DataGridElement/index.tsx | 0 .../Content/Tariffs/ModalMini/index.tsx | 0 .../Content/Tariffs/ModalPackage/index.tsx | 0 .../dashboard}/Content/Tariffs/Quiz/index.tsx | 0 .../Content/Tariffs/Templater/index.tsx | 0 .../dashboard}/Content/Tariffs/index.tsx | 0 .../dashboard}/Content/Tariffs/types.ts | 0 .../dashboard}/Content/Users/index.tsx | 0 .../dashboard}/Content/index.tsx | 2 +- .../dashboard}/Header/index.tsx | 0 .../dashboard}/Menu/index.tsx | 0 .../dashboard}/ModalAdmin/index.tsx | 0 .../dashboard}/ModalEntities/index.tsx | 0 .../dashboard}/ModalUser/index.tsx | 0 .../LoggedIn => pages/dashboard}/index.tsx | 0 src/store.ts | 6 ++-- 29 files changed, 34 insertions(+), 18 deletions(-) rename src/{Components => pages}/Authorization/index.tsx (100%) rename src/{Components => pages}/Error404/index.tsx (100%) rename src/{Components => pages}/Logo/index.tsx (100%) rename src/{Components => pages}/Sections/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Discounts/index.tsx (97%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Discounts/types.ts (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Entities/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Promocode/index.tsx (99%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Promocode/types.ts (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Support/Pagination/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Support/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Tariffs/Contractor/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Tariffs/DataGridElement/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Tariffs/ModalMini/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Tariffs/ModalPackage/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Tariffs/Quiz/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Tariffs/Templater/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Tariffs/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Tariffs/types.ts (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/Users/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Content/index.tsx (97%) rename src/{Components/LoggedIn => pages/dashboard}/Header/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/Menu/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/ModalAdmin/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/ModalEntities/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/ModalUser/index.tsx (100%) rename src/{Components/LoggedIn => pages/dashboard}/index.tsx (100%) diff --git a/src/index.tsx b/src/index.tsx index 1e41aea..a7230ff 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,10 +1,10 @@ import * as React from "react"; import { createRoot } from 'react-dom/client'; import { BrowserRouter, Routes, Route } from "react-router-dom"; -import Authorization from "./Components/Authorization"; -import Sections from "./Components/Sections"; -import LoggedIn from "./Components/LoggedIn"; -import Error404 from "./Components/Error404"; +import Authorization from "./pages/Authorization"; +import Sections from "./pages/Sections"; +import LoggedIn from "./pages/dashboard"; +import Error404 from "./pages/Error404"; const container = document.getElementById('root'); diff --git a/src/Components/Authorization/index.tsx b/src/pages/Authorization/index.tsx similarity index 100% rename from src/Components/Authorization/index.tsx rename to src/pages/Authorization/index.tsx diff --git a/src/Components/Error404/index.tsx b/src/pages/Error404/index.tsx similarity index 100% rename from src/Components/Error404/index.tsx rename to src/pages/Error404/index.tsx diff --git a/src/Components/Logo/index.tsx b/src/pages/Logo/index.tsx similarity index 100% rename from src/Components/Logo/index.tsx rename to src/pages/Logo/index.tsx diff --git a/src/Components/Sections/index.tsx b/src/pages/Sections/index.tsx similarity index 100% rename from src/Components/Sections/index.tsx rename to src/pages/Sections/index.tsx diff --git a/src/Components/LoggedIn/Content/Discounts/index.tsx b/src/pages/dashboard/Content/Discounts/index.tsx similarity index 97% rename from src/Components/LoggedIn/Content/Discounts/index.tsx rename to src/pages/dashboard/Content/Discounts/index.tsx index 66923a1..0bbc6fa 100644 --- a/src/Components/LoggedIn/Content/Discounts/index.tsx +++ b/src/pages/dashboard/Content/Discounts/index.tsx @@ -15,6 +15,14 @@ import Select, { SelectChangeEvent } from "@mui/material/Select"; import { PrivilegesProps, DiscountProps } from "./types"; import useStore, { StoreState } from "../../../../store"; import theme from "../../../../theme"; +import {styled} from "@mui/material/styles"; + + +const BoxButton = styled('div')(({ theme }) => ({ + [theme.breakpoints.down(400)]: { + justifyContent: 'center' + }, +})); const columns: GridColDef[] = [ @@ -470,7 +478,7 @@ const Discounts: React.FC = () => { marginTop: "35px", backgroundColor: theme.palette.content.main }}> - +
@@ -498,10 +506,13 @@ const Discounts: React.FC = () => { Дата действия: - + { flexDirection: "column", justifyContent: "center", alignItems: "center", + width: '100%', marginTop: "45px" }}> - - + diff --git a/src/Components/LoggedIn/Content/Discounts/types.ts b/src/pages/dashboard/Content/Discounts/types.ts similarity index 100% rename from src/Components/LoggedIn/Content/Discounts/types.ts rename to src/pages/dashboard/Content/Discounts/types.ts diff --git a/src/Components/LoggedIn/Content/Entities/index.tsx b/src/pages/dashboard/Content/Entities/index.tsx similarity index 100% rename from src/Components/LoggedIn/Content/Entities/index.tsx rename to src/pages/dashboard/Content/Entities/index.tsx diff --git a/src/Components/LoggedIn/Content/Promocode/index.tsx b/src/pages/dashboard/Content/Promocode/index.tsx similarity index 99% rename from src/Components/LoggedIn/Content/Promocode/index.tsx rename to src/pages/dashboard/Content/Promocode/index.tsx index 17b0795..49109a9 100644 --- a/src/Components/LoggedIn/Content/Promocode/index.tsx +++ b/src/pages/dashboard/Content/Promocode/index.tsx @@ -302,8 +302,9 @@ const Promocode: React.FC = () => { = ({ section }) => { alignItems: "center", overflow: "auto", overflowY: "auto", - padding: "60px 0" + padding: "60px 5px" }}> { componentsArray[ section ] } diff --git a/src/Components/LoggedIn/Header/index.tsx b/src/pages/dashboard/Header/index.tsx similarity index 100% rename from src/Components/LoggedIn/Header/index.tsx rename to src/pages/dashboard/Header/index.tsx diff --git a/src/Components/LoggedIn/Menu/index.tsx b/src/pages/dashboard/Menu/index.tsx similarity index 100% rename from src/Components/LoggedIn/Menu/index.tsx rename to src/pages/dashboard/Menu/index.tsx diff --git a/src/Components/LoggedIn/ModalAdmin/index.tsx b/src/pages/dashboard/ModalAdmin/index.tsx similarity index 100% rename from src/Components/LoggedIn/ModalAdmin/index.tsx rename to src/pages/dashboard/ModalAdmin/index.tsx diff --git a/src/Components/LoggedIn/ModalEntities/index.tsx b/src/pages/dashboard/ModalEntities/index.tsx similarity index 100% rename from src/Components/LoggedIn/ModalEntities/index.tsx rename to src/pages/dashboard/ModalEntities/index.tsx diff --git a/src/Components/LoggedIn/ModalUser/index.tsx b/src/pages/dashboard/ModalUser/index.tsx similarity index 100% rename from src/Components/LoggedIn/ModalUser/index.tsx rename to src/pages/dashboard/ModalUser/index.tsx diff --git a/src/Components/LoggedIn/index.tsx b/src/pages/dashboard/index.tsx similarity index 100% rename from src/Components/LoggedIn/index.tsx rename to src/pages/dashboard/index.tsx diff --git a/src/store.ts b/src/store.ts index 5e8a38b..e4db8f5 100644 --- a/src/store.ts +++ b/src/store.ts @@ -1,8 +1,8 @@ import create from "zustand"; import { persist } from "zustand/middleware" -import { ArrayProps } from "./Components/LoggedIn/Content/Tariffs/types"; -import { PromocodeProps } from "./Components/LoggedIn/Content/Promocode/types"; -import { DiscountProps } from "./Components/LoggedIn/Content/Discounts/types"; +import { ArrayProps } from "./pages/dashboard/Content/Tariffs/types"; +import { PromocodeProps } from "./pages/dashboard/Content/Promocode/types"; +import { DiscountProps } from "./pages/dashboard/Content/Discounts/types"; const useStore = create()(