Merge branch 'no-multi-space' into 'master'

Adds linter rule for no multi spaces

See merge request bloodyhealth/drip!263
This commit is contained in:
Julia Friesel
2020-02-17 13:05:44 +00:00
7 changed files with 14 additions and 11 deletions
+3 -2
View File
@@ -61,6 +61,7 @@
"ignoreComments": true, "ignoreComments": true,
"ignoreTemplateLiterals": true "ignoreTemplateLiterals": true
} }
] ],
"no-multi-spaces": 2,
} }
} }
+2 -2
View File
@@ -8,11 +8,11 @@ import { shared } from '../i18n/en/labels'
const AppLoadingView = () => { const AppLoadingView = () => {
return ( return (
<View flex={1}> <View flex={1}>
<View style={{flex:1, justifyContent: 'center'}}> <View style={{flex:1, justifyContent: 'center'}}>
<AppText style={{alignSelf: 'center'}}>{shared.loading}</AppText> <AppText style={{alignSelf: 'center'}}>{shared.loading}</AppText>
</View> </View>
</View> </View>
) )
} }
export default AppLoadingView export default AppLoadingView
+1 -1
View File
@@ -41,7 +41,7 @@ class Bleeding extends Component {
autoSave = () => { autoSave = () => {
const { date } = this.props const { date } = this.props
const valuesToSave = { ...this.state } const valuesToSave = { ...this.state }
const hasValueToSave = typeof this.state.value === 'number' const hasValueToSave = typeof this.state.value === 'number'
saveSymptom(this.symptom, date, hasValueToSave ? valuesToSave : null) saveSymptom(this.symptom, date, hasValueToSave ? valuesToSave : null)
} }
+1 -1
View File
@@ -37,7 +37,7 @@ class Desire extends Component {
autoSave = () => { autoSave = () => {
const { date } = this.props const { date } = this.props
const valuesToSave = { ...this.state } const valuesToSave = { ...this.state }
const hasValueToSave = typeof this.state.value === 'number' const hasValueToSave = typeof this.state.value === 'number'
saveSymptom(this.symptom, date, hasValueToSave ? valuesToSave : null) saveSymptom(this.symptom, date, hasValueToSave ? valuesToSave : null)
} }
@@ -53,7 +53,7 @@ class SymptomView extends Component {
return this.values[key] || this.values[key] === 0 return this.values[key] || this.values[key] === 0
} }
const valuesKeys = Object.keys(this.values) const valuesKeys = Object.keys(this.values)
return valuesKeys.some(valueHasBeenFilledOut) return valuesKeys.some(valueHasBeenFilledOut)
} }
+2 -2
View File
@@ -29,7 +29,7 @@ const IconText = ({ children, wrapperStyles }) => {
) )
} }
const HomeElement = ({ children, onPress, buttonColor, buttonLabel }) => { const HomeElement = ({ children, onPress, buttonColor, buttonLabel }) => {
return ( return (
<View <View
onPress={ onPress } onPress={ onPress }
@@ -228,4 +228,4 @@ function getBleedingPredictionRange(prediction) {
return labels.unknown return labels.unknown
} }
return (daysToEnd === 0 ? '0' : `0 - ${daysToEnd}`) return (daysToEnd === 0 ? '0' : `0 - ${daysToEnd}`)
} }
+4 -2
View File
@@ -67,7 +67,9 @@ export default function config(opts) {
} }
function getCycleForCycleStartDay(startDay, todayDate) { function getCycleForCycleStartDay(startDay, todayDate) {
const todayAsLocalDate = todayDate ? LocalDate.parse(todayDate) : LocalDate.now() const todayAsLocalDate = todayDate
? LocalDate.parse(todayDate)
: LocalDate.now()
const cycleStartIndex = cycleDaysSortedByDate.indexOf(startDay) const cycleStartIndex = cycleDaysSortedByDate.indexOf(startDay)
const i = cycleStartsSortedByDate.indexOf(startDay) const i = cycleStartsSortedByDate.indexOf(startDay)
const startLocalDate = LocalDate.parse(startDay.date) const startLocalDate = LocalDate.parse(startDay.date)
@@ -201,4 +203,4 @@ export default function config(opts) {
isMensesStart, isMensesStart,
getMensesDaysRightAfter getMensesDaysRightAfter
} }
} }