Commit 4eca3128 authored by Adam Procter's avatar Adam Procter 💩

Merge branch 'master' into svg_again

parents 07bce684 8c724aee
node_modules/.cache/*
/node_modules/.cache/*
node_modules/.cache/
*.swp
stages:
- install
- test
- build
- deploy
cache:
paths:
- node_modules/
- .yarn
install_dependencies:
stage: build
dependencies:
stage: install
script:
- echo "Installing dependencies"
- yarn install
artifacts:
paths:
- node_modules/
lint:
stage: build
stage: test
script:
- echo "Running eslint"
- yarn run lint
artifacts:
paths:
- node_modules/
build:
stage: build
script:
- echo "Building minified production app"
- yarn run build
artifacts:
paths:
- node_modules/
production_server:
stage: deploy
script:
- echo "Deploying to production server"
environment:
name: production
url: http://nn.adamprocter.co.uk
when: manual
only:
- master
{"remainingRequest":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/babel-loader/lib/index.js!/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/eslint-loader/index.js??ref--13-0!/Users/adamprocter/Documents/GitKraken/nodenoggin/src/main.js","dependencies":[{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/src/main.js","mtime":1534177597092},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js","mtime":1534157856761},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/babel-loader/lib/index.js","mtime":1534157848390},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/eslint-loader/index.js","mtime":1534157852415}],"contextDependencies":[],"result":["import \"core-js/modules/es6.array.iterator\";\nimport \"core-js/modules/es6.promise\";\nimport \"core-js/modules/es7.promise.finally\";\nimport Vue from 'vue';\nimport App from './App.vue';\nimport router from './router';\nVue.config.productionTip = false;\nnew Vue({\n router: router,\n render: function render(h) {\n return h(App);\n }\n}).$mount('#app');\n\nmounted: {\n require('@/assets/js/custom');\n}",{"version":3,"sources":["src/main.js"],"names":["Vue","App","router","config","productionTip","render","h","$mount","mounted","require"],"mappings":";;;AAAA,OAAOA,GAAP,MAAgB,KAAhB;AACA,OAAOC,GAAP,MAAgB,WAAhB;AACA,OAAOC,MAAP,MAAmB,UAAnB;AAEAF,IAAIG,MAAJ,CAAWC,aAAX,GAA2B,KAA3B;AAEA,IAAIJ,GAAJ,CAAQ;AACNE,gBADM;AAENG,UAAQ;AAAA,WAAKC,EAAEL,GAAF,CAAL;AAAA;AAFF,CAAR,EAGGM,MAHH,CAGU,MAHV;;AAKAC,SAAQ;AACRC,UAAQ,oBAAR;AAEC","sourceRoot":"/Users/adamprocter/Documents/GitKraken/nodenoggin","sourcesContent":["import Vue from 'vue'\nimport App from './App.vue'\nimport router from './router'\n\nVue.config.productionTip = false\n\nnew Vue({\n router,\n render: h => h(App)\n}).$mount('#app')\n\nmounted:{\nrequire('@/assets/js/custom')\n\n}"]}]}
\ No newline at end of file
{"remainingRequest":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/babel-loader/lib/index.js!/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/eslint-loader/index.js??ref--13-0!/Users/adamprocter/Documents/GitKraken/nodenoggin/src/main.js","dependencies":[{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/src/main.js","mtime":1534185811779},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/cache-loader/dist/cjs.js","mtime":1534157856761},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/babel-loader/lib/index.js","mtime":1534157848390},{"path":"/Users/adamprocter/Documents/GitKraken/nodenoggin/node_modules/eslint-loader/index.js","mtime":1534157852415}],"contextDependencies":[],"result":["import Vue from 'vue';\nimport svg from 'svg.js';\nimport connect from 'svg.connectable.js';\nimport dragg from 'svg.draggy.js';\nimport App from './App.vue';\nimport router from './router';\nVue.config.productionTip = false;\nnew Vue({\n router: router,\n render: function render(h) {\n return h(App);\n }\n}).$mount('#app');\n\nmounted: {\n require('@/assets/js/custom');\n}",{"version":3,"sources":["src/main.js"],"names":["Vue","svg","connect","dragg","App","router","config","productionTip","render","h","$mount","mounted","require"],"mappings":"AAAA,OAAOA,GAAP,MAAgB,KAAhB;AACA,OAAOC,GAAP,MAAgB,QAAhB;AACA,OAAOC,OAAP,MAAoB,oBAApB;AACA,OAAOC,KAAP,MAAkB,eAAlB;AACA,OAAOC,GAAP,MAAgB,WAAhB;AACA,OAAOC,MAAP,MAAmB,UAAnB;AAEAL,IAAIM,MAAJ,CAAWC,aAAX,GAA2B,KAA3B;AAEA,IAAIP,GAAJ,CAAQ;AACNK,gBADM;AAENG,UAAQ;AAAA,WAAKC,EAAEL,GAAF,CAAL;AAAA;AAFF,CAAR,EAGGM,MAHH,CAGU,MAHV;;AAKAC,SAAQ;AACRC,UAAQ,oBAAR;AAEC","sourceRoot":"/Users/adamprocter/Documents/GitKraken/nodenoggin","sourcesContent":["import Vue from 'vue'\nimport svg from 'svg.js'\nimport connect from 'svg.connectable.js'\nimport dragg from 'svg.draggy.js'\nimport App from './App.vue'\nimport router from './router'\n\nVue.config.productionTip = false\n\nnew Vue({\n router,\n render: h => h(App)\n}).$mount('#app')\n\nmounted:{\nrequire('@/assets/js/custom')\n\n}"]}]}
\ No newline at end of file
......@@ -17,7 +17,7 @@ export default {
}
// SVG UI needs
//var draw = SVG('spatialui').size(300, 300)
var draw = SVG('spatialui').size(300, 300)
// var links = draw.group()
// var markers = draw.group()
......@@ -27,7 +27,7 @@ export default {
// var rect_2 = nodes.group().translate(200, 200).draggy();
// var rect_3 = nodes.group().translate(100, 200).draggy();
//var rect_1 = draw.rect(50, 50).attr({ fill: '#f06' })
// var rect_1 = draw.rect(50, 50).attr({ fill: '#f06' })
// rect_2.rect(50, 50).attr({ fill: '#f08' })
// rect_3.rect(50, 50).attr({ fill: '#f12' })
......
import Vue from 'vue'
import App from './App.vue'
import router from './router'
import SVG from 'svg.js'
import connect from 'svg.connectable.js'
import dragg from 'svg.draggy.js'
Vue.config.productionTip = false
new Vue({
router,
router, SVG, connect, dragg,
render: h => h(App)
}).$mount('#app')
......
......@@ -9,6 +9,9 @@
<script>
// @ is an alias to /src
import instance from "@/components/instance.vue";
import svg from 'svg.js'
import connect from 'svg.connectable.js'
import dragg from 'svg.draggy.js'
export default {
name: 'home',
......
......@@ -9,8 +9,9 @@
import signin from "@/components/signin.vue";
import register from "@/components/register.vue";
export default {
name: 'start',
name: 'app',
components: {
signin: signin,
register: register
......
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