Merge branch 'develop' into feat/#15/mypageView

RedCross-Revive-Hackthon · Aug 24, 2023 · a74d924 · a74d924
2 parents 5926ca3 + f44e382
commit a74d924
Show file tree

Hide file tree

Showing 32 changed files with 643 additions and 29 deletions.
diff --git a/index.html b/index.html
@@ -3,6 +3,11 @@
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link
+      rel="stylesheet"
+      as="style"
+      crossorigin
+      href="https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/variable/pretendardvariable.css" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite + React + TS</title>
     <link

diff --git a/src/Router.tsx b/src/Router.tsx
@@ -1,13 +1,13 @@
 import { BrowserRouter, Route, Routes } from 'react-router-dom';
 
-import Main from './pages/Main';
+import Home from './pages/Home';
 import Mypage from './pages/Mypage';
 
 const Router = () => {
   return (
     <BrowserRouter>
       <Routes>
-        <Route path="/" element={<Main></Main>}></Route>
+        <Route path="/" element={<Home />}></Route>
         <Route path="/mypage" element={<Mypage></Mypage>}></Route>
       </Routes>
     </BrowserRouter>

diff --git a/src/assets/svgs/chat.svg b/src/assets/svgs/chat.svg
diff --git a/src/assets/svgs/community.svg b/src/assets/svgs/community.svg
diff --git a/src/assets/svgs/defaultUser.svg b/src/assets/svgs/defaultUser.svg
diff --git a/src/assets/svgs/down.svg b/src/assets/svgs/down.svg
diff --git a/src/assets/svgs/event.svg b/src/assets/svgs/event.svg
diff --git a/src/assets/svgs/firstPlace.svg b/src/assets/svgs/firstPlace.svg
diff --git a/src/assets/svgs/footerArea.svg b/src/assets/svgs/footerArea.svg
diff --git a/src/assets/svgs/gift.svg b/src/assets/svgs/gift.svg
diff --git a/src/assets/svgs/health.svg b/src/assets/svgs/health.svg
diff --git a/src/assets/svgs/home.svg b/src/assets/svgs/home.svg
diff --git a/src/assets/svgs/iconArea.svg b/src/assets/svgs/iconArea.svg
diff --git a/src/assets/svgs/myPage.svg b/src/assets/svgs/myPage.svg
diff --git a/src/assets/svgs/plusBtn.svg b/src/assets/svgs/plusBtn.svg
diff --git a/src/assets/svgs/secondPlace.svg b/src/assets/svgs/secondPlace.svg
diff --git a/src/assets/svgs/thirdPlace.svg b/src/assets/svgs/thirdPlace.svg
diff --git a/src/assets/svgs/up.svg b/src/assets/svgs/up.svg