Merge branch 'it18218640' into 'master'

some change

See merge request !76

frontend/src/router/router.js

@@ -15,7 +15,7 @@ const Stack = createNativeStackNavigator();
 const AppRouter = () => {
   return (
     <NavigationContainer>
-      <Stack.Navigator initialRouteName="Start">
+      <Stack.Navigator initialRouteName="Splash">
         <Stack.Screen
           options={{headerShown: false}}
           name="Home"

frontend/src/screen/Color.js

@@ -20,7 +20,7 @@ export default function Color(){
           .get(webUrel)
           .then((response) => {
             setData(response.data);
-            console.log(response.data);
+            // console.log(response.data);
           })
           .catch((err) => {
             setNotify({

frontend/src/screen/home.js

@@ -10,27 +10,34 @@ export default function Home({ navigation }){
 
     return (
       <SafeAreaView>
-        <ScrollView>
-          <View style={styles.imageContainer}>
-            <View style={styles.imageView}>
-              <Image
-                style={styles.image}
-                source={require('../assets/color/background.png')}
-                resizeMode="contain"></Image>
-              <ImageButton path="Color" title="Color Activity" />
-            </View>
+      <ScrollView>
+        <View style={styles.imageContainer}>
+          <View style={styles.imageView}>
+            <Image
+              style={styles.image}
+              source={require('../assets/color/background.png')}
+              resizeMode="contain"></Image>
+            <ImageButton path="Color" title="Color Activity" />
           </View>
-          <View style={styles.imageContainer}>
-            <View style={styles.imageView}>
-              <Image
-                style={styles.image}
-                source={require('../assets/color/background.png')}
-                resizeMode="contain"></Image>
-              <ImageButton path="Read" title="Read Activity" />
-            </View>
+          <View style={styles.imageView}>
+            <Image
+              style={styles.image}
+              source={require('../assets/color/background.png')}
+              resizeMode="contain"></Image>
+            <ImageButton path="Read" title="Read Activity" />
           </View>
-        </ScrollView>
-      </SafeAreaView>
+        </View>
+        <View style={styles.imageContainer}>
+          <View style={styles.imageView}>
+            <Image
+              style={styles.image}
+              source={require('../assets/color/background.png')}
+              resizeMode="contain"></Image>
+            <ImageButton path="Progress" title="Progress Chack" />
+          </View>
+        </View>
+      </ScrollView>
+    </SafeAreaView>
     );
 
 }