Skip to content

21_22-J 38
21_22-J 38
Commit 83a82e11 authored by Neranga K.T.'s avatar Neranga K.T.
Browse files
Options

Merge branch 'it18256888' into 'master' 

It18256888

See merge request !186
parents a707a954 cee1bb44
Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 54 deletions
frontend/package-lock.json
View file @ 83a82e11
{ {
"name": "firstapp", "name": "firstapp",
"version": "0.0.1", "version": "0.0.1",
"lockfileVersion": 2, "lockfileVersion": 1,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
...@@ -22513,14 +22513,6 @@ ...@@ -22513,14 +22513,6 @@
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY="
}, },
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
},
"string-hash-64": { "string-hash-64": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/string-hash-64/-/string-hash-64-1.0.3.tgz", "resolved": "https://registry.npmjs.org/string-hash-64/-/string-hash-64-1.0.3.tgz",
...@@ -22600,6 +22592,14 @@ ...@@ -22600,6 +22592,14 @@
"define-properties": "^1.1.3" "define-properties": "^1.1.3"
} }
}, },
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
},
"strip-ansi": { "strip-ansi": {
"version": "6.0.1", "version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
......
frontend/src/component/memory/MainButton.js 0 → 100644
View file @ 83a82e11
import React from 'react'
import {StyleSheet, View, Text, TouchableOpacity} from 'react-native'
import Colors from '../../constants/Colors'
const MainButton = (props) => {
return(
<TouchableOpacity onPress={props.onPress}>
<View style={{...styles.button, ...props.styles}}>
<Text style={styles.buttonText}>{props.children}</Text>
</View>
</TouchableOpacity>
);
};
const styles = StyleSheet.create({
button: {
backgroundColor: Colors.primary,
paddingVertical: 30,
paddingHorizontal: 30,
borderRadius: 25,
marginBottom: 20
},
buttonText: {
color: 'white',
fontSize: 30,
fontWeight: 'bold',
textAlign: 'center'
}
});
export default MainButton;
\ No newline at end of file
frontend/src/constants/Countdown.js
View file @ 83a82e11
export default { export default {
elementry: 7, elementry: 2,
medium: 5, medium: 5,
advance: 2 advance: 2
} }
\ No newline at end of file
frontend/src/router/router.js
View file @ 83a82e11
...@@ -7,7 +7,7 @@ import Home from '../screen/Home'; ...@@ -7,7 +7,7 @@ import Home from '../screen/Home';
import Start from '../screen/Start'; import Start from '../screen/Start';
import Register from '../screen/auth/Register'; import Register from '../screen/auth/Register';
import Login from '../screen/auth/Login'; import Login from '../screen/auth/Login';
import Splash from '../screen/splash/Splash'; import Splash from '../screen/splash/splash';
import Color from '../screen/Color'; import Color from '../screen/Color';
import Blue from '../screen/activity/Blue'; import Blue from '../screen/activity/Blue';
import Blue2 from '../screen/activity/Blue2'; import Blue2 from '../screen/activity/Blue2';
......
frontend/src/screen/memory/GameLevel.js
View file @ 83a82e11
import { Center, Column, Row } from 'native-base'; import { Center, Column, Row } from 'native-base';
import React from 'react'; import React, {useState} from 'react';
import {Text, View, StyleSheet, Button} from 'react-native'; import {Text, View, StyleSheet, Button, ScrollView, Image,ImageBackground, TouchableOpacity, Modal, Alert, Pressable} from 'react-native';
import MainButton from '../../component/memory/MainButton';
const GameLevel = ({navigation}) => { const GameLevel = ({navigation}) => {
const [modalVisible, setModalVisible] = useState(false);
const [mediumModalVisible, setMediumModalVisible] = useState(false);
return ( return (
<View style={styles.screen} > <ScrollView>
<View style={styles.levelWrapper}> <Modal
<View style={styles.levelContainer}> animationType="slide"
<Button style={styles.btn} title='Elementry' onPress={()=>{navigation.navigate('StartGameScreen')}} /> transparent={true}
<Button style={styles.btn} title='Medium' onPress={()=>{navigation.navigate('MediumLevelStart')}} /> visible={modalVisible}
<Button style={styles.btn} title='Advance' onPress={()=>{navigation.navigate('AdvanceLevelStart')}} /> onRequestClose={() => {
</View> Alert.alert("Modal has been closed.");
setModalVisible(!modalVisible);
}}
>
<View style={styles.centeredView}>
<View style={styles.modalView}>
<Text style={styles.modalText}>Please select matching images</Text>
<View style={{ flexDirection: 'row' }} >
<Pressable
style={[styles.button, styles.buttonClose]}
onPress={() => {setModalVisible(!modalVisible); navigation.navigate('GameScreenOne'); }}
>
<Text style={styles.textStyle}>Start</Text>
</Pressable>
<Pressable
style={[styles.button, styles.buttonClose]}
onPress={() => {setModalVisible(!modalVisible)}}
>
<Text style={styles.textStyle}>Cancel</Text>
</Pressable>
</View> </View>
</View>
</View> </View>
</Modal>
<Modal
animationType="slide"
transparent={true}
visible={mediumModalVisible}
onRequestClose={() => {
Alert.alert("Modal has been closed.");
setModalVisible(!mediumModalVisible);
}}
>
<View style={styles.centeredView}>
<View style={styles.modalView}>
<Text style={styles.modalText}>Please select matching images</Text>
<View style={{ flexDirection: 'row' }} >
<Pressable
style={[styles.button, styles.buttonClose]}
onPress={() => {setModalVisible(!mediumModalVisible); navigation.navigate('MediumGameScreenOne'); }}
>
<Text style={styles.textStyle}>Start</Text>
</Pressable>
<Pressable
style={[styles.button, styles.buttonClose]}
onPress={() => {setModalVisible(!mediumModalVisible)}}
>
<Text style={styles.textStyle}>Cancel</Text>
</Pressable>
</View>
</View>
</View>
</Modal>
<View style={{ marginBottom: 20 }}>
<View style={styles.gameItemRow}>
<ImageBackground source={{ uri: 'https://cdn.pixabay.com/photo/2014/09/21/21/31/flowers-455591_960_720.jpg' }}
style={styles.image}>
{/* <Text style={styles.title}>Play Memo</Text> */}
<View style={styles.titleContainer}>
<Text style={styles.title} numberOfLines={1}>Play Memo</Text>
</View>
</ImageBackground>
</View>
</View>
<View style={styles.screen} >
<MainButton styles={styles.elementryBtn} onPress={() => setModalVisible(true)}>
Elementry
</MainButton>
<MainButton styles={styles.mediumBtn} onPress={()=>{setMediumModalVisible(true)}}>
{/* navigation.navigate('MediumLevelStart') */}
Medium
</MainButton>
<MainButton styles={styles.advanceBtn} onPress={()=>{navigation.navigate('AdvanceLevelStart')}}>
Advance
</MainButton>
</View>
</ScrollView>
// <View style={styles.screen} >
// <View style={styles.levelWrapper}>
// <View style={styles.levelContainer}>
// <Button style={styles.btn} title='Elementry' onPress={()=>{navigation.navigate('StartGameScreen')}} />
// <Button style={styles.btn} title='Medium' onPress={()=>{navigation.navigate('MediumLevelStart')}} />
// <Button style={styles.btn} title='Advance' onPress={()=>{navigation.navigate('AdvanceLevelStart')}} />
// </View>
// </View>
// </View>
); );
} }
...@@ -34,10 +121,85 @@ const styles = StyleSheet.create({ ...@@ -34,10 +121,85 @@ const styles = StyleSheet.create({
justifyContent: 'center', justifyContent: 'center',
alignItems: 'center' alignItems: 'center'
}, },
btn: { elementryBtn: {
maxWidth: '100%', backgroundColor: 'green'
height: 30 },
} mediumBtn: {
backgroundColor: 'blue'
},
advanceBtn: {
backgroundColor: 'red'
},
image: {
height: 250,
width: '100%',
},
title: {
color: 'white',
fontWeight: 'bold',
fontSize: 30,
textAlign: 'center',
},
titleContainer: {
position: 'absolute',
padding: 20,
backgroundColor: 'rgba(0,0,0,0.5)',
bottom: 0,
width: '100%'
},
bgImage: {
height: '100%',
width: '100%',
justifyContent: 'flex-end'
},
gameItemRow: {
flexDirection: 'row',
},
centeredView: {
flex: 1,
justifyContent: "center",
alignItems: "center",
marginTop: 22
},
modalView: {
margin: 20,
backgroundColor: "white",
borderRadius: 20,
padding: 35,
alignItems: "center",
shadowColor: "#000",
shadowOffset: {
width: 0,
height: 2
},
shadowOpacity: 0.25,
shadowRadius: 4,
elevation: 5
},
button: {
borderRadius: 20,
padding: 10,
elevation: 2,
marginHorizontal: 10
},
buttonOpen: {
backgroundColor: "#F194FF",
},
buttonClose: {
backgroundColor: "#2196F3",
},
textStyle: {
color: "white",
fontWeight: "bold",
textAlign: "center",
fontSize: 20
},
modalText: {
marginBottom: 15,
textAlign: "center",
fontSize: 20
}
}); });
export default GameLevel; export default GameLevel;
......
frontend/src/screen/memory/GameOverScreen.js
View file @ 83a82e11
...@@ -61,11 +61,11 @@ const GameOverScreen = ({navigation}) => { ...@@ -61,11 +61,11 @@ const GameOverScreen = ({navigation}) => {
} }
if(data>=3.0){ if(data>=3.0){
disorderLevel = 'High' disorderLevel = 'High';
}else if (data>=1.5) { }else if (data>=1.5) {
disorderLevel = 'Medium' disorderLevel = 'Medium';
} else { } else {
disorderLevel = 'low' disorderLevel = 'low';
} }
const insertData = () => { const insertData = () => {
...@@ -89,8 +89,11 @@ const GameOverScreen = ({navigation}) => { ...@@ -89,8 +89,11 @@ const GameOverScreen = ({navigation}) => {
if(!loading){ if(!loading){
insertData(); insertData();
resultText=( resultText=(
// <Text style={styles.resultText}>
// <Text>Child's disorder level is </Text> <Text style={styles.highlight}>{disorderLevel}</Text>
// </Text>
<Text style={styles.resultText}> <Text style={styles.resultText}>
<Text>Child's disorder level is </Text> <Text style={styles.highlight}>{disorderLevel}</Text> {disorderLevel == 'High' ? `Hmm...It looks like you have to keep remember more...` : disorderLevel == 'Medium' ? `Hey...nicely played! Good!` : 'Wow! You are Excellent!'}
</Text> </Text>
); );
} }
...@@ -101,7 +104,7 @@ const GameOverScreen = ({navigation}) => { ...@@ -101,7 +104,7 @@ const GameOverScreen = ({navigation}) => {
<View style={styles.imageContainer}> <View style={styles.imageContainer}>
<Image <Image
fadeDuration={1000} fadeDuration={1000}
source={require('../../memory/images/assets/success.png')} source={require('../../memory/images/assets/navo2.png')}
style={styles.image} style={styles.image}
/> />
</View> </View>
...@@ -125,10 +128,10 @@ const styles = StyleSheet.create({ ...@@ -125,10 +128,10 @@ const styles = StyleSheet.create({
imageContainer: { imageContainer: {
width: '80%', width: '80%',
height: 300, height: 300,
borderColor: 'black', // borderColor: 'black',
borderWidth: 2, // borderWidth: 2,
borderRadius: 200, borderRadius: 200,
overflow: 'hidden', // overflow: 'hidden',
marginVertical: 30 marginVertical: 30
}, },
image : { image : {
...@@ -150,7 +153,8 @@ const styles = StyleSheet.create({ ...@@ -150,7 +153,8 @@ const styles = StyleSheet.create({
}, },
resultText: { resultText: {
textAlign: 'center', textAlign: 'center',
fontSize: 18 fontSize: 22,
fontWeight: 'bold'
} }
}); });
......
frontend/src/screen/memory/StartGameScreen.js
View file @ 83a82e11
import React from 'react'; import React from 'react';
import {Text, View, StyleSheet, Button} from 'react-native'; import {Text, View, StyleSheet, Button, Image, ImageBackground} from 'react-native';
const StartGameScreen = ({navigation}) => { const StartGameScreen = ({navigation}) => {
return( return(
<View style={styles.screen}> <View style={styles.screen}>
<Text>Start Game Screen</Text> {/* <ImageBackground source={require('../../memory/images/assets/gameback.png')} resizeMode="cover" style={styles.imageback}> */}
<Button title='Start' onPress={()=>{navigation.navigate("GameScreenOne")}}/> <View style={styles.imageContainer}>
<Text style={{ fontSize: 20, fontWeight: 'bold' }}>Select matching images</Text>
<Image
fadeDuration={1000}
source={require('../../memory/images/assets/navo1.png')}
style={styles.image}
/>
</View>
<Button title='Start' onPress={()=>{navigation.navigate("GameScreenOne")}}/>
{/* </ImageBackground> */}
</View> </View>
); );
} }
...@@ -15,7 +24,28 @@ const styles = StyleSheet.create({ ...@@ -15,7 +24,28 @@ const styles = StyleSheet.create({
flex: 1, flex: 1,
justifyContent: 'center', justifyContent: 'center',
alignItems: 'center' alignItems: 'center'
} },
imageContainer: {
alignItems: 'center',
width: '80%',
height: 300,
// borderColor: 'black',
// borderWidth: 2,
borderRadius: 200,
// overflow: 'hidden',
marginVertical: 30
},
image : {
width: '100%',
height: '100%'
},
// imageback: {
// flex: 1,
// justifyContent: 'center',
// width: '100%',
// height: '100%',
// padding: 20
// }
}); });
export default StartGameScreen; export default StartGameScreen;
\ No newline at end of file
frontend/src/screen/memory/elementry/GameScreenFive.js
View file @ 83a82e11
...@@ -27,7 +27,7 @@ const GameScreenFive = ({navigation}) => { ...@@ -27,7 +27,7 @@ const GameScreenFive = ({navigation}) => {
timeLabels={{s: 'Seconds'}} timeLabels={{s: 'Seconds'}}
style={styles.counter} style={styles.counter}
/> />
<Text style={styles.imageText}>Fish - මාළුවා</Text> <Text style={styles.imageText}>Fish</Text>
</View> </View>
); );
} }
......
frontend/src/screen/memory/elementry/GameScreenFour.js
View file @ 83a82e11
...@@ -4,12 +4,6 @@ import CountDown from 'react-native-countdown-component'; ...@@ -4,12 +4,6 @@ import CountDown from 'react-native-countdown-component';
import Countdown from '../../../constants/Countdown'; import Countdown from '../../../constants/Countdown';
const GameScreenFour = ({navigation}) => { const GameScreenFour = ({navigation}) => {
useEffect(()=>{
setTimeout( () => {
navigation.navigate('GameScreenFourAll');
}, 5000 );
});
return( return(
<View style={styles.sreen}> <View style={styles.sreen}>
...@@ -20,7 +14,7 @@ const GameScreenFour = ({navigation}) => { ...@@ -20,7 +14,7 @@ const GameScreenFour = ({navigation}) => {
style={styles.image} style={styles.image}
/> />
</View> </View>
<Text style={styles.imageText}>Car - කාරය</Text> <Text style={styles.imageText}>Car</Text>
<CountDown <CountDown
size={40} size={40}
until={Countdown.elementry} until={Countdown.elementry}
......
frontend/src/screen/memory/elementry/GameScreenOne.js
View file @ 83a82e11
...@@ -29,7 +29,7 @@ const GameScreenOne = ({navigation}) => { ...@@ -29,7 +29,7 @@ const GameScreenOne = ({navigation}) => {
style={styles.image} style={styles.image}
/> />
</View> </View>
<Text style={styles.imageText}>Pencil - පැන්සල</Text> <Text style={styles.imageText}>Pencil</Text>
<CountDown <CountDown
size={40} size={40}
until={Countdown.elementry} until={Countdown.elementry}
......
frontend/src/screen/memory/elementry/GameScreenSix.js
View file @ 83a82e11
...@@ -14,7 +14,7 @@ const GameScreenSix = ({navigation}) => { ...@@ -14,7 +14,7 @@ const GameScreenSix = ({navigation}) => {
style={styles.image} style={styles.image}
/> />
</View> </View>
<Text style={styles.imageText}>Pencil - පැන්සල</Text> <Text style={styles.imageText}>Pencil</Text>
<CountDown <CountDown
size={40} size={40}
until={Countdown.elementry} until={Countdown.elementry}
......
frontend/src/screen/memory/elementry/GameScreenThree.js
View file @ 83a82e11
...@@ -14,7 +14,7 @@ const GameScreenThree = ({navigation}) => { ...@@ -14,7 +14,7 @@ const GameScreenThree = ({navigation}) => {
style={styles.image} style={styles.image}
/> />
</View> </View>
<Text style={styles.imageText}>Flower - මල</Text> <Text style={styles.imageText}>Flower</Text>
<CountDown <CountDown
size={40} size={40}
until={Countdown.elementry} until={Countdown.elementry}
......
frontend/src/screen/memory/elementry/GameScreenTwo.js
View file @ 83a82e11
...@@ -14,7 +14,7 @@ const GameScreenTwo = ({navigation}) => { ...@@ -14,7 +14,7 @@ const GameScreenTwo = ({navigation}) => {
style={styles.image} style={styles.image}
/> />
</View> </View>
<Text style={styles.imageText}>Ball - බෝලය</Text> <Text style={styles.imageText}>Ball</Text>
<CountDown <CountDown
size={40} size={40}
until={Countdown.elementry} until={Countdown.elementry}
......
frontend/src/screen/memory/medium/MediumGameScreenFive.js
View file @ 83a82e11
...@@ -14,6 +14,7 @@ const MediumGameScreenFive = ({navigation}) => { ...@@ -14,6 +14,7 @@ const MediumGameScreenFive = ({navigation}) => {
style={styles.image} style={styles.image}
/> />
</View> </View>
<Text style={styles.imageText}>Shadow of Horse</Text>
<CountDown <CountDown
size={40} size={40}
until={Countdown.medium} until={Countdown.medium}
......
frontend/src/screen/memory/medium/MediumGameScreenFour.js
View file @ 83a82e11
...@@ -14,7 +14,7 @@ const MediumGameScreenFour = ({navigation}) => { ...@@ -14,7 +14,7 @@ const MediumGameScreenFour = ({navigation}) => {
style={styles.image} style={styles.image}
/> />
</View> </View>
<Text style={styles.imageText}>Car - කාරය</Text> <Text style={styles.imageText}>A boy with a balloon</Text>
<CountDown <CountDown
size={40} size={40}
until={Countdown.medium} until={Countdown.medium}
......
frontend/src/screen/memory/medium/MediumGameScreenOne.js
View file @ 83a82e11
...@@ -29,7 +29,7 @@ const MediumGameScreenOne = ({navigation}) => { ...@@ -29,7 +29,7 @@ const MediumGameScreenOne = ({navigation}) => {
style={styles.image} style={styles.image}
/> />
</View> </View>
<Text style={styles.imageText}>Pencil - පැන්සල</Text> <Text style={styles.imageText}>Birds</Text>
<CountDown <CountDown
size={40} size={40}
until={Countdown.medium} until={Countdown.medium}
......
frontend/src/screen/memory/medium/MediumGameScreenSix.js
View file @ 83a82e11
...@@ -14,7 +14,7 @@ const MediumGameScreenSix = ({navigation}) => { ...@@ -14,7 +14,7 @@ const MediumGameScreenSix = ({navigation}) => {
style={styles.image} style={styles.image}
/> />
</View> </View>
<Text style={styles.imageText}>Pencil - පැන්සල</Text> <Text style={styles.imageText}>Arrow</Text>
<CountDown <CountDown
size={40} size={40}
until={Countdown.medium} until={Countdown.medium}
......
frontend/src/screen/memory/medium/MediumGameScreenThree.js
View file @ 83a82e11
...@@ -14,7 +14,7 @@ const MediumGameScreenThree = ({navigation}) => { ...@@ -14,7 +14,7 @@ const MediumGameScreenThree = ({navigation}) => {
style={styles.image} style={styles.image}
/> />
</View> </View>
<Text style={styles.imageText}>Flower - මල</Text> <Text style={styles.imageText}>Circle and Rectangle</Text>
<CountDown <CountDown
size={40} size={40}
until={Countdown.medium} until={Countdown.medium}
......
frontend/src/screen/memory/medium/MediumGameScreenTwo.js
View file @ 83a82e11
...@@ -14,7 +14,7 @@ const MediumGameScreenTwo = ({navigation}) => { ...@@ -14,7 +14,7 @@ const MediumGameScreenTwo = ({navigation}) => {
style={styles.image} style={styles.image}
/> />
</View> </View>
<Text style={styles.imageText}>Ball - බෝලය</Text> <Text style={styles.imageText}>Boy with a bicycle</Text>
<CountDown <CountDown
size={40} size={40}
until={Countdown.medium} until={Countdown.medium}
......
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