diff --git a/app/.gitignore b/app/.gitignore index cc4d86b41e7d3f258e7b99c56192d068c79583d8..99337be2a6372fafe80482599d59e0366bd138cb 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,10 +1,11 @@ .DS_Store node_modules /dist -/assets/settings.json +/src/assets/settings.json # local env files +.env .env.local .env.*.local diff --git a/app/src/assets/settings.json b/app/src/assets/settings.json index cb5d964182e796c69a7962288c4c4f3fde509b8c..5b0f797475c5cf288af9f1b5abcffab1d0e3f6ff 100644 --- a/app/src/assets/settings.json +++ b/app/src/assets/settings.json @@ -1,3 +1,9 @@ { - "settings": [{ "name": "nogg", "password": "N/9d^9cn23" }] + "settings": [ + { + "name": "nogg", + "password": "N/9d^9cn23", + "url": "@nn.adamprocter.co.uk/" + } + ] } diff --git a/app/src/store/index.js b/app/src/store/index.js index 6fb2ba680b61689e34290c3f1cb2b7b52c41e048..93ef38c2b1ef82c2cd84386c62109e58d6b0062c 100644 --- a/app/src/store/index.js +++ b/app/src/store/index.js @@ -4,7 +4,7 @@ import PouchDB from 'pouchdb' PouchDB.plugin(require('pouchdb-find')) import VueDraggableResizable from 'vue-draggable-resizable' -import accounts from '../assets/settings.json' +//import accounts from '../assets/settings.json' // PouchDB.debug.enable('*') Vue.use(Vuex) @@ -24,14 +24,16 @@ if (localStorage.getItem('myNNClient') == null) { } var pouchdb = new PouchDB(microcosm) -var remote = - 'https://' + - accounts.settings[0].name + - ':' + - accounts.settings[0].password + - '@nn.adamprocter.co.uk/' + - microcosm + - '/' +// var remote = +// 'https://' + +// accounts.settings[0].name + +// ':' + +// accounts.settings[0].password + +// accounts.settings[0].url + +// microcosm + +// '/' + +var remote = 'http://127.0.0.1:5984/localcouch' const store = new Vuex.Store({ state: { @@ -80,14 +82,15 @@ const store = new Vuex.Store({ // console.log(doc) microcosm = doc pouchdb = new PouchDB(microcosm) - remote = - 'https://' + - accounts.settings[0].name + - ':' + - accounts.settings[0].password + - '@nn.adamprocter.co.uk/' + - microcosm + - '/' + // remote = + // 'https://' + + // accounts.settings[0].name + + // ':' + + // accounts.settings[0].password + + // accounts.settings[0].url + + // microcosm + + // '/' + remote = 'http://127.0.0.1:5984/localcouch' store.dispatch('syncDB') })