Skip to content

Commit

Permalink
Merge pull request #69 from DenysShchypt/bug/fix-versel
Browse files Browse the repository at this point in the history
new vercelconfig
  • Loading branch information
DenysShchypt authored Aug 14, 2024
2 parents 0b02282 + 7649756 commit 8a32191
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion client/src/components/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Route, Routes } from 'react-router-dom';
import { CssBaseline, ThemeProvider } from '@mui/material';
import { useEffect } from 'react';
import PrivateRoute from '../utils/router/privateRoute';
import { ColorModeContext, useMode } from '../theme';
import LayoutComponent from './Layout';
Expand All @@ -10,7 +11,6 @@ import SettingsPage from '../pages/Settings';
import AuthRootComponent from '../pages/Auth';
import SingleAssetPage from '../pages/SingleAsset';
import { useAppDispatch, useAppSelector } from '../utils/hook';
import { useEffect } from 'react';
import { logoutUsers } from '../store/thunks/auth';

function App() {
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Layout/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FC, useState } from 'react';
import { Location, Outlet, useLocation } from 'react-router-dom';
import TopBarComponent from '../TopBar';
import { useMediaQuery } from '@mui/material';
import TopBarComponent from '../TopBar';
import SideBarComponent from '../SideBar';
import { MainSection, RootBox } from './styles';

Expand Down
2 changes: 1 addition & 1 deletion client/src/components/charts/AreaChart/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
Filler,
Legend,
} from 'chart.js';
import type { ChartData, ChartOptions, ScriptableContext } from 'chart.js';
import { Line } from 'react-chartjs-2';
import type { ChartData, ChartOptions, ScriptableContext } from 'chart.js';
import { IAssetPriceData } from '../../../common/types/assets';

ChartJS.register(
Expand Down
8 changes: 7 additions & 1 deletion client/vercel.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@
"env": {
"NODE_ENV": "production"
}
}
},
"rewrites": [
{
"source": "/(.*)",
"destination": "/"
}
]
}
5 changes: 4 additions & 1 deletion client/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default defineConfig({
},
resolve: {
alias: {
'@': resolve(__dirname, 'src'),
'@emotion/styled': '@emotion/styled',
},
},
define: {
Expand All @@ -23,5 +23,8 @@ export default defineConfig({
external: ['@emotion/react', '@emotion/styled'],
},
},
optimizeDeps: {
include: ['@emotion/styled'],
},

});

0 comments on commit 8a32191

Please sign in to comment.