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