Skip to content

Commit

Permalink
Merge branch 'main' into develop/COT-52_redesign_find_password
Browse files Browse the repository at this point in the history
  • Loading branch information
MinJaeSon authored Jan 13, 2025
2 parents d8d734d + 8ca8256 commit b02b94a
Show file tree
Hide file tree
Showing 56 changed files with 2,484 additions and 2,485 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"browserslist": "^4.18.1",
"camelcase": "^6.2.1",
"case-sensitive-paths-webpack-plugin": "^2.4.0",
"cotato-openapi-clients": "^2.241007.0",
"cotato-openapi-clients": "2.241229.0",
"craco-alias": "^3.0.1",
"css-loader": "^6.5.1",
"css-minimizer-webpack-plugin": "^3.2.0",
Expand Down Expand Up @@ -197,4 +197,4 @@
"eslintConfig": {
"extends": "react-app"
}
}
}
6 changes: 4 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import FindPassword from '@pages/Login/FindPassword/FindPassword';
import ReadyState from '@components/ReadyState';
import NotFound from '@components/NotFound';
import CotatoThemeProvider from '@theme/context/CotatoThemeProvider';
import GlobalBackgroundSvgComponent from '@components/GlobalBackgroundSvgComponent';
import { FAQ } from '@pages/FAQ';
import { CotatoGlobalFab } from '@components/CotatoGlobalFab';
import Projects from '@pages/Projects/Projects';
Expand All @@ -24,6 +23,7 @@ import CSRoutes from '@pages/CS/CSRoutes';
import { About } from '@pages/About';
import 'react-toastify/dist/ReactToastify.css';
import { ToastContainer } from 'react-toastify';
import Background from '@components/Background';

function App() {
//
Expand Down Expand Up @@ -53,9 +53,10 @@ function App() {
<CotatoThemeProvider>
<GlobalStyle />
<ToastContainer position="bottom-right" autoClose={3000} />
<Background />

<Header />
<AgreementConfirmDialog />
<GlobalBackgroundSvgComponent />
<Routes>
<Route path="/" element={<Home />} />
<Route path="/projects" element={<Projects />} />
Expand All @@ -73,6 +74,7 @@ function App() {
<Route path="/signin" element={<Login />} />
<Route path="/*" element={<NotFound />} />
</Routes>

{isInAttendanceList ? <AttendanceFab /> : <CotatoGlobalFab />}
</CotatoThemeProvider>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/api/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ api.interceptors.response.use(

return api(config);
} catch (err) {
localStorage.clear();
localStorage.removeItem('token');
window.location.replace('/');
} finally {
isRefreshing = false;
Expand Down
3 changes: 3 additions & 0 deletions src/assets/behance_light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b02b94a

Please sign in to comment.