Skip to content

Commit

Permalink
Merge branch 'release' of https://github.com/IT-Cotato/COTATO-FE into…
Browse files Browse the repository at this point in the history
… release
  • Loading branch information
Donghyun Hwang committed Jan 12, 2025
2 parents 0f17068 + 2040371 commit b4732ad
Show file tree
Hide file tree
Showing 32 changed files with 3,187 additions and 2,798 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"css-minimizer-webpack-plugin": "^3.2.0",
"date-fns": "^3.3.1",
"dayjs": "^1.11.10",
"dompurify": "^3.1.6",
"dompurify": "^3.2.1",
"dotenv": "^10.0.0",
"dotenv-expand": "^5.1.0",
"eslint": "^8.3.0",
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
type="text/javascript"
src="//dapi.kakao.com/v2/maps/sdk.js?appkey=8820634f5fbd72b7d80d62b934c94d7d&libraries=services"
></script>
<title>COTATO</title>
<title>COTATO(QA)</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
5 changes: 2 additions & 3 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ import SignUp from '@pages/JoinUs/SignUp';
import MyPage from '@pages/MyPage/MyPage';
import { GlobalStyle } from '@theme/GlobalStyle';
import FindID from '@pages/Login/FindID';
import FindPWProcess from '@pages/Login/FindPWProcess';
import FindPassword from '@pages/Login/FindPassword/FindPassword';
import ReadyState from '@components/ReadyState';
import NotFound from '@components/NotFound';

import CotatoThemeProvider from '@theme/context/CotatoThemeProvider';
import { FAQ } from '@pages/FAQ';
import { CotatoGlobalFab } from '@components/CotatoGlobalFab';
Expand Down Expand Up @@ -68,7 +67,7 @@ function App() {
<Route path="/session/*" element={<Session />} />
<Route path="/faq" element={<FAQ />} />
<Route path="/findid" element={<FindID />} />
<Route path="/findpw" element={<FindPWProcess />} />
<Route path="/findpw" element={<FindPassword />} />
<Route path="/joinus" element={<SignUp />} />
<Route path="/mypage/*" element={<MyPage />} />
<Route path="/products" element={<ReadyState />} />
Expand Down
3 changes: 3 additions & 0 deletions src/assets/about_us_panel_text.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 51 additions & 0 deletions src/assets/cotato_panel_default.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 51 additions & 0 deletions src/assets/cotato_panel_long.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions src/assets/project.svg → src/assets/cotato_panel_short.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/assets/find_password_auth_code_panel_text.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 b4732ad

Please sign in to comment.