pre build

Author: JavaScriptMan-for

client/src/components/form_parts/FIO.tsx

@@ -8,14 +8,16 @@ const FIO: FC = () => {
     const { register, formState: { errors }, watch } = useFormContext<FractionAndFIO>();
 
     const isR = watch('isRepresentative')
-    const [isRes, setIsRes] = useState<boolean>(false)
+    const [isRes, setIsRes] = useState<string>('true')
 
     const fraction = watch('fraction')
     const [fractionState, setFractionState] = useState<'в доле' | 'га'>('в доле')
 
-    useEffect(() => {
-        setIsRes((prev) => !prev)
-    }, [isR])
+   useEffect(() => {
+    console.log(isR)
+  setIsRes(String(isR));
+}, [isR]);
+
     useEffect(() => {
         setFractionState(fraction)
     }, [fraction])
@@ -44,8 +46,8 @@ const FIO: FC = () => {
                             />
                         </div>
                         <div>
-                            {isRes && <label htmlFor="name_res">ФИО Представителя</label>}
-                            {isRes && <input
+                            {isRes == 'true' && <label htmlFor="name_res">ФИО Представителя</label>}
+                            {isRes == 'true' && <input
                                 type="text"
                                 id="name_res"
                                 placeholder='Иванов Иван Иванович'

client/src/hooks/useAlertUpload.hook.ts

@@ -3,7 +3,7 @@ import { useEffect } from 'react';
 
 export const useUnloadWarning = (enabled: boolean) => {
   useEffect(() => {
-    const handleBeforeUnload = (e: BeforeUnloadEvent) => {
+    const handleBeforeUnload = (e: any) => {
       e.preventDefault();
       e.returnValue = ''; // Необходимо для срабатывания в некоторых браузерах
     };

client/tsconfig.app.json

@@ -26,7 +26,7 @@
     "moduleDetection": "force",
     "jsx": "react-jsx",
     "noEmit": true,
-    "lib": ["es2017", "dom"],
+    "lib": ["es2017", "DOM", "DOM.Iterable"],
     "isolatedModules": true,
     "noFallthroughCasesInSwitch": true
   },

client/tsconfig.app.tsbuildinfo

@@ -5,6 +5,7 @@
     { "path": "./tsconfig.node.json" }
   ],
   "compilerOptions": {
+    "lib": ["DOM"],
     "baseUrl": ".",
     "paths": {
     "@components/*": ["./src/components/*"],
@@ -16,4 +17,6 @@
   }
   },
 
+
+
 }

client/tsconfig.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
     "target": "ES2022",
-    "lib": ["ES2023"],
+    "lib": ["ES2023", "DOM"],
     "module": "ESNext",
     "skipLibCheck": true,
 

client/tsconfig.node.json

@@ -1,4 +1,4 @@
-import { GeneralInfo, GeneralInfoToServer, VariousInfoToServer } from "./Form.type"
+import { GeneralInfoToServer, VariousInfoToServer } from "./Form.type"
 
 export interface HiType {
     id?: number,

client/types/Fetch.type.ts

@@ -7,9 +7,15 @@
     "server": "nodemon server.js --verbose",
     "client": "npm run dev --prefix ../client",
     "start": "concurrently \"npm run server\" \"npm run client\"",
-    "build": "tsc",
-    "prod": "npm run build && node dist/server.js",
-    "dev": "nodemon server.ts"
+    "dev": "nodemon server.ts",
+
+    "copy-static": "xcopy static dist\\static /E /I /Y",
+    "build": "rmdir /S /Q dist && tsc -b && npm run copy-static",
+
+    "copy-static-linux": "cp -r static dist/static",
+    "build-linux": "rm -rf dist && tsc -b && npm run copy-static",
+
+    "prod": "npm run build && node dist/server.js"
   },
   "keywords": [],
   "author": "",

server/package.json

@@ -1,4 +1,4 @@
-import express, {Request, Response, Express} from "express"
+import express, { Request, Response, Express } from "express"
 import { config } from "dotenv";
 import mainRouter from "./routes/main.route"
 import path from "path"
@@ -10,15 +10,27 @@ config()
 
 const PORT = process.env.PORT || 80
 
-app.use(cors({origin: 'localhost:3000'}))
+app.use(cors({ origin: 'localhost:3000' }))
 app.use(express.json());
+
 app.use(express.static(path.join(__dirname, "static")))
+
 app.use(bodyParser.json({ limit: "100mb" }))
 app.use(bodyParser.urlencoded({ limit: '100mb', extended: true }));
 
 
 //Rotes
-app.use('/api', mainRouter)
+app.use('/api', mainRouter);
+
+try {
+    app.use(express.static(path.join(__dirname, '..', '..', 'client', 'dist')))
+    app.use((req: Request, res: Response) => {
+        res.sendFile(path.join(__dirname, "..", '..', "client", 'dist'))
+    })
+} catch (error) {
+    console.error(error)
+}
+
 
 
 app.listen(PORT, () => {