diff --git a/web-app/index.html b/web-app/index.html index f71f934..fa92d9c 100644 --- a/web-app/index.html +++ b/web-app/index.html @@ -27,6 +27,6 @@
- + diff --git a/web-app/src/redux/services/lensIssuesApi.js b/web-app/src/Api/lensIssuesApi.js similarity index 91% rename from web-app/src/redux/services/lensIssuesApi.js rename to web-app/src/Api/lensIssuesApi.js index f6718f0..abb801d 100644 --- a/web-app/src/redux/services/lensIssuesApi.js +++ b/web-app/src/Api/lensIssuesApi.js @@ -1,5 +1,5 @@ import {createApi, fetchBaseQuery} from "@reduxjs/toolkit/query/react"; -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../Core/сonfig.js"; export const lensIssuesApi = createApi({ @@ -15,7 +15,7 @@ export const lensIssuesApi = createApi({ tagTypes: ['LensIssues'], endpoints: (builder) => ({ getLensIssues: builder.query({ - query: () => '/lens_issues/', + query: () => '/LensIssues/', providesTags: ['LensIssues'], refetchOnMountOrArgChange: 5 }), diff --git a/web-app/src/redux/services/lensesApi.js b/web-app/src/Api/lensesApi.js similarity index 94% rename from web-app/src/redux/services/lensesApi.js rename to web-app/src/Api/lensesApi.js index 7df4849..ec21a03 100644 --- a/web-app/src/redux/services/lensesApi.js +++ b/web-app/src/Api/lensesApi.js @@ -1,5 +1,5 @@ import {createApi, fetchBaseQuery} from "@reduxjs/toolkit/query/react"; -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../Core/сonfig.js"; export const lensesApi = createApi({ @@ -15,7 +15,7 @@ export const lensesApi = createApi({ tagTypes: ['Lens'], endpoints: (builder) => ({ getLenses: builder.query({ - query: () => '/lenses/', + query: () => '/Lenses/', providesTags: ['Lens'], refetchOnMountOrArgChange: 5 }), diff --git a/web-app/src/redux/services/patientsApi.js b/web-app/src/Api/patientsApi.js similarity index 94% rename from web-app/src/redux/services/patientsApi.js rename to web-app/src/Api/patientsApi.js index 00eba9d..306b85a 100644 --- a/web-app/src/redux/services/patientsApi.js +++ b/web-app/src/Api/patientsApi.js @@ -1,5 +1,5 @@ import {createApi, fetchBaseQuery} from '@reduxjs/toolkit/query/react' -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../Core/сonfig.js"; export const patientsApi = createApi({ reducerPath: 'patientsApi', @@ -14,7 +14,7 @@ export const patientsApi = createApi({ tagTypes: ['Patient'], endpoints: (builder) => ({ getPatients: builder.query({ - query: () => '/patients/', + query: () => '/Patients/', providesTags: ['Patient'], refetchOnMountOrArgChange: 5 }), diff --git a/web-app/src/redux/services/setContentApi.js b/web-app/src/Api/setContentApi.js similarity index 96% rename from web-app/src/redux/services/setContentApi.js rename to web-app/src/Api/setContentApi.js index b5e66a0..aefc7e4 100644 --- a/web-app/src/redux/services/setContentApi.js +++ b/web-app/src/Api/setContentApi.js @@ -1,5 +1,5 @@ import {createApi, fetchBaseQuery} from '@reduxjs/toolkit/query/react'; -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../Core/сonfig.js"; export const setContentApi = createApi({ reducerPath: 'setContentApi', diff --git a/web-app/src/redux/services/setsApi.js b/web-app/src/Api/setsApi.js similarity index 95% rename from web-app/src/redux/services/setsApi.js rename to web-app/src/Api/setsApi.js index 1ba4e58..e1b7188 100644 --- a/web-app/src/redux/services/setsApi.js +++ b/web-app/src/Api/setsApi.js @@ -1,5 +1,5 @@ import {createApi, fetchBaseQuery} from '@reduxjs/toolkit/query/react' -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../Core/сonfig.js"; export const setsApi = createApi({ reducerPath: 'setsApi', @@ -14,7 +14,7 @@ export const setsApi = createApi({ tagTypes: ['Set'], endpoints: (builder) => ({ getSets: builder.query({ - query: () => '/sets/', + query: () => '/Sets/', providesTags: ['Set'], refetchOnMountOrArgChange: 5 }), diff --git a/web-app/src/App.jsx b/web-app/src/App/App.jsx similarity index 73% rename from web-app/src/App.jsx rename to web-app/src/App/App.jsx index 5696c1f..5227a34 100644 --- a/web-app/src/App.jsx +++ b/web-app/src/App/App.jsx @@ -1,9 +1,9 @@ import {BrowserRouter as Router} from "react-router-dom"; import AppRouter from "./AppRouter.jsx"; -import {AuthProvider} from "./AuthContext.jsx"; -import "/src/styles/app.css"; +import {AuthProvider} from "../Hooks/AuthContext.jsx"; +import "/src/Styles/app.css"; import {Provider} from "react-redux"; -import store from "./redux/store"; +import store from "../Redux/store.js"; const App = () => ( diff --git a/web-app/src/App/AppRouter.jsx b/web-app/src/App/AppRouter.jsx new file mode 100644 index 0000000..27b9365 --- /dev/null +++ b/web-app/src/App/AppRouter.jsx @@ -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 = () => ( + + }/> + + }> + }> + }/> + }/> + }/> + }/> + }/> + + + }/> + +); + +export default AppRouter; \ No newline at end of file diff --git a/web-app/src/main.jsx b/web-app/src/App/main.jsx similarity index 100% rename from web-app/src/main.jsx rename to web-app/src/App/main.jsx diff --git a/web-app/src/AppRouter.jsx b/web-app/src/AppRouter.jsx deleted file mode 100644 index 2de9be0..0000000 --- a/web-app/src/AppRouter.jsx +++ /dev/null @@ -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 = () => ( - - }/> - - }> - }> - }/> - }/> - }/> - }/> - }/> - - - }/> - -); - -export default AppRouter; \ No newline at end of file diff --git a/web-app/src/components/lenses/LensListCard.jsx b/web-app/src/Components/Dummies/LensListCard.jsx similarity index 95% rename from web-app/src/components/lenses/LensListCard.jsx rename to web-app/src/Components/Dummies/LensListCard.jsx index 8f47d58..63a9b2f 100644 --- a/web-app/src/components/lenses/LensListCard.jsx +++ b/web-app/src/Components/Dummies/LensListCard.jsx @@ -2,8 +2,8 @@ import {Card, Popconfirm, Tooltip} from "antd"; import PropTypes from "prop-types"; import {DeleteOutlined, EditOutlined, EyeOutlined} from "@ant-design/icons"; import {useState} from "react"; -import LensViewModal from "./LensViewModal.jsx"; -import {LensPropType} from "../../types/lensPropType.js"; +import LensViewModal from "../Widgets/LensViewModal.jsx"; +import {LensPropType} from "../../Types/lensPropType.js"; const LensListCard = ({lens, handleEditLens, handleDeleteLens}) => { const [showModalInfo, setShowModalInfo] = useState(false); diff --git a/web-app/src/components/patients/PatientListCard.jsx b/web-app/src/Components/Dummies/PatientListCard.jsx similarity index 95% rename from web-app/src/components/patients/PatientListCard.jsx rename to web-app/src/Components/Dummies/PatientListCard.jsx index 230754b..f1e74e3 100644 --- a/web-app/src/components/patients/PatientListCard.jsx +++ b/web-app/src/Components/Dummies/PatientListCard.jsx @@ -2,8 +2,8 @@ import {Card, Modal, Popconfirm, Tooltip} from "antd"; import PropTypes from "prop-types"; import {DeleteOutlined, EditOutlined, EyeOutlined} from "@ant-design/icons"; import {useState} from "react"; -import PatientViewModal from "./PatientViewModal.jsx"; -import {PatientPropType} from "../../types/patientPropType.js"; +import PatientViewModal from "../Widgets/PatientViewModal.jsx"; +import {PatientPropType} from "../../Types/patientPropType.js"; const PatientListCard = ({patient, handleEditPatient, handleDeletePatient}) => { const [showModalInfo, setShowModalInfo] = useState(false); diff --git a/web-app/src/components/sets/SetListCard.jsx b/web-app/src/Components/Dummies/SetListCard.jsx similarity index 97% rename from web-app/src/components/sets/SetListCard.jsx rename to web-app/src/Components/Dummies/SetListCard.jsx index 4f3e6f8..21b30e6 100644 --- a/web-app/src/components/sets/SetListCard.jsx +++ b/web-app/src/Components/Dummies/SetListCard.jsx @@ -1,7 +1,7 @@ import PropTypes from "prop-types"; import {Card, Modal, Popconfirm, Tooltip} from "antd"; 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 deleteSet = () => { diff --git a/web-app/src/layouts/AppointmentsLayout.jsx b/web-app/src/Components/Layouts/AppointmentsLayout.jsx similarity index 90% rename from web-app/src/layouts/AppointmentsLayout.jsx rename to web-app/src/Components/Layouts/AppointmentsLayout.jsx index 9278ad5..4eb6230 100644 --- a/web-app/src/layouts/AppointmentsLayout.jsx +++ b/web-app/src/Components/Layouts/AppointmentsLayout.jsx @@ -4,13 +4,13 @@ import {Splitter} from "antd"; import { CalendarOutlined, TableOutlined, MenuFoldOutlined, MenuUnfoldOutlined, } from "@ant-design/icons"; -import AppointmentsCalendarPage from "../pages/appointments_layout/AppointmentsCalendarPage.jsx"; -import AppointmentsTablePage from "../pages/appointments_layout/AppointmentsTablePage.jsx"; -import getAllAppointments from "../api/appointments/getAllAppointments.js"; -import getAllScheduledAppointments from "../api/scheduled_appointments/getAllScheduledAppointments.js"; -import {useAuth} from "../AuthContext.jsx"; -import LoadingIndicator from "../components/LoadingIndicator.jsx"; -import {cacheInfo, getCachedInfo, getCacheTimestamp} from "../utils/cachedInfoUtils.js"; +import AppointmentsCalendarPage from "../Pages/AppointmentsCalendarPage.jsx"; +import AppointmentsTablePage from "../Pages/AppointmentsTablePage.jsx"; +import getAllAppointments from "../../old_api/appointments/getAllAppointments.js"; +import getAllScheduledAppointments from "../../old_api/scheduled_appointments/getAllScheduledAppointments.js"; +import {useAuth} from "../../Hooks/AuthContext.jsx"; +import LoadingIndicator from "../Widgets/LoadingIndicator.jsx"; +import {cacheInfo, getCachedInfo, getCacheTimestamp} from "../../Utils/cachedInfoUtils.js"; const {useBreakpoint} = Grid; diff --git a/web-app/src/layouts/LensesLayout.jsx b/web-app/src/Components/Layouts/LensesLayout.jsx similarity index 75% rename from web-app/src/layouts/LensesLayout.jsx rename to web-app/src/Components/Layouts/LensesLayout.jsx index f51a060..409106f 100644 --- a/web-app/src/layouts/LensesLayout.jsx +++ b/web-app/src/Components/Layouts/LensesLayout.jsx @@ -1,9 +1,9 @@ import { Tabs } 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 SetLensesPage from "../pages/lenses_layout/SetLensesPage.jsx"; +import SetsPage from "../Pages/SetsPage/SetsPage.jsx"; const items = [ @@ -16,7 +16,7 @@ const items = [ { key: '2', label: 'Наборы линз', - children: , + children: , icon: } ] diff --git a/web-app/src/layouts/MainLayout.jsx b/web-app/src/Components/Layouts/MainLayout.jsx similarity index 92% rename from web-app/src/layouts/MainLayout.jsx rename to web-app/src/Components/Layouts/MainLayout.jsx index 9362f95..e850e20 100644 --- a/web-app/src/layouts/MainLayout.jsx +++ b/web-app/src/Components/Layouts/MainLayout.jsx @@ -11,7 +11,7 @@ import { LogoutOutlined, MessageOutlined } from "@ant-design/icons"; -import {useAuth} from "../AuthContext.jsx"; +import {useAuth} from "../../Hooks/AuthContext.jsx"; const {Content, Footer, Sider} = Layout; @@ -28,10 +28,10 @@ const MainLayout = () => { const menuItems = [ getItem("Главная", "/", ), - getItem("Приёмы", "/appointments", ), + getItem("Приёмы", "/Appointments", ), getItem("Выдачи линз", "/issues", ), - getItem("Линзы и наборы", "/lenses", ), - getItem("Пациенты", "/patients", ), + getItem("Линзы и наборы", "/Lenses", ), + getItem("Пациенты", "/Patients", ), getItem("Рассылки", "/mailing", ), {type: "divider"}, getItem("Мой профиль", "profile", , [ diff --git a/web-app/src/pages/appointments_layout/AppointmentsCalendarPage.jsx b/web-app/src/Components/Pages/AppointmentsCalendarPage.jsx similarity index 93% rename from web-app/src/pages/appointments_layout/AppointmentsCalendarPage.jsx rename to web-app/src/Components/Pages/AppointmentsCalendarPage.jsx index 5f2fe8b..54d935f 100644 --- a/web-app/src/pages/appointments_layout/AppointmentsCalendarPage.jsx +++ b/web-app/src/Components/Pages/AppointmentsCalendarPage.jsx @@ -5,9 +5,9 @@ import 'dayjs/locale/ru'; import locale from 'antd/es/locale/ru_RU'; import updateLocale from 'dayjs/plugin/updateLocale'; import PropTypes, {arrayOf} from "prop-types"; -import CalendarCell from "../../components/appointments/CalendarCell.jsx"; -import {AppointmentPropType} from "../../types/appointmentPropType.js"; -import {ScheduledAppointmentPropType} from "../../types/scheduledAppointmentPropType.js"; +import CalendarCell from "../Widgets/CalendarCell.jsx"; +import {AppointmentPropType} from "../../Types/appointmentPropType.js"; +import {ScheduledAppointmentPropType} from "../../Types/scheduledAppointmentPropType.js"; const {useBreakpoint} = Grid; diff --git a/web-app/src/pages/appointments_layout/AppointmentsTablePage.jsx b/web-app/src/Components/Pages/AppointmentsTablePage.jsx similarity index 81% rename from web-app/src/pages/appointments_layout/AppointmentsTablePage.jsx rename to web-app/src/Components/Pages/AppointmentsTablePage.jsx index f0c0cf2..1a5a908 100644 --- a/web-app/src/pages/appointments_layout/AppointmentsTablePage.jsx +++ b/web-app/src/Components/Pages/AppointmentsTablePage.jsx @@ -1,6 +1,6 @@ -import {useAuth} from "../../AuthContext.jsx"; +import {useAuth} from "../../Hooks/AuthContext.jsx"; import {useEffect, useState} from "react"; -import getAllAppointments from "../../api/appointments/getAllAppointments.js"; +import getAllAppointments from "../../old_api/appointments/getAllAppointments.js"; import {notification} from "antd"; diff --git a/web-app/src/pages/HomePage.jsx b/web-app/src/Components/Pages/HomePage.jsx similarity index 100% rename from web-app/src/pages/HomePage.jsx rename to web-app/src/Components/Pages/HomePage.jsx diff --git a/web-app/src/pages/IssuesPage.jsx b/web-app/src/Components/Pages/IssuesPage/IssuesPage.jsx similarity index 95% rename from web-app/src/pages/IssuesPage.jsx rename to web-app/src/Components/Pages/IssuesPage/IssuesPage.jsx index 5b6d791..5645a69 100644 --- a/web-app/src/pages/IssuesPage.jsx +++ b/web-app/src/Components/Pages/IssuesPage/IssuesPage.jsx @@ -13,13 +13,13 @@ import { Pagination, Result } from "antd"; 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 LensIssueFormModal from "../components/lens_issues/LensIssueFormModal.jsx"; -import SelectViewMode from "../components/SelectViewMode.jsx"; -import LoadingIndicator from "../components/LoadingIndicator.jsx"; -import useIssues from "../hooks/data/useIssues.js"; -import useIssuesUI from "../hooks/ui/useIssuesUI.js"; +import LensIssueFormModal from "../../Widgets/LensIssueFormModal.jsx"; +import SelectViewMode from "../../Widgets/SelectViewMode.jsx"; +import LoadingIndicator from "../../Widgets/LoadingIndicator.jsx"; +import useIssues from "./useIssues.js"; +import useIssuesUI from "./useIssuesUI.js"; const {Title} = Typography; const {useBreakpoint} = Grid; diff --git a/web-app/src/hooks/data/useIssues.js b/web-app/src/Components/Pages/IssuesPage/useIssues.js similarity index 93% rename from web-app/src/hooks/data/useIssues.js rename to web-app/src/Components/Pages/IssuesPage/useIssues.js index 0d6f379..9ab6899 100644 --- a/web-app/src/hooks/data/useIssues.js +++ b/web-app/src/Components/Pages/IssuesPage/useIssues.js @@ -1,7 +1,7 @@ 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 {closeModal} from "../../redux/slices/lensIssuesSlice.js"; +import {closeModal} from "../../../Redux/Slices/lensIssuesSlice.js"; const useIssues = () => { diff --git a/web-app/src/hooks/ui/useIssuesUI.js b/web-app/src/Components/Pages/IssuesPage/useIssuesUI.js similarity index 97% rename from web-app/src/hooks/ui/useIssuesUI.js rename to web-app/src/Components/Pages/IssuesPage/useIssuesUI.js index e79a796..266f383 100644 --- a/web-app/src/hooks/ui/useIssuesUI.js +++ b/web-app/src/Components/Pages/IssuesPage/useIssuesUI.js @@ -1,5 +1,5 @@ import {useDispatch, useSelector} from "react-redux"; -import {getCachedInfo} from "../../utils/cachedInfoUtils.js"; +import {getCachedInfo} from "../../../Utils/cachedInfoUtils.js"; import { closeModal, openModal, @@ -10,7 +10,7 @@ import { setSearchText, setStartFilterDate, setViewMode -} from "../../redux/slices/lensIssuesSlice.js"; +} from "../../../Redux/Slices/lensIssuesSlice.js"; import {useEffect, useMemo} from "react"; import dayjs from "dayjs"; diff --git a/web-app/src/pages/lenses_layout/LensesPage.jsx b/web-app/src/Components/Pages/LensesPage/LensesPage.jsx similarity index 97% rename from web-app/src/pages/lenses_layout/LensesPage.jsx rename to web-app/src/Components/Pages/LensesPage/LensesPage.jsx index d0b8000..8b9344e 100644 --- a/web-app/src/pages/lenses_layout/LensesPage.jsx +++ b/web-app/src/Components/Pages/LensesPage/LensesPage.jsx @@ -22,12 +22,12 @@ import { TableOutlined, BuildOutlined } from "@ant-design/icons"; -import LensCard from "../../components/lenses/LensListCard.jsx"; -import LensFormModal from "../../components/lenses/LensFormModal.jsx"; -import SelectViewMode from "../../components/SelectViewMode.jsx"; -import LoadingIndicator from "../../components/LoadingIndicator.jsx"; -import useLenses from "../../hooks/data/useLenses.js"; -import useLensesUI from "../../hooks/ui/useLensesUI.js"; +import LensCard from "../../Dummies/LensListCard.jsx"; +import LensFormModal from "../../Widgets/LensFormModal.jsx"; +import SelectViewMode from "../../Widgets/SelectViewMode.jsx"; +import LoadingIndicator from "../../Widgets/LoadingIndicator.jsx"; +import useLenses from "./useLenses.js"; +import useLensesUI from "./useLensesUI.js"; const {Option} = Select; const {useBreakpoint} = Grid; diff --git a/web-app/src/hooks/data/useLenses.js b/web-app/src/Components/Pages/LensesPage/useLenses.js similarity index 95% rename from web-app/src/hooks/data/useLenses.js rename to web-app/src/Components/Pages/LensesPage/useLenses.js index 02373d4..bba24f6 100644 --- a/web-app/src/hooks/data/useLenses.js +++ b/web-app/src/Components/Pages/LensesPage/useLenses.js @@ -4,9 +4,9 @@ import { useDeleteLensMutation, useGetLensesQuery, useUpdateLensMutation -} from "../../redux/services/lensesApi.js"; +} from "../../../Api/lensesApi.js"; import {notification} from "antd"; -import {closeModal} from "../../redux/slices/lensesSlice.js"; +import {closeModal} from "../../../Redux/Slices/lensesSlice.js"; const useLenses = () => { diff --git a/web-app/src/hooks/ui/useLensesUI.js b/web-app/src/Components/Pages/LensesPage/useLensesUI.js similarity index 97% rename from web-app/src/hooks/ui/useLensesUI.js rename to web-app/src/Components/Pages/LensesPage/useLensesUI.js index 510ecd5..fc4a716 100644 --- a/web-app/src/hooks/ui/useLensesUI.js +++ b/web-app/src/Components/Pages/LensesPage/useLensesUI.js @@ -1,5 +1,5 @@ import {useEffect} from "react"; -import {getCachedInfo} from "../../utils/cachedInfoUtils.js"; +import {getCachedInfo} from "../../../Utils/cachedInfoUtils.js"; import { closeModal, openModal, @@ -7,7 +7,7 @@ import { setSearchParams, setSearchText, setShowAdvancedSearch, setViewMode -} from "../../redux/slices/lensesSlice.js"; +} from "../../../Redux/Slices/lensesSlice.js"; import {useDispatch, useSelector} from "react-redux"; diff --git a/web-app/src/pages/LoginPage.jsx b/web-app/src/Components/Pages/LoginPage.jsx similarity index 98% rename from web-app/src/pages/LoginPage.jsx rename to web-app/src/Components/Pages/LoginPage.jsx index c68b8b7..6e1cfbc 100644 --- a/web-app/src/pages/LoginPage.jsx +++ b/web-app/src/Components/Pages/LoginPage.jsx @@ -1,6 +1,6 @@ import {Form, Input, Button, Row, Col, Typography} from 'antd'; import {useEffect, useState} from 'react'; -import {useAuth} from "../AuthContext.jsx"; +import {useAuth} from "../../Hooks/AuthContext.jsx"; import {useNavigate} from "react-router-dom"; const {Title} = Typography; diff --git a/web-app/src/pages/PatientsPage.jsx b/web-app/src/Components/Pages/PatientsPage/PatientsPage.jsx similarity index 94% rename from web-app/src/pages/PatientsPage.jsx rename to web-app/src/Components/Pages/PatientsPage/PatientsPage.jsx index b5f4224..fcf307d 100644 --- a/web-app/src/pages/PatientsPage.jsx +++ b/web-app/src/Components/Pages/PatientsPage/PatientsPage.jsx @@ -18,12 +18,12 @@ import { SortDescendingOutlined, TableOutlined, TeamOutlined } from "@ant-design/icons"; -import PatientListCard from "../components/patients/PatientListCard.jsx"; -import PatientFormModal from "../components/patients/PatientFormModal.jsx"; -import SelectViewMode from "../components/SelectViewMode.jsx"; -import LoadingIndicator from "../components/LoadingIndicator.jsx"; -import usePatients from "../hooks/data/usePatients.js"; -import usePatientsUI from "../hooks/ui/usePatientsUI.js"; +import PatientListCard from "../../Dummies/PatientListCard.jsx"; +import PatientFormModal from "../../Widgets/PatientFormModal.jsx"; +import SelectViewMode from "../../Widgets/SelectViewMode.jsx"; +import LoadingIndicator from "../../Widgets/LoadingIndicator.jsx"; +import usePatients from "./usePatients.js"; +import usePatientsUI from "./usePatientsUI.js"; const {Option} = Select; const {Title} = Typography; @@ -195,6 +195,5 @@ const PatientsPage = () => { ); }; -; -export default PatientsPage; +export default PatientsPage; \ No newline at end of file diff --git a/web-app/src/hooks/data/usePatients.js b/web-app/src/Components/Pages/PatientsPage/usePatients.js similarity index 96% rename from web-app/src/hooks/data/usePatients.js rename to web-app/src/Components/Pages/PatientsPage/usePatients.js index 94cc87a..78fe3e2 100644 --- a/web-app/src/hooks/data/usePatients.js +++ b/web-app/src/Components/Pages/PatientsPage/usePatients.js @@ -5,8 +5,8 @@ import { useDeletePatientMutation, useGetPatientsQuery, useUpdatePatientMutation -} from "../../redux/services/patientsApi.js"; -import {closeModal} from "../../redux/slices/patientsSlice.js"; +} from "../../../Api/patientsApi.js"; +import {closeModal} from "../../../Redux/Slices/patientsSlice.js"; const usePatients = () => { const dispatch = useDispatch(); diff --git a/web-app/src/hooks/ui/usePatientsUI.js b/web-app/src/Components/Pages/PatientsPage/usePatientsUI.js similarity index 96% rename from web-app/src/hooks/ui/usePatientsUI.js rename to web-app/src/Components/Pages/PatientsPage/usePatientsUI.js index dcfdc6a..bcd7c80 100644 --- a/web-app/src/hooks/ui/usePatientsUI.js +++ b/web-app/src/Components/Pages/PatientsPage/usePatientsUI.js @@ -9,8 +9,8 @@ import { setSearchText, setSortOrder, setViewMode -} from "../../redux/slices/patientsSlice.js"; -import { getCachedInfo } from "../../utils/cachedInfoUtils.js"; +} from "../../../Redux/Slices/patientsSlice.js"; +import { getCachedInfo } from "../../../Utils/cachedInfoUtils.js"; const usePatientsUI = (patients) => { const dispatch = useDispatch(); diff --git a/web-app/src/pages/lenses_layout/SetLensesPage.jsx b/web-app/src/Components/Pages/SetsPage/SetsPage.jsx similarity index 86% rename from web-app/src/pages/lenses_layout/SetLensesPage.jsx rename to web-app/src/Components/Pages/SetsPage/SetsPage.jsx index b33ac48..a871e1c 100644 --- a/web-app/src/pages/lenses_layout/SetLensesPage.jsx +++ b/web-app/src/Components/Pages/SetsPage/SetsPage.jsx @@ -1,15 +1,15 @@ import {FloatButton, Input, List, Result, Row, Typography} from "antd"; import {PlusOutlined, SwitcherOutlined} from "@ant-design/icons"; -import SetListCard from "../../components/sets/SetListCard.jsx"; -import SetFormModal from "../../components/sets/SetFormModal.jsx"; -import LoadingIndicator from "../../components/LoadingIndicator.jsx"; -import useSets from "../../hooks/data/useSets.js"; -import useSetsUI from "../../hooks/ui/useSetsUI.js"; +import SetListCard from "../../Dummies/SetListCard.jsx"; +import SetFormModal from "../../Widgets/SetFormModal.jsx"; +import LoadingIndicator from "../../Widgets/LoadingIndicator.jsx"; +import useSets from "./useSets.js"; +import useSetsUI from "./useSetsUI.js"; const {Title} = Typography; -const SetLensesPage = () => { +const SetsPage = () => { const setsData = useSets(); const setsUI = useSetsUI(setsData.sets); @@ -78,4 +78,4 @@ const SetLensesPage = () => { ); }; -export default SetLensesPage; \ No newline at end of file +export default SetsPage; \ No newline at end of file diff --git a/web-app/src/hooks/data/useSets.js b/web-app/src/Components/Pages/SetsPage/useSets.js similarity index 96% rename from web-app/src/hooks/data/useSets.js rename to web-app/src/Components/Pages/SetsPage/useSets.js index fc9996b..e4e0929 100644 --- a/web-app/src/hooks/data/useSets.js +++ b/web-app/src/Components/Pages/SetsPage/useSets.js @@ -5,9 +5,9 @@ import { useDeleteSetMutation, useGetSetsQuery, useUpdateSetMutation -} from "../../redux/services/setsApi.js"; -import {closeModal} from "../../redux/slices/setsSlice.js"; -import {useAddSetContentMutation, useUpdateSetContentMutation} from "../../redux/services/setContentApi.js"; +} from "../../../Api/setsApi.js"; +import {closeModal} from "../../../Redux/Slices/setsSlice.js"; +import {useAddSetContentMutation, useUpdateSetContentMutation} from "../../../Api/setContentApi.js"; const useSets = () => { diff --git a/web-app/src/hooks/ui/useSetsUI.js b/web-app/src/Components/Pages/SetsPage/useSetsUI.js similarity index 97% rename from web-app/src/hooks/ui/useSetsUI.js rename to web-app/src/Components/Pages/SetsPage/useSetsUI.js index 7223605..1ceab76 100644 --- a/web-app/src/hooks/ui/useSetsUI.js +++ b/web-app/src/Components/Pages/SetsPage/useSetsUI.js @@ -7,7 +7,7 @@ import { setCurrentPage, setPageSize, setSearchText -} from "../../redux/slices/setsSlice.js"; +} from "../../../Redux/Slices/setsSlice.js"; const useSetsUI = (sets) => { diff --git a/web-app/src/components/PrivateRoute.jsx b/web-app/src/Components/PrivateRoute.jsx similarity index 82% rename from web-app/src/components/PrivateRoute.jsx rename to web-app/src/Components/PrivateRoute.jsx index c63bd7c..db61459 100644 --- a/web-app/src/components/PrivateRoute.jsx +++ b/web-app/src/Components/PrivateRoute.jsx @@ -1,5 +1,5 @@ import {Navigate, Outlet} from "react-router-dom"; -import {useAuth} from "../AuthContext.jsx"; +import {useAuth} from "../Hooks/AuthContext.jsx"; const PrivateRoute = () => { const {user} = useAuth(); diff --git a/web-app/src/components/appointments/AppointmentCellViewModal.jsx b/web-app/src/Components/Widgets/AppointmentCellViewModal.jsx similarity index 78% rename from web-app/src/components/appointments/AppointmentCellViewModal.jsx rename to web-app/src/Components/Widgets/AppointmentCellViewModal.jsx index 5cb1339..d4eaf40 100644 --- a/web-app/src/components/appointments/AppointmentCellViewModal.jsx +++ b/web-app/src/Components/Widgets/AppointmentCellViewModal.jsx @@ -1,6 +1,6 @@ import PropTypes from "prop-types"; -import {AppointmentPropType} from "../../types/appointmentPropType.js"; -import {ScheduledAppointmentPropType} from "../../types/scheduledAppointmentPropType.js"; +import {AppointmentPropType} from "../../Types/appointmentPropType.js"; +import {ScheduledAppointmentPropType} from "../../Types/scheduledAppointmentPropType.js"; import {Modal} from "antd"; diff --git a/web-app/src/components/appointments/CalendarCell.jsx b/web-app/src/Components/Widgets/CalendarCell.jsx similarity index 97% rename from web-app/src/components/appointments/CalendarCell.jsx rename to web-app/src/Components/Widgets/CalendarCell.jsx index d430230..ec01906 100644 --- a/web-app/src/components/appointments/CalendarCell.jsx +++ b/web-app/src/Components/Widgets/CalendarCell.jsx @@ -2,8 +2,8 @@ import {useEffect, useRef, useState} from "react"; import {Badge, Col, Tag, Tooltip, Typography} from "antd"; import dayjs from "dayjs"; import PropTypes from "prop-types"; -import {AppointmentPropType} from "../../types/appointmentPropType.js"; -import {ScheduledAppointmentPropType} from "../../types/scheduledAppointmentPropType.js"; +import {AppointmentPropType} from "../../Types/appointmentPropType.js"; +import {ScheduledAppointmentPropType} from "../../Types/scheduledAppointmentPropType.js"; const CalendarCell = ({appointments, scheduledAppointments, onCellClick, onItemClick}) => { diff --git a/web-app/src/components/lenses/LensFormModal.jsx b/web-app/src/Components/Widgets/LensFormModal.jsx similarity index 97% rename from web-app/src/components/lenses/LensFormModal.jsx rename to web-app/src/Components/Widgets/LensFormModal.jsx index 992e28f..fef0d97 100644 --- a/web-app/src/components/lenses/LensFormModal.jsx +++ b/web-app/src/Components/Widgets/LensFormModal.jsx @@ -1,9 +1,9 @@ import {Col, Form, InputNumber, Modal, notification, Row, Select} from "antd"; import {useEffect, useState} from "react"; import PropTypes from "prop-types"; -import getAllLensTypes from "../../api/lens_types/getAllLensTypes.js"; -import {useAuth} from "../../AuthContext.jsx"; -import {LensPropType} from "../../types/lensPropType.js"; +import getAllLensTypes from "../../old_api/lens_types/getAllLensTypes.js"; +import {useAuth} from "../../Hooks/AuthContext.jsx"; +import {LensPropType} from "../../Types/lensPropType.js"; const LensFormModal = ({visible, onCancel, onSubmit, lens}) => { diff --git a/web-app/src/components/lens_issues/LensIssueFormModal.jsx b/web-app/src/Components/Widgets/LensIssueFormModal.jsx similarity index 98% rename from web-app/src/components/lens_issues/LensIssueFormModal.jsx rename to web-app/src/Components/Widgets/LensIssueFormModal.jsx index f3c58a8..c35d7af 100644 --- a/web-app/src/components/lens_issues/LensIssueFormModal.jsx +++ b/web-app/src/Components/Widgets/LensIssueFormModal.jsx @@ -3,10 +3,10 @@ import { Modal, Input, Button, notification, Typography, Collapse, Steps, Row, Alert, Col, DatePicker, Spin, Grid } from "antd"; import PropTypes from "prop-types"; -import getAllPatients from "../../api/patients/getAllPatients.js"; -import {useAuth} from "../../AuthContext.jsx"; +import getAllPatients from "../../old_api/patients/getAllPatients.js"; +import {useAuth} from "../../Hooks/AuthContext.jsx"; import dayjs from "dayjs"; -import getNotIssuedLenses from "../../api/lenses/getNotIssuedLenses.js"; +import getNotIssuedLenses from "../../old_api/lenses/getNotIssuedLenses.js"; const {useBreakpoint} = Grid; diff --git a/web-app/src/components/lens_issues/LensIssueViewModal.jsx b/web-app/src/Components/Widgets/LensIssueViewModal.jsx similarity index 98% rename from web-app/src/components/lens_issues/LensIssueViewModal.jsx rename to web-app/src/Components/Widgets/LensIssueViewModal.jsx index ac0429f..4064fb6 100644 --- a/web-app/src/components/lens_issues/LensIssueViewModal.jsx +++ b/web-app/src/Components/Widgets/LensIssueViewModal.jsx @@ -1,6 +1,6 @@ import {Collapse, Modal} from "antd"; import PropTypes from "prop-types"; -import {LensIssuePropType} from "../../types/lensIssuePropType.js"; +import {LensIssuePropType} from "../../Types/lensIssuePropType.js"; const LensIssueViewModal = ({visible, onCancel, lensIssue}) => { diff --git a/web-app/src/components/lenses/LensViewModal.jsx b/web-app/src/Components/Widgets/LensViewModal.jsx similarity index 97% rename from web-app/src/components/lenses/LensViewModal.jsx rename to web-app/src/Components/Widgets/LensViewModal.jsx index 60022c6..09c708c 100644 --- a/web-app/src/components/lenses/LensViewModal.jsx +++ b/web-app/src/Components/Widgets/LensViewModal.jsx @@ -1,6 +1,6 @@ import {Button, Col, Modal, Row, Typography} from "antd"; import PropTypes from "prop-types"; -import {LensPropType} from "../../types/lensPropType.js"; +import {LensPropType} from "../../Types/lensPropType.js"; const {Text, Title} = Typography; diff --git a/web-app/src/components/LoadingIndicator.jsx b/web-app/src/Components/Widgets/LoadingIndicator.jsx similarity index 100% rename from web-app/src/components/LoadingIndicator.jsx rename to web-app/src/Components/Widgets/LoadingIndicator.jsx diff --git a/web-app/src/components/patients/PatientFormModal.jsx b/web-app/src/Components/Widgets/PatientFormModal.jsx similarity index 98% rename from web-app/src/components/patients/PatientFormModal.jsx rename to web-app/src/Components/Widgets/PatientFormModal.jsx index dd6df9a..0dbc6ee 100644 --- a/web-app/src/components/patients/PatientFormModal.jsx +++ b/web-app/src/Components/Widgets/PatientFormModal.jsx @@ -5,7 +5,7 @@ import locale from "antd/es/date-picker/locale/ru_RU"; import validator from "validator"; import {MaskedInput} from "antd-mask-input"; import dayjs from "dayjs"; -import {PatientPropType} from "../../types/patientPropType.js"; +import {PatientPropType} from "../../Types/patientPropType.js"; const {TextArea} = Input; diff --git a/web-app/src/components/patients/PatientViewModal.jsx b/web-app/src/Components/Widgets/PatientViewModal.jsx similarity index 97% rename from web-app/src/components/patients/PatientViewModal.jsx rename to web-app/src/Components/Widgets/PatientViewModal.jsx index 9f48938..cccacf6 100644 --- a/web-app/src/components/patients/PatientViewModal.jsx +++ b/web-app/src/Components/Widgets/PatientViewModal.jsx @@ -1,6 +1,6 @@ import {Button, Col, Modal, Row, Typography, Divider} from "antd"; import PropTypes from "prop-types"; -import {PatientPropType} from "../../types/patientPropType.js"; +import {PatientPropType} from "../../Types/patientPropType.js"; const { Text, Title } = Typography; diff --git a/web-app/src/components/SelectViewMode.jsx b/web-app/src/Components/Widgets/SelectViewMode.jsx similarity index 90% rename from web-app/src/components/SelectViewMode.jsx rename to web-app/src/Components/Widgets/SelectViewMode.jsx index 4626fe0..52d99da 100644 --- a/web-app/src/components/SelectViewMode.jsx +++ b/web-app/src/Components/Widgets/SelectViewMode.jsx @@ -1,8 +1,8 @@ import {BuildOutlined, TableOutlined} from "@ant-design/icons"; import {Select, Tooltip} from "antd"; import PropTypes from "prop-types"; -import {cacheInfo} from "../utils/cachedInfoUtils.js"; -import {ViewModPropType} from "../types/viewModPropType.js"; +import {cacheInfo} from "../../Utils/cachedInfoUtils.js"; +import {ViewModPropType} from "../../Types/viewModPropType.js"; const {Option} = Select; diff --git a/web-app/src/components/sets/SetFormModal.jsx b/web-app/src/Components/Widgets/SetFormModal.jsx similarity index 96% rename from web-app/src/components/sets/SetFormModal.jsx rename to web-app/src/Components/Widgets/SetFormModal.jsx index 0d54dd4..17342dd 100644 --- a/web-app/src/components/sets/SetFormModal.jsx +++ b/web-app/src/Components/Widgets/SetFormModal.jsx @@ -1,11 +1,11 @@ import {useState, useEffect} from "react"; import {Modal, Button, Form, Input, Table, InputNumber, Select, Space, notification} from "antd"; import {PlusOutlined, DeleteOutlined} from "@ant-design/icons"; -import getAllLensTypes from "../../api/lens_types/getAllLensTypes.js"; -import {useAuth} from "../../AuthContext.jsx"; +import getAllLensTypes from "../../old_api/lens_types/getAllLensTypes.js"; +import {useAuth} from "../../Hooks/AuthContext.jsx"; import PropTypes from "prop-types"; -import getSetContentBySetId from "../../api/set_content/getSetContentBySetId.js"; -import {SetPropType} from "../../types/setPropType.js"; +import getSetContentBySetId from "../../old_api/set_content/getSetContentBySetId.js"; +import {SetPropType} from "../../Types/setPropType.js"; const {Option} = Select; diff --git a/web-app/src/core/axiosConfig.js b/web-app/src/Core/axiosConfig.js similarity index 100% rename from web-app/src/core/axiosConfig.js rename to web-app/src/Core/axiosConfig.js diff --git a/web-app/src/core/сonfig.js b/web-app/src/Core/сonfig.js similarity index 100% rename from web-app/src/core/сonfig.js rename to web-app/src/Core/сonfig.js diff --git a/web-app/src/AuthContext.jsx b/web-app/src/Hooks/AuthContext.jsx similarity index 93% rename from web-app/src/AuthContext.jsx rename to web-app/src/Hooks/AuthContext.jsx index b81f861..4b8352f 100644 --- a/web-app/src/AuthContext.jsx +++ b/web-app/src/Hooks/AuthContext.jsx @@ -1,9 +1,9 @@ import {createContext, useState, useContext, useEffect} from "react"; 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 {useNavigate} from "react-router-dom"; -import createApi from "./core/axiosConfig.js"; +import createApi from "../Core/axiosConfig.js"; const AuthContext = createContext(undefined); diff --git a/web-app/src/redux/slices/lensIssuesSlice.js b/web-app/src/Redux/Slices/lensIssuesSlice.js similarity index 94% rename from web-app/src/redux/slices/lensIssuesSlice.js rename to web-app/src/Redux/Slices/lensIssuesSlice.js index 4bb1461..f7fa740 100644 --- a/web-app/src/redux/slices/lensIssuesSlice.js +++ b/web-app/src/Redux/Slices/lensIssuesSlice.js @@ -1,6 +1,5 @@ import {createSlice} from "@reduxjs/toolkit"; -import {cacheInfo} from "../../utils/cachedInfoUtils.js"; -import dayjs from "dayjs"; +import {cacheInfo} from "../../Utils/cachedInfoUtils.js"; const initialState = { searchText: '', diff --git a/web-app/src/redux/slices/lensesSlice.js b/web-app/src/Redux/Slices/lensesSlice.js similarity index 96% rename from web-app/src/redux/slices/lensesSlice.js rename to web-app/src/Redux/Slices/lensesSlice.js index f26bfc1..b4930a3 100644 --- a/web-app/src/redux/slices/lensesSlice.js +++ b/web-app/src/Redux/Slices/lensesSlice.js @@ -1,5 +1,5 @@ import {createSlice} from '@reduxjs/toolkit' -import {cacheInfo} from "../../utils/cachedInfoUtils.js"; +import {cacheInfo} from "../../Utils/cachedInfoUtils.js"; const initialState = { diff --git a/web-app/src/redux/slices/patientsSlice.js b/web-app/src/Redux/Slices/patientsSlice.js similarity index 96% rename from web-app/src/redux/slices/patientsSlice.js rename to web-app/src/Redux/Slices/patientsSlice.js index 07886c2..7981aa2 100644 --- a/web-app/src/redux/slices/patientsSlice.js +++ b/web-app/src/Redux/Slices/patientsSlice.js @@ -1,5 +1,5 @@ import {createSlice} from '@reduxjs/toolkit' -import {cacheInfo} from "../../utils/cachedInfoUtils.js"; +import {cacheInfo} from "../../Utils/cachedInfoUtils.js"; const initialState = { searchText: '', diff --git a/web-app/src/redux/slices/setsSlice.js b/web-app/src/Redux/Slices/setsSlice.js similarity index 100% rename from web-app/src/redux/slices/setsSlice.js rename to web-app/src/Redux/Slices/setsSlice.js diff --git a/web-app/src/redux/store.js b/web-app/src/Redux/store.js similarity index 62% rename from web-app/src/redux/store.js rename to web-app/src/Redux/store.js index ceb0918..4bd4661 100644 --- a/web-app/src/redux/store.js +++ b/web-app/src/Redux/store.js @@ -1,13 +1,13 @@ import {configureStore} from '@reduxjs/toolkit'; -import {patientsApi} from './services/patientsApi.js'; -import patientsUIReducer from './slices/patientsSlice.js'; -import {lensesApi} from './services/lensesApi.js'; -import lensesUIReducer from './slices/lensesSlice.js'; -import {setsApi} from "./services/setsApi.js"; -import setsUIReducer from './slices/setsSlice.js'; -import {setContentApi} from "./services/setContentApi.js"; -import {lensIssuesApi} from "./services/lensIssuesApi.js"; -import lensIssuesReducer from "./slices/lensIssuesSlice.js"; +import {patientsApi} from '../Api/patientsApi.js'; +import patientsUIReducer from './Slices/patientsSlice.js'; +import {lensesApi} from '../Api/lensesApi.js'; +import lensesUIReducer from './Slices/lensesSlice.js'; +import {setsApi} from "../Api/setsApi.js"; +import setsUIReducer from './Slices/setsSlice.js'; +import {setContentApi} from "../Api/setContentApi.js"; +import {lensIssuesApi} from "../Api/lensIssuesApi.js"; +import lensIssuesReducer from "./Slices/lensIssuesSlice.js"; export const store = configureStore({ reducer: { diff --git a/web-app/src/styles/app.css b/web-app/src/Styles/app.css similarity index 100% rename from web-app/src/styles/app.css rename to web-app/src/Styles/app.css diff --git a/web-app/src/types/appointmentPropType.js b/web-app/src/Types/appointmentPropType.js similarity index 100% rename from web-app/src/types/appointmentPropType.js rename to web-app/src/Types/appointmentPropType.js diff --git a/web-app/src/types/appointmentTypePropType.js b/web-app/src/Types/appointmentTypePropType.js similarity index 100% rename from web-app/src/types/appointmentTypePropType.js rename to web-app/src/Types/appointmentTypePropType.js diff --git a/web-app/src/types/lensIssuePropType.js b/web-app/src/Types/lensIssuePropType.js similarity index 100% rename from web-app/src/types/lensIssuePropType.js rename to web-app/src/Types/lensIssuePropType.js diff --git a/web-app/src/types/lensPropType.js b/web-app/src/Types/lensPropType.js similarity index 100% rename from web-app/src/types/lensPropType.js rename to web-app/src/Types/lensPropType.js diff --git a/web-app/src/types/lensTypePropType.js b/web-app/src/Types/lensTypePropType.js similarity index 100% rename from web-app/src/types/lensTypePropType.js rename to web-app/src/Types/lensTypePropType.js diff --git a/web-app/src/types/patientPropType.js b/web-app/src/Types/patientPropType.js similarity index 100% rename from web-app/src/types/patientPropType.js rename to web-app/src/Types/patientPropType.js diff --git a/web-app/src/types/scheduledAppointmentPropType.js b/web-app/src/Types/scheduledAppointmentPropType.js similarity index 100% rename from web-app/src/types/scheduledAppointmentPropType.js rename to web-app/src/Types/scheduledAppointmentPropType.js diff --git a/web-app/src/types/setContentPropType.js b/web-app/src/Types/setContentPropType.js similarity index 100% rename from web-app/src/types/setContentPropType.js rename to web-app/src/Types/setContentPropType.js diff --git a/web-app/src/types/setPropType.js b/web-app/src/Types/setPropType.js similarity index 100% rename from web-app/src/types/setPropType.js rename to web-app/src/Types/setPropType.js diff --git a/web-app/src/types/userPropType.js b/web-app/src/Types/userPropType.js similarity index 100% rename from web-app/src/types/userPropType.js rename to web-app/src/Types/userPropType.js diff --git a/web-app/src/types/viewModPropType.js b/web-app/src/Types/viewModPropType.js similarity index 100% rename from web-app/src/types/viewModPropType.js rename to web-app/src/Types/viewModPropType.js diff --git a/web-app/src/utils/cachedInfoUtils.js b/web-app/src/Utils/cachedInfoUtils.js similarity index 100% rename from web-app/src/utils/cachedInfoUtils.js rename to web-app/src/Utils/cachedInfoUtils.js diff --git a/web-app/src/api/appointments/getAllAppointments.js b/web-app/src/old_api/appointments/getAllAppointments.js similarity index 80% rename from web-app/src/api/appointments/getAllAppointments.js rename to web-app/src/old_api/appointments/getAllAppointments.js index b82e387..4ae243f 100644 --- a/web-app/src/api/appointments/getAllAppointments.js +++ b/web-app/src/old_api/appointments/getAllAppointments.js @@ -1,4 +1,4 @@ -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../../Core/сonfig.js"; const getAllAppointments = async (api) => { const response = await api.get(`${CONFIG.BASE_URL}/appointments/`); diff --git a/web-app/src/api/auth/loginRequest.js b/web-app/src/old_api/auth/loginRequest.js similarity index 87% rename from web-app/src/api/auth/loginRequest.js rename to web-app/src/old_api/auth/loginRequest.js index f5721f3..d0b6249 100644 --- a/web-app/src/api/auth/loginRequest.js +++ b/web-app/src/old_api/auth/loginRequest.js @@ -1,4 +1,4 @@ -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../../Core/сonfig.js"; const loginUser = async (loginData, api) => { const response = await api.post(`${CONFIG.BASE_URL}/login/`, loginData, { diff --git a/web-app/src/api/lens_issues/addLensIssue.js b/web-app/src/old_api/lens_issues/addLensIssue.js similarity index 81% rename from web-app/src/api/lens_issues/addLensIssue.js rename to web-app/src/old_api/lens_issues/addLensIssue.js index af5b500..f5d2524 100644 --- a/web-app/src/api/lens_issues/addLensIssue.js +++ b/web-app/src/old_api/lens_issues/addLensIssue.js @@ -1,4 +1,4 @@ -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../../Core/сonfig.js"; const AddLensIssue = async (api, lens_issue) => { const response = await api.post(`${CONFIG.BASE_URL}/lens_issues/`, lens_issue); diff --git a/web-app/src/api/lens_issues/getAllLensIssues.js b/web-app/src/old_api/lens_issues/getAllLensIssues.js similarity index 80% rename from web-app/src/api/lens_issues/getAllLensIssues.js rename to web-app/src/old_api/lens_issues/getAllLensIssues.js index c3307b9..7bf884d 100644 --- a/web-app/src/api/lens_issues/getAllLensIssues.js +++ b/web-app/src/old_api/lens_issues/getAllLensIssues.js @@ -1,4 +1,4 @@ -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../../Core/сonfig.js"; const GetAllLensIssues = async (api) => { const response = await api.get(`${CONFIG.BASE_URL}/lens_issues/`); diff --git a/web-app/src/api/lens_types/getAllLensTypes.js b/web-app/src/old_api/lens_types/getAllLensTypes.js similarity index 79% rename from web-app/src/api/lens_types/getAllLensTypes.js rename to web-app/src/old_api/lens_types/getAllLensTypes.js index 60e2c6f..8755872 100644 --- a/web-app/src/api/lens_types/getAllLensTypes.js +++ b/web-app/src/old_api/lens_types/getAllLensTypes.js @@ -1,4 +1,4 @@ -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../../Core/сonfig.js"; const getAllLensTypes = async (api) => { const response = await api.get(`${CONFIG.BASE_URL}/lens_types/`); diff --git a/web-app/src/api/lenses/getNotIssuedLenses.js b/web-app/src/old_api/lenses/getNotIssuedLenses.js similarity index 80% rename from web-app/src/api/lenses/getNotIssuedLenses.js rename to web-app/src/old_api/lenses/getNotIssuedLenses.js index 30fb48e..e8ab429 100644 --- a/web-app/src/api/lenses/getNotIssuedLenses.js +++ b/web-app/src/old_api/lenses/getNotIssuedLenses.js @@ -1,4 +1,4 @@ -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../../Core/сonfig.js"; const getNotIssuedLenses = async (api) => { const response = await api.get(`${CONFIG.BASE_URL}/lenses/not_issued/`); diff --git a/web-app/src/api/patients/getAllPatients.js b/web-app/src/old_api/patients/getAllPatients.js similarity index 79% rename from web-app/src/api/patients/getAllPatients.js rename to web-app/src/old_api/patients/getAllPatients.js index bcade53..44c8970 100644 --- a/web-app/src/api/patients/getAllPatients.js +++ b/web-app/src/old_api/patients/getAllPatients.js @@ -1,4 +1,4 @@ -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../../Core/сonfig.js"; const getAllPatients = async (api) => { const response = await api.get(`${CONFIG.BASE_URL}/patients/`); diff --git a/web-app/src/api/scheduled_appointments/getAllScheduledAppointments.js b/web-app/src/old_api/scheduled_appointments/getAllScheduledAppointments.js similarity index 82% rename from web-app/src/api/scheduled_appointments/getAllScheduledAppointments.js rename to web-app/src/old_api/scheduled_appointments/getAllScheduledAppointments.js index 7bf647f..8fdbd58 100644 --- a/web-app/src/api/scheduled_appointments/getAllScheduledAppointments.js +++ b/web-app/src/old_api/scheduled_appointments/getAllScheduledAppointments.js @@ -1,4 +1,4 @@ -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../../Core/сonfig.js"; const getAllScheduledAppointments = async (api) => { const response = await api.get(`${CONFIG.BASE_URL}/scheduled_appointments/`); diff --git a/web-app/src/api/set_content/getSetContentBySetId.js b/web-app/src/old_api/set_content/getSetContentBySetId.js similarity index 82% rename from web-app/src/api/set_content/getSetContentBySetId.js rename to web-app/src/old_api/set_content/getSetContentBySetId.js index 2bdadad..6fa7b2b 100644 --- a/web-app/src/api/set_content/getSetContentBySetId.js +++ b/web-app/src/old_api/set_content/getSetContentBySetId.js @@ -1,4 +1,4 @@ -import CONFIG from "../../core/сonfig.js"; +import CONFIG from "../../Core/сonfig.js"; const getSetContentBySetId = async (api, set_id) => { const response = await api.get(`${CONFIG.BASE_URL}/set_content/${set_id}/`);