From f9c020c1a9dd08ff5778afca157e75bea989d20d Mon Sep 17 00:00:00 2001
From: Adam Procter <adamprocter@researchnot.es>
Date: Fri, 20 Nov 2020 17:00:18 +0000
Subject: [PATCH] more kebab case fixes and rename Collect
redirect on initial load to organise if on larger display not working yet
---
app/src/App.vue | 21 +++++++++++++++++++++
app/src/components/CardsLayer.vue | 2 +-
app/src/components/OffLine.vue | 4 ++--
app/src/components/old/ControlsLayer.vue | 4 ++--
app/src/components/old/OnBoard-old.vue | 2 +-
app/src/experimental/uiStore.js | 1 +
app/src/router/index.js | 6 +++---
app/src/views/{List.vue => Collect.vue} | 2 +-
8 files changed, 32 insertions(+), 10 deletions(-)
rename app/src/views/{List.vue => Collect.vue} (99%)
diff --git a/app/src/App.vue b/app/src/App.vue
index d6dc96e..d9bc854 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -1,7 +1,10 @@
<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>
diff --git a/app/src/components/CardsLayer.vue b/app/src/components/CardsLayer.vue
index 16e4a98..2d743bb 100644
--- a/app/src/components/CardsLayer.vue
+++ b/app/src/components/CardsLayer.vue
@@ -99,7 +99,7 @@ export default {
},
editTrue(e) {
- this.$emit('editTrue', e)
+ this.$emit('edit-true', e)
},
deleteFlag(e) {
diff --git a/app/src/components/OffLine.vue b/app/src/components/OffLine.vue
index f8c5b52..2ab43f5 100644
--- a/app/src/components/OffLine.vue
+++ b/app/src/components/OffLine.vue
@@ -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)
},
diff --git a/app/src/components/old/ControlsLayer.vue b/app/src/components/old/ControlsLayer.vue
index 4bdbb4c..2bbe134 100644
--- a/app/src/components/old/ControlsLayer.vue
+++ b/app/src/components/old/ControlsLayer.vue
@@ -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) {
diff --git a/app/src/components/old/OnBoard-old.vue b/app/src/components/old/OnBoard-old.vue
index 2085657..ac5594d 100644
--- a/app/src/components/old/OnBoard-old.vue
+++ b/app/src/components/old/OnBoard-old.vue
@@ -106,7 +106,7 @@ export default {
},
letsGo() {
- this.$emit('clientAdded')
+ this.$emit('client-added')
// this.$emit('readyMode')
},
setFocus() {
diff --git a/app/src/experimental/uiStore.js b/app/src/experimental/uiStore.js
index 9d4a81a..74f1963 100644
--- a/app/src/experimental/uiStore.js
+++ b/app/src/experimental/uiStore.js
@@ -18,6 +18,7 @@ const store = {
nodes: [],
},
mode: 'select',
+ tipshidden: false,
scale: 1,
translation: {
x: 0,
diff --git a/app/src/router/index.js b/app/src/router/index.js
index 8489e75..d715684 100644
--- a/app/src/router/index.js
+++ b/app/src/router/index.js
@@ -1,6 +1,6 @@
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,
},
]
diff --git a/app/src/views/List.vue b/app/src/views/Collect.vue
similarity index 99%
rename from app/src/views/List.vue
rename to app/src/views/Collect.vue
index 26d5cc0..daba60a 100644
--- a/app/src/views/List.vue
+++ b/app/src/views/Collect.vue
@@ -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 () {
--
GitLab