Skip to content

Commit 044fec0

Browse files
authored
Merge pull request #1137 from StoDevX/greenkeeper/prettier-1.4.2
chore(package): update prettier to version 1.4.2
2 parents 9b5b9c8 + 6f08437 commit 044fec0

40 files changed

+130
-161
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"marked": "0.3.6",
120120
"minimist": "1.2.0",
121121
"pify": "2.3.0",
122-
"prettier": "1.3.1",
122+
"prettier": "1.4.2",
123123
"react-native-mock": "0.3.1",
124124
"react-native-view-shot": "1.9.1",
125125
"react-test-renderer": "15.5.4"

source/lib/courses/load-all-courses.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
import type {CourseCollectionType} from './types'
88
import {loadStudentNumber} from './load-student-number'
9-
import {
10-
loadCoursesFromUnofficialTranscript,
11-
} from './load-courses-from-unofficial-transcript'
9+
import {loadCoursesFromUnofficialTranscript} from './load-courses-from-unofficial-transcript'
1210

1311
export async function loadAllCourses(
1412
isConnected: boolean,

source/storybook/index.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ import SettingsView from '../views/settings'
5353
import CreditsView from '../views/settings/credits'
5454
import PrivacyView from '../views/settings/privacy'
5555
import LegalView from '../views/settings/legal'
56-
import CredentialsLoginSection
57-
from '../views/settings/sections/login-credentials'
56+
import CredentialsLoginSection from '../views/settings/sections/login-credentials'
5857
import TokenLoginSection from '../views/settings/sections/login-token'
5958
import OddsAndEndsSection from '../views/settings/sections/odds-and-ends'
6059
import SupportSection from '../views/settings/sections/support'
@@ -74,11 +73,10 @@ type ViewCollectionType = {
7473
},
7574
}
7675

77-
const Nav = ({children}: {children?: Function}) => (
76+
const Nav = ({children}: {children?: Function}) =>
7877
<Navigator
7978
renderScene={(route, navigator) => children && children({route, navigator})}
8079
/>
81-
)
8280

