andrei/visus-plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

поменял архитектуру фронт части

Browse Source
This commit is contained in:
Андрей Дувакин 2025-03-29 20:47:27 +05:00
parent 1b7ddc6d8a
commit a1cf2f7c88
74 changed files with 153 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-app/index.html
View File

@ -27,6 +27,6 @@
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script type="module" src="/src/main.jsx"></script> <script type="module" src="/src/App/main.jsx"></script>
</body> </body>
</html> </html>

4
web-app/src/redux/services/lensIssuesApi.js → web-app/src/Api/lensIssuesApi.js
View File

@ -1,5 +1,5 @@
import {createApi, fetchBaseQuery} from "@reduxjs/toolkit/query/react"; import {createApi, fetchBaseQuery} from "@reduxjs/toolkit/query/react";
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../Core/сonfig.js";
export const lensIssuesApi = createApi({ export const lensIssuesApi = createApi({
@ -15,7 +15,7 @@ export const lensIssuesApi = createApi({
tagTypes: ['LensIssues'], tagTypes: ['LensIssues'],
endpoints: (builder) => ({ endpoints: (builder) => ({
getLensIssues: builder.query({ getLensIssues: builder.query({
query: () => '/lens_issues/', query: () => '/LensIssues/',
providesTags: ['LensIssues'], providesTags: ['LensIssues'],
refetchOnMountOrArgChange: 5 refetchOnMountOrArgChange: 5
}), }),

4
web-app/src/redux/services/lensesApi.js → web-app/src/Api/lensesApi.js
View File

@ -1,5 +1,5 @@
import {createApi, fetchBaseQuery} from "@reduxjs/toolkit/query/react"; import {createApi, fetchBaseQuery} from "@reduxjs/toolkit/query/react";
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../Core/сonfig.js";
export const lensesApi = createApi({ export const lensesApi = createApi({
@ -15,7 +15,7 @@ export const lensesApi = createApi({
tagTypes: ['Lens'], tagTypes: ['Lens'],
endpoints: (builder) => ({ endpoints: (builder) => ({
getLenses: builder.query({ getLenses: builder.query({
query: () => '/lenses/', query: () => '/Lenses/',
providesTags: ['Lens'], providesTags: ['Lens'],
refetchOnMountOrArgChange: 5 refetchOnMountOrArgChange: 5
}), }),

4
web-app/src/redux/services/patientsApi.js → web-app/src/Api/patientsApi.js
View File

@ -1,5 +1,5 @@
import {createApi, fetchBaseQuery} from '@reduxjs/toolkit/query/react' import {createApi, fetchBaseQuery} from '@reduxjs/toolkit/query/react'
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../Core/сonfig.js";
export const patientsApi = createApi({ export const patientsApi = createApi({
reducerPath: 'patientsApi', reducerPath: 'patientsApi',
@ -14,7 +14,7 @@ export const patientsApi = createApi({
tagTypes: ['Patient'], tagTypes: ['Patient'],
endpoints: (builder) => ({ endpoints: (builder) => ({
getPatients: builder.query({ getPatients: builder.query({
query: () => '/patients/', query: () => '/Patients/',
providesTags: ['Patient'], providesTags: ['Patient'],
refetchOnMountOrArgChange: 5 refetchOnMountOrArgChange: 5
}), }),

2
web-app/src/redux/services/setContentApi.js → web-app/src/Api/setContentApi.js
View File

@ -1,5 +1,5 @@
import {createApi, fetchBaseQuery} from '@reduxjs/toolkit/query/react'; import {createApi, fetchBaseQuery} from '@reduxjs/toolkit/query/react';
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../Core/сonfig.js";
export const setContentApi = createApi({ export const setContentApi = createApi({
reducerPath: 'setContentApi', reducerPath: 'setContentApi',

4
web-app/src/redux/services/setsApi.js → web-app/src/Api/setsApi.js
View File

@ -1,5 +1,5 @@
import {createApi, fetchBaseQuery} from '@reduxjs/toolkit/query/react' import {createApi, fetchBaseQuery} from '@reduxjs/toolkit/query/react'
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../Core/сonfig.js";
export const setsApi = createApi({ export const setsApi = createApi({
reducerPath: 'setsApi', reducerPath: 'setsApi',
@ -14,7 +14,7 @@ export const setsApi = createApi({
tagTypes: ['Set'], tagTypes: ['Set'],
endpoints: (builder) => ({ endpoints: (builder) => ({
getSets: builder.query({ getSets: builder.query({
query: () => '/sets/', query: () => '/Sets/',
providesTags: ['Set'], providesTags: ['Set'],
refetchOnMountOrArgChange: 5 refetchOnMountOrArgChange: 5
}), }),

6
web-app/src/App.jsx → web-app/src/App/App.jsx
View File

@ -1,9 +1,9 @@
import {BrowserRouter as Router} from "react-router-dom"; import {BrowserRouter as Router} from "react-router-dom";
import AppRouter from "./AppRouter.jsx"; import AppRouter from "./AppRouter.jsx";
import {AuthProvider} from "./AuthContext.jsx"; import {AuthProvider} from "../Hooks/AuthContext.jsx";
import "/src/styles/app.css"; import "/src/Styles/app.css";
import {Provider} from "react-redux"; import {Provider} from "react-redux";
import store from "./redux/store"; import store from "../Redux/store.js";
const App = () => ( const App = () => (
<Provider store={store}> <Provider store={store}>

29
web-app/src/App/AppRouter.jsx Normal file
View File

@ -0,0 +1,29 @@
import {Routes, Route, Navigate} from "react-router-dom";
import PrivateRoute from "../Components/PrivateRoute.jsx";
import LoginPage from "../Components/Pages/LoginPage.jsx";
import MainLayout from "../Components/Layouts/MainLayout.jsx";
import PatientsPage from "../Components/Pages/PatientsPage/PatientsPage.jsx";
import HomePage from "../Components/Pages/HomePage.jsx";
import LensesLayout from "../Components/Layouts/LensesLayout.jsx";
import IssuesPage from "../Components/Pages/IssuesPage/IssuesPage.jsx";
import AppointmentsLayout from "../Components/Layouts/AppointmentsLayout.jsx";
const AppRouter = () => (
<Routes>
<Route path="/login" element={<LoginPage/>}/>
<Route element={<PrivateRoute/>}>
<Route element={<MainLayout/>}>
<Route path={"/Patients"} element={<PatientsPage/>}/>
<Route path={"/Lenses"} element={<LensesLayout/>}/>
<Route path={"/issues"} element={<IssuesPage/>}/>
<Route path={"/Appointments"} element={<AppointmentsLayout/>}/>
<Route path={"/"} element={<HomePage/>}/>
</Route>
</Route>
<Route path={"*"} element={<Navigate to={"/"}/>}/>
</Routes>
);
export default AppRouter;

0
web-app/src/main.jsx → web-app/src/App/main.jsx
View File

29
web-app/src/AppRouter.jsx
View File

@ -1,29 +0,0 @@
import {Routes, Route, Navigate} from "react-router-dom";
import PrivateRoute from "./components/PrivateRoute.jsx";
import LoginPage from "./pages/LoginPage.jsx";
import MainLayout from "./layouts/MainLayout.jsx";
import PatientsPage from "./pages/PatientsPage.jsx";
import HomePage from "./pages/HomePage.jsx";
import LensesLayout from "./layouts/LensesLayout.jsx";
import IssuesPage from "./pages/IssuesPage.jsx";
import AppointmentsLayout from "./layouts/AppointmentsLayout.jsx";
const AppRouter = () => (
<Routes>
<Route path="/login" element={<LoginPage/>}/>
<Route element={<PrivateRoute/>}>
<Route element={<MainLayout/>}>
<Route path={"/patients"} element={<PatientsPage/>}/>
<Route path={"/lenses"} element={<LensesLayout/>}/>
<Route path={"/issues"} element={<IssuesPage/>}/>
<Route path={"/appointments"} element={<AppointmentsLayout/>}/>
<Route path={"/"} element={<HomePage/>}/>
</Route>
</Route>
<Route path={"*"} element={<Navigate to={"/"}/>}/>
</Routes>
);
export default AppRouter;

4
web-app/src/components/lenses/LensListCard.jsx → web-app/src/Components/Dummies/LensListCard.jsx
View File

@ -2,8 +2,8 @@ import {Card, Popconfirm, Tooltip} from "antd";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import {DeleteOutlined, EditOutlined, EyeOutlined} from "@ant-design/icons"; import {DeleteOutlined, EditOutlined, EyeOutlined} from "@ant-design/icons";
import {useState} from "react"; import {useState} from "react";
import LensViewModal from "./LensViewModal.jsx"; import LensViewModal from "../Widgets/LensViewModal.jsx";
import {LensPropType} from "../../types/lensPropType.js"; import {LensPropType} from "../../Types/lensPropType.js";
const LensListCard = ({lens, handleEditLens, handleDeleteLens}) => { const LensListCard = ({lens, handleEditLens, handleDeleteLens}) => {
const [showModalInfo, setShowModalInfo] = useState(false); const [showModalInfo, setShowModalInfo] = useState(false);

4
web-app/src/components/patients/PatientListCard.jsx → web-app/src/Components/Dummies/PatientListCard.jsx
View File

@ -2,8 +2,8 @@ import {Card, Modal, Popconfirm, Tooltip} from "antd";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import {DeleteOutlined, EditOutlined, EyeOutlined} from "@ant-design/icons"; import {DeleteOutlined, EditOutlined, EyeOutlined} from "@ant-design/icons";
import {useState} from "react"; import {useState} from "react";
import PatientViewModal from "./PatientViewModal.jsx"; import PatientViewModal from "../Widgets/PatientViewModal.jsx";
import {PatientPropType} from "../../types/patientPropType.js"; import {PatientPropType} from "../../Types/patientPropType.js";
const PatientListCard = ({patient, handleEditPatient, handleDeletePatient}) => { const PatientListCard = ({patient, handleEditPatient, handleDeletePatient}) => {
const [showModalInfo, setShowModalInfo] = useState(false); const [showModalInfo, setShowModalInfo] = useState(false);

2
web-app/src/components/sets/SetListCard.jsx → web-app/src/Components/Dummies/SetListCard.jsx
View File

@ -1,7 +1,7 @@
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import {Card, Modal, Popconfirm, Tooltip} from "antd"; import {Card, Modal, Popconfirm, Tooltip} from "antd";
import {DeleteOutlined, EditOutlined, PlusOutlined} from "@ant-design/icons"; import {DeleteOutlined, EditOutlined, PlusOutlined} from "@ant-design/icons";
import {SetPropType} from "../../types/setPropType.js"; import {SetPropType} from "../../Types/setPropType.js";
const SetListCard = ({set, handleEditSet, handleDeleteSet, handleAppendSet}) => { const SetListCard = ({set, handleEditSet, handleDeleteSet, handleAppendSet}) => {
const deleteSet = () => { const deleteSet = () => {

14
web-app/src/layouts/AppointmentsLayout.jsx → web-app/src/Components/Layouts/AppointmentsLayout.jsx
View File

@ -4,13 +4,13 @@ import {Splitter} from "antd";
import { import {
CalendarOutlined, TableOutlined, MenuFoldOutlined, MenuUnfoldOutlined, CalendarOutlined, TableOutlined, MenuFoldOutlined, MenuUnfoldOutlined,
} from "@ant-design/icons"; } from "@ant-design/icons";
import AppointmentsCalendarPage from "../pages/appointments_layout/AppointmentsCalendarPage.jsx"; import AppointmentsCalendarPage from "../Pages/AppointmentsCalendarPage.jsx";
import AppointmentsTablePage from "../pages/appointments_layout/AppointmentsTablePage.jsx"; import AppointmentsTablePage from "../Pages/AppointmentsTablePage.jsx";
import getAllAppointments from "../api/appointments/getAllAppointments.js"; import getAllAppointments from "../../old_api/appointments/getAllAppointments.js";
import getAllScheduledAppointments from "../api/scheduled_appointments/getAllScheduledAppointments.js"; import getAllScheduledAppointments from "../../old_api/scheduled_appointments/getAllScheduledAppointments.js";
import {useAuth} from "../AuthContext.jsx"; import {useAuth} from "../../Hooks/AuthContext.jsx";
import LoadingIndicator from "../components/LoadingIndicator.jsx"; import LoadingIndicator from "../Widgets/LoadingIndicator.jsx";
import {cacheInfo, getCachedInfo, getCacheTimestamp} from "../utils/cachedInfoUtils.js"; import {cacheInfo, getCachedInfo, getCacheTimestamp} from "../../Utils/cachedInfoUtils.js";
const {useBreakpoint} = Grid; const {useBreakpoint} = Grid;

6
web-app/src/layouts/LensesLayout.jsx → web-app/src/Components/Layouts/LensesLayout.jsx
View File

@ -1,9 +1,9 @@
import { import {
Tabs Tabs
} from "antd"; } from "antd";
import LensesPage from "../pages/lenses_layout/LensesPage.jsx"; import LensesPage from "../Pages/LensesPage/LensesPage.jsx";
import {FolderViewOutlined, SwitcherOutlined} from "@ant-design/icons"; import {FolderViewOutlined, SwitcherOutlined} from "@ant-design/icons";
import SetLensesPage from "../pages/lenses_layout/SetLensesPage.jsx"; import SetsPage from "../Pages/SetsPage/SetsPage.jsx";
const items = [ const items = [
@ -16,7 +16,7 @@ const items = [
{ {
key: '2', key: '2',
label: 'Наборы линз', label: 'Наборы линз',
children: <SetLensesPage/>, children: <SetsPage/>,
icon: <SwitcherOutlined/> icon: <SwitcherOutlined/>
} }
] ]

8
web-app/src/layouts/MainLayout.jsx → web-app/src/Components/Layouts/MainLayout.jsx
View File

@ -11,7 +11,7 @@ import {
LogoutOutlined, LogoutOutlined,
MessageOutlined MessageOutlined
} from "@ant-design/icons"; } from "@ant-design/icons";
import {useAuth} from "../AuthContext.jsx"; import {useAuth} from "../../Hooks/AuthContext.jsx";
const {Content, Footer, Sider} = Layout; const {Content, Footer, Sider} = Layout;
@ -28,10 +28,10 @@ const MainLayout = () => {
const menuItems = [ const menuItems = [
getItem("Главная", "/", <HomeOutlined/>), getItem("Главная", "/", <HomeOutlined/>),
getItem("Приёмы", "/appointments", <CalendarOutlined/>), getItem("Приёмы", "/Appointments", <CalendarOutlined/>),
getItem("Выдачи линз", "/issues", <DatabaseOutlined/>), getItem("Выдачи линз", "/issues", <DatabaseOutlined/>),
getItem("Линзы и наборы", "/lenses", <FolderViewOutlined/>), getItem("Линзы и наборы", "/Lenses", <FolderViewOutlined/>),
getItem("Пациенты", "/patients", <TeamOutlined/>), getItem("Пациенты", "/Patients", <TeamOutlined/>),
getItem("Рассылки", "/mailing", <MessageOutlined/>), getItem("Рассылки", "/mailing", <MessageOutlined/>),
{type: "divider"}, {type: "divider"},
getItem("Мой профиль", "profile", <UserOutlined/>, [ getItem("Мой профиль", "profile", <UserOutlined/>, [

6
web-app/src/pages/appointments_layout/AppointmentsCalendarPage.jsx → web-app/src/Components/Pages/AppointmentsCalendarPage.jsx
View File

@ -5,9 +5,9 @@ import 'dayjs/locale/ru';
import locale from 'antd/es/locale/ru_RU'; import locale from 'antd/es/locale/ru_RU';
import updateLocale from 'dayjs/plugin/updateLocale'; import updateLocale from 'dayjs/plugin/updateLocale';
import PropTypes, {arrayOf} from "prop-types"; import PropTypes, {arrayOf} from "prop-types";
import CalendarCell from "../../components/appointments/CalendarCell.jsx"; import CalendarCell from "../Widgets/CalendarCell.jsx";
import {AppointmentPropType} from "../../types/appointmentPropType.js"; import {AppointmentPropType} from "../../Types/appointmentPropType.js";
import {ScheduledAppointmentPropType} from "../../types/scheduledAppointmentPropType.js"; import {ScheduledAppointmentPropType} from "../../Types/scheduledAppointmentPropType.js";
const {useBreakpoint} = Grid; const {useBreakpoint} = Grid;

4
web-app/src/pages/appointments_layout/AppointmentsTablePage.jsx → web-app/src/Components/Pages/AppointmentsTablePage.jsx
View File

@ -1,6 +1,6 @@
import {useAuth} from "../../AuthContext.jsx"; import {useAuth} from "../../Hooks/AuthContext.jsx";
import {useEffect, useState} from "react"; import {useEffect, useState} from "react";
import getAllAppointments from "../../api/appointments/getAllAppointments.js"; import getAllAppointments from "../../old_api/appointments/getAllAppointments.js";
import {notification} from "antd"; import {notification} from "antd";

0
web-app/src/pages/HomePage.jsx → web-app/src/Components/Pages/HomePage.jsx
View File

12
web-app/src/pages/IssuesPage.jsx → web-app/src/Components/Pages/IssuesPage/IssuesPage.jsx
View File

@ -13,13 +13,13 @@ import {
Pagination, Result Pagination, Result
} from "antd"; } from "antd";
import {DatabaseOutlined, PlusOutlined, UnorderedListOutlined} from "@ant-design/icons"; import {DatabaseOutlined, PlusOutlined, UnorderedListOutlined} from "@ant-design/icons";
import LensIssueViewModal from "../components/lens_issues/LensIssueViewModal.jsx"; import LensIssueViewModal from "../../Widgets/LensIssueViewModal.jsx";
import dayjs from "dayjs"; import dayjs from "dayjs";
import LensIssueFormModal from "../components/lens_issues/LensIssueFormModal.jsx"; import LensIssueFormModal from "../../Widgets/LensIssueFormModal.jsx";
import SelectViewMode from "../components/SelectViewMode.jsx"; import SelectViewMode from "../../Widgets/SelectViewMode.jsx";
import LoadingIndicator from "../components/LoadingIndicator.jsx"; import LoadingIndicator from "../../Widgets/LoadingIndicator.jsx";
import useIssues from "../hooks/data/useIssues.js"; import useIssues from "./useIssues.js";
import useIssuesUI from "../hooks/ui/useIssuesUI.js"; import useIssuesUI from "./useIssuesUI.js";
const {Title} = Typography; const {Title} = Typography;
const {useBreakpoint} = Grid; const {useBreakpoint} = Grid;

4
web-app/src/hooks/data/useIssues.js → web-app/src/Components/Pages/IssuesPage/useIssues.js
View File

@ -1,7 +1,7 @@
import {useDispatch, useSelector} from "react-redux"; import {useDispatch, useSelector} from "react-redux";
import {useAddLensIssuesMutation, useGetLensIssuesQuery} from "../../redux/services/lensIssuesApi.js"; import {useAddLensIssuesMutation, useGetLensIssuesQuery} from "../../../Api/lensIssuesApi.js";
import {notification} from "antd"; import {notification} from "antd";
import {closeModal} from "../../redux/slices/lensIssuesSlice.js"; import {closeModal} from "../../../Redux/Slices/lensIssuesSlice.js";
const useIssues = () => { const useIssues = () => {

4
web-app/src/hooks/ui/useIssuesUI.js → web-app/src/Components/Pages/IssuesPage/useIssuesUI.js
View File

@ -1,5 +1,5 @@
import {useDispatch, useSelector} from "react-redux"; import {useDispatch, useSelector} from "react-redux";
import {getCachedInfo} from "../../utils/cachedInfoUtils.js"; import {getCachedInfo} from "../../../Utils/cachedInfoUtils.js";
import { import {
closeModal, closeModal,
openModal, openModal,
@ -10,7 +10,7 @@ import {
setSearchText, setSearchText,
setStartFilterDate, setStartFilterDate,
setViewMode setViewMode
} from "../../redux/slices/lensIssuesSlice.js"; } from "../../../Redux/Slices/lensIssuesSlice.js";
import {useEffect, useMemo} from "react"; import {useEffect, useMemo} from "react";
import dayjs from "dayjs"; import dayjs from "dayjs";

12
web-app/src/pages/lenses_layout/LensesPage.jsx → web-app/src/Components/Pages/LensesPage/LensesPage.jsx
View File

@ -22,12 +22,12 @@ import {
TableOutlined, TableOutlined,
BuildOutlined BuildOutlined
} from "@ant-design/icons"; } from "@ant-design/icons";
import LensCard from "../../components/lenses/LensListCard.jsx"; import LensCard from "../../Dummies/LensListCard.jsx";
import LensFormModal from "../../components/lenses/LensFormModal.jsx"; import LensFormModal from "../../Widgets/LensFormModal.jsx";
import SelectViewMode from "../../components/SelectViewMode.jsx"; import SelectViewMode from "../../Widgets/SelectViewMode.jsx";
import LoadingIndicator from "../../components/LoadingIndicator.jsx"; import LoadingIndicator from "../../Widgets/LoadingIndicator.jsx";
import useLenses from "../../hooks/data/useLenses.js"; import useLenses from "./useLenses.js";
import useLensesUI from "../../hooks/ui/useLensesUI.js"; import useLensesUI from "./useLensesUI.js";
const {Option} = Select; const {Option} = Select;
const {useBreakpoint} = Grid; const {useBreakpoint} = Grid;

4
web-app/src/hooks/data/useLenses.js → web-app/src/Components/Pages/LensesPage/useLenses.js
View File

@ -4,9 +4,9 @@ import {
useDeleteLensMutation, useDeleteLensMutation,
useGetLensesQuery, useGetLensesQuery,
useUpdateLensMutation useUpdateLensMutation
} from "../../redux/services/lensesApi.js"; } from "../../../Api/lensesApi.js";
import {notification} from "antd"; import {notification} from "antd";
import {closeModal} from "../../redux/slices/lensesSlice.js"; import {closeModal} from "../../../Redux/Slices/lensesSlice.js";
const useLenses = () => { const useLenses = () => {

4
web-app/src/hooks/ui/useLensesUI.js → web-app/src/Components/Pages/LensesPage/useLensesUI.js
View File

@ -1,5 +1,5 @@
import {useEffect} from "react"; import {useEffect} from "react";
import {getCachedInfo} from "../../utils/cachedInfoUtils.js"; import {getCachedInfo} from "../../../Utils/cachedInfoUtils.js";
import { import {
closeModal, closeModal,
openModal, openModal,
@ -7,7 +7,7 @@ import {
setSearchParams, setSearchParams,
setSearchText, setShowAdvancedSearch, setSearchText, setShowAdvancedSearch,
setViewMode setViewMode
} from "../../redux/slices/lensesSlice.js"; } from "../../../Redux/Slices/lensesSlice.js";
import {useDispatch, useSelector} from "react-redux"; import {useDispatch, useSelector} from "react-redux";

2
web-app/src/pages/LoginPage.jsx → web-app/src/Components/Pages/LoginPage.jsx
View File

@ -1,6 +1,6 @@
import {Form, Input, Button, Row, Col, Typography} from 'antd'; import {Form, Input, Button, Row, Col, Typography} from 'antd';
import {useEffect, useState} from 'react'; import {useEffect, useState} from 'react';
import {useAuth} from "../AuthContext.jsx"; import {useAuth} from "../../Hooks/AuthContext.jsx";
import {useNavigate} from "react-router-dom"; import {useNavigate} from "react-router-dom";
const {Title} = Typography; const {Title} = Typography;

15
web-app/src/pages/PatientsPage.jsx → web-app/src/Components/Pages/PatientsPage/PatientsPage.jsx
View File

@ -18,12 +18,12 @@ import {
SortDescendingOutlined, TableOutlined, SortDescendingOutlined, TableOutlined,
TeamOutlined TeamOutlined
} from "@ant-design/icons"; } from "@ant-design/icons";
import PatientListCard from "../components/patients/PatientListCard.jsx"; import PatientListCard from "../../Dummies/PatientListCard.jsx";
import PatientFormModal from "../components/patients/PatientFormModal.jsx"; import PatientFormModal from "../../Widgets/PatientFormModal.jsx";
import SelectViewMode from "../components/SelectViewMode.jsx"; import SelectViewMode from "../../Widgets/SelectViewMode.jsx";
import LoadingIndicator from "../components/LoadingIndicator.jsx"; import LoadingIndicator from "../../Widgets/LoadingIndicator.jsx";
import usePatients from "../hooks/data/usePatients.js"; import usePatients from "./usePatients.js";
import usePatientsUI from "../hooks/ui/usePatientsUI.js"; import usePatientsUI from "./usePatientsUI.js";
const {Option} = Select; const {Option} = Select;
const {Title} = Typography; const {Title} = Typography;
@ -195,6 +195,5 @@ const PatientsPage = () => {
</div> </div>
); );
}; };
;
export default PatientsPage; export default PatientsPage;

4
web-app/src/hooks/data/usePatients.js → web-app/src/Components/Pages/PatientsPage/usePatients.js
View File

@ -5,8 +5,8 @@ import {
useDeletePatientMutation, useDeletePatientMutation,
useGetPatientsQuery, useGetPatientsQuery,
useUpdatePatientMutation useUpdatePatientMutation
} from "../../redux/services/patientsApi.js"; } from "../../../Api/patientsApi.js";
import {closeModal} from "../../redux/slices/patientsSlice.js"; import {closeModal} from "../../../Redux/Slices/patientsSlice.js";
const usePatients = () => { const usePatients = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();

4
web-app/src/hooks/ui/usePatientsUI.js → web-app/src/Components/Pages/PatientsPage/usePatientsUI.js
View File

@ -9,8 +9,8 @@ import {
setSearchText, setSearchText,
setSortOrder, setSortOrder,
setViewMode setViewMode
} from "../../redux/slices/patientsSlice.js"; } from "../../../Redux/Slices/patientsSlice.js";
import { getCachedInfo } from "../../utils/cachedInfoUtils.js"; import { getCachedInfo } from "../../../Utils/cachedInfoUtils.js";
const usePatientsUI = (patients) => { const usePatientsUI = (patients) => {
const dispatch = useDispatch(); const dispatch = useDispatch();

14
web-app/src/pages/lenses_layout/SetLensesPage.jsx → web-app/src/Components/Pages/SetsPage/SetsPage.jsx
View File

@ -1,15 +1,15 @@
import {FloatButton, Input, List, Result, Row, Typography} from "antd"; import {FloatButton, Input, List, Result, Row, Typography} from "antd";
import {PlusOutlined, SwitcherOutlined} from "@ant-design/icons"; import {PlusOutlined, SwitcherOutlined} from "@ant-design/icons";
import SetListCard from "../../components/sets/SetListCard.jsx"; import SetListCard from "../../Dummies/SetListCard.jsx";
import SetFormModal from "../../components/sets/SetFormModal.jsx"; import SetFormModal from "../../Widgets/SetFormModal.jsx";
import LoadingIndicator from "../../components/LoadingIndicator.jsx"; import LoadingIndicator from "../../Widgets/LoadingIndicator.jsx";
import useSets from "../../hooks/data/useSets.js"; import useSets from "./useSets.js";
import useSetsUI from "../../hooks/ui/useSetsUI.js"; import useSetsUI from "./useSetsUI.js";
const {Title} = Typography; const {Title} = Typography;
const SetLensesPage = () => { const SetsPage = () => {
const setsData = useSets(); const setsData = useSets();
const setsUI = useSetsUI(setsData.sets); const setsUI = useSetsUI(setsData.sets);
@ -78,4 +78,4 @@ const SetLensesPage = () => {
); );
}; };
export default SetLensesPage; export default SetsPage;

6
web-app/src/hooks/data/useSets.js → web-app/src/Components/Pages/SetsPage/useSets.js
View File

@ -5,9 +5,9 @@ import {
useDeleteSetMutation, useDeleteSetMutation,
useGetSetsQuery, useGetSetsQuery,
useUpdateSetMutation useUpdateSetMutation
} from "../../redux/services/setsApi.js"; } from "../../../Api/setsApi.js";
import {closeModal} from "../../redux/slices/setsSlice.js"; import {closeModal} from "../../../Redux/Slices/setsSlice.js";
import {useAddSetContentMutation, useUpdateSetContentMutation} from "../../redux/services/setContentApi.js"; import {useAddSetContentMutation, useUpdateSetContentMutation} from "../../../Api/setContentApi.js";
const useSets = () => { const useSets = () => {

2
web-app/src/hooks/ui/useSetsUI.js → web-app/src/Components/Pages/SetsPage/useSetsUI.js
View File

@ -7,7 +7,7 @@ import {
setCurrentPage, setCurrentPage,
setPageSize, setPageSize,
setSearchText setSearchText
} from "../../redux/slices/setsSlice.js"; } from "../../../Redux/Slices/setsSlice.js";
const useSetsUI = (sets) => { const useSetsUI = (sets) => {

2
web-app/src/components/PrivateRoute.jsx → web-app/src/Components/PrivateRoute.jsx
View File

@ -1,5 +1,5 @@
import {Navigate, Outlet} from "react-router-dom"; import {Navigate, Outlet} from "react-router-dom";
import {useAuth} from "../AuthContext.jsx"; import {useAuth} from "../Hooks/AuthContext.jsx";
const PrivateRoute = () => { const PrivateRoute = () => {
const {user} = useAuth(); const {user} = useAuth();

4
web-app/src/components/appointments/AppointmentCellViewModal.jsx → web-app/src/Components/Widgets/AppointmentCellViewModal.jsx
View File

@ -1,6 +1,6 @@
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import {AppointmentPropType} from "../../types/appointmentPropType.js"; import {AppointmentPropType} from "../../Types/appointmentPropType.js";
import {ScheduledAppointmentPropType} from "../../types/scheduledAppointmentPropType.js"; import {ScheduledAppointmentPropType} from "../../Types/scheduledAppointmentPropType.js";
import {Modal} from "antd"; import {Modal} from "antd";

4
web-app/src/components/appointments/CalendarCell.jsx → web-app/src/Components/Widgets/CalendarCell.jsx
View File

@ -2,8 +2,8 @@ import {useEffect, useRef, useState} from "react";
import {Badge, Col, Tag, Tooltip, Typography} from "antd"; import {Badge, Col, Tag, Tooltip, Typography} from "antd";
import dayjs from "dayjs"; import dayjs from "dayjs";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import {AppointmentPropType} from "../../types/appointmentPropType.js"; import {AppointmentPropType} from "../../Types/appointmentPropType.js";
import {ScheduledAppointmentPropType} from "../../types/scheduledAppointmentPropType.js"; import {ScheduledAppointmentPropType} from "../../Types/scheduledAppointmentPropType.js";
const CalendarCell = ({appointments, scheduledAppointments, onCellClick, onItemClick}) => { const CalendarCell = ({appointments, scheduledAppointments, onCellClick, onItemClick}) => {

6
web-app/src/components/lenses/LensFormModal.jsx → web-app/src/Components/Widgets/LensFormModal.jsx
View File

@ -1,9 +1,9 @@
import {Col, Form, InputNumber, Modal, notification, Row, Select} from "antd"; import {Col, Form, InputNumber, Modal, notification, Row, Select} from "antd";
import {useEffect, useState} from "react"; import {useEffect, useState} from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import getAllLensTypes from "../../api/lens_types/getAllLensTypes.js"; import getAllLensTypes from "../../old_api/lens_types/getAllLensTypes.js";
import {useAuth} from "../../AuthContext.jsx"; import {useAuth} from "../../Hooks/AuthContext.jsx";
import {LensPropType} from "../../types/lensPropType.js"; import {LensPropType} from "../../Types/lensPropType.js";
const LensFormModal = ({visible, onCancel, onSubmit, lens}) => { const LensFormModal = ({visible, onCancel, onSubmit, lens}) => {

6
web-app/src/components/lens_issues/LensIssueFormModal.jsx → web-app/src/Components/Widgets/LensIssueFormModal.jsx
View File

@ -3,10 +3,10 @@ import {
Modal, Input, Button, notification, Typography, Collapse, Steps, Row, Alert, Col, DatePicker, Spin, Grid Modal, Input, Button, notification, Typography, Collapse, Steps, Row, Alert, Col, DatePicker, Spin, Grid
} from "antd"; } from "antd";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import getAllPatients from "../../api/patients/getAllPatients.js"; import getAllPatients from "../../old_api/patients/getAllPatients.js";
import {useAuth} from "../../AuthContext.jsx"; import {useAuth} from "../../Hooks/AuthContext.jsx";
import dayjs from "dayjs"; import dayjs from "dayjs";
import getNotIssuedLenses from "../../api/lenses/getNotIssuedLenses.js"; import getNotIssuedLenses from "../../old_api/lenses/getNotIssuedLenses.js";
const {useBreakpoint} = Grid; const {useBreakpoint} = Grid;

2
web-app/src/components/lens_issues/LensIssueViewModal.jsx → web-app/src/Components/Widgets/LensIssueViewModal.jsx
View File

@ -1,6 +1,6 @@
import {Collapse, Modal} from "antd"; import {Collapse, Modal} from "antd";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import {LensIssuePropType} from "../../types/lensIssuePropType.js"; import {LensIssuePropType} from "../../Types/lensIssuePropType.js";
const LensIssueViewModal = ({visible, onCancel, lensIssue}) => { const LensIssueViewModal = ({visible, onCancel, lensIssue}) => {

2
web-app/src/components/lenses/LensViewModal.jsx → web-app/src/Components/Widgets/LensViewModal.jsx
View File

@ -1,6 +1,6 @@
import {Button, Col, Modal, Row, Typography} from "antd"; import {Button, Col, Modal, Row, Typography} from "antd";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import {LensPropType} from "../../types/lensPropType.js"; import {LensPropType} from "../../Types/lensPropType.js";
const {Text, Title} = Typography; const {Text, Title} = Typography;

0
web-app/src/components/LoadingIndicator.jsx → web-app/src/Components/Widgets/LoadingIndicator.jsx
View File

2
web-app/src/components/patients/PatientFormModal.jsx → web-app/src/Components/Widgets/PatientFormModal.jsx
View File

@ -5,7 +5,7 @@ import locale from "antd/es/date-picker/locale/ru_RU";
import validator from "validator"; import validator from "validator";
import {MaskedInput} from "antd-mask-input"; import {MaskedInput} from "antd-mask-input";
import dayjs from "dayjs"; import dayjs from "dayjs";
import {PatientPropType} from "../../types/patientPropType.js"; import {PatientPropType} from "../../Types/patientPropType.js";
const {TextArea} = Input; const {TextArea} = Input;

2
web-app/src/components/patients/PatientViewModal.jsx → web-app/src/Components/Widgets/PatientViewModal.jsx
View File

@ -1,6 +1,6 @@
import {Button, Col, Modal, Row, Typography, Divider} from "antd"; import {Button, Col, Modal, Row, Typography, Divider} from "antd";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import {PatientPropType} from "../../types/patientPropType.js"; import {PatientPropType} from "../../Types/patientPropType.js";
const { Text, Title } = Typography; const { Text, Title } = Typography;

4
web-app/src/components/SelectViewMode.jsx → web-app/src/Components/Widgets/SelectViewMode.jsx
View File

@ -1,8 +1,8 @@
import {BuildOutlined, TableOutlined} from "@ant-design/icons"; import {BuildOutlined, TableOutlined} from "@ant-design/icons";
import {Select, Tooltip} from "antd"; import {Select, Tooltip} from "antd";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import {cacheInfo} from "../utils/cachedInfoUtils.js"; import {cacheInfo} from "../../Utils/cachedInfoUtils.js";
import {ViewModPropType} from "../types/viewModPropType.js"; import {ViewModPropType} from "../../Types/viewModPropType.js";
const {Option} = Select; const {Option} = Select;

8
web-app/src/components/sets/SetFormModal.jsx → web-app/src/Components/Widgets/SetFormModal.jsx
View File

@ -1,11 +1,11 @@
import {useState, useEffect} from "react"; import {useState, useEffect} from "react";
import {Modal, Button, Form, Input, Table, InputNumber, Select, Space, notification} from "antd"; import {Modal, Button, Form, Input, Table, InputNumber, Select, Space, notification} from "antd";
import {PlusOutlined, DeleteOutlined} from "@ant-design/icons"; import {PlusOutlined, DeleteOutlined} from "@ant-design/icons";
import getAllLensTypes from "../../api/lens_types/getAllLensTypes.js"; import getAllLensTypes from "../../old_api/lens_types/getAllLensTypes.js";
import {useAuth} from "../../AuthContext.jsx"; import {useAuth} from "../../Hooks/AuthContext.jsx";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import getSetContentBySetId from "../../api/set_content/getSetContentBySetId.js"; import getSetContentBySetId from "../../old_api/set_content/getSetContentBySetId.js";
import {SetPropType} from "../../types/setPropType.js"; import {SetPropType} from "../../Types/setPropType.js";
const {Option} = Select; const {Option} = Select;

0
web-app/src/core/axiosConfig.js → web-app/src/Core/axiosConfig.js
View File

0
web-app/src/core/сonfig.js → web-app/src/Core/сonfig.js
View File

4
web-app/src/AuthContext.jsx → web-app/src/Hooks/AuthContext.jsx
View File

@ -1,9 +1,9 @@
import {createContext, useState, useContext, useEffect} from "react"; import {createContext, useState, useContext, useEffect} from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import loginUser from "./api/auth/loginRequest.js"; import loginUser from "../old_api/auth/loginRequest.js";
import {Spin} from "antd"; import {Spin} from "antd";
import {useNavigate} from "react-router-dom"; import {useNavigate} from "react-router-dom";
import createApi from "./core/axiosConfig.js"; import createApi from "../Core/axiosConfig.js";
const AuthContext = createContext(undefined); const AuthContext = createContext(undefined);

3
web-app/src/redux/slices/lensIssuesSlice.js → web-app/src/Redux/Slices/lensIssuesSlice.js
View File

@ -1,6 +1,5 @@
import {createSlice} from "@reduxjs/toolkit"; import {createSlice} from "@reduxjs/toolkit";
import {cacheInfo} from "../../utils/cachedInfoUtils.js"; import {cacheInfo} from "../../Utils/cachedInfoUtils.js";
import dayjs from "dayjs";
const initialState = { const initialState = {
searchText: '', searchText: '',

2
web-app/src/redux/slices/lensesSlice.js → web-app/src/Redux/Slices/lensesSlice.js
View File

@ -1,5 +1,5 @@
import {createSlice} from '@reduxjs/toolkit' import {createSlice} from '@reduxjs/toolkit'
import {cacheInfo} from "../../utils/cachedInfoUtils.js"; import {cacheInfo} from "../../Utils/cachedInfoUtils.js";
const initialState = { const initialState = {

2
web-app/src/redux/slices/patientsSlice.js → web-app/src/Redux/Slices/patientsSlice.js
View File

@ -1,5 +1,5 @@
import {createSlice} from '@reduxjs/toolkit' import {createSlice} from '@reduxjs/toolkit'
import {cacheInfo} from "../../utils/cachedInfoUtils.js"; import {cacheInfo} from "../../Utils/cachedInfoUtils.js";
const initialState = { const initialState = {
searchText: '', searchText: '',

0
web-app/src/redux/slices/setsSlice.js → web-app/src/Redux/Slices/setsSlice.js
View File

18
web-app/src/redux/store.js → web-app/src/Redux/store.js
View File

@ -1,13 +1,13 @@
import {configureStore} from '@reduxjs/toolkit'; import {configureStore} from '@reduxjs/toolkit';
import {patientsApi} from './services/patientsApi.js'; import {patientsApi} from '../Api/patientsApi.js';
import patientsUIReducer from './slices/patientsSlice.js'; import patientsUIReducer from './Slices/patientsSlice.js';
import {lensesApi} from './services/lensesApi.js'; import {lensesApi} from '../Api/lensesApi.js';
import lensesUIReducer from './slices/lensesSlice.js'; import lensesUIReducer from './Slices/lensesSlice.js';
import {setsApi} from "./services/setsApi.js"; import {setsApi} from "../Api/setsApi.js";
import setsUIReducer from './slices/setsSlice.js'; import setsUIReducer from './Slices/setsSlice.js';
import {setContentApi} from "./services/setContentApi.js"; import {setContentApi} from "../Api/setContentApi.js";
import {lensIssuesApi} from "./services/lensIssuesApi.js"; import {lensIssuesApi} from "../Api/lensIssuesApi.js";
import lensIssuesReducer from "./slices/lensIssuesSlice.js"; import lensIssuesReducer from "./Slices/lensIssuesSlice.js";
export const store = configureStore({ export const store = configureStore({
reducer: { reducer: {

0
web-app/src/styles/app.css → web-app/src/Styles/app.css
View File

0
web-app/src/types/appointmentPropType.js → web-app/src/Types/appointmentPropType.js
View File

0
web-app/src/types/appointmentTypePropType.js → web-app/src/Types/appointmentTypePropType.js
View File

0
web-app/src/types/lensIssuePropType.js → web-app/src/Types/lensIssuePropType.js
View File

0
web-app/src/types/lensPropType.js → web-app/src/Types/lensPropType.js
View File

0
web-app/src/types/lensTypePropType.js → web-app/src/Types/lensTypePropType.js
View File

0
web-app/src/types/patientPropType.js → web-app/src/Types/patientPropType.js
View File

0
web-app/src/types/scheduledAppointmentPropType.js → web-app/src/Types/scheduledAppointmentPropType.js
View File

0
web-app/src/types/setContentPropType.js → web-app/src/Types/setContentPropType.js
View File

0
web-app/src/types/setPropType.js → web-app/src/Types/setPropType.js
View File

0
web-app/src/types/userPropType.js → web-app/src/Types/userPropType.js
View File

0
web-app/src/types/viewModPropType.js → web-app/src/Types/viewModPropType.js
View File

0
web-app/src/utils/cachedInfoUtils.js → web-app/src/Utils/cachedInfoUtils.js
View File

2
web-app/src/api/appointments/getAllAppointments.js → web-app/src/old_api/appointments/getAllAppointments.js
View File

@ -1,4 +1,4 @@
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../../Core/сonfig.js";
const getAllAppointments = async (api) => { const getAllAppointments = async (api) => {
const response = await api.get(`${CONFIG.BASE_URL}/appointments/`); const response = await api.get(`${CONFIG.BASE_URL}/appointments/`);

2
web-app/src/api/auth/loginRequest.js → web-app/src/old_api/auth/loginRequest.js
View File

@ -1,4 +1,4 @@
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../../Core/сonfig.js";
const loginUser = async (loginData, api) => { const loginUser = async (loginData, api) => {
const response = await api.post(`${CONFIG.BASE_URL}/login/`, loginData, { const response = await api.post(`${CONFIG.BASE_URL}/login/`, loginData, {

2
web-app/src/api/lens_issues/addLensIssue.js → web-app/src/old_api/lens_issues/addLensIssue.js
View File

@ -1,4 +1,4 @@
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../../Core/сonfig.js";
const AddLensIssue = async (api, lens_issue) => { const AddLensIssue = async (api, lens_issue) => {
const response = await api.post(`${CONFIG.BASE_URL}/lens_issues/`, lens_issue); const response = await api.post(`${CONFIG.BASE_URL}/lens_issues/`, lens_issue);

2
web-app/src/api/lens_issues/getAllLensIssues.js → web-app/src/old_api/lens_issues/getAllLensIssues.js
View File

@ -1,4 +1,4 @@
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../../Core/сonfig.js";
const GetAllLensIssues = async (api) => { const GetAllLensIssues = async (api) => {
const response = await api.get(`${CONFIG.BASE_URL}/lens_issues/`); const response = await api.get(`${CONFIG.BASE_URL}/lens_issues/`);

2
web-app/src/api/lens_types/getAllLensTypes.js → web-app/src/old_api/lens_types/getAllLensTypes.js
View File

@ -1,4 +1,4 @@
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../../Core/сonfig.js";
const getAllLensTypes = async (api) => { const getAllLensTypes = async (api) => {
const response = await api.get(`${CONFIG.BASE_URL}/lens_types/`); const response = await api.get(`${CONFIG.BASE_URL}/lens_types/`);

2
web-app/src/api/lenses/getNotIssuedLenses.js → web-app/src/old_api/lenses/getNotIssuedLenses.js
View File

@ -1,4 +1,4 @@
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../../Core/сonfig.js";
const getNotIssuedLenses = async (api) => { const getNotIssuedLenses = async (api) => {
const response = await api.get(`${CONFIG.BASE_URL}/lenses/not_issued/`); const response = await api.get(`${CONFIG.BASE_URL}/lenses/not_issued/`);

2
web-app/src/api/patients/getAllPatients.js → web-app/src/old_api/patients/getAllPatients.js
View File

@ -1,4 +1,4 @@
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../../Core/сonfig.js";
const getAllPatients = async (api) => { const getAllPatients = async (api) => {
const response = await api.get(`${CONFIG.BASE_URL}/patients/`); const response = await api.get(`${CONFIG.BASE_URL}/patients/`);

2
web-app/src/api/scheduled_appointments/getAllScheduledAppointments.js → web-app/src/old_api/scheduled_appointments/getAllScheduledAppointments.js
View File

@ -1,4 +1,4 @@
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../../Core/сonfig.js";
const getAllScheduledAppointments = async (api) => { const getAllScheduledAppointments = async (api) => {
const response = await api.get(`${CONFIG.BASE_URL}/scheduled_appointments/`); const response = await api.get(`${CONFIG.BASE_URL}/scheduled_appointments/`);

2
web-app/src/api/set_content/getSetContentBySetId.js → web-app/src/old_api/set_content/getSetContentBySetId.js
View File

@ -1,4 +1,4 @@
import CONFIG from "../../core/сonfig.js"; import CONFIG from "../../Core/сonfig.js";
const getSetContentBySetId = async (api, set_id) => { const getSetContentBySetId = async (api, set_id) => {
const response = await api.get(`${CONFIG.BASE_URL}/set_content/${set_id}/`); const response = await api.get(`${CONFIG.BASE_URL}/set_content/${set_id}/`);