Commit Graph

479 Commits

Author SHA1 Message Date
Julia Friesel 022729ac1e Merge branch '156-make-components-like-prettier-radio-buttons' into 'master'
Resolve "make components like prettier radio buttons"

Closes #156

See merge request bloodyhealth/drip!68
2018-09-03 16:45:51 +00:00
Julia Friesel dd380cf9ba Merge branch '142-add-back-button-behavior-for-cycle-day-overview' into 'master'
Resolve "add back button behavior for cycle day overview"

Closes #142

See merge request bloodyhealth/drip!67
2018-09-03 12:54:25 +00:00
Julia Friesel ef75a377d0 Fix typo / bug 2018-09-03 13:54:52 +02:00
bl00dymarie 5296a9c6ee Merge branch 'Delete-console.logs' into 'master'
Deletes old console.logs

See merge request bloodyhealth/drip!70
2018-09-02 19:57:11 +00:00
Julia Friesel 25018a35f3 Remove unused import 2018-09-01 23:49:18 +02:00
Julia Friesel be6545ec03 Style fixes 2018-09-01 23:44:14 +02:00
Julia Friesel a2113a5ede Fix key 2018-09-01 23:37:59 +02:00
Julia Friesel 90a2814c4c Fix section layout 2018-09-01 23:35:50 +02:00
Julia Friesel 6fa18d70fe Add explainer to temperature 2018-09-01 23:33:41 +02:00
Julia Friesel 023feb452e Remove old styles 2018-09-01 22:49:02 +02:00
Julia Friesel 6baeaa0393 Add explainers to sex view 2018-09-01 22:46:02 +02:00
Julia Friesel 51622867a2 Add explainer to pain 2018-09-01 22:39:35 +02:00
Julia Friesel 4768057e32 Fix typo 2018-09-01 22:39:10 +02:00
Julia Friesel b5f8f57f49 Fix labels on overview 2018-09-01 22:39:01 +02:00
Julia Friesel f6c6c9ef26 Add explainer to note 2018-09-01 22:19:05 +02:00
Julia Friesel cffa42ed1c Add explainers to mucus 2018-09-01 22:01:05 +02:00
Julia Friesel 98fbacf9f8 Make symptom section component 2018-09-01 21:19:12 +02:00
Julia Friesel 4d8a4a79fd Add explainer to desire 2018-09-01 20:53:37 +02:00
Julia Friesel fbb840920b Fix whitespace 2018-09-01 20:53:30 +02:00
Julia Friesel 9868e8a943 Add explainer texts to cervix 2018-09-01 20:50:17 +02:00
Julia Friesel ea8cfed71d Appease linter 2018-09-01 20:15:27 +02:00
Julia Friesel 083e55eee8 Apply select tab group to pain edit view 2018-09-01 20:12:44 +02:00
Julia Friesel 4ed3aa48e0 Merge branch 'master' into 156-make-components-like-prettier-radio-buttons 2018-09-01 19:59:30 +02:00
Julia Friesel ac9ff0dc03 Correct style 2018-09-01 19:53:54 +02:00
Julia Friesel ddc117057c Remove unused style 2018-09-01 19:51:12 +02:00
Julia Friesel 2ec6626b4e Use select box group instead of single select boxes 2018-09-01 19:36:04 +02:00
Julia Friesel 71af282d9b Convert radio button group to select tab group 2018-09-01 19:11:44 +02:00
Julia Friesel 1d0b2497b4 Make select box text a child not a prop 2018-09-01 18:28:05 +02:00
Julia Friesel 8b37fa3ca4 Add app text component and remove radio button dep 2018-09-01 18:11:55 +02:00
emelko 5acb6639ba Deletes old console.logs 2018-08-31 21:28:31 +02:00
bl00dymarie c07dc51e5e Merge branch '117-implement-pain' into 'master'
Resolve "Implement pain"

Closes #117

See merge request bloodyhealth/drip!57
2018-08-31 19:11:55 +00:00
emelko ea83d6eb6b Merge branch 'master' into 117-implement-pain 2018-08-31 20:59:23 +02:00
emelko a664b6dfa8 Fixing pain and sex label for entering "other" and "note", displayed as:
- Other 
or if note is true
- Other (This is a note.)
2018-08-31 20:55:51 +02:00
Julia Friesel ca8764aa4b Add dot when active 2018-08-31 20:11:30 +02:00
Julia Friesel c2c8a7da26 First attempt for radio buttons 2018-08-31 19:52:07 +02:00
emelko 1c95ff3488 Adding autofocus to note when there is nothing entered yet 2018-08-31 19:49:15 +02:00
tina edf9b04b45 Merge branch '158-change-default-app-color' into 'master'
Resolve "research default app color, can we change it away from turqiouse ?"

Closes #158

See merge request bloodyhealth/drip!69
2018-08-31 17:07:07 +00:00
Julia Friesel 5b6ac9ebc1 Replace checkboxes with SelectBox component on sex view 2018-08-31 19:00:11 +02:00
tina 0a51bfc40b makes the default colors easily exchangable 2018-08-31 17:43:13 +02:00
Julia Friesel 0414eb3570 When navigating to cycle day, remember origin 2018-08-31 17:28:19 +02:00
tina f19a51d4ba Merge branch '155-add-temperature-note' into 'master'
Resolve "add temperature note"

Closes #155

See merge request bloodyhealth/drip!66
2018-08-31 15:15:38 +00:00
tina ed5d7e544b changes text input parameters for temperature note 2018-08-31 17:05:55 +02:00
tina 6b547abee2 Merge branch '143-don-t-allow-future-entries-except-note' into 'master'
Resolve "don't allow future entries except note"

Closes #137 and #143

See merge request bloodyhealth/drip!65
2018-08-31 14:37:26 +00:00
tina b119f1da93 removes package-lock from pr 2018-08-31 16:25:16 +02:00
Julia Friesel 1ba41c934f Use style arrays 2018-08-31 14:51:41 +02:00
tina 3bd5770c33 adds note to temperature 2018-08-31 14:01:48 +02:00
tina a3c02d30a0 disables entries for future datas except note, puts note at the end of the symptom list 2018-08-31 13:00:39 +02:00
emelko 895057e2f6 Takes back updated package-lock.json 2018-08-31 12:02:58 +02:00
emelko 38b454fb0b Merge branch 'master' into 117-implement-pain 2018-08-31 11:58:57 +02:00
tina 54a3db4096 Merge branch '98-function-to-get-predicted-bleeding-dates' into 'master'
Resolve "write function to get predicted bleeding dates (and use it in calendar)"

Closes #97 and #98

See merge request bloodyhealth/drip!60
2018-08-31 09:48:30 +00:00