Merge pull request #10 from InjeRecipe/#9_apiIntegration_main

#9 api integration main

injeRecipe/App.tsx

@@ -16,14 +16,15 @@ import {
 
 } from 'react-native';
 
-import { NavigationContainer } from '@react-navigation/native';
+import { NavigationContainer, useNavigation } from '@react-navigation/native';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
-import { Provider } from 'react-redux'
+import { Provider, useDispatch } from 'react-redux'
 import store from './src/redux/store';
 import RootStackNavigation from './src/navigations/RootStackNavigation';
 
+
 function App(){
-
+  
   return (
     <SafeAreaProvider>
       <Provider store={store}>

injeRecipe/ios/Podfile.lock

@@ -1141,6 +1141,8 @@ PODS:
     - React-jsi (= 0.73.2)
     - React-logger (= 0.73.2)
     - React-perflogger (= 0.73.2)
+  - RNCAsyncStorage (1.22.0):
+    - React-Core
   - RNGestureHandler (2.15.0):
     - glog
     - RCT-Folly (= 2022.05.16.00)
@@ -1239,6 +1241,7 @@ DEPENDENCIES:
   - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)
   - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - "RNGoogleSignin (from `../node_modules/@react-native-google-signin/google-signin`)"
   - RNReanimated (from `../node_modules/react-native-reanimated`)
@@ -1371,6 +1374,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/react/utils"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  RNCAsyncStorage:
+    :path: "../node_modules/@react-native-async-storage/async-storage"
   RNGestureHandler:
     :path: "../node_modules/react-native-gesture-handler"
   RNGoogleSignin:
@@ -1452,6 +1457,7 @@ SPEC CHECKSUMS:
   React-runtimescheduler: df8945a656356ff10f58f65a70820478bfcf33ad
   React-utils: f5bc61e7ea3325c0732ae2d755f4441940163b85
   ReactCommon: 45b5d4f784e869c44a6f5a8fad5b114ca8f78c53
+  RNCAsyncStorage: c43e6d71e13bb4748503797784839e0fbbf89d56
   RNGestureHandler: deda62b8339496ba721a45e0f3e2d7a319932cee
   RNGoogleSignin: fc408799f1990a12497a32f64280c0fe353ffcc1
   RNReanimated: 7d6d32f238f914f13d9d6fb45c0aef557f7f901e

injeRecipe/package.json

@@ -15,24 +15,28 @@
     "@dotlottie/react-player": "^1.6.15",
     "@gorhom/bottom-sheet": "^4.6.0",
     "@lottiefiles/react-lottie-player": "^3.5.3",
+    "@react-native-async-storage/async-storage": "^1.22.0",
     "@react-native-community/geolocation": "^3.1.0",
     "@react-native-google-signin/google-signin": "^11.0.0",
     "@react-navigation/bottom-tabs": "^6.5.11",
     "@react-navigation/native": "^6.1.9",
     "@react-navigation/native-stack": "^6.9.17",
     "@tsconfig/react-native": "^3.0.3",
     "axios": "^1.6.7",
+    "deprecated-react-native-prop-types": "^5.0.0",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "lottie-react-native": "^6.5.1",
     "react": "18.2.0",
     "react-dom": "^18.2.0",
     "react-native": "0.73.2",
+    "react-native-bit-swiper": "^1.1.8",
     "react-native-gesture-handler": "^2.15.0",
     "react-native-image-picker": "^7.1.0",
     "react-native-modal": "^13.0.1",
     "react-native-reanimated": "^3.7.0",
     "react-native-safe-area-context": "^4.8.2",
     "react-native-screens": "^3.29.0",
+    "react-native-swiper-flatlist": "^3.2.3",
     "react-native-vector-icons": "^10.0.3",
     "react-native-web": "^0.19.10",
     "react-redux": "^9.1.0",

injeRecipe/react-native-bit-swiper.d.ts

@@ -0,0 +1 @@
+declare module 'react-native-bit-swiper';

injeRecipe/src/@types/screen.tsx

@@ -1,17 +1,12 @@
 export const RootStackParamList = {
     Home:"Home",
     Bottom:"Bottom",
-    HomeStack:"HomeStackNavigator"
-}
-
-export type BottomStackParamList = {
+    HomeStack:"HomeStackNavigator",
     Main:undefined,
     Refrigator:undefined,
     Search:undefined,
-    Info:undefined
-}
-
-export const HomeStackParamList = {
+    Info:undefined,
     SignIn:"SignIn",
     SignUp:undefined
-}
+}
+

