Merge branch 'it18227314' into 'master'

New Progress

See merge request !177

frontend/src/router/router.js

@@ -42,6 +42,7 @@ import GameScreenSixAll from '../screen/memory/elementry/GameScreenSixAll';
 import GameOverScreen from '../screen/memory/GameOverScreen';
 
 import Sam from '../screen/sample/sam';
+import Progress from '../screen/Progress';
 
 const Stack = createNativeStackNavigator();
 
@@ -261,6 +262,11 @@ const AppRouter = () => {
           name="Sam"
           component={Sam}
         />
+        <Stack.Screen
+          options={{headerShown: false}}
+          name="Progress"
+          component={Progress}
+        />
       </Stack.Navigator>
     </NavigationContainer>
   );

frontend/src/screen/Home.js

@@ -53,7 +53,7 @@ export default function Home({ navigation }){
                 style={styles.image}
                 source={require('../assets/color/background.png')}
                 resizeMode="contain"></Image>
-              <ImageButton path="Progress" title="Progress Check" />
+              <ImageButton path="Progress" title="Progress" />
             </View>
             {/* <View style={styles.imageView}>
               <Image

frontend/src/screen/Progress.js

+import React, { Component } from 'react'
+import { StyleSheet, TouchableOpacity, View, Text, Pressable, SafeAreaView, ScrollView, Image, ImageBackground, Dimensions, Animated, Easing, NativeModules } from 'react-native';
+
+export default function Progress(){
+    return (
+      <View><Text>ddddddd</Text></View>
+    )
+  }

package-lock.json

+{
+  "name": "21_22j-38",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {}
+}