Skip to content

Commit eb3de03

Browse files
committed
Remove cordova, update packages, reorganize directory structure
1 parent 5b17b8c commit eb3de03

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+143
-295
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v6.2.1
1+
v6.4.0

client/index.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ import React from 'react';
33
import ReactDOM from 'react-dom';
44
import { Provider } from 'react-redux';
55
import { Router } from 'react-router';
6-
import { routes } from 'routes';
7-
import configureStore from 'config/store';
8-
import { browserHistory, hashHistory } from 'react-router';
6+
import { browserHistory } from 'react-router';
97
import { syncHistoryWithStore } from 'react-router-redux';
8+
import configureStore from 'store';
9+
import routes from 'routes';
1010

1111
/* Images
1212
* This space is reserved for images that are required by server rendering,
1313
* e.g. the favicon and any other images that need to be in the base HTML file.
1414
*/
15-
import '../common/assets/images/favicon.png';
15+
import '../common/images/favicon.png';
1616

1717
/* Stylesheets
1818
* Main.scss should @import all the other stylesheets that you need. If you want
1919
* to use LESS or another preprocessor, you can include it here and update your
2020
* webpack configure to use the appropriate loader.
2121
*/
22-
import '../common/assets/stylesheets/main.scss';
22+
import '../common/css/main.scss';
2323

2424
// The root element of your app
2525
const rootElement = document.getElementById('app');
@@ -28,10 +28,7 @@ const rootElement = document.getElementById('app');
2828
// rendering.
2929
const initialState = window.__INITIAL_STATE__;
3030
const store = configureStore(initialState);
31-
const history = syncHistoryWithStore(
32-
(__CORDOVA__ ? hashHistory : browserHistory),
33-
store
34-
);
31+
const history = syncHistoryWithStore(browserHistory, store);
3532

3633
// Render the app!
3734
ReactDOM.render(

common/assets/stylesheets/components/_header.scss

Lines changed: 0 additions & 12 deletions
This file was deleted.

common/assets/stylesheets/layout/_footer.scss

Lines changed: 0 additions & 4 deletions
This file was deleted.

common/assets/stylesheets/layout/_header.scss

Lines changed: 0 additions & 3 deletions
This file was deleted.

common/assets/stylesheets/main.scss

Lines changed: 0 additions & 27 deletions
This file was deleted.

common/assets/stylesheets/pages/_home.scss

Lines changed: 0 additions & 4 deletions
This file was deleted.

common/config/store.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)