Merge branch 'it18218640' into 'master'

table view update

See merge request !130

API/app.py

@@ -93,7 +93,7 @@ def abc():
 
 
 if __name__ == "__main__":
-    app.run(host='192.168.8.100')
+    app.run(host='192.168.8.101')
     # app.run(host='192.168.8.100,port='5000', debug=True)
     # app.run(debug=True)
 

frontend/src/component/TableList.js

@@ -11,8 +11,8 @@ const CONTENT = {
     ['4 jan 2022', '2s', 'White', 'Good'],
     ['5 jan 2022', '2s', 'Blue', 'Good'],
     ['6 jan 2022', '2s', 'Yellow', 'Good'],
-
-
+    
+    
   ],
 };
 
@@ -45,7 +45,7 @@ export default function App() {
 
 const styles = StyleSheet.create({
   container: { flex: 0, paddingTop: 20, paddingLeft: 60, paddingRight: 60, marginTop: 0, },
-  head: { height: 60, },
+  head: { height: 60,},
   wrapper: { flexDirection: 'row' },
   title: { flex: 1, },
   row: { height: 40 },

frontend/src/screen/Color.js

@@ -82,7 +82,7 @@ export default function Color() {
                 </View>
                 <View style={{ marginTop: 20, marginBottom: 40 }}>
                     <TouchableOpacity onPress={() => { navigation.navigate("ColorResult") }}
-                        style={styles.card}>
+                        style={styles.card3}>
 
                         <View style={[{ flexDirection: "row" }]}>
 
@@ -141,7 +141,7 @@ const styles = StyleSheet.create({
     },
     card : {
         borderWidth: 5,
-        borderColor: "lightblue",
+        borderColor: "purple",
         marginVertical: 20,
         backgroundColor: "#FFD700",
         paddingVertical: 8,
@@ -176,6 +176,24 @@ const styles = StyleSheet.create({
         },
         shadowOpacity: 0.3,
         shadowRadius: 1.5,
+    },card3 : {
+        borderWidth: 5,
+        borderColor: "lightblue",
+        marginVertical: 20,
+        backgroundColor: "purple",
+        paddingVertical: 8,
+        paddingHorizontal: 15,
+        padding: 15,
+        width: 380,
+        marginHorizontal: 20,
+        borderRadius: 30,
+        shadowColor: "#000",
+        shadowOffset: {
+            width: 2,
+            height: 2
+        },
+        shadowOpacity: 0.3,
+        shadowRadius: 1.5,
     },cardTitle: {
         fontWeight: "bold",
         color: "white",

frontend/src/screen/client/Client.js

 import axios from 'axios';
 
-export default axios.create({ baseURL: 'http://192.168.8.100:5000/',timeout: 15000, });
+export default axios.create({ baseURL: 'http://192.168.8.101:5000/',timeout: 15000, });
\ No newline at end of file

frontend/src/screen/result/ColorResult.js

 import React, { useEffect, useState } from "react";
-import { StyleSheet, View, Text, ScrollView, Pressable, ImageBackground, TouchableOpacity, Image, StatusBar } from 'react-native';
+import { StyleSheet, View, Text, Pressable, ImageBackground, TouchableOpacity, Image, ScrollView, StatusBar } from 'react-native';
 import { SafeAreaView } from "react-native-safe-area-context";
 
 import Orientation from 'react-native-orientation-locker';
@@ -11,7 +11,6 @@ import axios from "axios";
 
 const webUrel = "http://192.168.8.100:5000/getColorActivitiesResult";
 
-
 export default function ColorResult() {
 
     const navigation = useNavigation();
@@ -58,8 +57,8 @@ export default function ColorResult() {
                             source={require("../../assets/result/title.png")}
                         />
                     </View>
-                    <View style={{ marginTop: -90 }}>
-                        {/* <TableList /> */}
+                    <View style={{ marginTop: -70 }}>
+                        <TableList />
                     </View>
                 </ImageBackground>
             </View>
@@ -76,7 +75,7 @@ const styles = StyleSheet.create({
     },
     container: {
         // backgroundColor : '#fff',
-        marginTop: -220,
+        marginTop: -130,
         justifyContent: 'center',
         alignItems: 'center',
     },