From 53e9a8cadfa1ea8104acf3dae116a1c3be1812c3 Mon Sep 17 00:00:00 2001 From: cracklesparkle Date: Fri, 19 Jul 2024 14:43:58 +0900 Subject: [PATCH] Cleanup --- .../src/components/AccountMenu.tsx | 1 - .../src/components/FetchingData.ts | 2 +- .../src/components/FolderViewer.tsx | 1 - .../src/components/ServerData.tsx | 4 +- .../src/components/ServerHardware.tsx | 1 - .../src/components/ServerIpsView.tsx | 1 - .../src/components/ServerStorages.tsx | 1 - .../src/components/ServersView.tsx | 1 - .../components/modals/CreateCompanyModal.tsx | 1 - .../modals/CreateDepartmentModal.tsx | 1 - .../src/components/modals/CreateRoleModal.tsx | 1 - .../src/components/modals/CreateUserModal.tsx | 1 - frontend_reactjs/src/main.tsx | 12 --- frontend_reactjs/src/pages/Reports.tsx | 2 - frontend_reactjs/src/pages/Roles.tsx | 2 - frontend_reactjs/src/pages/Servers.tsx | 1 - frontend_reactjs/src/pages/Settings.tsx | 2 - frontend_reactjs/src/pages/Users.tsx | 2 - frontend_reactjs/src/pages/auth/SignIn.tsx | 3 - frontend_reactjs/src/pages/auth/SignUp.tsx | 1 - frontend_reactjs/src/store/auth.ts | 1 - frontend_reactjs/vite.config.d.ts | 2 - frontend_reactjs/vite.config.js | 86 ------------------- frontend_reactjs/vite.config.ts | 68 --------------- readme.md | 7 +- 25 files changed, 8 insertions(+), 197 deletions(-) delete mode 100644 frontend_reactjs/vite.config.d.ts delete mode 100644 frontend_reactjs/vite.config.js diff --git a/frontend_reactjs/src/components/AccountMenu.tsx b/frontend_reactjs/src/components/AccountMenu.tsx index 10bddaf..f3e1ef4 100644 --- a/frontend_reactjs/src/components/AccountMenu.tsx +++ b/frontend_reactjs/src/components/AccountMenu.tsx @@ -116,7 +116,6 @@ export default function AccountMenu() { anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }} > { - console.log() }}> (url: string, initData: T): T { fetchData() }, [url]) - console.log(data) + // Memoize the data value const memoizedData = useMemo(() => data, [data]) return memoizedData diff --git a/frontend_reactjs/src/components/FolderViewer.tsx b/frontend_reactjs/src/components/FolderViewer.tsx index e045895..f840858 100644 --- a/frontend_reactjs/src/components/FolderViewer.tsx +++ b/frontend_reactjs/src/components/FolderViewer.tsx @@ -118,7 +118,6 @@ export default function FolderViewer() { } const handleDocumentClick = async (doc: IDocument, index: number) => { - console.log(doc) setCurrentFileNo(index) setFileViewerModal(true) } diff --git a/frontend_reactjs/src/components/ServerData.tsx b/frontend_reactjs/src/components/ServerData.tsx index e2d8662..b12589d 100644 --- a/frontend_reactjs/src/components/ServerData.tsx +++ b/frontend_reactjs/src/components/ServerData.tsx @@ -25,14 +25,12 @@ function ServerData({ id }: IServer) { columns={serverIpsColumns} actions onRowClick={(params, event, details) => { - console.log(params.id, event, details) //setCurrentServerData(params.row) //setServerDataOpen(true) }} onSave={undefined} onDelete={function (data: any): Promise> { - console.log(data) - throw new Error('Function not implemented.') + throw new Error('N/A.') }} loading={false} /> diff --git a/frontend_reactjs/src/components/ServerHardware.tsx b/frontend_reactjs/src/components/ServerHardware.tsx index 682d8da..5d115e5 100644 --- a/frontend_reactjs/src/components/ServerHardware.tsx +++ b/frontend_reactjs/src/components/ServerHardware.tsx @@ -127,7 +127,6 @@ export default function ServerHardware() { }} /> )} />} onSave={(id: any) => { - console.log(id) }} onDelete={ServerService.removeServer} initialRows={hardwares} diff --git a/frontend_reactjs/src/components/ServerIpsView.tsx b/frontend_reactjs/src/components/ServerIpsView.tsx index 723dd6b..b4ab7ee 100644 --- a/frontend_reactjs/src/components/ServerIpsView.tsx +++ b/frontend_reactjs/src/components/ServerIpsView.tsx @@ -125,7 +125,6 @@ export default function ServerIpsView() { }} /> )} />} onSave={(id: any) => { - console.log(id) }} onDelete={ServerService.removeServer} initialRows={serverIps} diff --git a/frontend_reactjs/src/components/ServerStorages.tsx b/frontend_reactjs/src/components/ServerStorages.tsx index acd05e3..bdef2f2 100644 --- a/frontend_reactjs/src/components/ServerStorages.tsx +++ b/frontend_reactjs/src/components/ServerStorages.tsx @@ -116,7 +116,6 @@ export default function ServerStorage() { }} /> )} />} onSave={(id: any) => { - console.log(id) }} onDelete={ServerService.removeServer} initialRows={storages} diff --git a/frontend_reactjs/src/components/ServersView.tsx b/frontend_reactjs/src/components/ServersView.tsx index 36ad6b4..3324c4a 100644 --- a/frontend_reactjs/src/components/ServersView.tsx +++ b/frontend_reactjs/src/components/ServersView.tsx @@ -170,7 +170,6 @@ export default function ServersView() { /> } onSave={(id: any) => { - console.log(id) }} onDelete={ServerService.removeServer} initialRows={servers} diff --git a/frontend_reactjs/src/components/modals/CreateCompanyModal.tsx b/frontend_reactjs/src/components/modals/CreateCompanyModal.tsx index c628724..93073d9 100644 --- a/frontend_reactjs/src/components/modals/CreateCompanyModal.tsx +++ b/frontend_reactjs/src/components/modals/CreateCompanyModal.tsx @@ -43,7 +43,6 @@ export default function CreateCompanyModal({ const onSubmit: SubmitHandler = async (data) => { try { const response: AxiosResponse = await RoleService.createRole(data) - console.log(response.data) } catch (error) { console.error(error) } diff --git a/frontend_reactjs/src/components/modals/CreateDepartmentModal.tsx b/frontend_reactjs/src/components/modals/CreateDepartmentModal.tsx index ca1f29d..1d6b0ba 100644 --- a/frontend_reactjs/src/components/modals/CreateDepartmentModal.tsx +++ b/frontend_reactjs/src/components/modals/CreateDepartmentModal.tsx @@ -40,7 +40,6 @@ export default function CreateDepartmentModal({ const onSubmit: SubmitHandler = async (data) => { try { const response: AxiosResponse = await RoleService.createRole(data) - console.log(response.data) } catch (error) { console.error(error) } diff --git a/frontend_reactjs/src/components/modals/CreateRoleModal.tsx b/frontend_reactjs/src/components/modals/CreateRoleModal.tsx index 0d18740..9a5c229 100644 --- a/frontend_reactjs/src/components/modals/CreateRoleModal.tsx +++ b/frontend_reactjs/src/components/modals/CreateRoleModal.tsx @@ -39,7 +39,6 @@ export default function CreateRoleModal({ const onSubmit: SubmitHandler = async (data) => { try { const response: AxiosResponse = await RoleService.createRole(data) - console.log(response.data) } catch (error) { console.error(error) } diff --git a/frontend_reactjs/src/components/modals/CreateUserModal.tsx b/frontend_reactjs/src/components/modals/CreateUserModal.tsx index 8fde281..a0876f4 100644 --- a/frontend_reactjs/src/components/modals/CreateUserModal.tsx +++ b/frontend_reactjs/src/components/modals/CreateUserModal.tsx @@ -44,7 +44,6 @@ export default function CreateUserModal({ const onSubmit: SubmitHandler = async (data) => { try { const response: AxiosResponse = await UserService.createUser(data) - console.log(response.data) } catch (error) { console.error(error) } diff --git a/frontend_reactjs/src/main.tsx b/frontend_reactjs/src/main.tsx index 513e3df..eadf350 100644 --- a/frontend_reactjs/src/main.tsx +++ b/frontend_reactjs/src/main.tsx @@ -3,7 +3,6 @@ import React, { useEffect } from 'react' import ReactDOM from 'react-dom/client' import App from './App.tsx' import './index.css' -import { registerSW } from 'virtual:pwa-register' import { ThemeProvider } from '@emotion/react' import { createTheme } from '@mui/material' import { ruRU } from '@mui/material/locale' @@ -51,17 +50,6 @@ const lightTheme = createTheme( ruRU, ); -const updateSW = registerSW({ - onNeedRefresh() { - if (confirm("New content available. Reload?")) { - updateSW(true); - } - }, - onOfflineReady() { - console.log("offline ready"); - }, -}); - function ThemedApp() { const prefStore = usePrefStore() diff --git a/frontend_reactjs/src/pages/Reports.tsx b/frontend_reactjs/src/pages/Reports.tsx index a99252a..42e5a1e 100644 --- a/frontend_reactjs/src/pages/Reports.tsx +++ b/frontend_reactjs/src/pages/Reports.tsx @@ -68,12 +68,10 @@ export default function Reports() { disableRowSelectionOnClick processRowUpdate={(updatedRow, originalRow) => { - console.log(updatedRow, originalRow) return updatedRow }} onProcessRowUpdateError={(error) => { - console.log(error) }} /> } diff --git a/frontend_reactjs/src/pages/Roles.tsx b/frontend_reactjs/src/pages/Roles.tsx index af12a54..10ac88b 100644 --- a/frontend_reactjs/src/pages/Roles.tsx +++ b/frontend_reactjs/src/pages/Roles.tsx @@ -49,12 +49,10 @@ export default function Roles() { disableRowSelectionOnClick processRowUpdate={(updatedRow, originalRow) => { - console.log(updatedRow, originalRow) return updatedRow }} onProcessRowUpdateError={(error) => { - console.log(error) }} /> diff --git a/frontend_reactjs/src/pages/Servers.tsx b/frontend_reactjs/src/pages/Servers.tsx index 06a683f..1c406aa 100644 --- a/frontend_reactjs/src/pages/Servers.tsx +++ b/frontend_reactjs/src/pages/Servers.tsx @@ -9,7 +9,6 @@ export default function Servers() { const [currentTab, setCurrentTab] = useState(0) const handleTabChange = (event: React.SyntheticEvent, newValue: number) => { - console.log(event) setCurrentTab(newValue); } diff --git a/frontend_reactjs/src/pages/Settings.tsx b/frontend_reactjs/src/pages/Settings.tsx index bf677c4..19511d6 100644 --- a/frontend_reactjs/src/pages/Settings.tsx +++ b/frontend_reactjs/src/pages/Settings.tsx @@ -70,12 +70,10 @@ export default function Settings() { disableRowSelectionOnClick processRowUpdate={(updatedRow, originalRow) => { - console.log(updatedRow, originalRow) return updatedRow }} onProcessRowUpdateError={(error) => { - console.log(error) }} /> diff --git a/frontend_reactjs/src/pages/Users.tsx b/frontend_reactjs/src/pages/Users.tsx index 2289dd9..14d58c6 100644 --- a/frontend_reactjs/src/pages/Users.tsx +++ b/frontend_reactjs/src/pages/Users.tsx @@ -65,12 +65,10 @@ export default function Users() { disableRowSelectionOnClick processRowUpdate={(updatedRow, originalRow) => { - console.log(updatedRow, originalRow) return updatedRow }} onProcessRowUpdateError={(error) => { - console.log(error) }} /> diff --git a/frontend_reactjs/src/pages/auth/SignIn.tsx b/frontend_reactjs/src/pages/auth/SignIn.tsx index f088c27..d8c74d2 100644 --- a/frontend_reactjs/src/pages/auth/SignIn.tsx +++ b/frontend_reactjs/src/pages/auth/SignIn.tsx @@ -29,14 +29,11 @@ const SignIn = () => { try { const response: AxiosResponse = await AuthService.login(formBody) - console.log('Вход произошел успешно:', response.data); const token = response.data.access_token const userDataResponse: AxiosResponse = await UserService.getCurrentUser(token) - console.log('Пользователь:', userDataResponse.data) - setUserData(JSON.stringify(userDataResponse.data)) login(token) diff --git a/frontend_reactjs/src/pages/auth/SignUp.tsx b/frontend_reactjs/src/pages/auth/SignUp.tsx index 4dc56ef..766f77f 100644 --- a/frontend_reactjs/src/pages/auth/SignUp.tsx +++ b/frontend_reactjs/src/pages/auth/SignUp.tsx @@ -22,7 +22,6 @@ const SignUp = () => { const onSubmit: SubmitHandler = async (data) => { try { const response: AxiosResponse = await UserService.createUser(data) - console.log('Успешная регистрация:', response.data); } catch (error) { console.error('Ошибка регистрации:', error); } diff --git a/frontend_reactjs/src/store/auth.ts b/frontend_reactjs/src/store/auth.ts index 39ab954..f22df92 100644 --- a/frontend_reactjs/src/store/auth.ts +++ b/frontend_reactjs/src/store/auth.ts @@ -32,7 +32,6 @@ const initAuth = async () => { if (currentTime - issuedDate < TOKEN_EXPIRY_DURATION) { useAuthStore.setState(() => ({ isAuthenticated: true, token: token })) } else { - console.log("refreshing token") try { await refreshToken(); } catch (error) { diff --git a/frontend_reactjs/vite.config.d.ts b/frontend_reactjs/vite.config.d.ts deleted file mode 100644 index 340562a..0000000 --- a/frontend_reactjs/vite.config.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -declare const _default: import("vite").UserConfig; -export default _default; diff --git a/frontend_reactjs/vite.config.js b/frontend_reactjs/vite.config.js deleted file mode 100644 index e64b711..0000000 --- a/frontend_reactjs/vite.config.js +++ /dev/null @@ -1,86 +0,0 @@ -import { defineConfig } from 'vite'; -import react from '@vitejs/plugin-react-swc'; -import { VitePWA } from "vite-plugin-pwa"; -import { nodePolyfills } from 'vite-plugin-node-polyfills'; -// https://vitejs.dev/config/ -export default defineConfig({ - server: { - host: "0.0.0.0", - port: 5173 - }, - plugins: [ - nodePolyfills(), - react(), - VitePWA({ - registerType: 'autoUpdate', - workbox: { - globPatterns: ["**/*"], - runtimeCaching: [ - { - urlPattern: function (_a) { - var request = _a.request; - return request.mode === 'navigate'; - }, - handler: 'NetworkFirst', - options: { - cacheName: 'html-cache', - }, - }, - { - urlPattern: /\.(?:js|css)$/, - handler: 'StaleWhileRevalidate', - options: { - cacheName: 'static-resources', - }, - }, - { - urlPattern: /\.(?:png|jpg|jpeg|svg|gif)$/, - handler: 'CacheFirst', - options: { - cacheName: 'image-cache', - expiration: { - maxEntries: 50, - maxAgeSeconds: 30 * 24 * 60 * 60, // 30 days - }, - }, - }, - ] - }, - includeAssets: [ - "**/*", - ], - manifest: { - "theme_color": "#f69435", - "background_color": "#f69435", - "display": "standalone", - "scope": "/", - "start_url": "/", - "short_name": "Vite PWA", - "description": "Vite PWA Boilerplate", - "name": "Vite PWA Boilerplate", - "icons": [ - { - "src": "/icon-192x192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "/icon-256x256.png", - "sizes": "256x256", - "type": "image/png" - }, - { - "src": "/icon-384x384.png", - "sizes": "384x384", - "type": "image/png" - }, - { - "src": "/icon-512x512.png", - "sizes": "512x512", - "type": "image/png" - } - ] - }, - }), - ], -}); diff --git a/frontend_reactjs/vite.config.ts b/frontend_reactjs/vite.config.ts index 81fcb78..ab756f8 100644 --- a/frontend_reactjs/vite.config.ts +++ b/frontend_reactjs/vite.config.ts @@ -12,73 +12,5 @@ export default defineConfig({ plugins: [ nodePolyfills(), react(), - VitePWA({ - registerType: 'autoUpdate', - workbox: { - globPatterns: ["**/*"], - runtimeCaching: [ - { - urlPattern: ({ request }) => request.mode === 'navigate', - handler: 'NetworkFirst', - options: { - cacheName: 'html-cache', - }, - }, - { - urlPattern: /\.(?:js|css)$/, - handler: 'StaleWhileRevalidate', - options: { - cacheName: 'static-resources', - }, - }, - { - urlPattern: /\.(?:png|jpg|jpeg|svg|gif)$/, - handler: 'CacheFirst', - options: { - cacheName: 'image-cache', - expiration: { - maxEntries: 50, - maxAgeSeconds: 30 * 24 * 60 * 60, // 30 days - }, - }, - }, - ] - }, - includeAssets: [ - "**/*", - ], - manifest: { - "theme_color": "#f69435", - "background_color": "#f69435", - "display": "standalone", - "scope": "/", - "start_url": "/", - "short_name": "Vite PWA", - "description": "Vite PWA Boilerplate", - "name": "Vite PWA Boilerplate", - "icons": [ - { - "src": "/icon-192x192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "/icon-256x256.png", - "sizes": "256x256", - "type": "image/png" - }, - { - "src": "/icon-384x384.png", - "sizes": "384x384", - "type": "image/png" - }, - { - "src": "/icon-512x512.png", - "sizes": "512x512", - "type": "image/png" - } - ] - }, - }), ], }) diff --git a/readme.md b/readme.md index 1708186..e85a1d4 100644 --- a/readme.md +++ b/readme.md @@ -3,4 +3,9 @@ pip install -r requierements.txt html с использованием vuejs в файле /backend_fastapi/.env добавить адрес базы данных -SQL_URL = "mssql+aioodbc://username:password@host/database?driver=ODBC+Driver+17+for+SQL+Server" \ No newline at end of file +SQL_URL = "mssql+aioodbc://username:password@host/database?driver=ODBC+Driver+17+for+SQL+Server" + +# Docker +### Инструкция по запуску фронтенда +Запустить билд контейнеров: +`docker compose up -d --build`