getBible/app
4
2
Fork 0
mirror of https://github.com/getbible/app.git synced 2024-12-22 15:58:55 +00:00
Code

Merge branch 'main' of github.com:getbible/app into main

Browse Source 
Please enter a commit message to explain why this merge is necessary,
This commit is contained in:
Oh 2020-10-26 16:51:09 +02:00
commit 1b5c327508
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/components/Options.vue
View File

@ -84,11 +84,11 @@ export default {
return this.filteredChapters
},
filteredChapters() {
return _.orderBy(this.chapter.verses.filter((item) => item.verse.toString().toLowerCase()
.includes(this.search.toLowerCase())
|| item.chapter.toString().toLowerCase().includes(this.search.toLowerCase())
|| item.name.toString().toLowerCase().includes(this.search.toLowerCase())
|| item.text.toLowerCase().includes(this.search.toLowerCase())), 'verse');
return _.orderBy(this.chapter.verses.filter((item) =>
item.verse.toString().toLowerCase().includes(this.search.toLowerCase())
|| item.chapter.toString().toLowerCase().includes(this.search.toLowerCase())
|| item.name.toString().toLowerCase().includes(this.search.toLowerCase())
|| item.text.toLowerCase().includes(this.search.toLowerCase())), 'verse');
},
},
methods:{
@ -97,24 +97,32 @@ export default {
this.progress = 95
let config = {
headers: {'Access-Control-Allow-Origin': '*'}
};
};
let url = `https://getbible.net/v2/${this.translation}/${this.book}/${this.chapter_num}.json`
let response = fetch(url, config).catch(function(err) {
this.chapter = err
this.loading =false
this.message = 'Error'
});
if (!response) return;
fetch(`https://getbible.net/v2/${this.translation}/${this.book}/${this.chapter_num}.json`, config)
.then(response => {
this.progress = 99
return response.json()})
.then(data => {
let data = response.json().catch(err => {
this.chapter = err
this.loading =false
this.message = 'Error'
})
this.loading =false
// console.log(data)
if (!data) return;
this.chapter = data
this.progress =0
}).catch(function(err) {
this.chapter = err
this.loading =false
this.message = 'Error'
});
},
async update_tr(){
@ -126,7 +134,8 @@ export default {
this.loading =true
this.progress =25
this.message = 'Loading...'
fetch(`https://getbible.net/v2/${this.translation}/books.json`,config)
let url = `https://getbible.net/v2/${this.translation}/books.json`
fetch(url,config)
.then(response => response.json())
.then(data => {
// console.log(data)