From 88776817cb2744c256f3bffcd6b5fb24626adb50 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 29 Apr 2019 23:05:52 +0000 Subject: [PATCH] --- ayanova/src/api/aboutinfo.js | 2 +- ayanova/src/api/auth.js | 10 ---------- ayanova/src/api/authutil.js | 3 --- ayanova/src/api/initialize.js | 13 +------------ ayanova/src/api/locale.js | 8 -------- ayanova/src/views/login.vue | 4 ---- 6 files changed, 2 insertions(+), 38 deletions(-) diff --git a/ayanova/src/api/aboutinfo.js b/ayanova/src/api/aboutinfo.js index 102d3e18..54da54de 100644 --- a/ayanova/src/api/aboutinfo.js +++ b/ayanova/src/api/aboutinfo.js @@ -1,5 +1,5 @@ export default { - version: "8.0.0-alpha.3", + version: "8.0.0-alpha.4", copyright: "Copyright © 1999-2019, Ground Zero Tech-Works Inc. All Rights Reserved" }; diff --git a/ayanova/src/api/auth.js b/ayanova/src/api/auth.js index 19c1ef61..83477f15 100644 --- a/ayanova/src/api/auth.js +++ b/ayanova/src/api/auth.js @@ -13,17 +13,7 @@ export default { ) .then(apiUtil.status) .then(apiUtil.json) - .then(result => { - /* eslint-disable-next-line */ - console.log("auth.js about to process login..."); - return result; - }) .then(processLogin) - .then(result => { - /* eslint-disable-next-line */ - console.log("auth.js returned from process login, resolving next"); - return result; - }) .then(() => { return Promise.resolve(true); }) //succeeded, nothing to return diff --git a/ayanova/src/api/authutil.js b/ayanova/src/api/authutil.js index 5aa00343..07ca8823 100644 --- a/ayanova/src/api/authutil.js +++ b/ayanova/src/api/authutil.js @@ -43,9 +43,6 @@ export function processLogin(response) { roles: token["ayanova/roles"] }); - /* eslint-disable-next-line */ - console.log("STEP 2 - PROCESS LOGIN - CALLING INITIALIZE"); - //Initialize the application initialize().then(() => { store.commit( diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js index 32eea581..2db231a7 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -17,17 +17,11 @@ function addNavItem(title, icon, route) { // on change of authentication status export default function initialize() { var promise = new Promise(function(resolve) { - /* eslint-disable-next-line */ - console.log("STEP 3 - INITIALIZE TOP"); if (store.state.authenticated) { - /* eslint-disable-next-line */ - console.log("STEP 4 - INITIALIZE FETCHING LOCALE KEYS"); //Fetch the core localized text keys that will always be required by user locale .fetch(locale.coreKeys) .then(function putFetchedNavItemsInStore() { - /* eslint-disable-next-line */ - console.log("STEP 5 - DONE FETCHING LOCALE KEYS CREATING NAV ITEMS"); //put nav items into store //Everyone has a home addNavItem(locale.get("Home"), "home", "/"); @@ -83,10 +77,6 @@ export default function initialize() { // addNavItem(locale.get("Logout"), "sign-out-alt", "/login"); }) .then(() => { - /* eslint-disable-next-line */ - console.log( - "STEP 6 - INIT DONE WITH NAV, NOW FETCHING USEROPTIONS SETTINGS" - ); //CACHE LOCALE SETTINGS api .get("UserOptions/" + store.state.userId) @@ -116,8 +106,7 @@ export default function initialize() { //Store offset in locale data locale.timeZoneOffset = res.data.timeZoneOffset; - /* eslint-disable-next-line */ - console.log("STEP 7 - DONE FETCHING LOCALE SETTINGS"); + resolve(); } }) diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js index a6240f22..6076df80 100644 --- a/ayanova/src/api/locale.js +++ b/ayanova/src/api/locale.js @@ -12,9 +12,6 @@ export default { return store.state.localeText[key]; }, fetch(keys) { - /* eslint-disable-next-line */ - console.log("LOCALE - TOP OF FETCH(KEYS)"); - return new Promise(function fetchLocaleKeysFromServer(resolve) { //, reject //step 1: build an array of keys that we don't have already @@ -39,11 +36,6 @@ export default { _.forEach(response.data, function commitFetchedLTItemToStore(item) { store.commit("addLocaleText", item); }); - /* eslint-disable-next-line */ - console.log( - "LOCALE - DONE FETCH(KEYS) and stored about to call Resolve()..." - ); - resolve(); }); }); diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue index 184c390c..131c1d0e 100644 --- a/ayanova/src/views/login.vue +++ b/ayanova/src/views/login.vue @@ -76,13 +76,9 @@ export default { if (this.input.username != "" && this.input.password != "") { this.errorBadCreds = false; var that = this; - /* eslint-disable-next-line */ - console.log("STEP 1 - LOGIN::AUTHENTICATING"); auth .authenticate(this.input.username, this.input.password) .then(() => { - /* eslint-disable-next-line */ - console.log("STEP 8 - LOGIN::AUTHENTICATE COMPLETED - GOING HOME"); this.$router.push({ name: "home" }); }) .catch(function handleCaughtLoginError(error) {