8381
export class SnapshotsView extends React.Component {
8482
state = {
@@ -209,13 +207,13 @@ export class SnapshotsView extends React.Component {
209207
render() {
210208
const selected = get(this.views, this.state.viewPath, {})
211209

212-
const options = this.viewsAsList().map(([parent, child]) => (
210+
const options = this.viewsAsList().map(([parent, child]) =>
213211
<Picker.Item
214212
key={`${parent}.${child}`}
215213
label={`${parent}${child}`}
216214
value={`${parent}.${child}`}
217-
/>
218-
))
215+
/>,
216+
)
219217

220218
const height = Dimensions.get('window').height
221219
const heightDiff = Platform.OS === 'ios' ? 64 : 56

source/views/building-hours/detail.android.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,29 +150,29 @@ export class BuildingHoursDetailView extends React.Component {
150150
<Text style={styles.badgeText}>{openStatus}</Text>
151151
</View>
152152

153-
{schedules.map(set => (
153+
{schedules.map(set =>
154154
<Card
155155
key={set.title}
156156
style={styles.scheduleContainer}
157157
header={set.title}
158158
footer={set.notes}
159159
>
160160
<View style={styles.scheduleHoursWrapper}>
161-
{set.hours.map((schedule, i) => (
161+
{set.hours.map((schedule, i) =>
162162
<ScheduleRow
163163
key={i}
164164
now={this.state.now}
165165
schedule={schedule}
166166
isActive={
167167
set.isPhysicallyOpen !== false &&
168-
schedule.days.includes(dayOfWeek) &&
169-
isBuildingOpenAtMoment(schedule, this.state.now)
168+
schedule.days.includes(dayOfWeek) &&
169+
isBuildingOpenAtMoment(schedule, this.state.now)
170170
}
171-
/>
172-
))}
171+
/>,
172+
)}
173173
</View>
174-
</Card>
175-
))}
174+
</Card>,
175+
)}
176176
</View>
177177
</ParallaxView>
178178
)

source/views/building-hours/detail.ios.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export class BuildingHoursDetailView extends React.Component {
128128
</View>
129129

130130
<TableView>
131-
{schedules.map(set => (
131+
{schedules.map(set =>
132132
<Section
133133
key={set.title}
134134
header={set.title.toUpperCase()}
@@ -151,8 +151,8 @@ export class BuildingHoursDetailView extends React.Component {
151151
/>
152152
)
153153
})}
154-
</Section>
155-
))}
154+
</Section>,
155+
)}
156156
</TableView>
157157
</View>
158158
</ParallaxView>

source/views/building-hours/list.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,13 @@ export class BuildingHoursList extends React.Component {
6666
refreshing={this.props.loading}
6767
onRefresh={this.props.onRefresh}
6868
>
69-
{(data: BuildingType) => (
69+
{(data: BuildingType) =>
7070
<BuildingRow
7171
name={data.name}
7272
info={data}
7373
now={this.props.now}
7474
onPress={() => this.onPressRow(data)}
75-
/>
76-
)}
75+
/>}
7776
</SimpleListView>
7877
)
7978
}

source/views/building-hours/row.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ export function BuildingRow({info, name, now, onPress}: PropsType) {
8686
</Row>
8787

8888
<View style={styles.detailWrapper}>
89-
{hours.map(({isActive, label, status}, i) => (
89+
{hours.map(({isActive, label, status}, i) =>
9090
<Detail key={i} style={styles.detailRow}>
9191
<BuildingTimeSlot
9292
highlight={hours.length > 1 && isActive}
9393
label={label}
9494
status={status}
9595
/>
96-
</Detail>
97-
))}
96+
</Detail>,
97+
)}
9898
</View>
9999
</Column>
100100
</ListRow>

source/views/calendar/index.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,22 @@ export default function CalendarPage() {
1717
id: 'StOlafCalendarView',
1818
title: 'St. Olaf',
1919
icon: 'school',
20-
component: () => (
21-
<GoogleCalendarView calendarId="le6tdd9i38vgb7fcmha0hu66u9gjus2e%40import.calendar.google.com" />
22-
),
20+
component: () =>
21+
<GoogleCalendarView calendarId="le6tdd9i38vgb7fcmha0hu66u9gjus2e%40import.calendar.google.com" />,
2322
},
2423
{
2524
id: 'OlevilleCalendarView',
2625
title: 'Oleville',
2726
icon: 'happy',
28-
component: () => (
29-
<GoogleCalendarView calendarId="[email protected]" />
30-
),
27+
component: () =>
28+
<GoogleCalendarView calendarId="[email protected]" />,
3129
},
3230
{
3331
id: 'NorthfieldCalendarView',
3432
title: 'Northfield',
3533
icon: 'pin',
36-
component: () => (
37-
<GoogleCalendarView calendarId="thisisnorthfield%40gmail.com" />
38-
),
34+
component: () =>
35+
<GoogleCalendarView calendarId="thisisnorthfield%40gmail.com" />,
3936
},
4037
]}
4138
/>

source/views/components/filter/filter-view.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ export function FilterViewComponent(props: PropsType) {
2626
props.onChange(result)
2727
}
2828

29-
const contents = props.filters.map(filter => (
29+
const contents = props.filters.map(filter =>
3030
<FilterSection
3131
key={filter.key}
3232
filter={filter}
3333
onChange={onFilterChanged}
34-
/>
35-
))
34+
/>,
35+
)
3636

3737
return (
3838
<ScrollView style={styles.container}>

source/views/components/filter/section-list.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export function ListSection({filter, onChange}: PropsType) {
6464
}
6565

6666
const hasImageColumn = options.some(val => Boolean(val.image))
67-
let buttons = options.map(val => (
67+
let buttons = options.map(val =>
6868
<Cell
6969
key={val.title}
7070
onPress={() => buttonPushed(val)}
@@ -80,8 +80,8 @@ export function ListSection({filter, onChange}: PropsType) {
8080
{val.detail ? <Text style={styles.detail}>{val.detail}</Text> : null}
8181
</Column>
8282
}
83-
/>
84-
))
83+
/>,
84+
)
8585

8686
if (mode === 'OR') {
8787
const showAllButton = (

0 commit comments

Comments
 (0)