From 5bc642d02e8955b200bb21cf30e863fdf0c53765 Mon Sep 17 00:00:00 2001 From: BoHong Li Date: Thu, 9 Mar 2017 02:41:05 +0800 Subject: Use JavaScript Standard Style (part 2) Fixed all fail on frontend code. --- public/js/lib/common/login.js | 133 +++++++++++++++++++++--------------------- public/js/lib/config/index.js | 28 ++++----- 2 files changed, 82 insertions(+), 79 deletions(-) (limited to 'public/js/lib') diff --git a/public/js/lib/common/login.js b/public/js/lib/common/login.js index 58fa55c6..18cd377d 100644 --- a/public/js/lib/common/login.js +++ b/public/js/lib/common/login.js @@ -1,89 +1,92 @@ -import { serverurl } from '../config'; +/* eslint-env browser, jquery */ +/* global Cookies */ -let checkAuth = false; -let profile = null; -let lastLoginState = getLoginState(); -let lastUserId = getUserId(); -var loginStateChangeEvent = null; +import { serverurl } from '../config' -export function setloginStateChangeEvent(func) { - loginStateChangeEvent = func; +let checkAuth = false +let profile = null +let lastLoginState = getLoginState() +let lastUserId = getUserId() +var loginStateChangeEvent = null + +export function setloginStateChangeEvent (func) { + loginStateChangeEvent = func } -export function resetCheckAuth() { - checkAuth = false; +export function resetCheckAuth () { + checkAuth = false } -export function setLoginState(bool, id) { - Cookies.set('loginstate', bool, { - expires: 365 - }); - if (id) { - Cookies.set('userid', id, { - expires: 365 - }); - } else { - Cookies.remove('userid'); - } - lastLoginState = bool; - lastUserId = id; - checkLoginStateChanged(); +export function setLoginState (bool, id) { + Cookies.set('loginstate', bool, { + expires: 365 + }) + if (id) { + Cookies.set('userid', id, { + expires: 365 + }) + } else { + Cookies.remove('userid') + } + lastLoginState = bool + lastUserId = id + checkLoginStateChanged() } -export function checkLoginStateChanged() { - if (getLoginState() != lastLoginState || getUserId() != lastUserId) { - if (loginStateChangeEvent) setTimeout(loginStateChangeEvent, 100); - return true; - } else { - return false; - } +export function checkLoginStateChanged () { + if (getLoginState() !== lastLoginState || getUserId() !== lastUserId) { + if (loginStateChangeEvent) setTimeout(loginStateChangeEvent, 100) + return true + } else { + return false + } } -export function getLoginState() { - const state = Cookies.get('loginstate'); - return state === "true" || state === true; +export function getLoginState () { + const state = Cookies.get('loginstate') + return state === 'true' || state === true } -export function getUserId() { - return Cookies.get('userid'); +export function getUserId () { + return Cookies.get('userid') } -export function clearLoginState() { - Cookies.remove('loginstate'); +export function clearLoginState () { + Cookies.remove('loginstate') } -export function checkIfAuth(yesCallback, noCallback) { - const cookieLoginState = getLoginState(); - if (checkLoginStateChanged()) checkAuth = false; - if (!checkAuth || typeof cookieLoginState == 'undefined') { - $.get(`${serverurl}/me`) +export function checkIfAuth (yesCallback, noCallback) { + const cookieLoginState = getLoginState() + if (checkLoginStateChanged()) checkAuth = false + if (!checkAuth || typeof cookieLoginState === 'undefined') { + $.get(`${serverurl}/me`) .done(data => { - if (data && data.status == 'ok') { - profile = data; - yesCallback(profile); - setLoginState(true, data.id); - } else { - noCallback(); - setLoginState(false); - } + if (data && data.status === 'ok') { + profile = data + yesCallback(profile) + setLoginState(true, data.id) + } else { + noCallback() + setLoginState(false) + } }) .fail(() => { - noCallback(); + noCallback() }) .always(() => { - checkAuth = true; - }); - } else if (cookieLoginState) { - yesCallback(profile); - } else { - noCallback(); - } + checkAuth = true + }) + } else if (cookieLoginState) { + yesCallback(profile) + } else { + noCallback() + } } export default { - checkAuth, - profile, - lastLoginState, - lastUserId, - loginStateChangeEvent -}; + checkAuth, + profile, + lastLoginState, + lastUserId, + loginStateChangeEvent +} diff --git a/public/js/lib/config/index.js b/public/js/lib/config/index.js index 2b73679f..1ea7a7ab 100644 --- a/public/js/lib/config/index.js +++ b/public/js/lib/config/index.js @@ -1,19 +1,19 @@ -import configJson from '../../../../config.json'; // root path json config +import configJson from '../../../../config.json' // root path json config -const config = 'production' === process.env.NODE_ENV ? configJson.production : configJson.development; +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 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/ -export const debug = config.debug || false; +export const domain = config.domain || '' // domain name +export const urlpath = config.urlpath || '' // sub url path, like: www.example.com/ +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 : ''}`; -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 port = window.location.port +export const serverurl = `${window.location.protocol}//${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'; +export const version = '0.5.0' -- cgit v1.2.3