Merge pull request #340 from develo-pool/refactor/#339-FileStructure

Refactor/#339 file structure
develo-pool · Feb 5, 2023 · 31c2806 · 31c2806
2 parents f112a5c + bb1592b
commit 31c2806
Show file tree

Hide file tree

Showing 135 changed files with 305 additions and 228 deletions.
diff --git a/.watchmanconfig b/.watchmanconfig
diff --git a/App.tsx b/App.tsx
@@ -1,10 +1,10 @@
 import {NavigationContainer} from '@react-navigation/native';
 import React, {useEffect} from 'react';
 // import {Alert} from 'react-native';
-import RootStack from './screens/RootStack';
+import RootStack from './src/screens/RootStack';
 import {QueryClient, QueryClientProvider} from 'react-query';
 import {Provider} from 'react-redux';
-import store from './slices';
+import store from './src/slices';
 import {
   request,
   PERMISSIONS,

diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 <image src="https://user-images.githubusercontent.com/66757141/191906174-e5a5d5d4-6762-41ea-9447-11490985ff4f.png" width="100px"/>
 
 ## Contents
+- [Summary](#summary)
 - [Latest Release](#latest-release)
 - [Demo](#demo)
 - [Start](#start)
@@ -14,38 +15,107 @@
 
 <br/>
 
-## Latest Release
-**Google Playstore**  
-🔗 https://play.google.com/store/apps/details?id=com.app_pool_frontend  
-**AppStore**  
-🔗 https://apps.apple.com/kr/app/pool/id1640180474  
-**Web**  
-🔗 https://app-pool-firebase.web.app
-
-<br/>
-
-## Demo
+## Summary
 
-**Authentication (SignUp/Login)**  
-<image src="https://user-images.githubusercontent.com/72551358/197339969-3f884440-128e-45f1-902b-54088f3a5dd1.gif" width="150px"/>
-<image src="https://user-images.githubusercontent.com/72551358/197340008-d22c2c8d-1f1b-4c46-a8df-78e138a45d7d.gif" width="150px"/>
+`바로 닿는 메세지 POOL`은 `Push 알림`으로 브랜드와 팔로워를 잇는 강력한 메세지 서비스입니다.
+- 브랜드 등록 심사 요청을 통해 누구나 `브랜드`가 될 수 있습니다.
+- 브랜드는 `Push 알림 메세지`를 생성할 수 있습니다.
+- 유저는 원하는 브랜드를 팔로우하여 `Push 알림 메세지`를 받아볼 수 있습니다.
 
-**Search Brand / Follow&UnFollow**  
-<image src="https://user-images.githubusercontent.com/72551358/197339992-f0f7d9f3-6032-4126-8ff1-4e346da88dce.gif" width="150px"/>
+<br/>
 
-**Read Messages / Create Comment**  
-<image src="https://user-images.githubusercontent.com/72551358/197340006-2e55f7cb-5043-418d-b455-c3541c28c097.gif" width="150px"/>
+## Latest Release
+<table>
+  <tr>
+    <th align='left'>Google Playstore</th>
+    <td>https://play.google.com/store/apps/details?id=com.app_pool_frontend</td>
+  </tr>
+  <tr>
+    <th align='left'>AppStore</th>
+    <td>https://apps.apple.com/kr/app/pool/id1640180474  </td>
+  </tr>
+  <tr>
+    <th align='left'>Web</th>
+    <td>https://app-pool-firebase.web.app</td>
+  </tr>
+</table>
 
-**Brand Assign**  
-<image src="https://user-images.githubusercontent.com/72551358/197341212-86abe19d-2447-454e-b328-a767af815577.gif" width="150px"/>
+_\* 서버 운영이 2022.11로 종료되었습니다._
 
-**Create Message**  
-<image src="https://user-images.githubusercontent.com/72551358/197340004-d5b0a7c8-bbee-4534-84a9-c9cf18283545.gif" width="150px"/>
+<br/>
 
-**Receive Message(Push Alarm)**
+## Demo
 
-**Information Web**  
-<image src="https://user-images.githubusercontent.com/72551358/197341213-881ecc14-9a98-49df-8b54-8077a4a15247.gif" width="150px"/>
+<details open>
+    <summary>[Demo] Authentication</summary>
+    <table>
+      <tr>
+        <th>SignUp</th>
+        <th>Login</th>
+      </tr>
+      <tr>
+        <td><image src="https://user-images.githubusercontent.com/72551358/197339969-3f884440-128e-45f1-902b-54088f3a5dd1.gif" width="300px"/></td>
+        <td><image src="https://user-images.githubusercontent.com/72551358/197340008-d22c2c8d-1f1b-4c46-a8df-78e138a45d7d.gif" width="300px"/></td>
+      </tr>
+    </table>
+</details>
+<details>
+    <summary>[Demo] Search & Follow Brand</summary>
+    <table>
+      <tr>
+        <th>Search & Follow Brand</th>
+      </tr>
+      <tr>
+        <td><image src="https://user-images.githubusercontent.com/72551358/197339992-f0f7d9f3-6032-4126-8ff1-4e346da88dce.gif" width="300px"/></td>
+      </tr>
+    </table>
+</details>
+<details>
+    <summary>[Demo] Read & Create Message</summary>
+    <table>
+      <tr>
+        <th>Read Messages / Create Comment</th>
+      </tr>
+      <tr>
+        <td><image src="https://user-images.githubusercontent.com/72551358/197340006-2e55f7cb-5043-418d-b455-c3541c28c097.gif" width="300px"/></td>
+      </tr>
+    </table>
+</details>
+<details>
+    <summary>[Demo] Brand Assign</summary>
+    <table>
+      <tr>
+        <th>Brand Assign</th>
+      </tr>
+      <tr>
+        <td><image src="https://user-images.githubusercontent.com/72551358/197341212-86abe19d-2447-454e-b328-a767af815577.gif" width="300px"/></td>
+      </tr>
+    </table>
+</details>
+<details>
+    <summary>[Demo] Create & Receive Message</summary>
+    <table>
+      <tr>
+        <th>Create Message</th>
+        <th>Receive Message(Push Alarm)</th>
+      </tr>
+      <tr>
+        <td><image src="https://user-images.githubusercontent.com/72551358/197340004-d5b0a7c8-bbee-4534-84a9-c9cf18283545.gif" width="300px"/></td>
+        <td></td>
+      </tr>
+    </table>
+</details>
+<details>
+    <summary>[Demo] Information Web</summary>
+    <table>
+      <tr>
+        <th>Information Web</th>
+      </tr>
+      <tr>
+        <td><image src="https://user-images.githubusercontent.com/72551358/197341213-881ecc14-9a98-49df-8b54-8077a4a15247.gif" width="300px"/></td>
+      </tr>
+    </table>
+</details>
 
 <br/>
 
@@ -72,19 +142,19 @@ $ yarn lint #run eslint
 
 <table>
   <tr>
-    <th>코어</th>
+    <th align='left'>Core</th>
     <td>ReactNative, TypeScript</td>
   </tr>
   <tr>
-    <th>상태관리</th>
+    <th align='left'>State Management</th>
     <td>Redux, React-Query</td>
   </tr>
   <tr>
-    <th>패키지 매니저</th>
+    <th align='left'>Package Manager</th>
     <td>Yarn</td>
   </tr>
   <tr>
-    <th>빌드</th>
+    <th align='left'>Build</th>
     <td>Babel, Webpack    </td>
   </tr>
 </table>
@@ -93,29 +163,35 @@ $ yarn lint #run eslint
 <br/>
 
 ## Folder Tree
-```
-├── android
-├── ios
-├── dist # 빌드된 web 폴더
-├── api # api 요청 관련 폴더
-├── assets # svg, image, font, theme 등 정적 파일 폴더
-├── components # 여러 page에서 사용하는 컴포넌트들
-├── screens # React Navigation에서 사용하는 Screen들
-├── hooks # react hooks
-├── slices # redux slices 폴더
-├── storages # Asyncstorage 관련 폴더
-├── web # Web 관련 폴더
-│   └── assets # Web favicon, manifest 등의 파일 폴더
+```python
+📂.github
+ ┣ 📂workflows
+📂dist # 빌드된 web 폴더
+📂android
+📂ios
+📂web # Web 관련 폴더
+📂assets # svg, image, font, theme 등 정적 파일 폴더
+ ┣ 📂fonts
+ ┣ theme.ts
+📂src
+ ┣ 📂api # api 요청 관련 폴더
+ ┣ 📂components # 여러 page에서 사용하는 컴포넌트들
+ ┣ 📂hooks # react hooks
+ ┣ 📂screens # React Navigation에서 사용하는 Screen들
+ ┣ 📂slices # redux slices 폴더
+ ┣ 📂storages # Asyncstorage 관련 폴더
+ ┣ App.tsx
+ ┗ index.tsx
 ```
 
 <br/>
 
 ## Commit Rule
 | 타입     | 내용                  |
-|----------|-----------------------|
+|----------|----------------------|
 | style    | 코드 스타일 혹은 포맷 |
 | feature  | 새로운 기능           |
-| fix      | 수정                  |
+| fix      | 수정                 |
 | refactor | 코드 리팩토링         |
 | design   | 사용자 UI 수정        |
 | test     | 테스트 코드           |
@@ -124,7 +200,7 @@ $ yarn lint #run eslint
 
 <br/>
 
-## Branch
+## Branch Rule
 | 브랜치명                        | 설명                  |
 |--------------------------------|-----------------------|
 | main                           | 메인 브랜치            |

diff --git a/__tests__/App-test.tsx b/__tests__/App-test.tsx
diff --git a/app.json b/app.json
diff --git a/components/category/categoryList.ts b/components/category/categoryList.ts
diff --git a/index.js b/index.js
@@ -4,9 +4,10 @@
 
 import {AppRegistry} from 'react-native';
 import App from './App';
-import {name as appName} from './app.json';
 import messaging from '@react-native-firebase/messaging';
 
+const appName = 'app_pool_frontend';
+
 messaging().setBackgroundMessageHandler(async remoteMessage => {
   console.log('Message handled in the background!', remoteMessage);
   onMessageReceived(remoteMessage);

diff --git a/api/auth/index.ts → src/api/auth/index.ts b/api/auth/index.ts → src/api/auth/index.ts
diff --git a/api/auth/types.ts → src/api/auth/types.ts b/api/auth/types.ts → src/api/auth/types.ts
diff --git a/api/brand/index.ts → src/api/brand/index.ts b/api/brand/index.ts → src/api/brand/index.ts
diff --git a/api/brand/types.ts → src/api/brand/types.ts b/api/brand/types.ts → src/api/brand/types.ts
diff --git a/api/client.ts → src/api/client.ts b/api/client.ts → src/api/client.ts
diff --git a/api/comment/index.ts → src/api/comment/index.ts b/api/comment/index.ts → src/api/comment/index.ts
diff --git a/api/comment/types.ts → src/api/comment/types.ts b/api/comment/types.ts → src/api/comment/types.ts
diff --git a/api/fcm/index.ts → src/api/fcm/index.ts b/api/fcm/index.ts → src/api/fcm/index.ts
diff --git a/api/fcm/types.ts → src/api/fcm/types.ts b/api/fcm/types.ts → src/api/fcm/types.ts
diff --git a/api/follow/index.ts → src/api/follow/index.ts b/api/follow/index.ts → src/api/follow/index.ts
diff --git a/api/follow/types.ts → src/api/follow/types.ts b/api/follow/types.ts → src/api/follow/types.ts
diff --git a/api/message/index.ts → src/api/message/index.ts b/api/message/index.ts → src/api/message/index.ts
diff --git a/api/message/types.ts → src/api/message/types.ts b/api/message/types.ts → src/api/message/types.ts
diff --git a/api/profile/index.ts → src/api/profile/index.ts b/api/profile/index.ts → src/api/profile/index.ts
diff --git a/api/profile/types.ts → src/api/profile/types.ts b/api/profile/types.ts → src/api/profile/types.ts
diff --git a/api/web/index.ts → src/api/web/index.ts b/api/web/index.ts → src/api/web/index.ts
diff --git a/api/web/types.ts → src/api/web/types.ts b/api/web/types.ts → src/api/web/types.ts
diff --git a/components/AlertBox.tsx → src/components/AlertBox.tsx b/components/AlertBox.tsx → src/components/AlertBox.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {StyleSheet, Text, View} from 'react-native';
-import theme from '../assets/theme';
+import theme from '../../assets/theme';
 import {useSelector} from 'react-redux';
 import {RootState} from '../slices';
 

diff --git a/components/MainContainer.tsx → src/components/MainContainer.tsx b/components/MainContainer.tsx → src/components/MainContainer.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {StyleSheet, View} from 'react-native';
-import theme from '../assets/theme';
+import theme from '../../assets/theme';
 
 export const PADDING = 24;
 

diff --git a/components/ProcessBar.tsx → src/components/ProcessBar.tsx b/components/ProcessBar.tsx → src/components/ProcessBar.tsx
@@ -1,7 +1,7 @@
 // import React, {useEffect, useRef} from 'react';
 import React, {useEffect, useRef} from 'react';
 import {Animated, StyleSheet, View} from 'react-native';
-import theme from '../assets/theme';
+import theme from '../../assets/theme';
 
 const WIDTH = 167;
 const HEIGHT = 4;

diff --git a/components/ScreenBottomButton.tsx → src/components/ScreenBottomButton.tsx b/components/ScreenBottomButton.tsx → src/components/ScreenBottomButton.tsx
@@ -7,7 +7,7 @@ import {
   StyleSheet,
   Text,
 } from 'react-native';
-import theme from '../assets/theme';
+import theme from '../../assets/theme';
 
 function ScreenBottomButton({
   name,

diff --git a/components/TextInputs.tsx → src/components/TextInputs.tsx b/components/TextInputs.tsx → src/components/TextInputs.tsx
@@ -7,7 +7,7 @@ import {
   Text,
   KeyboardTypeOptions,
 } from 'react-native';
-import theme from '../assets/theme';
+import theme from '../../assets/theme';
 import Icon from 'react-native-vector-icons/MaterialIcons';
 
 interface Props {

diff --git a/components/Title.tsx → src/components/Title.tsx b/components/Title.tsx → src/components/Title.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {StyleSheet, Text, View} from 'react-native';
-import theme from '../assets/theme';
+import theme from '../../assets/theme';
 
 interface Props {
   title: string;

diff --git a/components/auth/AuthComponents.tsx → src/components/auth/AuthComponents.tsx b/components/auth/AuthComponents.tsx → src/components/auth/AuthComponents.tsx
@@ -8,7 +8,7 @@ import {
   View,
 } from 'react-native';
 import Icon from 'react-native-vector-icons/MaterialIcons';
-import theme from '../../assets/theme';
+import theme from '../../../assets/theme';
 
 export function InputTitle({title}: {title: string}) {
   return <Text style={styles.text}>{title}</Text>;

diff --git a/components/auth/FirstForm.tsx → src/components/auth/FirstForm.tsx b/components/auth/FirstForm.tsx → src/components/auth/FirstForm.tsx
diff --git a/components/auth/LoginButton.tsx → src/components/auth/LoginButton.tsx b/components/auth/LoginButton.tsx → src/components/auth/LoginButton.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {Pressable, StyleSheet, Text} from 'react-native';
-import theme from '../../assets/theme';
+import theme from '../../../assets/theme';
 
 function LoginButton({
   text,

diff --git a/components/auth/PasswordForm.tsx → src/components/auth/PasswordForm.tsx b/components/auth/PasswordForm.tsx → src/components/auth/PasswordForm.tsx
@@ -4,7 +4,7 @@ import TextInputs from '../TextInputs';
 import {InputTitle} from './AuthComponents';
 import {CheckPassword} from './Validation';
 import Icon from 'react-native-vector-icons/MaterialIcons';
-import theme from '../../assets/theme';
+import theme from '../../../assets/theme';
 
 interface PasswordFormProps {
   password: string;

diff --git a/components/auth/PhoneAuthForm.tsx → src/components/auth/PhoneAuthForm.tsx b/components/auth/PhoneAuthForm.tsx → src/components/auth/PhoneAuthForm.tsx
diff --git a/components/auth/SecondForm.tsx → src/components/auth/SecondForm.tsx b/components/auth/SecondForm.tsx → src/components/auth/SecondForm.tsx
diff --git a/components/auth/SignUpForm.tsx → src/components/auth/SignUpForm.tsx b/components/auth/SignUpForm.tsx → src/components/auth/SignUpForm.tsx
diff --git a/components/auth/SignUpScreenBottomButton.tsx → ...ponents/auth/SignUpScreenBottomButton.tsx b/components/auth/SignUpScreenBottomButton.tsx → ...ponents/auth/SignUpScreenBottomButton.tsx
diff --git a/components/auth/ThirdForm.tsx → src/components/auth/ThirdForm.tsx b/components/auth/ThirdForm.tsx → src/components/auth/ThirdForm.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {Linking, StyleSheet, Text, View} from 'react-native';
 import {useQuery} from 'react-query';
 import {nickNameExist, usernameExist} from '../../api/auth';
-import theme from '../../assets/theme';
+import theme from '../../../assets/theme';
 import {SignUpScreenProps} from '../../screens/SignUpScreen';
 import TextInputs from '../TextInputs';
 import Title from '../Title';

diff --git a/components/auth/Validation.ts → src/components/auth/Validation.ts b/components/auth/Validation.ts → src/components/auth/Validation.ts