Skip to content

Commit b518146

Browse files
author
Krit
committed
add \n at the end of file, revert Dashboard.js to its original
1 parent ff1c7e0 commit b518146

File tree

2 files changed

+85
-87
lines changed

2 files changed

+85
-87
lines changed

‎src/dashboard/Dashboard.js

Lines changed: 84 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ let Empty = React.createClass({
6767
});
6868

6969
const AppsIndexPage = () => (
70-
<AccountView section='Your Apps'>
71-
<AppsIndex />
72-
</AccountView>
73-
);
70+
<AccountView section='Your Apps'>
71+
<AppsIndex />
72+
</AccountView>
73+
);
7474

7575
const AccountSettingsPage = () => (
76-
<AccountView section='Account Settings'>
77-
<AccountOverview />
78-
</AccountView>
79-
);
76+
<AccountView section='Account Settings'>
77+
<AccountOverview />
78+
</AccountView>
79+
);
8080

8181
const PARSE_DOT_COM_SERVER_INFO = {
8282
features: {
@@ -137,32 +137,32 @@ class Dashboard extends React.Component {
137137
{},
138138
{ useMasterKey: true }
139139
).then(serverInfo => {
140-
app.serverInfo = serverInfo;
141-
return app;
142-
}, error => {
143-
if (error.code === 100) {
144-
app.serverInfo = {
145-
error: 'unable to connect to server',
146-
enabledFeatures: {},
147-
parseServerVersion: "unknown"
140+
app.serverInfo = serverInfo;
141+
return app;
142+
}, error => {
143+
if (error.code === 100) {
144+
app.serverInfo = {
145+
error: 'unable to connect to server',
146+
enabledFeatures: {},
147+
parseServerVersion: "unknown"
148+
}
149+
return Parse.Promise.as(app);
150+
} else if (error.code === 107) {
151+
app.serverInfo = {
152+
error: 'server version too low',
153+
enabledFeatures: {},
154+
parseServerVersion: "unknown"
155+
}
156+
return Parse.Promise.as(app);
157+
} else {
158+
app.serverInfo = {
159+
error: 'unknown error',
160+
enabledFeatures: {},
161+
parseServerVersion: "unknown"
162+
}
163+
return Parse.Promise.as(app);
148164
}
149-
return Parse.Promise.as(app);
150-
} else if (error.code === 107) {
151-
app.serverInfo = {
152-
error: 'server version too low',
153-
enabledFeatures: {},
154-
parseServerVersion: "unknown"
155-
}
156-
return Parse.Promise.as(app);
157-
} else {
158-
app.serverInfo = {
159-
error: 'unknown error',
160-
enabledFeatures: {},
161-
parseServerVersion: "unknown"
162-
}
163-
return Parse.Promise.as(app);
164-
}
165-
});
165+
});
166166
}
167167
});
168168
return Parse.Promise.when(appInfoPromises);
@@ -196,66 +196,64 @@ class Dashboard extends React.Component {
196196
</div>
197197
}
198198

