Skip to content

Commit

Permalink
Merge pull request #144 from IT-Cotato/feat/TCV-21_implement_about_us
Browse files Browse the repository at this point in the history
Feat/tcv 21 implement about us
  • Loading branch information
WONYOUNG-HC authored Oct 24, 2024
2 parents c277a3f + 919c1a4 commit 26e88c9
Show file tree
Hide file tree
Showing 32 changed files with 1,559 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import FindID from '@pages/Login/FindID';
import FindPWProcess from '@pages/Login/FindPWProcess';
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';
Expand All @@ -22,6 +21,7 @@ import AttendanceRoutes from '@pages/Attendance/Attendance.routes';
import { AttendanceFab } from '@components/attendance/attendance-fab';
import AgreementConfirmDialog from '@components/AgreementConfirmDialog';
import CSRoutes from '@pages/CS/CSRoutes';
import { About } from '@pages/About';

function App() {
const location = useLocation();
Expand Down Expand Up @@ -54,9 +54,9 @@ function App() {
<Routes>
<Route path="/" element={<Home />} />
<Route path="/projects" element={<Projects />} />
<Route path="/about" element={<ReadyState />} />
<Route path="/attendance/*" element={<AttendanceRoutes />} />
<Route path="/cs/*" element={<CSRoutes />} />
<Route path="/about" element={<About />} />
<Route path="/session/*" element={<Session />} />
<Route path="/faq" element={<FAQ />} />
<Route path="/findid" element={<FindID />} />
Expand Down
Binary file added src/assets/about_us_amusement.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/about_us_it_event.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/about_us_project.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/about_us_speach_bubble.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/about_us_study.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/assets/analytics_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 63 additions & 0 deletions src/assets/character_laptop_laugh.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 26e88c9

Please sign in to comment.