From 8c445b2a52b1d9063be55d09cf4932868487c6ba Mon Sep 17 00:00:00 2001
From: caileanhtuan <connorcai180@gmail.com>
Date: Thu, 4 Apr 2024 19:25:25 -0400
Subject: [PATCH] feat: change user flow

---
 App.tsx                                       | 52 +++++++++----------
 src/requests.ts                               |  2 +
 src/screens/Game/ExercisesCompleted.tsx       |  9 +++-
 src/screens/Game/MathMain/MathMain.tsx        |  4 +-
 .../Game/SectionSummary/SectionSummary.tsx    | 21 ++++++++
 src/screens/Stacks/gameDescriptions.ts        | 14 ++---
 src/screens/Stacks/generalDescriptions.ts     | 10 ++--
 src/types.ts                                  |  6 ++-
 8 files changed, 77 insertions(+), 41 deletions(-)
 create mode 100644 src/screens/Game/SectionSummary/SectionSummary.tsx

diff --git a/App.tsx b/App.tsx
index b742d8b3..4ed5b58f 100644
--- a/App.tsx
+++ b/App.tsx
@@ -35,31 +35,31 @@ export default function App() {
     <Provider store={store}>
       <PersistGate persistor={persistor} loading={null}>
         <SafeAreaProvider>
-          <AuthGuard>
-            <NavigationContainerWithTracking>
-              <Stack.Navigator
-                // Consistent styling across all stacked screens
-                screenOptions={{
-                  headerBackTitleVisible: false,
-                  gestureEnabled: false,
-                  headerTintColor: "black",
-                  headerLeft: null,
-                  headerStyle: {
-                    backgroundColor: "white",
-                  },
-                  headerTitleStyle: {
-                    fontWeight: "bold",
-                    fontSize: 22,
-                    color: "black",
-                  },
-                  headerTitleAlign: "center",
-                  animation: "fade",
-                }}
-              >
-                {MergedStacks}
-              </Stack.Navigator>
-            </NavigationContainerWithTracking>
-          </AuthGuard>
+          {/* <AuthGuard> */}
+          <NavigationContainerWithTracking>
+            <Stack.Navigator
+              // Consistent styling across all stacked screens
+              screenOptions={{
+                headerBackTitleVisible: false,
+                gestureEnabled: false,
+                headerTintColor: "black",
+                headerLeft: null,
+                headerStyle: {
+                  backgroundColor: "white",
+                },
+                headerTitleStyle: {
+                  fontWeight: "bold",
+                  fontSize: 22,
+                  color: "black",
+                },
+                headerTitleAlign: "center",
+                animation: "fade",
+              }}
+            >
+              {MergedStacks}
+            </Stack.Navigator>
+          </NavigationContainerWithTracking>
+          {/* </AuthGuard> */}
         </SafeAreaProvider>
       </PersistGate>
     </Provider>
@@ -75,5 +75,5 @@ axios.interceptors.request.use(
     // Do something with request error
     logAxiosError(error);
     return Promise.reject(error);
-  },
+  }
 );
diff --git a/src/requests.ts b/src/requests.ts
index fb1749b4..86a01c4f 100644
--- a/src/requests.ts
+++ b/src/requests.ts
@@ -60,10 +60,12 @@ export async function internalRequest<T>({
     });
 
     if (response.data.success === false) {
+      console.log("Error1:", response.data.message);
       throw new Error(`Unable to connect to API: ${response.data.message}`);
     }
     return response.data.payload;
   } catch (e) {
+    console.log("Error2:", e);
     throw new Error(`Unable to connect to API: ${e}`);
   }
 }
diff --git a/src/screens/Game/ExercisesCompleted.tsx b/src/screens/Game/ExercisesCompleted.tsx
index 71d82459..d94d4f74 100644
--- a/src/screens/Game/ExercisesCompleted.tsx
+++ b/src/screens/Game/ExercisesCompleted.tsx
@@ -8,6 +8,7 @@ import Text from "../../components/Text";
 import useAsyncStorage from "../../hooks/useAsyncStorage";
 import { RootStackParamList, SoundSetting, Settings } from "../../types";
 import useSound from "../../hooks/useSound";
+import { GameTypes } from "../../types";
 
 const sound = require("../../assets/congrats.mp3") as AVPlaybackSource;
 
@@ -40,7 +41,7 @@ type Props = NativeStackScreenProps<RootStackParamList, "ExercisesCompleted">;
 function ExercisesCompleted({ navigation }: Props) {
   const { storageValue: settings } = useAsyncStorage<Settings>("SETTINGS");
   const { unloadSound } = useSound(sound, SoundSetting.voiceOverOn);
-
+  const gameCompleted = "Math";
   const correct = 1;
   const total = 1;
 
@@ -73,6 +74,12 @@ function ExercisesCompleted({ navigation }: Props) {
             navigation.navigate("ExtraPractice");
           }}
         />
+        <Button
+          title="To Section Summary"
+          onPress={() => {
+            navigation.navigate("SectionSummary");
+          }}
+        />
       </View>
     </View>
   );
diff --git a/src/screens/Game/MathMain/MathMain.tsx b/src/screens/Game/MathMain/MathMain.tsx
index f52a552a..3c5f6237 100644
--- a/src/screens/Game/MathMain/MathMain.tsx
+++ b/src/screens/Game/MathMain/MathMain.tsx
@@ -39,7 +39,7 @@ function MathMain({ route, navigation }: Props) {
           remainingTimeRef.current.getRemainingTime();
       }, waitSeconds * 1000);
     },
