From 93b28b3f838fdea6ce33768b101c58abebaac61c Mon Sep 17 00:00:00 2001
From: Adam Procter <adamprocter@researchnot.es>
Date: Fri, 28 Feb 2020 20:57:24 +0000
Subject: [PATCH] edits for gitignore
---
app/.gitignore | 3 ++-
app/src/assets/settings.json | 8 +++++++-
app/src/store/index.js | 37 +++++++++++++++++++-----------------
3 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/app/.gitignore b/app/.gitignore
index cc4d86b..99337be 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 cb5d964..5b0f797 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 6fb2ba6..93ef38c 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')
})
--
GitLab