Merge branch 'develop' into feature/9oormthon-univ#17/커뮤니티-API-연결

seraphicalness · Nov 23, 2024 · fe6517d · fe6517d
2 parents 3de0cca + 5b7fc2f
commit fe6517d
Show file tree

Hide file tree

Showing 42 changed files with 3,799 additions and 187 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files
-
+.env
 # dependencies
 node_modules/
 

diff --git a/app.config.js b/app.config.js
@@ -0,0 +1,21 @@
+import 'dotenv/config';
+
+export default {
+  expo: {
+    name: 'ZipCock',
+    version: '1.0.0',
+    extra: {
+      kakaoRedirectUri: process.env.KAKAO_REDIRECT_URI,
+      kakaoClientId: process.env.KAKAO_CLIENT_ID,
+      serverUrl: process.env.SERVER_URL,
+      kakaoJsKey: process.env.KAKAO_JS_KEY,
+    },
+    ios: {
+      newArchEnabled: true,
+      bundleIdentifier: 'com.zipcock.app',
+    },
+    android: {
+      newArchEnabled: true,
+    },
+  },
+};
diff --git a/app.json b/app.json
@@ -11,7 +11,8 @@
     "userInterfaceStyle": "light",
     "newArchEnabled": true,
     "ios": {
-      "supportsTablet": true
+      "supportsTablet": true,
+      "bundleIdentifier": "com.zipcock.app"
     },
     "android": {
       "adaptiveIcon": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,19 +9,26 @@
     "web": "expo start --web"
   },
   "dependencies": {
+    "@react-native-seoul/kakao-login": "^5.4.1",
     "@react-navigation/bottom-tabs": "^7.0.4",
     "@react-navigation/native": "^7.0.3",
     "@react-navigation/native-stack": "^7.0.3",
+    "axios": "^1.7.7",
+    "dotenv": "^16.4.5",
     "expo": "~52.0.7",
     "expo-file-system": "~18.0.3",
     "expo-image-picker": "~16.0.2",
     "expo-status-bar": "~2.0.0",
+    "prop-types": "^15.8.1",
     "react": "18.3.1",
     "react-native": "0.76.2",
     "react-native-dotenv": "^3.4.11",
     "react-native-safe-area-context": "4.12.0",
     "react-native-screens": "~4.1.0",
-    "react-native-svg": "15.8.0"
+    "react-native-svg": "15.8.0",
+    "react-native-config": "^1.5.3",
+    "react-native-kakao-logins": "^1.4.0",
+    "react-native-webview": "^13.12.4"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

diff --git a/src/assets/images/home/realestateinfo/test_image.png b/src/assets/images/home/realestateinfo/test_image.png
diff --git a/src/assets/images/home/slide/slide1.png b/src/assets/images/home/slide/slide1.png
diff --git a/src/assets/images/home/slide/slide2.png b/src/assets/images/home/slide/slide2.png
diff --git a/src/navigation/stack/HomeStack.jsx b/src/navigation/stack/HomeStack.jsx
@@ -1,7 +1,17 @@
 import React from 'react';
 import { View } from 'react-native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
-import { Home, FavoriteHomes, RealEstateInfo, BuildingRegister, BuildingInfo } from '../../screens/home/index';
+import {
+  Home,
+  FavoriteHomes,
+  RealEstateInfo,
+  BuildingRegister,
+  BuildingInfo,
+  RealEstateCaution,
+  RealEstateTest,
+  RealEstateResult,
+  RealEstateTestInfo,
+} from '../../screens/home/index';
 import { BackIcon } from '../../assets/icons/iconSvg';
 
 const Stack = createNativeStackNavigator();
@@ -75,6 +85,58 @@ function HomeStack() {
           ),
         })}
       />
+      <Stack.Screen
+        name="RealEstateCaution"
+        component={RealEstateCaution}
+        options={({ navigation }) => ({
+          title: 'RealEstateCaution',
+          headerTitleAlign: 'center',
+          headerLeft: () => (
+            <View style={{ marginLeft: 10 }}>
+              <BackIcon onPress={() => navigation.goBack()} />
+            </View>
+          ),
+        })}
+      />
+      <Stack.Screen
+        name="RealEstateTest"
+        component={RealEstateTest}
+        options={({ navigation }) => ({
+          title: 'RealEstateInfo',
+          headerTitleAlign: 'center',
+          headerLeft: () => (
+            <View style={{ marginLeft: 10 }}>
+              <BackIcon onPress={() => navigation.goBack()} />
+            </View>
+          ),
+        })}
+      />
+      <Stack.Screen
+        name="RealEstateTestInfo"
+        component={RealEstateTestInfo}
+        options={({ navigation }) => ({
+          title: 'RealEstateTestInfo',
+          headerTitleAlign: 'center',
+          headerLeft: () => (
+            <View style={{ marginLeft: 10 }}>
+              <BackIcon onPress={() => navigation.goBack()} />
+            </View>
+          ),
+        })}
+      />
+      <Stack.Screen
+        name="RealEstateResult"
+        component={RealEstateResult}
+        options={({ navigation }) => ({
+          title: 'RealEstateResult',
+          headerTitleAlign: 'center',
+          headerLeft: () => (
+            <View style={{ marginLeft: 10 }}>
+              <BackIcon onPress={() => navigation.goBack()} />
+            </View>
+          ),
+        })}
+      />
     </Stack.Navigator>
   );
 }