Skip to content
Snippets Groups Projects
Commit f85ed18e authored by Adam Procter's avatar Adam Procter
Browse files

Merge branch 'organise-forlarger' into main

parents b0b0781b f9c020c1
No related branches found
No related tags found
No related merge requests found
<template> <template>
<div id="app"> <div id="app">
<navigation /> <navigation />
<router-view /> <router-view />
<!-- <router-view v-if="this.window.width < 600" name="this.name" />
<router-view v-else to="/organise" /> -->
</div> </div>
</template> </template>
...@@ -11,12 +14,30 @@ import Navigation from './components/Navigation' ...@@ -11,12 +14,30 @@ import Navigation from './components/Navigation'
export default { export default {
data: function () { data: function () {
return { return {
// name: '',
// window: {
// width: 0,
// height: 0,
// },
routes: routes.filter((route) => !!route.name), routes: routes.filter((route) => !!route.name),
} }
}, },
components: { components: {
navigation: Navigation, navigation: Navigation,
}, },
// mounted() {
// window.addEventListener('resize', this.handleResize)
// this.handleResize()
// this.name = routes[1].name
// },
// destroyed() {
// window.removeEventListener('resize', this.handleResize)
// },
// methods: {
// handleResize() {
// this.window.width = window.innerWidth
// },
// },
} }
</script> </script>
<style> <style>
......
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
}, },
editTrue(e) { editTrue(e) {
this.$emit('editTrue', e) this.$emit('edit-true', e)
}, },
deleteFlag(e) { deleteFlag(e) {
......
...@@ -39,10 +39,10 @@ export default { ...@@ -39,10 +39,10 @@ export default {
methods: { methods: {
addDoc() { addDoc() {
this.$store.dispatch('addDoc') this.$store.dispatch('addDoc')
this.$emit('editMode') this.$emit('edit-mode')
}, },
editTrue(e) { editTrue(e) {
this.$emit('editTrue', e) this.$emit('edit-true', e)
//// console.log(e) //// console.log(e)
}, },
......
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
}, },
listView() { listView() {
// FIXME: add action here to toggle visiblity // FIXME: add action here to toggle visiblity
this.$emit('listView') this.$emit('list-view')
}, },
exportStorage: function () { exportStorage: function () {
// Save local indexeddb document-store to JSON file // Save local indexeddb document-store to JSON file
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
} else { } else {
// handle offline status // handle offline status
// console.log('offline') // console.log('offline')
ref.$emit('offlineTriggered') ref.$emit('offline-triggered')
} }
}, },
isReachable: function (url) { isReachable: function (url) {
......
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
}, },
letsGo() { letsGo() {
this.$emit('clientAdded') this.$emit('client-added')
// this.$emit('readyMode') // this.$emit('readyMode')
}, },
setFocus() { setFocus() {
......
...@@ -18,6 +18,7 @@ const store = { ...@@ -18,6 +18,7 @@ const store = {
nodes: [], nodes: [],
}, },
mode: 'select', mode: 'select',
tipshidden: false,
scale: 1, scale: 1,
translation: { translation: {
x: 0, x: 0,
......
import Vue from 'vue' import Vue from 'vue'
import VueRouter from 'vue-router' import VueRouter from 'vue-router'
import List from '../views/List.vue' import Collect from '../views/Collect.vue'
import Organise from '../views/Organise.vue' import Organise from '../views/Organise.vue'
import Cards from '../views/Cards.vue' import Cards from '../views/Cards.vue'
import Discarded from '../views/Discarded.vue' import Discarded from '../views/Discarded.vue'
...@@ -17,7 +17,7 @@ export const routes = [ ...@@ -17,7 +17,7 @@ export const routes = [
{ {
path: '/', path: '/',
name: 'Collect', name: 'Collect',
component: List, component: Collect,
}, },
{ {
path: '/organise', path: '/organise',
...@@ -57,7 +57,7 @@ export const routes = [ ...@@ -57,7 +57,7 @@ export const routes = [
// dynamic segement `:microcosm` is added to the path // dynamic segement `:microcosm` is added to the path
{ {
path: '/microcosm/:microcosm', path: '/microcosm/:microcosm',
component: List, component: Collect,
}, },
] ]
......
...@@ -77,7 +77,7 @@ import { mapState } from 'vuex' ...@@ -77,7 +77,7 @@ import { mapState } from 'vuex'
import { shortcutsMixin } from '@/components/mixins/shortcutsMixin.js' import { shortcutsMixin } from '@/components/mixins/shortcutsMixin.js'
export default { export default {
name: 'List', name: 'Collect',
mixins: [shortcutsMixin], mixins: [shortcutsMixin],
data: function () { data: function () {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment