From a2400983cf6d75bcb86423503d64bd343f2e3dd3 Mon Sep 17 00:00:00 2001 From: Julia Friesel Date: Tue, 24 Jul 2018 14:30:20 +0200 Subject: [PATCH] Move status labels to cycle day labels --- components/cycle-day/labels/labels.js | 29 ++++++++++++--------------- labels/labels.js | 8 -------- lib/sympto-adapter.js | 2 +- 3 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 labels/labels.js diff --git a/components/cycle-day/labels/labels.js b/components/cycle-day/labels/labels.js index 25909df..6e294ef 100644 --- a/components/cycle-day/labels/labels.js +++ b/components/cycle-day/labels/labels.js @@ -1,17 +1,14 @@ -const bleeding = ['spotting', 'light', 'medium', 'heavy'] -const mucusFeeling = ['dry', 'nothing', 'wet', 'slippery'] -const mucusTexture = ['nothing', 'creamy', 'egg white'] -const mucusNFP = ['t', 'Ø', 'f', 'S', '+S'] -const cervixOpening = ['closed', 'medium', 'open'] -const cervixFirmness = ['hard', 'soft'] -const cervixPosition = ['low', 'medium', 'high'] +export const bleeding = ['spotting', 'light', 'medium', 'heavy'] +export const mucusFeeling = ['dry', 'nothing', 'wet', 'slippery'] +export const mucusTexture = ['nothing', 'creamy', 'egg white'] +export const mucusNFP = ['t', 'Ø', 'f', 'S', '+S'] +export const cervixOpening = ['closed', 'medium', 'open'] +export const cervixFirmness = ['hard', 'soft'] +export const cervixPosition = ['low', 'medium', 'high'] -export { - bleeding, - mucusFeeling, - mucusTexture, - mucusNFP, - cervixOpening, - cervixFirmness, - cervixPosition -} +export const fertilityStatus = { + fertile: 'fertile', + infertile: 'infertile', + fertileUntilEvening: 'Fertile phase ends in the evening', + unknown: 'We cannot show any cycle information because no menses has been entered' +} \ No newline at end of file diff --git a/labels/labels.js b/labels/labels.js deleted file mode 100644 index 20c8ad0..0000000 --- a/labels/labels.js +++ /dev/null @@ -1,8 +0,0 @@ -export const bleeding = ['spotting', 'light', 'medium', 'heavy'] - -export const fertilityStatus = { - fertile: 'fertile', - infertile: 'infertile', - fertileUntilEvening: 'Fertile phase ends in the evening', - unknown: 'We cannot show any cycle information because no menses has been entered' -} \ No newline at end of file diff --git a/lib/sympto-adapter.js b/lib/sympto-adapter.js index 1eb9e27..b6ab217 100644 --- a/lib/sympto-adapter.js +++ b/lib/sympto-adapter.js @@ -1,6 +1,6 @@ import getFertilityStatus from './sympto' import cycleModule from './cycle' -import { fertilityStatus } from '../labels/labels' +import { fertilityStatus } from '../components/cycle-day/labels/labels' const { getCycleForDay,