depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move config variable to lib/config

Browse source
This commit is contained in:
Yukai Huang 2017-01-13 22:46:38 +08:00
parent 3566d71aea
commit c2a8911b9c
2 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
public/js/common.js
View file

@ -1,21 +1,4 @@
// import config from './config';
import {
domain, // domain name
urlpath, // sub url path, like: www.example.com/<urlpath>
debug,
GOOGLE_API_KEY,
GOOGLE_CLIENT_ID,
DROPBOX_APP_KEY
} from './config';
//common
export const port = window.location.port;
window.serverurl = `${window.location.protocol}//${domain ? domain : window.location.hostname}${port ? ':' + port : ''}${urlpath ? '/' + urlpath : ''}`;
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';
import { serverurl } from './lib/config';
let checkAuth = false;
let profile = null;
@ -101,12 +84,6 @@ export function checkIfAuth(yesCallback, noCallback) {
}
export default {
domain,
urlpath,
debug,
GOOGLE_API_KEY,
GOOGLE_CLIENT_ID,
DROPBOX_APP_KEY,
checkAuth,
profile,
lastLoginState,

19
public/js/lib/config/index.js Normal file
View file

@ -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';