From f9de1124c33710b11b279992a4f4eb770e6b5973 Mon Sep 17 00:00:00 2001 From: cracklesparkle Date: Wed, 10 Jul 2024 14:37:00 +0900 Subject: [PATCH] Cleanup --- frontend_reactjs/package-lock.json | 9 -- frontend_reactjs/package.json | 1 - frontend_reactjs/src/App.tsx | 4 +- .../src/components/AccountMenu.tsx | 72 ++++++++-------- .../src/components/FetchingData.ts | 24 +++--- .../src/components/FolderViewer.tsx | 11 +-- frontend_reactjs/src/components/UserData.ts | 2 +- .../components/modals/CreateCompanyModal.tsx | 6 +- .../modals/CreateDepartmentModal.tsx | 2 +- .../src/components/modals/CreateRoleModal.tsx | 3 +- .../src/components/modals/CreateUserModal.tsx | 2 +- .../src/components/modals/FileViewer.tsx | 17 +--- frontend_reactjs/src/hooks/swrHooks.ts | 6 +- frontend_reactjs/src/interfaces/auth.ts | 6 +- frontend_reactjs/src/interfaces/fuel.ts | 14 ++++ frontend_reactjs/src/interfaces/servers.ts | 6 ++ .../src/layouts/DashboardLayout.tsx | 9 +- .../src/layouts/DashboardLayoutResponsive.tsx | 2 +- frontend_reactjs/src/main.tsx | 52 ++++++++++-- frontend_reactjs/src/pages/ApiTest.tsx | 75 +++++++++++++---- frontend_reactjs/src/pages/Documents.tsx | 31 ------- frontend_reactjs/src/pages/NotFound.tsx | 3 +- frontend_reactjs/src/pages/Reports.tsx | 11 +-- frontend_reactjs/src/pages/Roles.tsx | 2 +- frontend_reactjs/src/pages/Settings.tsx | 4 +- frontend_reactjs/src/pages/Users.tsx | 2 +- frontend_reactjs/src/services/AuthService.ts | 2 +- .../src/services/DocumentService.ts | 6 +- .../src/services/ServersService.ts | 2 +- frontend_reactjs/src/services/UserService.ts | 3 +- frontend_reactjs/src/store/auth.ts | 6 +- frontend_reactjs/src/store/preferences.ts | 3 +- frontend_reactjs/tsconfig.node.tsbuildinfo | 1 + frontend_reactjs/vite.config.d.ts | 2 + frontend_reactjs/vite.config.js | 82 +++++++++++++++++++ frontend_reactjs/yarn.lock | 5 -- 36 files changed, 312 insertions(+), 176 deletions(-) create mode 100644 frontend_reactjs/tsconfig.node.tsbuildinfo create mode 100644 frontend_reactjs/vite.config.d.ts create mode 100644 frontend_reactjs/vite.config.js diff --git a/frontend_reactjs/package-lock.json b/frontend_reactjs/package-lock.json index b4adc0f..c2ad56f 100644 --- a/frontend_reactjs/package-lock.json +++ b/frontend_reactjs/package-lock.json @@ -29,7 +29,6 @@ "react-hook-form": "^7.52.0", "react-router-dom": "^6.23.1", "swr": "^2.2.5", - "zod": "^3.23.8", "zustand": "^4.5.2" }, "devDependencies": { @@ -9927,14 +9926,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/zod": { - "version": "3.23.8", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", - "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", - "funding": { - "url": "https://github.com/sponsors/colinhacks" - } - }, "node_modules/zustand": { "version": "4.5.2", "resolved": "https://registry.npmjs.org/zustand/-/zustand-4.5.2.tgz", diff --git a/frontend_reactjs/package.json b/frontend_reactjs/package.json index df05058..168578c 100644 --- a/frontend_reactjs/package.json +++ b/frontend_reactjs/package.json @@ -31,7 +31,6 @@ "react-hook-form": "^7.52.0", "react-router-dom": "^6.23.1", "swr": "^2.2.5", - "zod": "^3.23.8", "zustand": "^4.5.2" }, "devDependencies": { diff --git a/frontend_reactjs/src/App.tsx b/frontend_reactjs/src/App.tsx index 78fa2f1..e2df4d0 100644 --- a/frontend_reactjs/src/App.tsx +++ b/frontend_reactjs/src/App.tsx @@ -1,4 +1,4 @@ -import { BrowserRouter as Router, Route, Routes, Navigate, redirect } from "react-router-dom" +import { BrowserRouter as Router, Route, Routes, Navigate } from "react-router-dom" import Main from "./pages/Main" import Users from "./pages/Users" import Roles from "./pages/Roles" @@ -10,7 +10,7 @@ import ApiTest from "./pages/ApiTest" import SignUp from "./pages/auth/SignUp" import { initAuth, useAuthStore } from "./store/auth" import { useEffect, useState } from "react" -import { Box, CircularProgress, Container } from "@mui/material" +import { Box, CircularProgress } from "@mui/material" import Documents from "./pages/Documents" import Reports from "./pages/Reports" diff --git a/frontend_reactjs/src/components/AccountMenu.tsx b/frontend_reactjs/src/components/AccountMenu.tsx index c204649..04b0444 100644 --- a/frontend_reactjs/src/components/AccountMenu.tsx +++ b/frontend_reactjs/src/components/AccountMenu.tsx @@ -4,14 +4,13 @@ import Avatar from '@mui/material/Avatar'; import Menu from '@mui/material/Menu'; import MenuItem from '@mui/material/MenuItem'; import ListItemIcon from '@mui/material/ListItemIcon'; -import Divider from '@mui/material/Divider'; import IconButton from '@mui/material/IconButton'; import Tooltip from '@mui/material/Tooltip'; import Settings from '@mui/icons-material/Settings'; import Logout from '@mui/icons-material/Logout'; import { useNavigate } from 'react-router-dom'; -import { logout, useAuthStore } from '../store/auth'; -import { ListItem, Switch, styled } from '@mui/material'; +import { logout } from '../store/auth'; +import { ListItemText, Switch, styled } from '@mui/material'; import { setDarkMode, usePrefStore } from '../store/preferences'; const Android12Switch = styled(Switch)(({ theme }) => ({ @@ -79,36 +78,39 @@ export default function AccountMenu() { + { console.log() }}> - { - setDarkMode(e.target.checked) - }} /> - Тема + + { + setDarkMode(e.target.checked) + }} /> + + + Тема: {prefStore.darkMode ? "темная" : "светлая"} + diff --git a/frontend_reactjs/src/components/FetchingData.ts b/frontend_reactjs/src/components/FetchingData.ts index cf9c3ed..e7ae153 100644 --- a/frontend_reactjs/src/components/FetchingData.ts +++ b/frontend_reactjs/src/components/FetchingData.ts @@ -1,21 +1,21 @@ -import { useState, useEffect, useMemo } from 'react'; -import axiosInstance from '../http/axiosInstance'; +import { useState, useEffect, useMemo } from 'react' +import axiosInstance from '../http/axiosInstance' export function useDataFetching(url: string, initData: T): T { - const [data, setData] = useState(initData); + const [data, setData] = useState(initData) useEffect(() => { const fetchData = async () => { - const response = await axiosInstance.get(url); - const result = await response.data; - setData(result); - }; + const response = await axiosInstance.get(url) + const result = await response.data + setData(result) + } - fetchData(); - }, [url]); + fetchData() + }, [url]) console.log(data) // Memoize the data value - const memoizedData = useMemo(() => data, [data]); - return memoizedData; -}; + const memoizedData = useMemo(() => data, [data]) + return memoizedData +} export default useDataFetching; \ No newline at end of file diff --git a/frontend_reactjs/src/components/FolderViewer.tsx b/frontend_reactjs/src/components/FolderViewer.tsx index f84af9d..e045895 100644 --- a/frontend_reactjs/src/components/FolderViewer.tsx +++ b/frontend_reactjs/src/components/FolderViewer.tsx @@ -1,6 +1,6 @@ import { useDocuments, useDownload, useFolders } from '../hooks/swrHooks' import { IDocument, IDocumentFolder } from '../interfaces/documents' -import { Box, Breadcrumbs, Button, Card, CardActionArea, CircularProgress, Divider, IconButton, Input, InputLabel, LinearProgress, Link, List, ListItem, ListItemButton, SxProps } from '@mui/material' +import { Box, Breadcrumbs, Button, CircularProgress, Divider, IconButton, Link, List, ListItemButton, SxProps } from '@mui/material' import { Cancel, Close, Download, Folder, InsertDriveFile, Upload, UploadFile } from '@mui/icons-material' import React, { useEffect, useRef, useState } from 'react' import DocumentService from '../services/DocumentService' @@ -29,7 +29,7 @@ const FileItemStyle: SxProps = { padding: '8px' } -function ItemFolder({ folder, index, handleFolderClick, ...props }: FolderProps) { +function ItemFolder({ folder, handleFolderClick, ...props }: FolderProps) { return ( handleFolderClick(folder)} @@ -118,6 +118,7 @@ export default function FolderViewer() { } const handleDocumentClick = async (doc: IDocument, index: number) => { + console.log(doc) setCurrentFileNo(index) setFileViewerModal(true) } @@ -139,7 +140,7 @@ export default function FolderViewer() { setDragOver(true) } - const handleDragLeave = (e: React.DragEvent) => { + const handleDragLeave = () => { setDragOver(false) } @@ -159,11 +160,11 @@ export default function FolderViewer() { setIsUploading(true) if (filesToUpload.length > 0 && currentFolder && currentFolder.id) { const formData = new FormData() - for (let file of filesToUpload) { + for (const file of filesToUpload) { formData.append('files', file) } try { - const response = await DocumentService.uploadFiles(currentFolder.id, formData, setUploadProgress); + await DocumentService.uploadFiles(currentFolder.id, formData, setUploadProgress); setIsUploading(false); setFilesToUpload([]); mutate(`/info/documents/${currentFolder.id}`); diff --git a/frontend_reactjs/src/components/UserData.ts b/frontend_reactjs/src/components/UserData.ts index 5700cd1..227281e 100644 --- a/frontend_reactjs/src/components/UserData.ts +++ b/frontend_reactjs/src/components/UserData.ts @@ -1,4 +1,4 @@ -import { memo, useEffect, useMemo, useState } from "react"; +import { useEffect, useMemo, useState } from "react"; import UserService from "../services/UserService"; export default function useUserData(token: string, initData: T): T { diff --git a/frontend_reactjs/src/components/modals/CreateCompanyModal.tsx b/frontend_reactjs/src/components/modals/CreateCompanyModal.tsx index 779f9a5..c628724 100644 --- a/frontend_reactjs/src/components/modals/CreateCompanyModal.tsx +++ b/frontend_reactjs/src/components/modals/CreateCompanyModal.tsx @@ -2,7 +2,7 @@ import { SubmitHandler, useForm } from 'react-hook-form'; import { AxiosResponse } from 'axios'; import { ApiResponse } from '../../interfaces/auth'; import RoleService from '../../services/RoleService'; -import { Box, Button, MenuItem, Modal, Select, TextField, Typography } from '@mui/material'; +import { Box, Button, Modal, Select, TextField, Typography } from '@mui/material'; import { ICompany } from '../../interfaces/documents'; import { useCompanies } from '../../hooks/swrHooks'; @@ -12,7 +12,7 @@ interface Props { } const style = { - position: 'absolute' as 'absolute', + position: 'absolute', top: '50%', left: '50%', transform: 'translate(-50%, -50%)', @@ -93,7 +93,7 @@ export default function CreateCompanyModal({ /> {companies} - +