-    [getNewProblem, remainingTimeRef],
+    [getNewProblem, remainingTimeRef]
   );
 
   const onPressChoice = (choiceValue: number) => {
@@ -47,7 +47,7 @@ function MathMain({ route, navigation }: Props) {
     updateStatsOnAnswer(
       isCorrect,
       prevProblemRemainingTimeRef.current -
-        remainingTimeRef.current.getRemainingTime(),
+        remainingTimeRef.current.getRemainingTime()
     );
     if (isCorrect) {
       Toast.show({
diff --git a/src/screens/Game/SectionSummary/SectionSummary.tsx b/src/screens/Game/SectionSummary/SectionSummary.tsx
new file mode 100644
index 00000000..33d16e58
--- /dev/null
+++ b/src/screens/Game/SectionSummary/SectionSummary.tsx
@@ -0,0 +1,21 @@
+import { View } from "react-native";
+import Text from "../../../components/Text";
+import Button from "../../../components/Button";
+import { NativeStackScreenProps } from "@react-navigation/native-stack";
+import { RootStackParamList, GameTypes } from "../../../types";
+
+type Props = NativeStackScreenProps<RootStackParamList, "ExercisesCompleted">;
+
+export default function SectionSummary({ navigation, route }: Props) {
+  return (
+    <View>
+      <Text>Section Summary</Text>
+      <Button
+        title="Return to Home"
+        onPress={() => {
+          navigation.navigate("HomeScreen");
+        }}
+      />
+    </View>
+  );
+}
diff --git a/src/screens/Stacks/gameDescriptions.ts b/src/screens/Stacks/gameDescriptions.ts
index 3ffb7b16..e8786232 100644
--- a/src/screens/Stacks/gameDescriptions.ts
+++ b/src/screens/Stacks/gameDescriptions.ts
@@ -16,7 +16,7 @@ const triviaImage = require("../../assets/Trivia_Icon.png") as AVPlaybackSource;
 const gameDescriptions: GameDescriptions = {
   Math: {
     title: "Math",
-    minutes: 5,
+    minutes: 0.1,
     intro: {
       name: "MathIntro",
       sound: mathSound,
@@ -27,12 +27,12 @@ const gameDescriptions: GameDescriptions = {
     },
     game: {
       name: "MathMain",
-      nextScreenArgs: ["ReadingIntro"],
+      nextScreenArgs: ["ExercisesCompleted"],
     },
   },
   Reading: {
     title: "Reading",
-    minutes: 5,
+    minutes: 0.1,
     intro: {
       name: "ReadingIntro",
       sound: readingSound,
@@ -43,12 +43,12 @@ const gameDescriptions: GameDescriptions = {
     },
     game: {
       name: "ReadingMain",
-      nextScreenArgs: ["WritingIntro"],
+      nextScreenArgs: ["ExercisesCompleted"],
     },
   },
   Writing: {
     title: "Writing",
-    minutes: 5,
+    minutes: 0.1,
     intro: {
       name: "WritingIntro",
       sound: writingSound,
@@ -59,12 +59,12 @@ const gameDescriptions: GameDescriptions = {
     },
     game: {
       name: "WritingMain",
-      nextScreenArgs: ["TriviaIntro"],
+      nextScreenArgs: ["ExercisesCompleted"],
     },
   },
   Trivia: {
     title: "Writing (Trivia)",
-    minutes: 5,
+    minutes: 0.1,
     intro: {
       name: "TriviaIntro",
       sound: triviaSound,
diff --git a/src/screens/Stacks/generalDescriptions.ts b/src/screens/Stacks/generalDescriptions.ts
index a61b94e8..d6418d3f 100644
--- a/src/screens/Stacks/generalDescriptions.ts
+++ b/src/screens/Stacks/generalDescriptions.ts
@@ -3,6 +3,7 @@ import GameOverview from "../Game/GameOverview";
 import ExtraPractice from "../Game/ExtraPractice";
 import ExercisesCompleted from "../Game/ExercisesCompleted";
 import Pause from "../Game/Pause";
+import SectionSummary from "../Game/SectionSummary/SectionSummary"
 import HomeScreen from "../Home/HomeScreen";
 
 const generalDescriptions: ScreenDescription[] = [
@@ -30,10 +31,11 @@ const generalDescriptions: ScreenDescription[] = [
     title: "Exercises done!",
   },
   {
-    name: "ExtraPractice",
-    component: ExtraPractice,
-    title: "More Exercises",
-  },
+    name: "SectionSummary",
+    component: SectionSummary,
+    title: "Section Summary",
+  }
+
 ];
 
 export default generalDescriptions;
diff --git a/src/types.ts b/src/types.ts
index c058f211..9c302159 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -162,7 +162,11 @@ export type RootStackParamList = {
   TriviaIntro: { nextScreenArgs: NavigationArgs } | undefined;
   TriviaMain: { nextScreenArgs: NavigationArgs } | undefined;
   Pause: undefined;
-  ExercisesCompleted: undefined;
+  ExercisesCompleted: {nextScreenArgs: NavigationArgs} | undefined;
+  SectionSummary:{nextScreenArgs: NavigationArgs} | undefined;
+  // SectionSummary: {gameCompleted: string};
+  // SectionSummary:{gameCompleted: GameTypes} | undefined;
+
   ExtraPractice: undefined;
   SettingsScreen: undefined;
   TimePicker: undefined;