Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
21_22-J 38
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
21_22-J 38
21_22-J 38
Commits
ed970a5f
Commit
ed970a5f
authored
May 03, 2022
by
Neranga K.T.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some ui changes
parent
bce8894f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
48 additions
and
9 deletions
+48
-9
frontend/src/component/memory/MainButton.js
frontend/src/component/memory/MainButton.js
+1
-1
frontend/src/screen/memory/GameLevel.js
frontend/src/screen/memory/GameLevel.js
+22
-6
frontend/src/screen/memory/GameOverScreen.js
frontend/src/screen/memory/GameOverScreen.js
+1
-0
frontend/src/store/actions/memory.js
frontend/src/store/actions/memory.js
+5
-0
frontend/src/store/reducers/memory.js
frontend/src/store/reducers/memory.js
+19
-2
No files found.
frontend/src/component/memory/MainButton.js
View file @
ed970a5f
...
@@ -4,7 +4,7 @@ import Colors from '../../constants/Colors'
...
@@ -4,7 +4,7 @@ import Colors from '../../constants/Colors'
const
MainButton
=
(
props
)
=>
{
const
MainButton
=
(
props
)
=>
{
return
(
return
(
<
TouchableOpacity
onPress
=
{
props
.
onPress
}
>
<
TouchableOpacity
disabled
=
{
props
.
disabled
}
onPress
=
{
props
.
onPress
}
>
<
View
style
=
{{...
styles
.
button
,
...
props
.
styles
}}
>
<
View
style
=
{{...
styles
.
button
,
...
props
.
styles
}}
>
<
Text
style
=
{
styles
.
buttonText
}
>
{
props
.
children
}
<
/Text
>
<
Text
style
=
{
styles
.
buttonText
}
>
{
props
.
children
}
<
/Text
>
<
/View
>
<
/View
>
...
...
frontend/src/screen/memory/GameLevel.js
View file @
ed970a5f
...
@@ -2,10 +2,26 @@ import { Center, Column, Row } from 'native-base';
...
@@ -2,10 +2,26 @@ import { Center, Column, Row } from 'native-base';
import
React
,
{
useState
}
from
'
react
'
;
import
React
,
{
useState
}
from
'
react
'
;
import
{
Text
,
View
,
StyleSheet
,
Button
,
ScrollView
,
Image
,
ImageBackground
,
TouchableOpacity
,
Modal
,
Alert
,
Pressable
}
from
'
react-native
'
;
import
{
Text
,
View
,
StyleSheet
,
Button
,
ScrollView
,
Image
,
ImageBackground
,
TouchableOpacity
,
Modal
,
Alert
,
Pressable
}
from
'
react-native
'
;
import
MainButton
from
'
../../component/memory/MainButton
'
;
import
MainButton
from
'
../../component/memory/MainButton
'
;
import
{
useDispatch
,
useSelector
}
from
'
react-redux
'
;
import
{
Icon
}
from
'
react-native-elements
'
;
const
GameLevel
=
({
navigation
})
=>
{
const
GameLevel
=
({
navigation
})
=>
{
const
[
modalVisible
,
setModalVisible
]
=
useState
(
false
);
const
[
modalVisible
,
setModalVisible
]
=
useState
(
false
);
const
[
mediumModalVisible
,
setMediumModalVisible
]
=
useState
(
false
);
const
[
mediumModalVisible
,
setMediumModalVisible
]
=
useState
(
false
);
const
status
=
useSelector
(
state
=>
state
.
memory
.
is_passed
.
status
);
const
level
=
useSelector
(
state
=>
state
.
memory
.
is_passed
.
level
);
console
.
log
(
status
);
console
.
log
(
level
);
React
.
useEffect
(()
=>
{
const
unsubscribe
=
navigation
.
addListener
(
'
focus
'
,
()
=>
{
});
return
unsubscribe
;
},
[
navigation
]);
return
(
return
(
<
ScrollView
>
<
ScrollView
>
<
Modal
<
Modal
...
@@ -81,15 +97,15 @@ const GameLevel = ({navigation}) => {
...
@@ -81,15 +97,15 @@ const GameLevel = ({navigation}) => {
<
/View
>
<
/View
>
<
/View
>
<
/View
>
<
View
style
=
{
styles
.
screen
}
>
<
View
style
=
{
styles
.
screen
}
>
<
MainButton
styles
=
{
styles
.
elementryBtn
}
onPress
=
{()
=>
setModalVisible
(
true
)}
>
<
MainButton
disabled
=
{
false
}
styles
=
{
styles
.
elementryBtn
}
onPress
=
{()
=>
setModalVisible
(
true
)}
>
Elementry
<
Icon
name
=
"
unlock-alt
"
type
=
"
font-awesome
"
size
=
{
36
}
color
=
"
white
"
/>
Elementry
<
/MainButton
>
<
/MainButton
>
<
MainButton
styles
=
{
styles
.
mediumBtn
}
onPress
=
{()
=>
{
setMediumModalVisible
(
true
)}}
>
<
MainButton
disabled
=
{
!
status
?
true
:
false
}
styles
=
{
styles
.
mediumBtn
}
onPress
=
{()
=>
{
setMediumModalVisible
(
true
)}}
>
{
/* navigation.navigate('MediumLevelStart') */
}
{
/* navigation.navigate('MediumLevelStart') */
}
Medium
<
Icon
name
=
{
status
?
'
unlock-alt
'
:
'
lock
'
}
type
=
"
font-awesome
"
size
=
{
36
}
color
=
"
white
"
/>
Medium
<
/MainButton
>
<
/MainButton
>
<
MainButton
styles
=
{
styles
.
advanceBtn
}
onPress
=
{()
=>
{
navigation
.
navigate
(
'
AdvanceLevelStart
'
)}}
>
<
MainButton
disabled
=
{
true
}
styles
=
{
styles
.
advanceBtn
}
onPress
=
{()
=>
{
navigation
.
navigate
(
'
AdvanceLevelStart
'
)}}
>
Advance
<
Icon
name
=
"
lock
"
type
=
"
font-awesome
"
size
=
{
36
}
color
=
"
white
"
/>
Advance
<
/MainButton
>
<
/MainButton
>
<
/View
>
<
/View
>
<
/ScrollView
>
<
/ScrollView
>
...
...
frontend/src/screen/memory/GameOverScreen.js
View file @
ed970a5f
...
@@ -88,6 +88,7 @@ const GameOverScreen = ({navigation}) => {
...
@@ -88,6 +88,7 @@ const GameOverScreen = ({navigation}) => {
if
(
!
loading
){
if
(
!
loading
){
insertData
();
insertData
();
dispatch
(
memoryActions
.
levelPassed
({
level
:
disorderLevel
,
status
:
true
}));
resultText
=
(
resultText
=
(
// <Text style={styles.resultText}>
// <Text style={styles.resultText}>
// <Text>Child's disorder level is </Text> <Text style={styles.highlight}>{disorderLevel}</Text>
// <Text>Child's disorder level is </Text> <Text style={styles.highlight}>{disorderLevel}</Text>
...
...
frontend/src/store/actions/memory.js
View file @
ed970a5f
...
@@ -2,6 +2,7 @@ export const SET_ANSWERS = 'SET_ANSWERS';
...
@@ -2,6 +2,7 @@ export const SET_ANSWERS = 'SET_ANSWERS';
export
const
SET_TIME
=
'
SET_TIME
'
;
export
const
SET_TIME
=
'
SET_TIME
'
;
export
const
CLEAR_DATA
=
'
CLEAR_DATA
'
;
export
const
CLEAR_DATA
=
'
CLEAR_DATA
'
;
export
const
SET_GAME_LEVEL
=
'
SET_GAME_LEVEL
'
;
export
const
SET_GAME_LEVEL
=
'
SET_GAME_LEVEL
'
;
export
const
PASS
=
'
PASS
'
;
export
const
setGameLevel
=
(
level
)
=>
{
export
const
setGameLevel
=
(
level
)
=>
{
return
{
type
:
SET_GAME_LEVEL
,
level
:
level
}
return
{
type
:
SET_GAME_LEVEL
,
level
:
level
}
...
@@ -17,4 +18,8 @@ export const setTime = (time) => {
...
@@ -17,4 +18,8 @@ export const setTime = (time) => {
export
const
clearData
=
()
=>
{
export
const
clearData
=
()
=>
{
return
{
type
:
CLEAR_DATA
}
return
{
type
:
CLEAR_DATA
}
}
export
const
levelPassed
=
(
status
)
=>
{
return
{
type
:
PASS
,
status
:
status
}
}
}
\ No newline at end of file
frontend/src/store/reducers/memory.js
View file @
ed970a5f
import
{
CLEAR_DATA
,
SET_ANSWERS
,
SET_GAME_LEVEL
,
SET_TIME
}
from
"
../actions/memory
"
;
import
{
CLEAR_DATA
,
SET_ANSWERS
,
SET_GAME_LEVEL
,
SET_TIME
,
PASS
}
from
"
../actions/memory
"
;
const
initialState
=
{
const
initialState
=
{
gameLevel
:
null
,
gameLevel
:
null
,
memoryData
:
{},
memoryData
:
{},
screenTime
:
{}
screenTime
:
{},
is_passed
:
{
level
:
null
,
status
:
false
}
}
}
const
memoryReducer
=
(
state
=
initialState
,
action
)
=>
{
const
memoryReducer
=
(
state
=
initialState
,
action
)
=>
{
...
@@ -44,6 +48,19 @@ const memoryReducer = (state=initialState, action) => {
...
@@ -44,6 +48,19 @@ const memoryReducer = (state=initialState, action) => {
gameLevel
:
null
gameLevel
:
null
}
}
case
PASS
:
const
levelPassed
=
action
.
level
;
const
PassedStatus
=
action
.
status
;
return
{
...
state
,
is_passed
:
{
level
:
levelPassed
,
status
:
PassedStatus
}
}
default
:
default
:
return
state
return
state
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment