Commit 8936b528 authored by Adam Procter's avatar Adam Procter

Merge branch 'rename-userinterface'

parents 4d687a0b 2934c0fe
Pipeline #230 failed with stages
......@@ -5,13 +5,13 @@
</a>
<!-- <knowledgeobject v-for="(knowledgeobject, index) in allobjects" :key="index" :object="knowledgeobject"/> -->
<userinterface></userinterface>
<humaninterface></humaninterface>
</div>
</template>
<script>
//import knowledgeobject from './knowledge-object.vue'
import userinterface from "./user-interface.vue";
import humaninterface from "./human-interface.vue";
// helper to access data from vuex
import { mapState } from "vuex";
......@@ -19,7 +19,7 @@ export default {
name: "current-instance",
components: {
// knowledgeobject,
userinterface
humaninterface
},
computed: mapState(["allobjects"])
};
......
<template>
<div id="user-interface">
<div id="human-interface">
<!-- the SVG.js stuff appears here -->
<styledviewer v-show="isShowing"></styledviewer>
</div>
......@@ -19,7 +19,7 @@ var knowledgeObj;
var knowledgeObjid;
export default {
name: "user-interface",
name: "human-interface",
components: {
styledviewer: styledviewer
},
......@@ -43,7 +43,7 @@ export default {
},
mounted: function() {
// SVG UI next
var draw = SVG("user-interface").size(600, 300);
var draw = SVG("human-interface").size(600, 300);
var data = [];
var data2 = [];
......
......@@ -591,25 +591,25 @@
lodash "^4.17.10"
to-fast-properties "^2.0.0"
"@fortawesome/fontawesome-common-types@^0.2.12":
version "0.2.12"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.12.tgz#42baa71f97ca06faeb0b6718fa5ed20c5eefdf07"
"@fortawesome/fontawesome-common-types@^0.2.14":
version "0.2.14"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.14.tgz#0eb86a77ac88e8c12c48591735283f0bf0ea5606"
"@fortawesome/fontawesome-svg-core@^1.2.2":
version "1.2.12"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.12.tgz#9732617b1e484435f6946645d7f9ad248f12c437"
version "1.2.14"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.14.tgz#48fde5fbfa223cffd5fac9c0402cfbe87605a7d0"
dependencies:
"@fortawesome/fontawesome-common-types" "^0.2.12"
"@fortawesome/fontawesome-common-types" "^0.2.14"
"@fortawesome/free-solid-svg-icons@^5.2.0":
version "5.6.3"
resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.6.3.tgz#1d7f6669ccd6a1ea673699e41f7e32c81401a260"
version "5.7.1"
resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.7.1.tgz#df41b8643383862a2af93456e7129e5ffc0fb7ae"
dependencies:
"@fortawesome/fontawesome-common-types" "^0.2.12"
"@fortawesome/fontawesome-common-types" "^0.2.14"
"@fortawesome/vue-fontawesome@^0.1.1":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.4.tgz#610a6d419311d400d24e162f7cb3a30082706a12"
version "0.1.5"
resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.5.tgz#ea70a4d4ad0d6d617048a5b2a2ff33e21fe47d61"
"@intervolga/optimize-cssnano-plugin@^1.0.5":
version "1.0.6"
......@@ -6871,8 +6871,8 @@ vue-style-loader@^4.1.0:
loader-utils "^1.0.2"
vue-template-compiler@^2.5.17:
version "2.6.5"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.5.tgz#2e3b4f20cdfa2a54a48895d97a5b711d0e7ad81c"
version "2.6.6"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.6.tgz#a807acbf3d51971d3721d75ecb1b927b517c1a02"
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
......@@ -6882,8 +6882,8 @@ vue-template-es2015-compiler@^1.8.2:
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.8.2.tgz#dd73e80ba58bb65dd7a8aa2aeef6089cf6116f2a"
vue@^2.5.17:
version "2.6.5"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.5.tgz#7a7e8723b875b91800e576aac41cb3ed325dddf0"
version "2.6.6"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.6.tgz#dde41e483c11c46a7bf523909f4f2f816ab60d25"
vuex@^3.0.1:
version "3.1.0"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment