fix vercel react and clean

giladfuchs · giladfuchs · commit 9f0bb353762a · 2025-08-17T19:47:51.000+03:00
diff --git a/react/package.json b/react/package.json
@@ -6,7 +6,7 @@
     "scripts": {
         "start": "vite --port 4050",
         "lint": "eslint . --ext .ts,.tsx",
-        "format": "prettier --write .",
+        "format": "npx prettier --write .",
         "typecheck": "tsc --noEmit",
         "lint:fix": "eslint . --ext .ts,.tsx --fix --cache",
         "dev:lint": "concurrently -k -n VITE,ESLINT -c auto \"vite\" \"chokidar 'src/**/*.{ts,tsx}' -c 'eslint {path}'\"",
diff --git a/react/src/contexts/AxiosInterceptor.tsx b/react/src/contexts/AxiosInterceptor.tsx
@@ -1,10 +1,10 @@
 import { useEffect, useContext, ReactNode } from 'react';
 import { toast } from 'sonner';
+import type { AxiosError, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
 import API from '../utils/axios';
-import { setLoading } from '../store/generalSlice';
 import AuthContext from './UseAuth';
-import type { AxiosError, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
-import { useAppDispatch } from '../store';
+import { setLoading } from '@/store/generalSlice';
+import { useAppDispatch } from '@/store';
 
 interface AxiosInterceptorProps {
     children: ReactNode;
diff --git a/react/src/contexts/UseAuth.tsx b/react/src/contexts/UseAuth.tsx
@@ -1,7 +1,7 @@
 import { ReactElement, createContext, useCallback, useEffect, useReducer, useContext } from 'react';
 import { useNavigate } from 'react-router-dom';
-import API from '../utils/axios';
-import { authReducerActionProps, initialAuthContextProps, AuthContextType } from '../types';
+import API from '@/utils/axios';
+import { authReducerActionProps, initialAuthContextProps, AuthContextType } from '@/types';
 
 const LOGIN = 'LOGIN';
 const LOGOUT = 'LOGOUT';
diff --git a/react/src/layout/Customization/index.tsx b/react/src/layout/Customization/index.tsx
@@ -1,4 +1,6 @@
-import React, { useEffect } from 'react';
+import { ChangeEvent, useEffect, useState } from 'react';
+import { Property } from 'csstype';
+
 import { useSelector } from 'react-redux';
 import { useTheme } from '@mui/material/styles';
 import { Avatar, ButtonBase, FormControl, FormControlLabel, FormLabel, Grid, Radio, RadioGroup, Switch, PaletteMode } from '@mui/material';
@@ -15,11 +17,10 @@ import theme4 from '../../assets/scss/_theme4.module.scss';
 import theme5 from '../../assets/scss/_theme5.module.scss';
 import theme6 from '../../assets/scss/_theme6.module.scss';
 
-import { StringColorProps, DefaultRootStateProps } from '../../types';
+import { StringColorProps, DefaultRootStateProps } from '@/types';
 import config from '../../config';
-import { setFontFamily, setNavType, setPresetColor, setRtlLayout } from '../../store/customizationReducer';
-import { Property } from 'csstype';
-import { useAppDispatch } from '../../store';
+import { setFontFamily, setNavType, setPresetColor, setRtlLayout } from '@/store/customizationReducer';
+import { useAppDispatch } from '@/store';
 
 const PresetColor = ({
     color,
@@ -52,18 +53,18 @@ const Customization = () => {
 
     const customization = useSelector((state: DefaultRootStateProps) => state.customization);
 
-    const [navType, setNavTypeState] = React.useState<PaletteMode>(customization.navType);
+    const [navType, setNavTypeState] = useState<PaletteMode>(customization.navType);
     useEffect(() => {
         dispatch(setNavType(navType));
     }, [dispatch, navType]);
 
-    const [presetColor, setPresetColorState] = React.useState<string>(customization.presetColor);
+    const [presetColor, setPresetColorState] = useState<string>(customization.presetColor);
     useEffect(() => {
         dispatch(setPresetColor(presetColor));
     }, [dispatch, presetColor]);
 
-    const [rtlLayout, setRtlLayoutState] = React.useState(customization.rtlLayout);
-    const handleRtlLayout = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const [rtlLayout, setRtlLayoutState] = useState(customization.rtlLayout);
+    const handleRtlLayout = (event: ChangeEvent<HTMLInputElement>) => {
         setRtlLayoutState(event.target.checked);
     };
 
@@ -91,7 +92,7 @@ const Customization = () => {
             break;
     }
 
-    const [fontFamily, setFontFamilyState] = React.useState(initialFont);
+    const [fontFamily, setFontFamilyState] = useState(initialFont);
     useEffect(() => {
         let newFont: Property.FontFamily;
         switch (fontFamily) {
diff --git a/react/src/layout/MainLayout/Header/ProfileSection/index.tsx b/react/src/layout/MainLayout/Header/ProfileSection/index.tsx
@@ -24,12 +24,12 @@ import {
 } from '@mui/icons-material';
 
 import PerfectScrollbar from 'react-perfect-scrollbar';
-import MainCard from '../../../../ui-component/cards/MainCard';
-import { useAuth } from '../../../../contexts/UseAuth';
-import { DefaultRootStateProps } from '../../../../types';
-import Customization from '../../../Customization';
-import { setLocale } from '../../../../store/customizationReducer';
-import { useAppDispatch } from '../../../../store';
+import MainCard from '@/ui-component/cards/MainCard';
+import { useAuth } from '@/contexts/UseAuth';
+import { DefaultRootStateProps } from '@/types';
+import Customization from '@/layout/Customization';
+import { setLocale } from '@/store/customizationReducer';
+import { useAppDispatch } from '@/store';
 
 const ProfileSection = () => {
     const theme = useTheme();
diff --git a/react/src/routes/Guard.tsx b/react/src/routes/Guard.tsx
@@ -1,6 +1,6 @@
 import { useNavigate } from 'react-router-dom';
-import { useAuth } from '../contexts/UseAuth';
-import { GuardProps } from '../types';
+import { useAuth } from '@/contexts/UseAuth';
+import { GuardProps } from '@/types';
 import { useEffect } from 'react';
 import config from '../config';
 
diff --git a/react/src/store/generalSlice.ts b/react/src/store/generalSlice.ts
@@ -1,6 +1,6 @@
 import { createAsyncThunk, createSlice, PayloadAction, ActionReducerMapBuilder, type GetThunkAPI } from '@reduxjs/toolkit';
 import { toast } from 'sonner';
-import { Assignment, FieldValue, FilterQuery, ModelType, Student, TableModelType, Teacher } from '../types';
+import { Assignment, FieldValue, FilterQuery, ModelType, Student, TableModelType, Teacher } from '@/types';
 import API from '../utils/axios';
 
 export interface ModelList {
diff --git a/react/src/themes/types.tsx b/react/src/themes/types.tsx
@@ -1,7 +1,7 @@
 import type { CSSObject } from '@emotion/react';
 import { PaletteMode } from '@mui/material';
 import { Property } from 'csstype';
-import { ColorProps } from '../types';
+import { ColorProps } from '@/types';
 
 export interface CustomizationProps {
     fontFamily: Property.FontFamily;
diff --git a/react/src/types/index.ts b/react/src/types/index.ts
@@ -1,7 +1,7 @@
 import { ReactElement } from 'react';
 import { PaletteMode } from '@mui/material';
 import { Property } from 'csstype';
-import { ModelState } from '../store/generalSlice';
+import { ModelState } from '@/store/generalSlice';
 
 export * from './general';
 export * from './table';
diff --git a/react/src/types/theme/createTheme.d.ts b/react/src/types/theme/createTheme.d.ts
@@ -1,5 +1,5 @@
 import customShadows from '../../themes/shadows';
-import type { CustomizationStateProps } from '../index';
+import type { CustomizationStateProps } from '@/types';
 
 declare module '@mui/material/styles' {
     interface ThemeOptions {
diff --git a/react/src/ui-component/form/DynamicForm.tsx b/react/src/ui-component/form/DynamicForm.tsx
@@ -2,7 +2,7 @@ import { FormEvent, useState } from 'react';
 import { Grid, Button, Typography } from '@mui/material';
 import { FormattedMessage } from 'react-intl';
 import FieldRenderer from './FieldRenderer';
-import { FieldValue, FormField } from '../../types/form';
+import { FieldValue, FormField } from '@/types';
 
 interface DynamicFormProps {
     title: string;
diff --git a/react/src/ui-component/form/FieldRenderer.tsx b/react/src/ui-component/form/FieldRenderer.tsx
@@ -1,6 +1,6 @@
 import { TextField, Autocomplete } from '@mui/material';
 import { FormattedMessage } from 'react-intl';
-import { FormField, FormType, FieldAutoComplete, FieldValue } from '../../types/form';
+import { FormField, FormType, FieldAutoComplete, FieldValue } from '@/types';
 
 interface Props {
     field: FormField;
diff --git a/react/src/ui-component/form/Form.tsx b/react/src/ui-component/form/Form.tsx
@@ -1,9 +1,9 @@
 import { useNavigate, useParams } from 'react-router-dom';
 import { useSelector } from 'react-redux';
-import { DefaultRootStateProps, ModelType, create_form_fields, FormField, get_form_by_model, FieldValue, FormModelType } from '../../types';
-import { array_obj_to_obj_with_key } from '../../utils/transformation';
-import { createOrUpdateRow } from '../../store/generalSlice';
-import { useAppDispatch } from '../../store';
+import { DefaultRootStateProps, ModelType, create_form_fields, FormField, get_form_by_model, FieldValue, FormModelType } from '@/types';
+import { array_obj_to_obj_with_key } from '@/utils/transformation';
+import { createOrUpdateRow } from '@/store/generalSlice';
+import { useAppDispatch } from '@/store';
 import { FormattedMessage, useIntl } from 'react-intl';
 import DynamicForm from './DynamicForm';
 import { Button } from '@mui/material';
diff --git a/react/src/ui-component/layout/Locales.tsx b/react/src/ui-component/layout/Locales.tsx
@@ -1,6 +1,6 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect, ReactNode } from 'react';
 import { useSelector } from 'react-redux';
-import { DefaultRootStateProps } from '../../types';
+import { DefaultRootStateProps } from '@/types';
 
 import { IntlProvider, MessageFormatElement } from 'react-intl';
 
@@ -18,7 +18,7 @@ const loadLocaleData = (locale: string) => {
 };
 
 export interface LocalsProps {
-    children: React.ReactNode;
+    children: ReactNode;
 }
 
 const Locales = ({ children }: LocalsProps) => {
diff --git a/react/src/ui-component/layout/RTLLayout.tsx b/react/src/ui-component/layout/RTLLayout.tsx
@@ -4,8 +4,8 @@ import { CacheProvider } from '@emotion/react';
 import createCache, { StylisPlugin } from '@emotion/cache';
 import rtlPlugin from 'stylis-plugin-rtl';
 import { CssBaseline, ThemeProvider, StyledEngineProvider, createTheme } from '@mui/material';
-import themes from '../../themes'; // your existing theme factory
-import { DefaultRootStateProps } from '../../types';
+import themes from '@/themes';
+import { DefaultRootStateProps } from '@/types';
 
 export interface RTLLayoutProps {
     children: ReactNode;
diff --git a/react/src/ui-component/table/MuiTable.tsx b/react/src/ui-component/table/MuiTable.tsx
@@ -5,9 +5,9 @@ import { useSelector } from 'react-redux';
 import { Grid, IconButton, Table, TableBody, TableCell, TableContainer, TableHead, TableRow } from '@mui/material';
 import MainCard from '../cards/MainCard';
 import AddBoxIcon from '@mui/icons-material/AddBox';
-import { fetchRowsByModel } from '../../store/generalSlice';
-import { useAppDispatch } from '../../store';
-import { DefaultRootStateProps, get_columns_mui_by_model, ModelType, MUITableModelType } from '../../types';
+import { fetchRowsByModel } from '@/store/generalSlice';
+import { useAppDispatch } from '@/store';
+import { DefaultRootStateProps, get_columns_mui_by_model, ModelType, MUITableModelType } from '@/types';
 
 const MuiTable = ({ model }: { model: ModelType }) => {
     const cells = get_columns_mui_by_model(model);
diff --git a/react/src/ui-component/table/ag-grid/AGTableRenderer.tsx b/react/src/ui-component/table/ag-grid/AGTableRenderer.tsx
@@ -4,7 +4,7 @@ import AssignmentsRenderer from './renderer/AssignmentsRenderer';
 import ActionRenderer from './renderer/ActionRenderer';
 import { useIntl } from 'react-intl';
 import { useSelector } from 'react-redux';
-import { DefaultRootStateProps, AGTableModelType } from '../../../types';
+import { DefaultRootStateProps, AGTableModelType } from '@/types';
 
 const defaultColDef: ColDef = {
     resizable: true,
diff --git a/react/src/ui-component/table/ag-grid/renderer/AssignmentsRenderer.tsx b/react/src/ui-component/table/ag-grid/renderer/AssignmentsRenderer.tsx
@@ -2,7 +2,7 @@ import { useState, useRef } from 'react';
 import { ICellRendererParams } from 'ag-grid-community';
 import { Button, Popper, Paper, TableBody, Typography, TableCell, TableRow } from '@mui/material';
 
-import { Assignment } from '../../../../types';
+import { Assignment } from '@/types';
 
 const AssignmentsHover = ({ assignments }: { assignments: Assignment[] }) => (
     <TableBody>
diff --git a/react/src/views/StudentView.tsx b/react/src/views/StudentView.tsx
@@ -12,12 +12,12 @@ import {
     Edit as EditIcon
 } from '@mui/icons-material';
 import { Divider, Grid, IconButton, List, ListItem, ListItemIcon, ListItemText, Typography } from '@mui/material';
-import { Assignment, DefaultRootStateProps, ModelType, Student } from '../types';
+import { Assignment, DefaultRootStateProps, ModelType, Student } from '@/types';
 
-import { deleteRowById, setAssignments, setUserAndStudentId } from '../store/generalSlice';
-import { useAppDispatch } from '../store';
-import API from '../utils/axios';
-import { array_obj_to_obj_with_key } from '../utils/transformation';
+import { deleteRowById, setAssignments, setUserAndStudentId } from '@/store/generalSlice';
+import { useAppDispatch } from '@/store';
+import API from '@/utils/axios';
+import { array_obj_to_obj_with_key } from '@/utils/transformation';
 
 const StudentProfile = ({ student }: { student: Student }) => {
     const intl = useIntl();
diff --git a/react/src/views/pages/AuthLogin.tsx b/react/src/views/pages/AuthLogin.tsx
@@ -3,8 +3,8 @@ import { useTheme } from '@mui/material/styles';
 import * as Yup from 'yup';
 import { Formik } from 'formik';
 import { Box, Button, FormControl, FormHelperText, Grid, InputLabel, OutlinedInput, Typography } from '@mui/material';
-import { useAuth } from '../../contexts/UseAuth';
-import { ModelType } from '../../types';
+import { useAuth } from '@/contexts/UseAuth';
+import { ModelType } from '@/types';
 
 type LoginValues = {
     id: string;
diff --git a/react/src/views/pages/Login.tsx b/react/src/views/pages/Login.tsx
@@ -3,9 +3,9 @@ import { useTheme, styled } from '@mui/material/styles';
 import { Divider, Grid, Stack, Typography, useMediaQuery, Box, Link as MuiLink } from '@mui/material';
 import MainCard, { MainCardProps } from '../../ui-component/cards/MainCard';
 import AuthLogin from './AuthLogin';
-import Logo from '../../ui-component/layout/Logo';
-import MuiTable from '../../ui-component/table/MuiTable';
-import { ModelType } from '../../types';
+import Logo from '@/ui-component/layout/Logo';
+import MuiTable from '@/ui-component/table/MuiTable';
+import { ModelType } from '@/types';
 import { ElementType } from 'react';
 
 const AuthCardWrapper = ({ children, ...other }: MainCardProps) => (