199-
return (
200-
<Router history={history}>
201-
<Redirect from='/' to='/apps' />
202-
<Route path='/' component={App}>
203-
<Route path='apps' component={AppsIndexPage} />
204-
205-
<Redirect from='apps/:appId' to='/apps/:appId/browser' />
206-
<Route path='apps/:appId' component={AppData}>
207-
<Route path='getting_started' component={Empty} />
199+
return <Router history={history}>
200+
<Redirect from='/' to='/apps' />
201+
<Route path='/' component={App}>
202+
<Route path='apps' component={AppsIndexPage} />
208203

209-
<Route path='browser' component={false ? SchemaOverview : Browser} /> //In progress features. Change false to true to work on this feature.
210-
<Route path='browser/:className' component={Browser} />
204+
<Redirect from='apps/:appId' to='/apps/:appId/browser' />
205+
<Route path='apps/:appId' component={AppData}>
206+
<Route path='getting_started' component={Empty} />
211207

212-
<Route path='cloud_code' component={CloudCode} />
213-
<Route path='cloud_code/*' component={CloudCode} />
214-
<Route path='webhooks' component={Webhooks} />
215-
<Redirect from='jobs' to='/apps/:appId/jobs/scheduled' />
216-
<Route path='jobs' component={JobsData}>
217-
<Route path='new' component={JobEdit} />
218-
<Route path='edit/:jobId' component={JobEdit} />
219-
<Route path=':section' component={Jobs} />
220-
</Route>
221-
<Redirect from='logs' to='/apps/:appId/logs/info' />
222-
<Route path='logs/:type' component={Logs} />
223-
<Route path='config' component={Config} />
224-
<Route path='api_console' component={ApiConsole} />
225-
<Route path='migration' component={Migration} />
226-
<Redirect from='push' to='/apps/:appId/push/activity/all' />
227-
<Redirect from='push/activity' to='/apps/:appId/push/activity/all' />
228-
<Route path='push/activity/:category' component={PushIndex} />
229-
<Route path='push/audiences' component={PushAudiencesIndex} />
230-
<Route path='push/new' component={PushNew} />
231-
<Route path='push/:pushId' component={PushDetails} />
208+
<Route path='browser' component={false ? SchemaOverview : Browser} /> //In progress features. Change false to true to work on this feature.
209+
<Route path='browser/:className' component={Browser} />
232210

233-
<Redirect from='analytics' to='/apps/:appId/analytics/overview' />
234-
<Route path='analytics'>
235-
<Route path='overview' component={AnalyticsOverview} />
236-
<Redirect from='explorer' to='/apps/:appId/analytics/explorer/chart' />
237-
<Route path='explorer/:displayType' component={Explorer} />
238-
<Route path='retention' component={Retention} />
239-
<Route path='performance' component={Performance} />
240-
<Route path='slow_queries' component={SlowQueries} />
241-
</Route>
211+
<Route path='cloud_code' component={CloudCode} />
212+
<Route path='cloud_code/*' component={CloudCode} />
213+
<Route path='webhooks' component={Webhooks} />
214+
<Redirect from='jobs' to='/apps/:appId/jobs/scheduled' />
215+
<Route path='jobs' component={JobsData}>
216+
<Route path='new' component={JobEdit} />
217+
<Route path='edit/:jobId' component={JobEdit} />
218+
<Route path=':section' component={Jobs} />
219+
</Route>
220+
<Redirect from='logs' to='/apps/:appId/logs/info' />
221+
<Route path='logs/:type' component={Logs} />
222+
<Route path='config' component={Config} />
223+
<Route path='api_console' component={ApiConsole} />
224+
<Route path='migration' component={Migration} />
225+
<Redirect from='push' to='/apps/:appId/push/activity/all' />
226+
<Redirect from='push/activity' to='/apps/:appId/push/activity/all' />
227+
<Route path='push/activity/:category' component={PushIndex} />
228+
<Route path='push/audiences' component={PushAudiencesIndex} />
229+
<Route path='push/new' component={PushNew} />
230+
<Route path='push/:pushId' component={PushDetails} />
242231

243-
<Redirect from='settings' to='/apps/:appId/settings/general' />
244-
<Route path='settings' component={SettingsData}>
245-
<Route path='general' component={GeneralSettings} />
246-
<Route path='keys' component={SecuritySettings} />
247-
<Route path='users' component={UsersSettings} />
248-
<Route path='push' component={PushSettings} />
249-
<Route path='hosting' component={HostingSettings} />
250-
</Route>
232+
<Redirect from='analytics' to='/apps/:appId/analytics/overview' />
233+
<Route path='analytics'>
234+
<Route path='overview' component={AnalyticsOverview} />
235+
<Redirect from='explorer' to='/apps/:appId/analytics/explorer/chart' />
236+
<Route path='explorer/:displayType' component={Explorer} />
237+
<Route path='retention' component={Retention} />
238+
<Route path='performance' component={Performance} />
239+
<Route path='slow_queries' component={SlowQueries} />
251240
</Route>
252241

253-
<Redirect from='account' to='/account/overview' />
254-
<Route path='account/overview' component={AccountSettingsPage} />
242+
<Redirect from='settings' to='/apps/:appId/settings/general' />
243+
<Route path='settings' component={SettingsData}>
244+
<Route path='general' component={GeneralSettings} />
245+
<Route path='keys' component={SecuritySettings} />
246+
<Route path='users' component={UsersSettings} />
247+
<Route path='push' component={PushSettings} />
248+
<Route path='hosting' component={HostingSettings} />
249+
</Route>
255250
</Route>
256-
<Route path='*' component={FourOhFour} />
257-
</Router>
258-
)
251+
252+
<Redirect from='account' to='/account/overview' />
253+
<Route path='account/overview' component={AccountSettingsPage} />
254+
</Route>
255+
<Route path='*' component={FourOhFour} />
256+
</Router>
259257
}
260258
}
261259

‎src/dashboard/history.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
// Use the singleton history in react-router v2
1010
import { browserHistory } from 'react-router'
1111

12-
export default browserHistory;
12+
export default browserHistory;

0 commit comments

Comments
 (0)