From 098026e360d6ffdc617a130266d0cf43e9d548bd Mon Sep 17 00:00:00 2001
From: Erastus Amunwe <eneamunwe@gmail.com>
Date: Mon, 26 Oct 2020 15:23:01 +0200
Subject: [PATCH] refactored some codes

---
 src/components/Options.vue | 49 ++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/components/Options.vue b/src/components/Options.vue
index 72d0e94..e8af860 100644
--- a/src/components/Options.vue
+++ b/src/components/Options.vue
@@ -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': '*'}
-                };
+                                };
             
-                fetch(`https://getbible.net/v2/${this.translation}/${this.book}/${this.chapter_num}.json`, config)
-                .then(response => {
-                    this.progress = 99
-                    return response.json()})
-                .then(data => {
-                    this.loading =false
+                    let url =  `https://getbible.net/v2/${this.translation}/${this.book}/${this.chapter_num}.json`
                     
-                    // console.log(data)
+                    let response = fetch(url, config).catch(function(err) {
+                            this.chapter = err
+                            this.loading =false
+                            this.message = 'Error'
+                            
+                        });
+
+                    if (!response) return;
+
+                    this.progress = 99
+                    let data = response.json().catch(err => {
+                                                    this.chapter = err
+                                                    this.loading =false
+                                                    this.message = 'Error'
+                                                })
+                    this.loading =false
+                        
+                    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)