From 45b2fb239f12c81f1918a0c16cd7dfac2ffcaa82 Mon Sep 17 00:00:00 2001 From: Erastus Amunwe Date: Fri, 8 Jan 2021 17:16:47 +0200 Subject: [PATCH] formatted code for readability --- src/App.vue | 77 +++++----- src/api/getbible_v2_api.js | 4 +- src/components/Options.vue | 276 +++++++++++++++++++---------------- src/components/Picker.vue | 42 +++--- src/components/Search.vue | 205 ++++++++++++++++---------- src/components/Selection.vue | 206 +++++++++++++++----------- src/components/Verses.vue | 164 ++++++++++++--------- src/store/actions.js | 186 +++++++++++------------ src/store/getters.js | 114 +++++++-------- src/store/mutations.js | 100 ++++++------- src/store/state.js | 20 +-- src/store/store.js | 4 +- utils/index.js | 104 ++++++------- 13 files changed, 817 insertions(+), 685 deletions(-) diff --git a/src/App.vue b/src/App.vue index 3dd83a5..a17e6ea 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,39 +1,37 @@ \ No newline at end of file diff --git a/src/components/Search.vue b/src/components/Search.vue index aaafeb7..4f4299d 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -1,82 +1,139 @@ \ No newline at end of file diff --git a/src/components/Selection.vue b/src/components/Selection.vue index 8883909..d90f27b 100644 --- a/src/components/Selection.vue +++ b/src/components/Selection.vue @@ -1,94 +1,128 @@ \ No newline at end of file diff --git a/src/components/Verses.vue b/src/components/Verses.vue index 7ae51d1..3dad35d 100644 --- a/src/components/Verses.vue +++ b/src/components/Verses.vue @@ -1,34 +1,46 @@ \ No newline at end of file diff --git a/src/store/actions.js b/src/store/actions.js index 1095ecf..1f0702e 100644 --- a/src/store/actions.js +++ b/src/store/actions.js @@ -1,8 +1,8 @@ import idb from '../api/idb'; -import getbible from '../api/getbible_v2_api'; +import getbible from '../api/getbible_v2_api'; export default { - async add({commit}, payload){ + async add({ commit }, payload) { // payload = { // abbreviation: '', @@ -12,106 +12,106 @@ export default { // } // } commit('toggle_loading', true) - const response = await getbible.get_translation(payload.abbreviation).catch(err => console.log(err)) - // console.log(response); - if(!response) return; + const response = await getbible.get_translation(payload.abbreviation).catch(err => console.log(err)) + // console.log(response); + if (!response) return; - const data = await response.json().catch(err => console.log(err)) - // console.log(JSON.parse(data)); - if(!data) return; - let dataString = JSON.stringify(data) - let savet = JSON.stringify(payload.saved_translations.putObj) - // console.log(dataString); - payload.translation = { - name: 'translations', - putObj: JSON.parse(dataString), - } - payload.saved_translations.putObj = JSON.parse(savet) - let success = false + const data = await response.json().catch(err => console.log(err)) + // console.log(JSON.parse(data)); + if (!data) return; + let dataString = JSON.stringify(data) + let savet = JSON.stringify(payload.saved_translations.putObj) + // console.log(dataString); + payload.translation = { + name: 'translations', + putObj: JSON.parse(dataString), + } + payload.saved_translations.putObj = JSON.parse(savet) + let success = false //save translation in indexdb - success = await idb.save(payload.translation).catch(err => console.log(err)); - - if(!success) + success = await idb.save(payload.translation).catch(err => console.log(err)); + + if (!success) return; // then save the newly added translation details to the list of saved tr...s success = await idb.save(payload.saved_translations).catch(err => console.log(err)); - if(!success) return; + if (!success) return; - commit('add_translation', payload); - commit('toggle_loading', false) - }, - async remove({commit}, payload){ - // payload example - // payload = { - // translation:{ - // name: 'translation', - // keyPath: 'aksjv' - // }, - // saved_translations:{ - // name: 'saved_translation', - // keyPath: "askjv" - // } - // } - commit('toggle_loading', true) - const {translation, saved_translations} = payload - let success = false - //save translation in indexdb - success = await idb.delete(translation).catch(err => console.log(err)); - - if(!success) - return; - - // then save the newly added translation details to the list of saved tr...s - success = await idb.delete(saved_translations).catch(err => console.log(err)); - - - if(!success) return; - - commit('REMOVE_TRANSLATION', payload); - setTimeout(()=>{ - commit('toggle_loading', false) - }, 1200) - }, - async initialise({commit}){ + commit('add_translation', payload); + commit('toggle_loading', false) + }, + async remove({ commit }, payload) { + // payload example + // payload = { + // translation:{ + // name: 'translation', + // keyPath: 'aksjv' + // }, + // saved_translations:{ + // name: 'saved_translation', + // keyPath: "askjv" + // } + // } commit('toggle_loading', true) - let saved_translations = await idb.getAll('saved_translations').catch(err => console.log(err)); - console.log(saved_translations); - if(!saved_translations) saved_translations = []; - - - let translations = await idb.getAll('translations').catch(err => console.log(err)); - - if(!translations || !translations.length) translations = [{}]; - - commit('initialise', {saved_translations, translation: translations[0]}) - + const { translation, saved_translations } = payload + let success = false + //save translation in indexdb + success = await idb.delete(translation).catch(err => console.log(err)); + + if (!success) + return; + + // then save the newly added translation details to the list of saved tr...s + success = await idb.delete(saved_translations).catch(err => console.log(err)); + + + if (!success) return; + + commit('REMOVE_TRANSLATION', payload); + setTimeout(() => { + commit('toggle_loading', false) + }, 1200) + }, + async initialise({ commit }) { + commit('toggle_loading', true) + let saved_translations = await idb.getAll('saved_translations').catch(err => console.log(err)); + console.log(saved_translations); + if (!saved_translations) saved_translations = []; + + + let translations = await idb.getAll('translations').catch(err => console.log(err)); + + if (!translations || !translations.length) translations = [{}]; + + commit('initialise', { saved_translations, translation: translations[0] }) + commit('toggle_loading', false) - }, - set_chapter({commit}, payload) { - commit('set_chapter', payload) - }, - message({commit}, payload){ - commit('message', payload) - }, - set_book({commit}, payload) { - commit('set_book', payload) - }, - async set_translation({commit}, payload){ - commit('toggle_loading', true) - let translation = await idb.get('translations', payload.selected_translation).catch(err => console.log(err)); - - if(!translation) return; - payload.translation = translation - commit('set_translation', payload) - // console.log("from acitons", payload); - setTimeout(()=>{ - commit('toggle_loading', false) - }, 2500) - }, - search({commit}, payload){ - commit('search', payload) - } + }, + set_chapter({ commit }, payload) { + commit('set_chapter', payload) + }, + message({ commit }, payload) { + commit('message', payload) + }, + set_book({ commit }, payload) { + commit('set_book', payload) + }, + async set_translation({ commit }, payload) { + commit('toggle_loading', true) + let translation = await idb.get('translations', payload.selected_translation).catch(err => console.log(err)); + + if (!translation) return; + payload.translation = translation + commit('set_translation', payload) + // console.log("from acitons", payload); + setTimeout(() => { + commit('toggle_loading', false) + }, 2500) + }, + search({ commit }, payload) { + commit('search', payload) + } } \ No newline at end of file diff --git a/src/store/getters.js b/src/store/getters.js index 19e164d..497836f 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -2,67 +2,67 @@ export default { - chapter : (state) =>{ - return state.selected.chapter - }, + chapter: (state) => { + return state.selected.chapter + }, - book_nr : (state) =>{ - return state.selected.book - }, - loading: (state) =>{ - return state.loading; - }, - book_name:(state, getters)=> { - if(!getters.books.length) return null - let book = getters.books.find(book => book.nr === getters.book_nr) - if(!book) return null; - return book.name; - }, + book_nr: (state) => { + return state.selected.book + }, + loading: (state) => { + return state.loading; + }, + book_name: (state, getters) => { + if (!getters.books.length) return null + let book = getters.books.find(book => book.nr === getters.book_nr) + if (!book) return null; + return book.name; + }, - translation: (state)=>{ - return state.selected.translation; - }, - saved_translations: (state)=>{ - return state.saved_translations; - }, - in_memory_translation : (state) =>{ - // console.log("from ", state.in_memory_translation ); - return state.in_memory_translation - }, + translation: (state) => { + return state.selected.translation; + }, + saved_translations: (state) => { + return state.saved_translations; + }, + in_memory_translation: (state) => { + // console.log("from ", state.in_memory_translation ); + return state.in_memory_translation + }, - books : (state, getters)=>{ - if(!getters.in_memory_translation.books) + books: (state, getters) => { + if (!getters.in_memory_translation.books) return [] - debugger; - return getters.in_memory_translation.books.map(book => ({nr: book.nr, name: book.name})) - }, + debugger; + return getters.in_memory_translation.books.map(book => ({ nr: book.nr, name: book.name })) + }, - dir:(state, getters)=>{ - // console.log(getters.in_memory_translation); - if(!getters.in_memory_translation.direction) + dir: (state, getters) => { + // console.log(getters.in_memory_translation); + if (!getters.in_memory_translation.direction) return 'ltr' - return getters.in_memory_translation.direction.toLowerCase(); - }, - search: (state)=>{ - console.log(state.search); - debugger; - return state.search; - }, - chapters : (state, getters) =>{ - console.log(getters.book_nr); - debugger; - if(!getters.book_nr) return []; - const book = getters.in_memory_translation.books.find(book => book.nr == getters.book_nr) - console.log("Found the book",book); - return book.chapters - }, + return getters.in_memory_translation.direction.toLowerCase(); + }, + search: (state) => { + console.log(state.search); + debugger; + return state.search; + }, + chapters: (state, getters) => { + console.log(getters.book_nr); + debugger; + if (!getters.book_nr) return []; + const book = getters.in_memory_translation.books.find(book => book.nr == getters.book_nr) + console.log("Found the book", book); + return book.chapters + }, - verses: (state, getters) => { - // console.log("Searching for chapter", getters.chapter); - if(!getters.chapter) - return [] - const chapter = getters.chapters.find(chapter => chapter.chapter === getters.chapter) - return chapter.verses; - } - - } \ No newline at end of file + verses: (state, getters) => { + // console.log("Searching for chapter", getters.chapter); + if (!getters.chapter) + return [] + const chapter = getters.chapters.find(chapter => chapter.chapter === getters.chapter) + return chapter.verses; + } + +} \ No newline at end of file diff --git a/src/store/mutations.js b/src/store/mutations.js index 01a22ee..01bd361 100644 --- a/src/store/mutations.js +++ b/src/store/mutations.js @@ -1,56 +1,56 @@ export default { - add_translation (state, payload ) { + add_translation(state, payload) { - state.saved_translations.push(payload.saved_translations.putObj) - - }, - REMOVE_TRANSLATION (state, payload ) { - - const {keyPath} = payload.saved_translations; + state.saved_translations.push(payload.saved_translations.putObj) - state.saved_translations = state.saved_translations.filter(tr => tr.abbreviation !== keyPath) + }, + REMOVE_TRANSLATION(state, payload) { - if(state.in_memory_translation.abbreviation === keyPath){ - state.in_memory_translation = {} - state.selected = { - translation: null, - book: null, - chapter: null - } - } - - }, - save_settings(state, settings){ - state.settings = settings; - localStorage.setItem('settings', JSON.stringify(settings)) - }, - add_search(state, search){ - state.search = search - }, - initialise(state, payload){ - state.saved_translations = payload.saved_translations - state.in_memory_translation = payload.translation - console.log(state.saved_translations); - }, - set_chapter(state, payload){ - state.selected.chapter = payload; - }, - set_book(state, payload){ - state.selected.chapter = null; - state.selected.book = payload; - }, - set_translation(state, payload){ - state.selected.book = null - state.selected.chapter = null - state.selected.translation = payload.selected_translation; - state.in_memory_translation = payload.translation; - }, - toggle_loading(state, payload){ - state.loading = payload; - }, - search(state, payload){ - state.search = payload; - } - } \ No newline at end of file + const { keyPath } = payload.saved_translations; + + state.saved_translations = state.saved_translations.filter(tr => tr.abbreviation !== keyPath) + + if (state.in_memory_translation.abbreviation === keyPath) { + state.in_memory_translation = {} + state.selected = { + translation: null, + book: null, + chapter: null + } + } + + }, + save_settings(state, settings) { + state.settings = settings; + localStorage.setItem('settings', JSON.stringify(settings)) + }, + add_search(state, search) { + state.search = search + }, + initialise(state, payload) { + state.saved_translations = payload.saved_translations + state.in_memory_translation = payload.translation + console.log(state.saved_translations); + }, + set_chapter(state, payload) { + state.selected.chapter = payload; + }, + set_book(state, payload) { + state.selected.chapter = null; + state.selected.book = payload; + }, + set_translation(state, payload) { + state.selected.book = null + state.selected.chapter = null + state.selected.translation = payload.selected_translation; + state.in_memory_translation = payload.translation; + }, + toggle_loading(state, payload) { + state.loading = payload; + }, + search(state, payload) { + state.search = payload; + } +} \ No newline at end of file diff --git a/src/store/state.js b/src/store/state.js index 8fbbf6d..efdc311 100644 --- a/src/store/state.js +++ b/src/store/state.js @@ -1,11 +1,11 @@ export default { - saved_translations: [], - selected:{ - translation: null, - book: null, - chapter: null - }, - loading: false, - in_memory_translation:{}, - search: '', - } \ No newline at end of file + saved_translations: [], + selected: { + translation: null, + book: null, + chapter: null + }, + loading: false, + in_memory_translation: {}, + search: '', +} \ No newline at end of file diff --git a/src/store/store.js b/src/store/store.js index 67419d0..9864de3 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -2,8 +2,8 @@ import { createStore } from 'vuex' import state from './state'; -import getters from './getters'; -import mutations from './mutations'; +import getters from './getters'; +import mutations from './mutations'; import actions from './actions' export const store = createStore({ diff --git a/utils/index.js b/utils/index.js index 94095a3..21d6a92 100644 --- a/utils/index.js +++ b/utils/index.js @@ -1,58 +1,58 @@ -export const isArray = function(a) { - return (!!a) && (a.constructor === Array); +export const isArray = function (a) { + return (!!a) && (a.constructor === Array); }; -export const isObject = function(a) { - return (!!a) && (a.constructor === Object); +export const isObject = function (a) { + return (!!a) && (a.constructor === Object); }; -export const isDate = function(o) { - return o instanceof Object && o.constructor === Date; +export const isDate = function (o) { + return o instanceof Object && o.constructor === Date; +} + +export const has = function (o, p) { + let has = true + for (const prop of p) { + has = o.hasOwnProperty(prop) + if (!has) break; + } + return has; +} +export const querablePromise = function (promise) { + // Don't modify any promise that has been already modified. + if (promise.isPending) return promise; + + // Setup our initial state. + const state = { + isPending: true, + isRejected: false, + isResolved: false, + + // Specified so that we'll generate accessor functions for them. + err: undefined, + val: undefined, + }; + + // We must actually wait for the promise to either resolve or reject, + // wrap that value, then let it continue on. + const result = promise.then( + function (val) { + state.isResolved = true; + state.isPending = false; + state.val = val; + return val; + }, + function (err) { + state.isRejected = true; + state.isPending = false; + state.err = err; + throw err; + } + ); + + for (const val of Object.keys(state)) { + result[val] = function () { return state[val]; }; } -export const has = function(o,p){ - let has = true - for (const prop of p) { - has = o.hasOwnProperty(prop) - if(!has) break; - } - return has; -} -export const querablePromise = function(promise) { - // Don't modify any promise that has been already modified. - if (promise.isPending) return promise; - - // Setup our initial state. - const state = { - isPending: true, - isRejected: false, - isResolved: false, - - // Specified so that we'll generate accessor functions for them. - err: undefined, - val: undefined, - }; - - // We must actually wait for the promise to either resolve or reject, - // wrap that value, then let it continue on. - const result = promise.then( - function(val) { - state.isResolved = true; - state.isPending = false; - state.val = val; - return val; - }, - function(err) { - state.isRejected = true; - state.isPending = false; - state.err = err; - throw err; - } - ); - - for (const val of Object.keys(state)) { - result[val] = function() { return state[val]; }; - } - - return result; - } \ No newline at end of file + return result; +} \ No newline at end of file