diff --git a/app/client/index.js b/app/client/index.js index 35c9495..8efdc18 100644 --- a/app/client/index.js +++ b/app/client/index.js @@ -22,9 +22,9 @@ app.use(require('./models/search')) app.use(require('./models/selection')) app.use(require('./models/tags')) -app.route('/', require('./views/start')) -app.route('/home', require('./views/home')) -app.route('/initial', require('./views/initial')) -app.route('/reader', require('./views/reader')) +app.route('#', require('./views/start')) +app.route('#home', require('./views/home')) +app.route('#initial', require('./views/initial')) +app.route('#reader', require('./views/reader')) app.mount('body') diff --git a/app/client/models/main.js b/app/client/models/main.js index 2999182..ec260e9 100644 --- a/app/client/models/main.js +++ b/app/client/models/main.js @@ -5,11 +5,11 @@ module.exports = (state, bus) => { bus.on('initialising:start', () => { state.initialising = true - bus.emit('pushState', '/initial') + bus.emit('pushState', '#initial') }) bus.on('initialising:stop', () => { state.initialising = false - bus.emit('pushState', '/home') + bus.emit('pushState', '#home') }) } diff --git a/app/client/models/reader.js b/app/client/models/reader.js index c054c78..82c1ffb 100644 --- a/app/client/models/reader.js +++ b/app/client/models/reader.js @@ -3,11 +3,11 @@ module.exports = (state, bus) => { bus.on('reader:read', paper => { state.reading = paper - bus.emit('pushState', `/reader`) + bus.emit('pushState', '#reader') }) bus.on('reader:quit', () => { state.reading = null - bus.emit('pushState', '/home') + bus.emit('pushState', '#home') }) } diff --git a/app/client/state.js b/app/client/state.js deleted file mode 100644 index 85505a5..0000000 --- a/app/client/state.js +++ /dev/null @@ -1,36 +0,0 @@ -module.exports = { - results: [], - tags: { - tags: {}, - showAddField: false, - loaded: false - }, - datasources: { shown: false, loaded: false, list: [] }, - detailshown: false, - autocompleteshown: false, - search: { - query: '', - tagquery: null, - tags: [] - }, - contentserver: require('./lib/contentServer')(C.DATASOURCES_PATH), - collectioncount: 0, - selection: { - reference: null, - list: [], - lookup: {}, - downloaded: 'loading' - }, - reader: { - visible: false, - paper: null - }, - notes: {}, - downloads: { - totalspeed: 0, - list: [], - lookup: {} - }, - online: false, - initialising: false -}