Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Drip
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
backup
Drip
Commits
cd3cc3c7
Commit
cd3cc3c7
authored
6 years ago
by
tina
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into '28-edit-temperature-screen'
# Conflicts: # home.js
parents
f2ad9f10
73c5785f
No related branches found
No related tags found
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
home.js
+13
-0
13 additions, 0 deletions
home.js
package-lock.json
+1561
-1561
1561 additions, 1561 deletions
package-lock.json
with
1575 additions
and
1562 deletions
.gitlab-ci.yml
+
1
−
1
View file @
cd3cc3c7
image
:
jfr3000/docker-nativescript
image
:
node:8
# This folder is cached between builds
# http://docs.gitlab.com/ce/ci/yaml/README.html#cache
...
...
This diff is collapsed.
Click to expand it.
home.js
+
13
−
0
View file @
cd3cc3c7
...
...
@@ -4,19 +4,32 @@ import {
Button
,
Text
}
from
'
react-native
'
import
{
LocalDate
}
from
'
js-joda
'
import
styles
from
'
./styles
'
import
getCycleDay
from
'
./get-cycle-day
'
import
{
getOrCreateCycleDay
}
from
'
./db
'
export
default
class
Home
extends
Component
{
constructor
(
props
)
{
super
(
props
)
}
passTodayToDayView
()
{
const
todayDateString
=
LocalDate
.
now
().
toString
()
const
cycleDay
=
getOrCreateCycleDay
(
todayDateString
)
const
navigate
=
this
.
props
.
navigation
.
navigate
navigate
(
'
dayView
'
,
{
cycleDay
})
}
render
()
{
const
navigate
=
this
.
props
.
navigation
.
navigate
return
(
<
View
style
=
{
styles
.
container
}
>
<
Text
style
=
{
styles
.
welcome
}
>
Welcome
!
Today
is
day
{
getCycleDay
()}
of
your
current
cycle
<
/Text
>
<
Button
onPress
=
{()
=>
this
.
passTodayToDayView
()}
title
=
"
Edit symptoms for today
"
>
<
/Button
>
<
Button
onPress
=
{()
=>
navigate
(
'
calendar
'
)}
title
=
"
Go to calendar
"
>
...
...
This diff is collapsed.
Click to expand it.
package-lock.json
+
1561
−
1561
View file @
cd3cc3c7
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