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

Auto stash before merge of "feature/nodes-and-connections-canvas" and "listView"

parent 00210420
No related branches found
No related tags found
No related merge requests found
Showing
with 102 additions and 74 deletions
module.exports = { module.exports = {
root: true, root: true,
env: { env: {
node: true, node: true
}, },
extends: ['plugin:vue/essential', 'eslint:recommended', '@vue/prettier'], extends: ['plugin:vue/essential', 'eslint:recommended', '@vue/prettier'],
parserOptions: { parserOptions: {
parser: 'babel-eslint', parser: 'babel-eslint'
}, },
rules: { rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
}, }
} }
module.exports = { module.exports = {
singleQuote: true, singleQuote: true,
semi: false, semi: false
} }
module.exports = { module.exports = {
presets: ['@vue/cli-plugin-babel/preset'], presets: ['@vue/cli-plugin-babel/preset']
} }
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
export default { export default {
props: { props: {
buttonClass: { buttonClass: {
type: String, type: String
}, }
}, }
} }
</script> </script>
......
...@@ -45,8 +45,8 @@ export default { ...@@ -45,8 +45,8 @@ export default {
}, },
computed: mapState({ computed: mapState({
myMicrocosm: (state) => state.microcosm, myMicrocosm: state => state.microcosm,
myClient: (state) => state.myclient, myClient: state => state.myclient
}), }),
methods: { methods: {
addNode() { addNode() {
...@@ -105,8 +105,8 @@ export default { ...@@ -105,8 +105,8 @@ export default {
}, },
getServerUrl: function() { getServerUrl: function() {
return serverUrl || window.location.origin return serverUrl || window.location.origin
}, }
}, }
} }
</script> </script>
......
...@@ -18,17 +18,17 @@ export default { ...@@ -18,17 +18,17 @@ export default {
name: 'ListLayer', name: 'ListLayer',
props: { props: {
nodeid: String, nodeid: String,
nodetext: String, nodetext: String
}, },
computed: mapState({ computed: mapState({
myNodes: (state) => state.myNodes, myNodes: state => state.myNodes
}), }),
filters: { filters: {
// need to write a reverse data filter I suspect here so new data is at the top of list // need to write a reverse data filter I suspect here so new data is at the top of list
marked: marked, marked: marked
}, }
} }
</script> </script>
......
...@@ -76,19 +76,19 @@ export default { ...@@ -76,19 +76,19 @@ export default {
nodetext: String, nodetext: String,
nodewidth: Number, nodewidth: Number,
nodeheight: Number, nodeheight: Number,
deleted: Boolean, deleted: Boolean
}, },
data() { data() {
return { return {
pickupz: 99, pickupz: 99,
readmode: false, readmode: false,
mode: 'Read', mode: 'Read'
} }
}, },
filters: { filters: {
marked: marked, marked: marked
}, },
// FIXME: how do we know how to focus on the newest node ? // FIXME: how do we know how to focus on the newest node ?
...@@ -106,9 +106,9 @@ export default { ...@@ -106,9 +106,9 @@ export default {
// }, // },
computed: mapState({ computed: mapState({
myNodes: (state) => state.myNodes, myNodes: state => state.myNodes,
configPositions: (state) => state.configPositions, configPositions: state => state.configPositions,
configEmoji: (state) => state.configEmoji, configEmoji: state => state.configEmoji
}), }),
methods: { methods: {
onActivated() { onActivated() {
...@@ -146,7 +146,7 @@ export default { ...@@ -146,7 +146,7 @@ export default {
y, y,
width, width,
height, height,
zindex, zindex
}) })
}, },
onDrag(x, y) { onDrag(x, y) {
...@@ -172,7 +172,7 @@ export default { ...@@ -172,7 +172,7 @@ export default {
y, y,
width, width,
height, height,
zindex, zindex
}) })
}, },
...@@ -198,8 +198,8 @@ export default { ...@@ -198,8 +198,8 @@ export default {
this.readmode = true this.readmode = true
this.mode = 'Edit' this.mode = 'Edit'
} }
}, }
}, }
} }
</script> </script>
......
...@@ -79,7 +79,7 @@ export default { ...@@ -79,7 +79,7 @@ export default {
clientid: '', clientid: '',
parta: true, parta: true,
partb: false, partb: false,
partc: false, partc: false
} }
}, },
...@@ -120,8 +120,8 @@ export default { ...@@ -120,8 +120,8 @@ export default {
}, },
readyFocusTwo() { readyFocusTwo() {
this.$refs.objectnametwo.focus() this.$refs.objectnametwo.focus()
}, }
}, }
} }
</script> </script>
......
...@@ -20,17 +20,17 @@ export default { ...@@ -20,17 +20,17 @@ export default {
name: 'OtherListlayer', name: 'OtherListlayer',
props: { props: {
nodeid: String, nodeid: String,
nodetext: String, nodetext: String
}, },
computed: mapState({ computed: mapState({
otherNodes: (state) => state.otherNodes, otherNodes: state => state.otherNodes
}), }),
filters: { filters: {
// need to write a reverse data filter I suspect here so new data is at the top of list // need to write a reverse data filter I suspect here so new data is at the top of list
marked: marked, marked: marked
}, }
} }
</script> </script>
......
...@@ -99,32 +99,32 @@ export default { ...@@ -99,32 +99,32 @@ export default {
name: 'otherNodeslayer', name: 'otherNodeslayer',
components: { components: {
EmojiPicker, EmojiPicker
}, },
props: { props: {
nodeid: String, nodeid: String,
nodetext: String, nodetext: String,
nodewidth: Number, nodewidth: Number,
nodeheight: Number, nodeheight: Number
}, },
data() { data() {
return { return {
input: '', input: '',
search: '', search: '',
pickupz: 99, pickupz: 99
} }
}, },
filters: { filters: {
marked: marked, marked: marked
}, },
mounted() {}, mounted() {},
computed: mapState({ computed: mapState({
otherNodes: (state) => state.otherNodes, otherNodes: state => state.otherNodes,
configPositions: (state) => state.configPositions, configPositions: state => state.configPositions,
configEmoji: (state) => state.configEmoji, configEmoji: state => state.configEmoji
}), }),
methods: { methods: {
onActivated() { onActivated() {
...@@ -162,7 +162,7 @@ export default { ...@@ -162,7 +162,7 @@ export default {
y, y,
width, width,
height, height,
zindex, zindex
}) })
}, },
onDrag(x, y) { onDrag(x, y) {
...@@ -188,7 +188,7 @@ export default { ...@@ -188,7 +188,7 @@ export default {
y, y,
width, width,
height, height,
zindex, zindex
}) })
}, },
append(emoji) { append(emoji) {
...@@ -199,19 +199,19 @@ export default { ...@@ -199,19 +199,19 @@ export default {
nodeid = this.nodeid nodeid = this.nodeid
this.$store.dispatch('addEmoji', { this.$store.dispatch('addEmoji', {
nodeid, nodeid,
emojitext, emojitext
}) })
this.input = '' this.input = ''
}, }
}, },
directives: { directives: {
focus: { focus: {
inserted(el) { inserted(el) {
el.focus() el.focus()
}, }
}, }
}, }
} }
</script> </script>
......
...@@ -60,6 +60,6 @@ export const drag = { ...@@ -60,6 +60,6 @@ export const drag = {
function setTranslate(xPos, yPos, el) { function setTranslate(xPos, yPos, el) {
el.style.transform = 'translate3d(' + xPos + 'px, ' + yPos + 'px, 0)' el.style.transform = 'translate3d(' + xPos + 'px, ' + yPos + 'px, 0)'
} }
}, }
}, }
} }
...@@ -25,6 +25,6 @@ export const draw = { ...@@ -25,6 +25,6 @@ export const draw = {
ctx.stroke() ctx.stroke()
ctx.setTransform(1, 0, 0, 1, 0, 0) ctx.setTransform(1, 0, 0, 1, 0, 0)
}, }
}, }
} }
...@@ -11,6 +11,6 @@ export const shortcutsMixin = { ...@@ -11,6 +11,6 @@ export const shortcutsMixin = {
this.addNode() this.addNode()
} }
} }
}, }
}, }
} }
...@@ -6,7 +6,10 @@ ...@@ -6,7 +6,10 @@
v-bind:key="mode.name" v-bind:key="mode.name"
v-bind:class="isActive(mode) ? 'active' : 'inactive'" v-bind:class="isActive(mode) ? 'active' : 'inactive'"
> >
<Icon v-bind:type="mode.icon" v-bind:theme="isActive(mode) ? 'light' : 'dark'" /> <Icon
v-bind:type="mode.icon"
v-bind:theme="isActive(mode) ? 'light' : 'dark'"
/>
</button> </button>
</nav> </nav>
</template> </template>
......
...@@ -5,8 +5,16 @@ ...@@ -5,8 +5,16 @@
clip-rule="evenodd" clip-rule="evenodd"
d="M37 15H17.1154V30.8636H37V15ZM15.1154 13V32.8636H39V13H15.1154Z" d="M37 15H17.1154V30.8636H37V15ZM15.1154 13V32.8636H39V13H15.1154Z"
/> />
<path fill-rule="evenodd" clip-rule="evenodd" d="M26 27L26 19L28 19L28 27L26 27Z" /> <path
fill-rule="evenodd"
clip-rule="evenodd"
d="M26 27L26 19L28 19L28 27L26 27Z"
/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M31 24H23V22H31V24Z" /> <path fill-rule="evenodd" clip-rule="evenodd" d="M31 24H23V22H31V24Z" />
<path fill-rule="evenodd" clip-rule="evenodd" d="M16 16.1364H12V36H35.8846V32H16V16.1364Z" /> <path
fill-rule="evenodd"
clip-rule="evenodd"
d="M16 16.1364H12V36H35.8846V32H16V16.1364Z"
/>
</g> </g>
</template> </template>
...@@ -9,4 +9,15 @@ import person from './person' ...@@ -9,4 +9,15 @@ import person from './person'
import plus from './plus' import plus from './plus'
import select from './select' import select from './select'
export { addNode, connection, draw, idea, magnify, minus, move, person, plus, select } export {
addNode,
connection,
draw,
idea,
magnify,
minus,
move,
person,
plus,
select
}
<template> <template>
<g> <g>
<rect x="11" y="36.4246" width="10.5" height="4" transform="rotate(-45 11 36.4246)" /> <rect
x="11"
y="36.4246"
width="10.5"
height="4"
transform="rotate(-45 11 36.4246)"
/>
<path <path
fill-rule="evenodd" fill-rule="evenodd"
clip-rule="evenodd" clip-rule="evenodd"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment