Commit fc57ce6d authored by Lihinikaduwa D.N.R.  's avatar Lihinikaduwa D.N.R.

Merge branch 'master' of http://gitlab.sliit.lk/21_22-j-38/21_22j-38 into it18257632

parents 274a444d d9baf31b
...@@ -256,4 +256,4 @@ def predict_pronounce(FPFN): ...@@ -256,4 +256,4 @@ def predict_pronounce(FPFN):
if __name__ == "__main__": if __name__ == "__main__":
app.run(host='192.168.1.101') app.run(host='192.168.8.100')
...@@ -12,7 +12,7 @@ def create_con(): ...@@ -12,7 +12,7 @@ def create_con():
database="helply", database="helply",
host="127.0.0.1", host="127.0.0.1",
user="root", user="root",
password="12345678" password="rp19970520"
) )
return db return db
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
"dependencies": { "dependencies": {
"@react-native-async-storage/async-storage": "^1.17.3", "@react-native-async-storage/async-storage": "^1.17.3",
"@react-native-community/netinfo": "^7.1.7", "@react-native-community/netinfo": "^7.1.7",
"@react-native-picker/picker": "^2.4.1",
"@react-native-voice/voice": "^3.2.3", "@react-native-voice/voice": "^3.2.3",
"@react-navigation/drawer": "^6.1.8", "@react-navigation/drawer": "^6.1.8",
"@react-navigation/native": "^6.0.6", "@react-navigation/native": "^6.0.6",
...@@ -3967,6 +3968,18 @@ ...@@ -3967,6 +3968,18 @@
"peerDependencies": { "peerDependencies": {
"react-native": ">=0.59" "react-native": ">=0.59"
} }
<<<<<<< HEAD
},
"node_modules/@react-native-picker/picker": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@react-native-picker/picker/-/picker-2.4.1.tgz",
"integrity": "sha512-1XWy3IQgwr7MWd30KdY1iUh2gQZD+JiotN1ifj/ptFUYKon/0UFwngKQaWCO/CP/FdLl20/huSSLwKedYrdMMA==",
"peerDependencies": {
"react": "16 || 17",
"react-native": ">=0.57"
}
=======
>>>>>>> a7a9d5d3add78ba5f3c20db3f2d330f56f73a488
}, },
"node_modules/@react-native-voice/voice": { "node_modules/@react-native-voice/voice": {
"version": "3.2.3", "version": "3.2.3",
...@@ -18342,6 +18355,15 @@ ...@@ -18342,6 +18355,15 @@
"resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-7.1.12.tgz", "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-7.1.12.tgz",
"integrity": "sha512-fkCRkOgzfdD0sr8JTasDgm716l8bJPkCNjXIyllG8K+UyixVa68lroQmgW9pewE5G5p43I9MWPtGZR/kVowBzg==", "integrity": "sha512-fkCRkOgzfdD0sr8JTasDgm716l8bJPkCNjXIyllG8K+UyixVa68lroQmgW9pewE5G5p43I9MWPtGZR/kVowBzg==",
"requires": {} "requires": {}
<<<<<<< HEAD
},
"@react-native-picker/picker": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@react-native-picker/picker/-/picker-2.4.1.tgz",
"integrity": "sha512-1XWy3IQgwr7MWd30KdY1iUh2gQZD+JiotN1ifj/ptFUYKon/0UFwngKQaWCO/CP/FdLl20/huSSLwKedYrdMMA==",
"requires": {}
=======
>>>>>>> a7a9d5d3add78ba5f3c20db3f2d330f56f73a488
}, },
"@react-native-voice/voice": { "@react-native-voice/voice": {
"version": "3.2.3", "version": "3.2.3",
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"dependencies": { "dependencies": {
"@react-native-async-storage/async-storage": "^1.17.3", "@react-native-async-storage/async-storage": "^1.17.3",
"@react-native-community/netinfo": "^7.1.7", "@react-native-community/netinfo": "^7.1.7",
"@react-native-picker/picker": "^2.4.1",
"@react-native-voice/voice": "^3.2.3", "@react-native-voice/voice": "^3.2.3",
"@react-navigation/drawer": "^6.1.8", "@react-navigation/drawer": "^6.1.8",
"@react-navigation/native": "^6.0.6", "@react-navigation/native": "^6.0.6",
......
export default api = 'http://192.168.8.170:5000' export default api = 'http://192.168.8.100:5000'
\ No newline at end of file \ No newline at end of file
...@@ -469,7 +469,11 @@ const AppRouter = () => { ...@@ -469,7 +469,11 @@ const AppRouter = () => {
component={Sam} component={Sam}
/> />
<Stack.Screen <Stack.Screen
options={{headerShown: false}} options={{
headerShown: true,
headerTintColor: 'white',
headerStyle: {backgroundColor: Colors.secondary},
}}
name="Progress" name="Progress"
component={Progress} component={Progress}
/> />
......
...@@ -51,7 +51,7 @@ export default function Home({ navigation }){ ...@@ -51,7 +51,7 @@ export default function Home({ navigation }){
<View style={styles.imageView}> <View style={styles.imageView}>
<Image <Image
style={styles.image} style={styles.image}
source={require('../assets/color/background.png')} source={require('../assets/color/progress.png')}
resizeMode="contain"></Image> resizeMode="contain"></Image>
<ImageButton path="Progress" title="Progress" /> <ImageButton path="Progress" title="Progress" />
</View> </View>
......
import React, { Component } from 'react' import React, {Component} from 'react';
import { StyleSheet, TouchableOpacity, View, Text, Pressable, SafeAreaView, ScrollView, Image, ImageBackground, Dimensions, Animated, Easing, NativeModules } from 'react-native'; import {
StyleSheet,
TouchableOpacity,
View,
Text,
Pressable,
SafeAreaView,
ScrollView,
Image,
ImageBackground,
Dimensions,
Animated,
Easing,
NativeModules,
Button,
} from 'react-native';
import {useNavigation} from '@react-navigation/native';
export default function Progress(){ export default function Progress() {
return ( const Separator = () => <View style={styles.separator} />;
<View><Text>ddddddd</Text></View> const navigation = useNavigation();
) return (
} <SafeAreaView style={styles.container}>
<View>
<Button
title="Color Activity"
onPress={() =>
navigation.navigate('PrimaryType', {
title: 'Primary Activities',
id: 1,
})
}></Button>
</View>
<Separator />
<View>
<Button title="Reading Activity"></Button>
</View>
<Separator />
<View>
<Button title="Memory Activity"></Button>
</View>
</SafeAreaView>
);
}
const styles = StyleSheet.create({
container: {
flex: 1,
marginVertical: 20,
marginHorizontal: 15,
},
separator: {
marginVertical: 10,
},
});
...@@ -2,6 +2,6 @@ import axios from 'axios'; ...@@ -2,6 +2,6 @@ import axios from 'axios';
// export default axios.create({ baseURL: 'http://192.168.8.102:5000/', timeout: 15000, }); // export default axios.create({ baseURL: 'http://192.168.8.102:5000/', timeout: 15000, });
export default axios.create({ export default axios.create({
baseURL: 'http://192.168.1.101:5000/', baseURL: 'http://192.168.8.100:5000/',
timeout: 15000, timeout: 15000,
}); });
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment