Skip to content

21_22-J 38
21_22-J 38
Commit 2464f719 authored by W.D.R.P. Sandeepa's avatar W.D.R.P. Sandeepa
Browse files
Options

Merge branch 'it18218640' into 'master' 

change interface

See merge request !150
parents 9e962933 c4e6e5ed
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
API/app.py
View file @ 2464f719
......@@ -170,6 +170,6 @@ def login():
return make_response(body)
if __name__ == "__main__":
app.run(host='192.168.8.100')
app.run(host='192.168.8.101')
# app.run(host='192.168.8.102')
# app.run(debug=True)
\ No newline at end of file
frontend/src/screen/activity/Black.js
View file @ 2464f719
......@@ -149,15 +149,15 @@ export default function Black() {
<View style={{}}>
<TouchableOpacity onPress={startRecording}
style={{ width: "30%", height: "40%", borderRadius: 50 }}>
style={{ width: "30%", height: "35%", borderRadius: 50 }}>
<Image source={require('../../assets/game/mic2.png')} resizeMode='contain' style={{ flex: 1, marginLeft: -190 }} />
</TouchableOpacity>
</View>
<View style={{ marginLeft: -100 }}>
<View style={{ marginLeft: -100, marginTop:-15 }}>
<TouchableOpacity onPress={() => { }}
style={{ width: "60%", height: "40%", borderRadius: 50 }}>
<Image source={require('../../assets/game/next.png')} resizeMode='contain' style={{ flex: .9, marginLeft: -90 }} />
style={{ width: "60%", height: "50%", borderRadius: 50 }}>
<Image source={require('../../assets/game/finish.png')} resizeMode='contain' style={{ flex: .9, marginLeft: -150 }} />
</TouchableOpacity>
</View>
......
frontend/src/screen/activity/Green.js
View file @ 2464f719
......@@ -134,7 +134,7 @@ export default function Green() {
<View>
<Image style={styles.blackboard} source={require("../../assets/game/blackboard.png")}></Image>
<Image style={styles.blackboard} source={require("../../assets/game/back2.png")}></Image>
<View style={{ width: 180, height: 180, backgroundColor: backColor, marginTop: -370, marginLeft: 455, borderRadius: 100 }}>
</View>
......
frontend/src/screen/activity/PrimaryType.js
View file @ 2464f719
......@@ -88,7 +88,7 @@ export default function PrimaryType(title) {
<View style={[{ flexDirection: "row" }]}>
<View style={styles.cardImage}>
<Image source={require("../../assets/login/bb.jpg")}
<Image source={require("../../assets/color/red.jpg")}
style={{ width: 100, height: 100, borderRadius: 30 }}></Image>
</View>
......@@ -140,7 +140,7 @@ export default function PrimaryType(title) {
<View style={[{ flexDirection: "row" }]}>
<View style={styles.cardImage}>
<Image source={require("../../assets/login/bb.jpg")}
<Image source={require("../../assets/color/green.jpg")}
style={{ width: 100, height: 100, borderRadius: 30 }}></Image>
</View>
......@@ -193,7 +193,7 @@ export default function PrimaryType(title) {
<View style={[{ flexDirection: "row" }]}>
<View style={styles.cardImage}>
<Image source={require("../../assets/login/bb.jpg")}
<Image source={require("../../assets/color/black.jpg")}
style={{ width: 100, height: 100, borderRadius: 30 }}></Image>
</View>
......
frontend/src/screen/activity/SecondaryType.js
View file @ 2464f719
......@@ -84,14 +84,14 @@ export default function SecondaryType(title) {
<View style={[{ flexDirection: "row" }]}>
<View style={styles.cardImage}>
<Image source={require("../../assets/login/bb.jpg")}
<Image source={require("../../assets/color/yellow.png")}
style={{ width: 100, height: 100, borderRadius: 30 }}></Image>
</View>
<View style={{ flex: 0.6 }}>
{/* <Text style={styles.cardDescription}>{id}</Text> */}
<Text style={styles.cardTitle}>Red Color</Text>
<Text style={styles.cardLocation}>Primary Activity</Text>
<Text style={styles.cardTitle}>Yellow Color</Text>
<Text style={styles.cardLocation}>Secondary Activity</Text>
<View
style={{
marginLeft: 10,
......@@ -136,14 +136,14 @@ export default function SecondaryType(title) {
<View style={[{ flexDirection: "row" }]}>
<View style={styles.cardImage}>
<Image source={require("../../assets/login/bb.jpg")}
<Image source={require("../../assets/color/blue.jpg")}
style={{ width: 100, height: 100, borderRadius: 30 }}></Image>
</View>
<View style={{ flex: 0.6 }}>
{/* <Text style={styles.cardDescription}>{id}</Text> */}
<Text style={styles.cardTitle}>Red Color</Text>
<Text style={styles.cardLocation}>Primary Activity</Text>
<Text style={styles.cardTitle}>Blue Color</Text>
<Text style={styles.cardLocation}>Secondary Activity</Text>
<View
style={{
marginLeft: 10,
......@@ -188,14 +188,14 @@ export default function SecondaryType(title) {
<View style={[{ flexDirection: "row" }]}>
<View style={styles.cardImage}>
<Image source={require("../../assets/login/bb.jpg")}
<Image source={require("../../assets/color/white.jpg")}
style={{ width: 100, height: 100, borderRadius: 30 }}></Image>
</View>
<View style={{ flex: 0.6 }}>
{/* <Text style={styles.cardDescription}>{id}</Text> */}
<Text style={styles.cardTitle}>Red Color</Text>
<Text style={styles.cardLocation}>Primary Activity</Text>
<Text style={styles.cardTitle}>White Color</Text>
<Text style={styles.cardLocation}>Secondary Activity</Text>
<View
style={{
marginLeft: 10,
......
frontend/src/screen/activity/White.js
View file @ 2464f719
......@@ -149,15 +149,15 @@ export default function White() {
<View style={{}}>
<TouchableOpacity onPress={startRecording}
style={{ width: "30%", height: "40%", borderRadius: 50 }}>
style={{ width: "30%", height: "35%", borderRadius: 50 }}>
<Image source={require('../../assets/game/mic2.png')} resizeMode='contain' style={{ flex: 1, marginLeft: -190 }} />
</TouchableOpacity>
</View>
<View style={{ marginLeft: -100 }}>
<View style={{ marginLeft: -100, marginTop:-15 }}>
<TouchableOpacity onPress={() => { }}
style={{ width: "60%", height: "40%", borderRadius: 50 }}>
<Image source={require('../../assets/game/next.png')} resizeMode='contain' style={{ flex: .9, marginLeft: -90 }} />
style={{ width: "60%", height: "50%", borderRadius: 50 }}>
<Image source={require('../../assets/game/finish.png')} resizeMode='contain' style={{ flex: .9, marginLeft: -150, }} />
</TouchableOpacity>
</View>
......
frontend/src/screen/client/Client.js
View file @ 2464f719
......@@ -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.100:5000/',
baseURL: 'http://192.168.8.101:5000/',
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