injeRecipe/src/assets/lottie/weather/cloudy.json

@@ -0,0 +1 @@
+{"v":"5.5.9","fr":30,"ip":0,"op":600,"w":200,"h":200,"nm":"天气-多云","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"“乌云”轮廓","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[89.95,115.1,0],"ix":2},"a":{"a":0,"k":[76.6,50.05,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,18.8],[7.5,6.5],[0,1],[19.401,0],[0,-19.299],[-0.101,-0.299],[5.2,0],[0,-18.5],[-18,-0.599],[0,0],[0,0],[0,0]],"o":[[0,-10.601],[0.101,-1],[0,-19.299],[-19.4,0],[0,0.301],[-4.401,-2.199],[-18.5,0],[0,18.1],[0,0],[0,0],[0,0],[18.5,-0.799]],"v":[[65.25,14.8],[52.95,-11.801],[53.15,-14.801],[17.95,-49.8],[-17.25,-14.801],[-17.149,-13.801],[-31.75,-17.2],[-65.25,16.3],[-32.85,49.699],[-32.85,49.8],[31.75,49.8],[31.75,49.699]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.969000004787,0.969000004787,0.969000004787,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[65.5,50.05],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,18.3],[19.4,0],[0,-18.5],[0,0],[0,0]],"o":[[0,-18.4],[-19.4,0],[0,0],[0,0],[19.2,-0.3]],"v":[[35.2,0],[0,-33.4],[-35.2,0],[-35.2,33.4],[0.4,33.4]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.917999985639,0.917999985639,0.917999985639,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[117.75,66.451],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":601,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"“太阳”轮廓","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[128.397,85.608,0],"ix":2},"a":{"a":0,"k":[37.356,37.368,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-20.489,-0.009],[-0.009,20.49],[0,0],[20.49,0.003],[0.003,-20.49]],"o":[[-0.009,20.49],[20.49,0.009],[0,0],[0.003,-20.49],[-20.49,-0.004],[0,0]],"v":[[-37.097,-0.008],[-0.013,37.109],[37.103,0.025],[37.103,-0.008],[0.009,-37.113],[-37.097,-0.02]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929000016755,0.663000009574,0.081999999402,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[37.356,37.368],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":601,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"“光芒”轮廓","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":600,"s":[360]}],"ix":10},"p":{"a":0,"k":[128.449,85.6,0],"ix":2},"a":{"a":0,"k":[58.9,61.35,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.3,1],[-0.901,1.3],[0,0],[-1.299,-0.9],[0.9,-1.3],[0,0]],"o":[[-1.301,-1],[0,0],[1,-1.3],[1.3,1],[0,0],[-1,1.3]],"v":[[27.951,-38.5],[27.251,-42.7],[31.65,-48.7],[35.85,-49.4],[36.551,-45.2],[32.15,-39.2]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.5,1.6],[-1.5,0.5],[0,0],[-0.5,-1.5],[1.5,-0.5],[0,0]],"o":[[-0.5,-1.6],[0,0],[1.599,-0.5],[0.5,1.6],[0,0],[-1.6,0.5]],"v":[[45.251,-14.7],[47.15,-18.5],[54.251,-20.8],[58.051,-18.9],[56.15,-15.1],[49.051,-12.8]],"c":true},"ix":2},"nm":"路径 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[-0.5,1.6],[-1.6,-0.6],[0,0],[0.599,-1.6],[1.599,0.6],[0,0]],"o":[[0.5,-1.6],[0,0],[1.601,0.5],[-0.5,1.6],[0,0],[-1.599,-0.5]],"v":[[45.251,14.7],[49.051,12.8],[56.15,15.1],[58.051,18.9],[54.251,20.8],[47.15,18.5]],"c":true},"ix":2},"nm":"路径 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[-1.4,1],[-0.899,-1.4],[0,0],[1.401,-0.9],[0.901,1.4],[0,0]],"o":[[1.3,-1],[0,0],[1,1.3],[-1.299,1],[0,0],[-1,-1.3]],"v":[[27.951,38.5],[32.15,39.2],[36.551,45.2],[35.85,49.4],[31.65,48.7],[27.251,42.7]],"c":true},"ix":2},"nm":"路径 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[-1.7,0],[0,-1.6],[0,0],[1.6,0],[0,1.6],[0,0]],"o":[[1.699,0],[0,0],[0,1.7],[-1.7,0],[0,0],[0,-1.7]],"v":[[-0.049,47.6],[2.951,50.6],[2.951,58.1],[-0.049,61.1],[-3.049,58.1],[-3.049,50.6]],"c":true},"ix":2},"nm":"路径 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[-1.3,-1],[0.901,-1.3],[0,0],[1.299,0.9],[-0.899,1.3],[0,0]],"o":[[1.3,1],[0,0],[-1,1.3],[-1.3,-1],[0,0],[1,-1.4]],"v":[[-28.049,38.5],[-27.35,42.7],[-31.749,48.7],[-35.949,49.4],[-36.65,45.2],[-32.249,39.2]],"c":true},"ix":2},"nm":"路径 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[-0.5,-1.6],[1.5,-0.5],[0,0],[0.5,1.5],[-1.5,0.5],[0,0]],"o":[[0.5,1.6],[0,0],[-1.6,0.5],[-0.5,-1.6],[0,0],[1.601,-0.6]],"v":[[-45.349,14.7],[-47.249,18.5],[-54.349,20.8],[-58.15,18.9],[-56.249,15.1],[-49.15,12.8]],"c":true},"ix":2},"nm":"路径 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[0.641,-1.597],[1.512,0.696],[0,0],[-0.695,1.512],[-1.512,-0.695],[0,0]],"o":[[-0.558,1.542],[0,0],[-1.543,-0.558],[0.558,-1.542],[0,0],[1.543,0.557]],"v":[[-44.187,-14.327],[-48.104,-12.657],[-55.041,-15.347],[-56.712,-19.264],[-52.795,-20.934],[-45.858,-18.244]],"c":true},"ix":2},"nm":"路径 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[1.399,-1],[0.9,1.4],[0,0],[-1.4,0.9],[-0.901,-1.4],[0,0]],"o":[[-1.3,1],[0,0],[-1,-1.3],[1.299,-1],[0,0],[1,1.3]],"v":[[-28.049,-38.5],[-32.249,-39.2],[-36.65,-45.2],[-35.949,-49.4],[-31.749,-48.7],[-27.35,-42.7]],"c":true},"ix":2},"nm":"路径 9","mn":"ADBE Vector Shape - Group","hd":false},{"ind":9,"ty":"sh","ix":10,"ks":{"a":0,"k":{"i":[[1.699,0],[0,1.6],[0,0],[-1.601,0],[0,-1.6],[0,0]],"o":[[-1.7,0],[0,0],[0,-1.7],[1.699,0],[0,0],[0,1.6]],"v":[[-0.049,-47.6],[-3.049,-50.6],[-3.049,-58.1],[-0.049,-61.1],[2.951,-58.1],[2.951,-50.6]],"c":true},"ix":2},"nm":"路径 10","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"合并路径 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929000016755,0.663000009574,0.081999999402,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[58.9,61.35],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":12,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":601,"st":0,"bm":0}],"markers":[]}

injeRecipe/src/color/colors.tsx

@@ -3,6 +3,8 @@ export const Colors ={
      BUTTON_SIGNUP : "#323232",
      FONT_WHITE: "#FFFFFF",
      SEPARATED_LINE : "#E5E5E5",
+     SEPARATED_LINE_TORNUP : "#515151",
+     BACKGROUND_DEFAULT : "#FEFCFC",
 
      REFRIGATOR_AI_BUTTON:"#cb6930",
      SELECTED_ITEM_BACKGROUND : "#ffcc99"

injeRecipe/src/component/Header.tsx

@@ -6,7 +6,7 @@ export function Header(){
 
     const styles = StyleSheet.create({
         container:{
-            height:height*0.07,
+            height:100,
             alignContent:"center",
             alignItems:"center",
             justifyContent:"center",