From c2a8911b9c7872ea0d085020aa17e82162130f3d Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Fri, 13 Jan 2017 22:46:38 +0800
Subject: Move config variable to lib/config

---
 public/js/lib/config/index.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 public/js/lib/config/index.js

(limited to 'public/js/lib/config')

diff --git a/public/js/lib/config/index.js b/public/js/lib/config/index.js
new file mode 100644
index 00000000..bffbadd9
--- /dev/null
+++ b/public/js/lib/config/index.js
@@ -0,0 +1,19 @@
+import configJson from '../../../../config.json'; // root path json config
+
+const config = 'production' === process.env.NODE_ENV ? configJson.production : configJson.development;
+
+export const GOOGLE_API_KEY = config.google && config.google.apiKey;
+export const GOOGLE_CLIENT_ID = config.google && config.google.clientID
+export const DROPBOX_APP_KEY = config.dropbox && config.dropbox.appKey
+
+export const domain = config.domain;
+export const urlpath = config.urlpath;
+export const debug = config.debug;
+
+export const port = window.location.port;
+export const serverurl = `${window.location.protocol}//${domain ? domain : window.location.hostname}${port ? ':' + port : ''}${urlpath ? '/' + urlpath : ''}`;
+window.serverurl = serverurl;
+export const noteid = urlpath ? window.location.pathname.slice(urlpath.length + 1, window.location.pathname.length).split('/')[1] : window.location.pathname.split('/')[1];
+export const noteurl = `${serverurl}/${noteid}`;
+
+export const version = '0.5.0';
-- 
cgit v1.2.3


From 2408ff4ba96c929a575b34e85d5cff0a01789ca4 Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Fri, 13 Jan 2017 23:12:17 +0800
Subject: Add default value for config

---
 public/js/lib/config/index.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'public/js/lib/config')

diff --git a/public/js/lib/config/index.js b/public/js/lib/config/index.js
index bffbadd9..2b73679f 100644
--- a/public/js/lib/config/index.js
+++ b/public/js/lib/config/index.js
@@ -2,13 +2,13 @@ import configJson from '../../../../config.json'; // root path json config
 
 const config = 'production' === process.env.NODE_ENV ? configJson.production : configJson.development;
 
-export const GOOGLE_API_KEY = config.google && config.google.apiKey;
-export const GOOGLE_CLIENT_ID = config.google && config.google.clientID
-export const DROPBOX_APP_KEY = config.dropbox && config.dropbox.appKey
+export const GOOGLE_API_KEY = (config.google && config.google.apiKey) || '';
+export const GOOGLE_CLIENT_ID = (config.google && config.google.clientID) || '';
+export const DROPBOX_APP_KEY = (config.dropbox && config.dropbox.appKey) || '';
 
-export const domain = config.domain;
-export const urlpath = config.urlpath;
-export const debug = config.debug;
+export const domain = config.domain || ''; // domain name
+export const urlpath = config.urlpath || ''; // sub url path, like: www.example.com/<urlpath>
+export const debug = config.debug || false;
 
 export const port = window.location.port;
 export const serverurl = `${window.location.protocol}//${domain ? domain : window.location.hostname}${port ? ':' + port : ''}${urlpath ? '/' + urlpath : ''}`;
-- 
cgit v1.2.3