diff --git a/components/calendar.js b/components/calendar.js index ae2e422..af213dd 100644 --- a/components/calendar.js +++ b/components/calendar.js @@ -54,7 +54,6 @@ export default class CalendarView extends Component { } function toCalFormat(bleedingDaysSortedByDate) { - //const shadesOfRed = ['#ffbaba', '#ff7b7b', '#ff5252', '#ff0000'] return bleedingDaysSortedByDate.reduce((acc, day) => { acc[day.date] = { startingDay: true, @@ -67,7 +66,6 @@ function toCalFormat(bleedingDaysSortedByDate) { function predictionToCalFormat(predictedDays) { if (!predictedDays.length) return {} - //const shadesOfGrey = ['#e5e5e5', '#cccccc'] // [lighter, darker] const middleIndex = (predictedDays[0].length - 1) / 2 return predictedDays.reduce((acc, setOfDays) => { setOfDays.reduce((accSet, day, i) => { diff --git a/components/chart/day-column.js b/components/chart/day-column.js index 14a7fe9..8215ee5 100644 --- a/components/chart/day-column.js +++ b/components/chart/day-column.js @@ -71,7 +71,7 @@ export default class DayColumn extends Component { const cycleDayNumber = getCycleDayNumber(dateString) const shortDate = dateString.split('-').slice(1).join('-') const cycleDayLabel = ( - + {cycleDayNumber ? cycleDayNumber : ' '} ) const dateLabel = ( @@ -140,7 +140,7 @@ export default class DayColumn extends Component { {typeof symptoms.sex === 'number' && } diff --git a/components/chart/styles.js b/components/chart/styles.js index 88063d8..56cede6 100644 --- a/components/chart/styles.js +++ b/components/chart/styles.js @@ -1,8 +1,8 @@ import config from '../../config' import {primaryColor, shadesOfRed} from '../../styles/index' -const colorTemperatur = '#765285' -const colorTemperaturLight = '#a67fb5' +const colorTemperature = '#765285' +const colorTemperatureLight = '#a67fb5' const dotWidth = 10 const lineWidth = 2 const colorLtl = '#feb47b' @@ -10,22 +10,22 @@ const colorLtl = '#feb47b' const styles = { curve: { borderStyle: 'solid', - borderColor: colorTemperatur, + borderColor: colorTemperature, borderWidth: lineWidth, }, curveExcluded: { - borderColor: colorTemperaturLight, + borderColor: colorTemperatureLight, borderWidth: lineWidth, borderStyle: 'dotted' }, curveDots: { - backgroundColor: colorTemperatur, + backgroundColor: colorTemperature, width: dotWidth, height: dotWidth, borderRadius: 50 }, curveDotsExcluded: { - backgroundColor: colorTemperaturLight, + backgroundColor: colorTemperatureLight, width: dotWidth, height: dotWidth, borderRadius: 50 @@ -35,12 +35,12 @@ const styles = { date: { color: 'grey', fontSize: 9, - fontWeight: '100' + fontWeight: '100', }, number: { color: primaryColor, fontSize: 13, - textAlign: 'center' + textAlign: 'center', } }, rect: { @@ -69,7 +69,7 @@ const styles = { '#feb47b' ], yAxis: { - width: 27,//config.columnWidth, + width: 27, borderRightWidth: 0.5, borderColor: 'lightgrey', borderStyle: 'solid' diff --git a/components/chart/y-axis.js b/components/chart/y-axis.js index 0cd9ed0..d2dda88 100644 --- a/components/chart/y-axis.js +++ b/components/chart/y-axis.js @@ -10,9 +10,6 @@ export function makeYAxisLabels(columnHeight) { const style = styles.yAxisLabel return getTickPositions(columnHeight).map((y, i) => { - // this eyeballing is sadly necessary because RN does not - // support percentage values for transforms, which we'd need - // to reliably place the label vertically centered to the grid const tick = scaleMax - i * units const tickLabel = tick * 10 % 10 ? tick.toString() : tick.toString() + '.0' let showTick @@ -24,6 +21,9 @@ export function makeYAxisLabels(columnHeight) { showTick = (tick * 10 % 5) ? false : true tickBold = tick * 10 % 10 ? {} : {fontWeight: 'bold'} } + // this eyeballing is sadly necessary because RN does not + // support percentage values for transforms, which we'd need + // to reliably place the label vertically centered to the grid return (