From 0ed2c1a00c87a2b4982a148e539490b3398c19fa Mon Sep 17 00:00:00 2001
From: Adam Procter <adamprocter@researchnot.es>
Date: Fri, 28 Feb 2020 21:01:28 +0000
Subject: [PATCH] updated back to repo
---
app/.gitignore | 1 -
app/src/assets/settings.json | 2 +-
app/src/store/index.js | 39 ++++++++++++++++++------------------
3 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/app/.gitignore b/app/.gitignore
index 99337be..7b2632e 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -3,7 +3,6 @@ node_modules
/dist
/src/assets/settings.json
-
# local env files
.env
.env.local
diff --git a/app/src/assets/settings.json b/app/src/assets/settings.json
index 5b0f797..7a32006 100644
--- a/app/src/assets/settings.json
+++ b/app/src/assets/settings.json
@@ -2,7 +2,7 @@
"settings": [
{
"name": "nogg",
- "password": "N/9d^9cn23",
+ "password": "",
"url": "@nn.adamprocter.co.uk/"
}
]
diff --git a/app/src/store/index.js b/app/src/store/index.js
index 93ef38c..fa35fa7 100644
--- a/app/src/store/index.js
+++ b/app/src/store/index.js
@@ -4,8 +4,7 @@ import PouchDB from 'pouchdb'
PouchDB.plugin(require('pouchdb-find'))
import VueDraggableResizable from 'vue-draggable-resizable'
-//import accounts from '../assets/settings.json'
-// PouchDB.debug.enable('*')
+import accounts from '../assets/settings.json'
Vue.use(Vuex)
Vue.component('vue-draggable-resizable', VueDraggableResizable)
@@ -24,16 +23,16 @@ if (localStorage.getItem('myNNClient') == null) {
}
var pouchdb = new PouchDB(microcosm)
-// var remote =
-// 'https://' +
-// accounts.settings[0].name +
-// ':' +
-// accounts.settings[0].password +
-// accounts.settings[0].url +
-// 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'
+//var remote = 'http://127.0.0.1:5984/localcouch'
const store = new Vuex.Store({
state: {
@@ -82,15 +81,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 +
- // accounts.settings[0].url +
- // microcosm +
- // '/'
- remote = 'http://127.0.0.1:5984/localcouch'
+ 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')
})
--
GitLab