Merge pull request #192 from Igloo-Club/register/#191/agreeAPI

Register/#191/agree api
Igloo-Club · Mar 27, 2024 · 5f36038 · 5f36038
2 parents 2bfa2e4 + b2fee91
commit 5f36038
Show file tree

Hide file tree

Showing 123 changed files with 3,232 additions and 662 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,148 @@
-Igloo Club's FE Repository
+# nungil
+
+## about nungil
+
+[눈길 보러가기 nungil.com](https://nungil.com)
+
+## Team
+
+<table align="center">
+    <tr align="center">      
+      <td style="min-width: 150px;">
+            <a href="https://github.com/SooY2">
+              <img src="https://avatars.githubusercontent.com/SooY2" width="200" alt="깃허브계정-프로필사진">
+              <br />
+              <b>SooY2</b> 
+            </a>
+        </td>
+      <td style="min-width: 150px;">
+            <a href="https://github.com/7iw8n">
+              <img src="https://avatars.githubusercontent.com/7iw8n" width="200" alt="깃허브계정-프로필사진">
+              <br />
+              <b>7iw8n</b>
+            </a>
+        </td>
+    </tr>
+    <tr align="center">
+       <td>
+            신수연 <br/>
+              <img src="https://img.shields.io/badge/-Frontend-FA7268" alt="Frontend">
+      </td>
+       <td>
+            한지원 <br/>
+            <img src="https://img.shields.io/badge/-Frontend-FA7268" alt="Frontend">
+      </td>
+    </tr>
+  	<tr align="center">
+       <td>
+          회원가입 프로세스 <br/>
+          채팅
+      </td>
+       <td>
+          메인페이지 <br/>
+          지도 <br/>
+      </td>
+    </tr>
+</table>
+
+<p align="right"><a href="#top">(🔼 Top)</a></p>
+
+## ⚒️ 기술 및 기술 환경
+
+### 기술스택
+
+<table>
+<tr>
+ <td align="center" width="100px">Library</td>
+ <td width="700px">
+ <img src="https://img.shields.io/badge/React-61DAFB?style=flat&logo=React&logoColor=FFFFFF"/>
+    </td>
+</tr>
+<tr>
+ <td align="center" width="100px">Programming Language</td>
+ <td >
+<img src="https://img.shields.io/badge/typescript-3178C6?style=flat&logo=typescript&logoColor=FFFFFF"/>
+    </td>
+</tr>
+<tr>
+ <td align="center" width="100px">Styling</td>
+ <td >
+<img src="https://img.shields.io/badge/Emotion-DB7093?style=flat&logo=Emotion&logoColor=white"/>
+    </td>
+</tr>
+<tr>
+ <td align="center" width="100px">Data Fetching</td>
+ <td >
+<img src="https://img.shields.io/badge/axios-7F2B7B?style=flat&logo=axios&logoColor=FFFFFF"> 
+    </td>
+</tr>
+<tr>
+ <td align="center">Package Manager</td>
+ <td>
+    <img src="https://img.shields.io/badge/yarn-2C8EBB?style=flat&logo=yarn&logoColor=ffffff"/>
+  </td>
+</tr>
+<tr>
+ <td align="center">Formatting</td>
+ <td>
+  <img src="https://img.shields.io/badge/Prettier-373338?style=flat&logo=Prettier&logoColor=ffffff"/>
+  <img src="https://img.shields.io/badge/ESLint-4B3263?style=flat&logo=eslint&logoColor=white"/>
+  <img src="https://img.shields.io/badge/stylelint-000?style=flat&logo=stylelint&logoColor=whit"/>
+
+ </td>
+</tr>
+<tr>
+ <td align="center">collaboration tool</td>
+ <td>
+    <img src="https://img.shields.io/badge/Notion-FEFEFE?style=flat&logo=Notion&logoColor=000000"/>
+<img src="https://img.shields.io/badge/Discord-5865F2?style=flat&logo=Discord&logoColor=FFFFFF"/>
+<img src="https://img.shields.io/badge/GitHub-181717?style=flat&logo=GitHub&logoColor=FFFFFF"/>
+<img src="https://img.shields.io/badge/Git-F05032?style=flat&logo=Git&logoColor=FFFFFF"/> 
+ </td>
+<tr>
+  <td align="center">API</td>
+ <td>
+ <img src="https://img.shields.io/badge/BackEnd API-green?style=flat"/>
+    <img src="https://img.shields.io/badge/kakao API-yellow?style=flat&logo=kakao&logoColor=FFFFFF"/>
+
+ </td>
+</tr>
+<tr>
+ <td align="center">IDE</td>
+ <td>
+    <img src="https://img.shields.io/badge/VSCode-007ACC?style=flat&logo=Visual%20Studio%20Code&logoColor=white"/>
+</tr>
+</table>
+
+## 🤝 협업 환경
+
+### ⚙️ Convention
+
+팀원 간의 원활한 소통과 협업을 위해 prettier와 커밋 컨벤션을 지정하였습니다.
+
+- ### Prettier Convention
+
+```
+{
+
+}
+```
+
+- ### Git Convention
+
+```swift
+브랜치명/#이슈번호/설명
+```
+
+```bash
+feat: 새로운 기능 구현
+fix: 버그, 오류 해결, 코드 수정
+add: Feat 이외의 부수적인 코드 추가
+del: 쓸모없는 코드, 주석 삭제
+refactor: 전면 수정이 있을 때 사용합니다
+style: 기능에 영향을 주지 않는 커밋, 코드순서, css, 포맷에 관한 커밋
+chore: 그 이외의 잡일/ 버전 코드 수정, 패키지 구조 변경, 파일 이동, 파일이름 변경
+docs: README나 WIKI 등의 문서 개정
+setting: 프로젝트 관련 세팅
+code review: 코드리뷰 반영
+```
diff --git a/index.html b/index.html
@@ -1,6 +1,24 @@
 <!doctype html>
-<html lang="en">
+<html lang="ko">
   <head>
+    <!-- Google tag (gtag.js) -->
+    <script
+      async
+      src="https://www.googletagmanager.com/gtag/js?id=G-KMVG2003FW"
+    ></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag() {
+        dataLayer.push(arguments);
+      }
+      gtag('js', new Date());
+
+      gtag('config', 'G-KMVG2003FW');
+    </script>
+    <meta
+      name="naver-site-verification"
+      content="5d81599387edfab2cdfa83df29cd4ea1c1ad0f9e"
+    />
     <meta charset="UTF-8" />
     <link
       rel="icon"
@@ -9,8 +27,22 @@
     />
     <meta
       name="viewport"
-      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
+      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
     />
+    <!-- Google Tag Manager -->
+    <script>
+      (function (w, d, s, l, i) {
+        w[l] = w[l] || [];
+        w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
+        var f = d.getElementsByTagName(s)[0],
+          j = d.createElement(s),
+          dl = l != 'dataLayer' ? '&l=' + l : '';
+        j.async = true;
+        j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+        f.parentNode.insertBefore(j, f);
+      })(window, document, 'script', 'dataLayer', 'GTM-K9H8G2Q9');
+    </script>
+    <!-- End Google Tag Manager -->
     <meta property="og:title" content="눈길" />
     <meta property="og:description" content="눈길 : 인연을 만나보세요" />
     <meta property="og:image" content="/logo.png" />
@@ -22,8 +54,22 @@
       href="https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/variable/pretendardvariable.min.css"
     />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta
+      name="google-site-verification"
+      content="PWnw6s75jB6ZihxauNZjGTwaAaTXBuUTTF5zoBkRzOM"
+    />
   </head>
   <body>
+    <!-- Google Tag Manager (noscript) -->
+    <noscript
+      ><iframe
+        src="https://www.googletagmanager.com/ns.html?id=GTM-K9H8G2Q9"
+        height="0"
+        width="0"
+        style="display: none; visibility: hidden"
+      ></iframe
+    ></noscript>
+    <!-- End Google Tag Manager (noscript) -->
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
   </body>

diff --git a/package.json b/package.json
@@ -24,14 +24,18 @@
     "@emotion/styled": "^11.11.0",
     "@stomp/stompjs": "^7.0.0",
     "@types/lodash-es": "^4.17.12",
+    "@types/react-slick": "^0.23.13",
     "@types/sockjs-client": "^1.5.4",
     "@types/stompjs": "^2.3.9",
     "axios": "^1.6.5",
     "emotion-reset": "^3.0.1",
+    "framer-motion": "^11.0.18",
     "lodash-es": "^4.17.21",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.22.0",
+    "react-slick": "^0.30.2",
+    "slick-carousel": "^1.8.1",
     "sockjs-client": "^1.6.1"
   },
   "devDependencies": {

diff --git a/src/App.tsx b/src/App.tsx
@@ -12,6 +12,7 @@ function App() {
   };
 
   useEffect(() => {
+    window.addEventListener('resize', () => setScreenSize());
     setScreenSize();
   });
 

diff --git a/src/Router.tsx b/src/Router.tsx
@@ -2,53 +2,54 @@ import { createBrowserRouter } from 'react-router-dom';
 import Login from './login';
 import AuthKakao from './login/AuthKakao';
 import Landing from './landing/Landing';
+import Register from './register/RegisterPage';
 import MainPage from './main/pages/mainPage';
 import DetailPage from './main/pages/DetailPage';
 import FinishMatch from './main/pages/finishMatch';
-import Register from './register/RegisterPage';
 import NungilList from './nungilList/pages/nungilList';
 import ReceivedDetailPage from './nungilList/pages/receivedDetailPage';
 import SendDetailPage from './nungilList/pages/sendDetailPage';
 import MyPage from './mypage/pages/myPage';
 import EditProfilePage from './mypage/pages/editProfilePage';
 import Chat from './chat/Chat';
 import ChatRoom from './chat/components/chatRoom/ChatRoom';
-import InfoModal from './chat/components/InfoModal';
+// import 사전신청완료 from './common/components/RegisterAdvanceApplication';
 
 const router = createBrowserRouter([
   {
-    path: '/',
+    path: '',
     element: <Landing />,
+    children: [
+      {
+        path: 'register',
+        element: <Register />,
+      },
+      {
+        path: '/oauth/kakao/callback',
+        element: <AuthKakao />,
+      },
+      {
+        path: '/main-page',
+        element: <MainPage />,
+      },
+      {
+        path: 'detailpage/:nungilId',
+        element: <DetailPage />,
+      },
+      { path: 'finishmatch/:nungilId', element: <FinishMatch /> },
+      { path: 'nungillist', element: <NungilList /> },
+      { path: 'receiveddetailpage/:nungilId', element: <ReceivedDetailPage /> },
+      { path: 'senddetailpage/:nungilId', element: <SendDetailPage /> },
+      { path: 'mypage', element: <MyPage /> },
+      { path: 'editprofilepage', element: <EditProfilePage /> },
+      { path: 'chat', element: <Chat /> },
+      { path: 'chat/:chatRoomId', element: <ChatRoom /> },
+    ],
   },
   {
     path: 'login',
     element: <Login />,
   },
-  {
-    path: 'register',
-    element: <Register />,
-  },
-  {
-    path: '/oauth/kakao/callback',
-    element: <AuthKakao />,
-  },
-  {
-    path: 'main-page',
-    element: <MainPage />,
-  },
-  {
-    path: 'detailpage/:nungilId',
-    element: <DetailPage />,
-  },
-  { path: 'finishmatch/:nungilId', element: <FinishMatch /> },
-  { path: 'nungillist', element: <NungilList /> },
-  { path: 'receiveddetailpage/:nungilId', element: <ReceivedDetailPage /> },
-  { path: 'senddetailpage/:nungilId', element: <SendDetailPage /> },
-  { path: 'mypage', element: <MyPage /> },
-  { path: 'editprofilepage', element: <EditProfilePage /> },
-  { path: 'chat', element: <Chat /> },
-  { path: 'chat/:chatRoomId', element: <ChatRoom /> },
-  { path: 'infomodal', element: <InfoModal /> },
 ]);
 
 export default router;
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ function App() { @@
       };
       useEffect(() => {
+        window.addEventListener('resize', () => setScreenSize());
         setScreenSize();
       });
@@ Expand Down @@