Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Ecolyo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
LLLE_Project
Ecolyo
Commits
2f7f9dcf
Commit
2f7f9dcf
authored
4 years ago
by
HAUTBOIS Aurelie
Browse files
Options
Downloads
Patches
Plain Diff
feat: modify exploration view
parent
21184cdc
No related branches found
No related tags found
1 merge request
!189
features/US286-create_mission_view
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/Exploration/ExplorationView.tsx
+11
-8
11 additions, 8 deletions
src/components/Exploration/ExplorationView.tsx
src/locales/fr.json
+1
-0
1 addition, 0 deletions
src/locales/fr.json
with
12 additions
and
8 deletions
src/components/Exploration/ExplorationView.tsx
+
11
−
8
View file @
2f7f9dcf
...
@@ -4,7 +4,7 @@ import { AppStore } from 'store'
...
@@ -4,7 +4,7 @@ import { AppStore } from 'store'
import
CozyBar
from
'
components/Header/CozyBar
'
import
CozyBar
from
'
components/Header/CozyBar
'
import
Content
from
'
components/Content/Content
'
import
Content
from
'
components/Content/Content
'
import
Header
from
'
components/Header/Header
'
import
Header
from
'
components/Header/Header
'
import
{
User
Miss
ionState
}
from
'
enum/user
Miss
ion.enum
'
import
{
User
Explorat
ionState
}
from
'
enum/user
Explorat
ion.enum
'
import
{
UserChallenge
}
from
'
models
'
import
{
UserChallenge
}
from
'
models
'
const
ExplorationView
:
React
.
FC
=
()
=>
{
const
ExplorationView
:
React
.
FC
=
()
=>
{
...
@@ -17,11 +17,11 @@ const ExplorationView: React.FC = () => {
...
@@ -17,11 +17,11 @@ const ExplorationView: React.FC = () => {
setHeaderHeight
(
height
)
setHeaderHeight
(
height
)
},
[])
},
[])
const
render
Miss
ion
=
(
challenge
:
UserChallenge
)
=>
{
const
render
Explorat
ion
=
(
challenge
:
UserChallenge
)
=>
{
switch
(
challenge
.
miss
ion
.
state
)
{
switch
(
challenge
.
explorat
ion
.
state
)
{
case
User
Miss
ionState
.
UNLOCKED
:
case
User
Explorat
ionState
.
UNLOCKED
:
return
'
ExplorationOngoing
'
return
'
ExplorationOngoing
'
case
User
Miss
ionState
.
DONE
:
case
User
Explorat
ionState
.
DONE
:
return
'
ExplorationFinished
'
return
'
ExplorationFinished
'
default
:
default
:
return
'
ExplorationOnGoing
'
return
'
ExplorationOnGoing
'
...
@@ -30,14 +30,17 @@ const ExplorationView: React.FC = () => {
...
@@ -30,14 +30,17 @@ const ExplorationView: React.FC = () => {
return
(
return
(
<>
<>
<
CozyBar
titleKey
=
{
'
COMMON.APP_QUIZ_TITLE
'
}
displayBackArrow
=
{
true
}
/>
<
CozyBar
titleKey
=
{
'
COMMON.APP_EXPLORATION_TITLE
'
}
displayBackArrow
=
{
true
}
/>
<
Header
<
Header
setHeaderHeight
=
{
defineHeaderHeight
}
setHeaderHeight
=
{
defineHeaderHeight
}
desktopTitleKey
=
{
'
COMMON.APP_
QUIZ
_TITLE
'
}
desktopTitleKey
=
{
'
COMMON.APP_
EXPLORATION
_TITLE
'
}
displayBackArrow
=
{
true
}
displayBackArrow
=
{
true
}
></
Header
>
></
Header
>
<
Content
height
=
{
headerHeight
}
>
<
Content
height
=
{
headerHeight
}
>
{
currentChallenge
&&
render
Miss
ion
(
currentChallenge
)
}
{
currentChallenge
&&
render
Explorat
ion
(
currentChallenge
)
}
</
Content
>
</
Content
>
</>
</>
)
)
...
...
This diff is collapsed.
Click to expand it.
src/locales/fr.json
+
1
−
0
View file @
2f7f9dcf
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
"APP_TITLE"
:
"Ecolyo"
,
"APP_TITLE"
:
"Ecolyo"
,
"APP_CHALLENGE_TITLE"
:
"Défi"
,
"APP_CHALLENGE_TITLE"
:
"Défi"
,
"APP_QUIZ_TITLE"
:
"Quiz"
,
"APP_QUIZ_TITLE"
:
"Quiz"
,
"APP_EXPLORATION_TITLE"
:
"Exploration"
,
"APP_DUEL_TITLE"
:
"Duel final"
,
"APP_DUEL_TITLE"
:
"Duel final"
,
"APP_ECO_GESTURE_TITLE"
:
"Ecogestes"
,
"APP_ECO_GESTURE_TITLE"
:
"Ecogestes"
,
"APP_OPTIONS_TITLE"
:
"Options"
,
"APP_OPTIONS_TITLE"
:
"Options"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment