Subindo redux para armazenamento do estado de datas

DevsDomain · Nov 3, 2024 · ef03804 · ef03804
1 parent 71f49b3
commit ef03804
Show file tree

Hide file tree

Showing 16 changed files with 206 additions and 178 deletions.
diff --git a/frontend/App.tsx b/frontend/App.tsx
@@ -3,8 +3,9 @@ import React, { useEffect } from "react";
 import * as SplashScreen from "expo-splash-screen";
 import { useFonts, Signika_400Regular } from "@expo-google-fonts/signika";
 import { UserProvider } from "./src/context/userContext";
-import { DateProvider } from "./src/context/dateContext";
 import { PaperProvider } from "react-native-paper";
+import {Provider} from 'react-redux'
+import { store } from "./src/store/store";
 SplashScreen.preventAutoHideAsync(); // Manter a splash screen até as fontes serem carregadas
 
 export default function App() {
@@ -25,11 +26,11 @@ export default function App() {
   }
   return (
     <PaperProvider>
+      <Provider store={store}>
       <UserProvider>
-        <DateProvider>
           <Routes />
-        </DateProvider>
       </UserProvider>
+      </Provider>
     </PaperProvider>
 
   )

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -20,6 +20,7 @@
     "@react-navigation/native": "^6.1.18",
     "@react-navigation/native-stack": "^6.11.0",
     "@react-navigation/stack": "^6.4.1",
+    "@reduxjs/toolkit": "^2.3.0",
     "@types/react-native": "^0.73.0",
     "axios": "^1.7.7",
     "cors": "^2.8.5",
@@ -45,7 +46,8 @@
     "react-native-svg": "^15.7.1",
     "react-native-svg-circular-progress": "^1.0.4",
     "react-native-vector-icons": "^10.2.0",
-    "react-native-web": "~0.19.10"
+    "react-native-web": "~0.19.10",
+    "react-redux": "^9.1.2"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

diff --git a/frontend/src/context/dateContext.tsx b/frontend/src/context/dateContext.tsx
diff --git a/frontend/src/dateSlice.ts b/frontend/src/dateSlice.ts
@@ -0,0 +1,17 @@
+import { createSlice } from '@reduxjs/toolkit';
+import moment from 'moment';
+
+export const dateSlice = createSlice({
+    name: 'date',
+    initialState: {
+        value: moment.utc().format("YYYY-MM-DD"),
+    },
+    reducers: {
+        setNewDate: (state, action) => { state.value = action.payload }
+    },
+});
+
+export const { setNewDate } = dateSlice.actions;
+export const selectDate = (state: any) => state.date.value;
+
+export default dateSlice.reducer;
diff --git a/frontend/src/routes/index.tsx b/frontend/src/routes/index.tsx
@@ -1,6 +1,5 @@
 import StackRoutes from "./stack.routes";
 import { NavigationContainer } from "@react-navigation/native";
-import TabRoutes from "./tab.routes";
 import { UserContext } from "../context/userContext";
 import { useContext } from "react";
 import AuthRoutes from "./auth.routes";

diff --git a/frontend/src/routes/stack.routes.tsx b/frontend/src/routes/stack.routes.tsx
@@ -18,7 +18,6 @@ import React from "react";
 import ProductDetailsScreenPG from "../screens/ProductPG";
 import AlimentosConsumidosScreen from "../screens/AlimentosConsumidosScreen";
 import SelectRefeicao from "../screens/SelectRefeicao";
-import Main from "../screens/HomeScreen";
 import { IuserLogin } from "../types/user";
 
 const Stack = createStackNavigator();
@@ -27,14 +26,14 @@ export default function StackRoutes() {
   const [isOnboardingCompleted, setIsOnboardingCompleted] = useState<
     null | boolean
   >(null);
-  const [user,setUser] = useState<IuserLogin>();
+  const [user, setUser] = useState<IuserLogin>();
 
   useEffect(() => {
     const checkOnboardingStatus = async () => {
       const completed = await AsyncStorage.getItem("onboardingCompleted");
       setIsOnboardingCompleted(completed === "true");
 
-      const userData = await AsyncStorage.getItem("user"); 
+      const userData = await AsyncStorage.getItem("user");
       setUser(userData ? JSON.parse(userData) : null);
     };
 
@@ -46,40 +45,17 @@ export default function StackRoutes() {
   }
 
   return (
-    <Stack.Navigator
-      initialRouteName={isOnboardingCompleted ? "Main" : "Onboarding"}
-      screenOptions={({ navigation, route }) => ({
-        headerShown: !(route.name === "Onboarding"),
-        headerLeft:
-          route.name === "Main"
-            ? () => (
-                <TouchableOpacity
-                  onPress={() => navigation.goBack()}
-                  style={{
-                    flexDirection: "row",
-                    alignItems: "center",
-                    marginLeft: 10,
-                  }}
-                >
-                  <Ionicons name="arrow-back" size={24} color="black" />
-                  <Text style={{ marginLeft: 5, fontSize: 18 }}>Voltar</Text>
-                </TouchableOpacity>
-              )
-            : undefined,
-      })}
-    >
-      {!isOnboardingCompleted && (
-        <Stack.Screen
-          name="Onboarding"
-          component={TabRoutes}
-          options={{ headerShown: false }}
-        />
-      )}
-
-
-
-
-<Stack.Screen
+    <Stack.Navigator>
+
+      <Stack.Screen
+        name="Main"
+        component={TabRoutes}
+        options={{ headerShown: false }}
+      />
+
+
+
+      <Stack.Screen
         name="SelectRefeicao"
         component={SelectRefeicao}
         options={{
@@ -160,7 +136,7 @@ export default function StackRoutes() {
           },
         }}
       />
-   <Stack.Screen
+      <Stack.Screen
         name="AlimentosConsumidosScreen"
         component={AlimentosConsumidosScreen}
         options={{
@@ -173,7 +149,7 @@ export default function StackRoutes() {
             color: "#000000", // Cor do título, ajustada para melhor contraste com o fundo
           },
         }}
-      />  
+      />
       <Stack.Screen
         name="termsOfUse"
         component={TermsOfUse}
@@ -194,10 +170,10 @@ export default function StackRoutes() {
         }}
       />
 
-      <Stack.Screen 
-      name="ProfileScreen" 
-      component={ProfileScreen}
-      options={{
+      <Stack.Screen
+        name="ProfileScreen"
+        component={ProfileScreen}
+        options={{
           headerShown: false,
           title: "Profile",
           headerStyle: {
@@ -206,7 +182,7 @@ export default function StackRoutes() {
           headerTitleStyle: {
             color: "#000000", // Cor do título, ajustada para melhor contraste com o fundo
           },
-        }}/>
+        }} />