[FE/feat/#59] 나의 입찰 요청서 상세 페이지 + 달력 라이브러리 적용

2024-startup · May 22, 2024 · e1e7ddd · e1e7ddd
2 parents ea21fb5 + 2929888
commit e1e7ddd
Show file tree

Hide file tree

Showing 20 changed files with 843 additions and 181 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,3 +12,14 @@ services:
     command: ["java", "-jar", "/app/app.jar"]
     volumes:
       - ./backend/ready/app:/app/app
+
+  # dev_frontend:
+  #   build:
+  #     context: ./frontend/
+  #     dockerfile: Dockerfile
+  #   image: dev_frontend
+  #   volumes:
+  #     - ./Team/frontend:/android
+  #     - ./Team/frontend:/ios
+  #   container_name: dev_frontend
+  #   command: ["npm", "run", "start"]
diff --git a/frontend/App.tsx b/frontend/App.tsx
@@ -13,7 +13,6 @@ import MatchingDetail from './src/pages/UserMatching/MatchingDetail';
 import MatchingDone from './src/pages/UserMatching/MatchingDone';
 import BeforeMatching from './src/pages/UserMatching/BeforeMatching';
 import CompanyMatchingPage from './src/pages/CompanyMatching/CompanyMatching';
-import EstimateDetail from './src/pages/EstimatePage/EstimateDetail';
 import CompanyMatchingDetail from './src/pages/CompanyMatching/CompanyMatchingDetail';
 import EstimateStep1 from './src/pages/EstimateStepPage/EstimateStep1';
 import EstimateStep2 from './src/pages/EstimateStepPage/EstimateStep2';
@@ -25,139 +24,150 @@ import BottomTab from './src/components/bottomTabs';
 import Edit from './src/pages/EditPage/EditPage';
 import Requests from './src/pages/Requests/RequestsPage';
 import Quote from './src/pages/QuotePage/QuotePage';
+import UserEstimateDetail from './src/pages/EstimatePage/UserEstimateDetail';
+import CompanyEstimateDetail from './src/pages/EstimatePage/CompanyEstimateDetail';
+
 import CustomHeader from './src/pages/Header';
+import {RecoilRoot} from 'recoil';
 /**
  * Main App
  * @param props
  * @returns
  */
 
 const RootStack = createStackNavigator();
-const App = (props: any) => {
+const App = () => {
   return (
-    <NavigationContainer>
-      <RootStack.Navigator initialRouteName="Main">
-        <RootStack.Screen
-          name="OnBoarding"
-          component={OnBoarding}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="EstimateStep1"
-          component={EstimateStep1}
-          options={{header: () => <CustomHeader title="견적 요청" />}}
-        />
-        <RootStack.Screen
-          name="EstimateStep2"
-          component={EstimateStep2}
-          options={{headerShown: true}}
-        />
-        <RootStack.Screen
-          name="EstimateStep3"
-          component={EstimateStep3}
-          options={{header: () => <CustomHeader title="견적 요청" />}}
-        />
-        <RootStack.Screen
-          name="BidStep1"
-          component={BidStep1}
-          options={{header: () => <CustomHeader title="입찰 요청" />}}
-        />
-        <RootStack.Screen
-          name="BidStep2"
-          component={BidStep2}
-          options={{header: () => <CustomHeader title="입찰 요청" />}}
-        />
-        <RootStack.Screen
-          name="BidStep3"
-          component={BidStep3}
-          options={{header: () => <CustomHeader title="입찰 요청" />}}
-        />
-        <RootStack.Screen
-          name="BottomTab"
-          component={BottomTab}
-          options={{headerShown: false}}
-        />
-        {/* 이게 메인페이지 */}
-        <RootStack.Screen
-          name="MainPage"
-          component={MainPage}
-          options={{header: () => <CustomHeader title="홈" />}}
-        />
-        <RootStack.Screen
-          name="Main"
-          component={Main}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="Test"
-          component={Test}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="LoginPage"
-          component={LoginPage}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="SignUpPage"
-          component={SignUpPage}
-          options={{headerShown: false}}
-        />
+    <RecoilRoot>
+      <NavigationContainer>
+        <RootStack.Navigator initialRouteName="Main">
+          <RootStack.Screen
+            name="OnBoarding"
+            component={OnBoarding}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="EstimateStep1"
+            component={EstimateStep1}
+            options={{header: () => <CustomHeader title="견적 요청" />}}
+          />
+          <RootStack.Screen
+            name="EstimateStep2"
+            component={EstimateStep2}
+            options={{headerShown: true}}
+          />
+          <RootStack.Screen
+            name="EstimateStep3"
+            component={EstimateStep3}
+            options={{header: () => <CustomHeader title="견적 요청" />}}
+          />
+          <RootStack.Screen
+            name="BidStep1"
+            component={BidStep1}
+            options={{header: () => <CustomHeader title="입찰 요청" />}}
+          />
+          <RootStack.Screen
+            name="BidStep2"
+            component={BidStep2}
+            options={{header: () => <CustomHeader title="입찰 요청" />}}
+          />
+          <RootStack.Screen
+            name="BidStep3"
+            component={BidStep3}
+            options={{header: () => <CustomHeader title="입찰 요청" />}}
+          />
+          <RootStack.Screen
+            name="BottomTab"
+            component={BottomTab}
+            options={{headerShown: false}}
+          />
+          {/* 이게 메인페이지 */}
+          <RootStack.Screen
+            name="MainPage"
+            component={MainPage}
+            options={{header: () => <CustomHeader title="홈" />}}
+          />
+          <RootStack.Screen
+            name="Main"
+            component={Main}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="Test"
+            component={Test}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="LoginPage"
+            component={LoginPage}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="SignUpPage"
+            component={SignUpPage}
+            options={{headerShown: false}}
+          />
 
-        <RootStack.Screen name="MyPage" component={MyPage} />
+          <RootStack.Screen name="MyPage" component={MyPage} />
 
-        <RootStack.Screen
-          name="Matching"
-          component={Matching}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="MatchingDetail"
-          component={MatchingDetail}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="MatchingDone"
-          component={MatchingDone}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="BeforeMatching"
-          component={BeforeMatching}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="CompanyMatching"
-          component={CompanyMatchingPage}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="EstimateDetail"
-          component={EstimateDetail}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="CompanyMatchingDetail"
-          component={CompanyMatchingDetail}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="Edit"
-          component={Edit}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="Requests"
-          component={Requests}
-          options={{headerShown: false}}
-        />
-        <RootStack.Screen
-          name="Quote"
-          component={Quote}
-          options={{headerShown: false}}
-        />
-      </RootStack.Navigator>
-    </NavigationContainer>
+          <RootStack.Screen
+            name="Matching"
+            component={Matching}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="MatchingDetail"
+            component={MatchingDetail}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="MatchingDone"
+            component={MatchingDone}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="BeforeMatching"
+            component={BeforeMatching}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="CompanyMatching"
+            component={CompanyMatchingPage}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="UserEstimateDetail"
+            component={UserEstimateDetail}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="CompanyMatchingDetail"
+            component={CompanyMatchingDetail}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="Edit"
+            component={Edit}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="Requests"
+            component={Requests}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="Quote"
+            component={Quote}
+            options={{headerShown: false}}
+          />
+          <RootStack.Screen
+            name="CompnayEstimateDetail"
+            component={CompanyEstimateDetail}
+            options={{headerShown: false}}
+          />
+        </RootStack.Navigator>
+      </NavigationContainer>
+    </RecoilRoot>
   );
 };
 export default App;
diff --git a/frontend/android/build.gradle b/frontend/android/build.gradle
@@ -18,4 +18,6 @@ buildscript {
     }
 }
 
+
+
 apply plugin: "com.facebook.react.rootproject"
diff --git a/frontend/dockerfile b/frontend/dockerfile
@@ -0,0 +1,19 @@
+FROM node:18-buster
+
+MAINTAINER Collector
+
+RUN mkdir /frontend
+WORKDIR /frontend
+
+COPY ./package.json ./
+COPY ./yarn.lock ./
+WORKDIR /frontend/
+RUN npm install
+RUN npm install -g expo-cli
+
+
+
+EXPOSE 19000
+EXPOSE 19001
+EXPOSE 19002
+COPY . /frontend/
diff --git a/frontend/ios/SigongMate.xcodeproj/project.pbxproj b/frontend/ios/SigongMate.xcodeproj/project.pbxproj
@@ -468,7 +468,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = SigongMate/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 17.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -495,7 +494,6 @@
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				INFOPLIST_FILE = SigongMate/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 17.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",