Merge pull request #25 from Fastcampus-Youcandoit/feature/#3

feat: 위키 및 갤러리 라우팅 설정
KDT1-FE · Sep 18, 2023 · 6e597c2 · 6e597c2
2 parents aae74a7 + 408dbb6
commit 6e597c2
Show file tree

Hide file tree

Showing 20 changed files with 258 additions and 233 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,20 +1,65 @@
 import { BrowserRouter, Route, Routes } from "react-router-dom";
+import GlobalStyle from "./styles/globalStyle";
 import Header from "./components/common/Header";
 import Footer from "./components/common/Footer";
 import Home from "./pages/Home";
-import Gallery from "./pages/Gallery";
-import GlobalStyle from "./styles/globalStyle";
+
+// Wiki page
 import Wiki from "./pages/Wiki";
 
+// office-life Componenets
+import CompanyRules from "./components/wiki/office-life/CompanyRules";
+import OrganizationChart from "./components/wiki/office-life/OrganizationChart";
+import TeamIntroduction from "./components/wiki/office-life/TeamIntroduction";
+
+// project Components
+import InProject from "./components/wiki/project/InProject";
+import UpComing from "./components/wiki/project/UpComing";
+import Completed from "./components/wiki/project/Completed";
+
+// onboarding Components
+import ReadingList from "./components/wiki/onboarding/ReadingList";
+import Topics from "./components/wiki/onboarding/Topics";
+
+// Gallery Componenets
+import Gallery from "./pages/Gallery";
+import OfficePhoto from "./components/gallery/OfficePhoto";
+import Business from "./components/gallery/Business";
+import JobPosting from "./components/gallery/JobPosting";
+
 const App = () => {
   return (
     <BrowserRouter>
       <GlobalStyle />
       <Header />
       <Routes>
         <Route path="/" element={<Home />} />
-        <Route path="/gallery" element={<Gallery />} />
-        <Route path="/wiki" element={<Wiki />} />
+        {/* wiki */}
+        <Route path="/wiki" element={<Wiki />}>
+          {/* office-life */}
+          <Route path="office-life/company-rules" element={<CompanyRules />} />
+          <Route
+            path="office-life/team-introduction"
+            element={<TeamIntroduction />}
+          />
+          <Route
+            path="office-life/organization-chart"
+            element={<OrganizationChart />}
+          />
+          {/* project */}
+          <Route path="project/in-progress" element={<InProject />} />
+          <Route path="project/upcoming" element={<UpComing />} />
+          <Route path="project/completed" element={<Completed />} />
+          {/* onboarding */}
+          <Route path="onboarding/reading-list" element={<ReadingList />} />
+          <Route path="onboarding/topics" element={<Topics />} />
+        </Route>
+        {/* gallery */}
+        <Route path="/gallery" element={<Gallery />}>
+          <Route path="office-photo" element={<OfficePhoto />} />
+          <Route path="business" element={<Business />} />
+          <Route path="job-posting" element={<JobPosting />} />
+        </Route>
       </Routes>
     </BrowserRouter>
   );

diff --git a/src/assets/icons/fontAwesome.txt b/src/assets/icons/fontAwesome.txt
diff --git a/src/components/SideBar/OfficeLife.tsx b/src/components/SideBar/OfficeLife.tsx
@@ -16,13 +16,13 @@ const OrganizationChart = () => {
 const OfficeLife = () => {
   return (
     <div>
-      <Link to="company-rules">
+      <Link to="/wiki/office-life/company-rules">
         <Text>회사내규</Text>
       </Link>
-      <Link to="team-introduction">
+      <Link to="/wiki/office-life/team-introduction">
         <Text>팀소개</Text>
       </Link>
-      <Link to="organization-chart">
+      <Link to="/wiki/office-life/organization-chart">
         <Text>조직도</Text>
       </Link>
     </div>

diff --git a/src/components/SideBar/Photos.tsx b/src/components/SideBar/Photos.tsx