From 448b0061945b65dc36c08eaf6752060600d5895d Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Mon, 20 Mar 2017 01:39:09 +0800
Subject: Update to generate front-end constants on server startup

To avoid extra webpacking on changing configs and follow the 12 factor app
---
 public/js/lib/common/constant.ejs |  8 ++++++++
 public/js/lib/config/index.js     | 18 +++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 public/js/lib/common/constant.ejs

(limited to 'public/js')

diff --git a/public/js/lib/common/constant.ejs b/public/js/lib/common/constant.ejs
new file mode 100644
index 00000000..e4a1cf0a
--- /dev/null
+++ b/public/js/lib/common/constant.ejs
@@ -0,0 +1,8 @@
+window.domain = '<%- domain %>'
+window.urlpath = '<%- urlpath %>'
+window.debug = <%- debug %>
+window.version = '<%- version %>'
+
+window.GOOGLE_API_KEY = '<%- GOOGLE_API_KEY %>'
+window.GOOGLE_CLIENT_ID = '<%- GOOGLE_CLIENT_ID %>'
+window.DROPBOX_APP_KEY = '<%- DROPBOX_APP_KEY %>'
\ No newline at end of file
diff --git a/public/js/lib/config/index.js b/public/js/lib/config/index.js
index 1ea7a7ab..11e4389f 100644
--- a/public/js/lib/config/index.js
+++ b/public/js/lib/config/index.js
@@ -1,14 +1,10 @@
-import configJson from '../../../../config.json' // root path json config
+export const GOOGLE_API_KEY = window.GOOGLE_API_KEY || ''
+export const GOOGLE_CLIENT_ID = window.GOOGLE_CLIENT_ID || ''
+export const DROPBOX_APP_KEY = window.DROPBOX_APP_KEY || ''
 
-const config = process.env.NODE_ENV === 'production' ? 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 || '' // domain name
-export const urlpath = config.urlpath || '' // sub url path, like: www.example.com/<urlpath>
-export const debug = config.debug || false
+export const domain = window.domain || '' // domain name
+export const urlpath = window.urlpath || '' // sub url path, like: www.example.com/<urlpath>
+export const debug = window.debug || false
 
 export const port = window.location.port
 export const serverurl = `${window.location.protocol}//${domain || window.location.hostname}${port ? ':' + port : ''}${urlpath ? '/' + urlpath : ''}`
@@ -16,4 +12,4 @@ 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'
+export const version = window.version
-- 
cgit v1.2.3