2.3 - Reduced number of request to API

Author: quead

src/app/app.component.ts

@@ -112,16 +112,12 @@ export class AppComponent implements OnInit {
     this.authService.checkLogged();
     this.db2.list('sessions/' + localStorage.getItem('session_key')).valueChanges().subscribe((data) => {
       if (data.length > 0) {
-        // this.clearSession();
         // localStorage.setItem('settings', JSON.parse(data['3']));
-        // this.currentVideo = data['2'];
-        // this.shareLink = 'https://youtu.be/' + this.currentVideo.id;
-        // this.playlistInit();
-        // this.updatePlaylist();
-        // this.getRelatedVideos();
+        // this.shared.getSettings();
+        // this.setDefaultPlayer();
       } else {
-        this.setDefaultPlayer();
         this.shared.getSettings();
+        this.setDefaultPlayer();
       }
     });
   }
@@ -148,6 +144,12 @@ export class AppComponent implements OnInit {
   }
 
   setDefaultPlayer() {
+    this.shared.initFeed().then(data => {
+      this.initPlayer();
+    });
+  }
+
+  initPlayer() {
     this.globals.currentVideo = this.globals.feedVideos[0];
     this.shareLink = 'https://youtu.be/' + this.globals.currentVideo['id'];
     this.getRelatedVideos();

src/app/components/category/category.component.ts

@@ -21,12 +21,13 @@ export class CategoryComponent implements OnInit {
     private activatedRoute: ActivatedRoute,
     private router: Router
   ) {
-    // INIT SETTINGS
-    this.shared.getSettings();
   }
 
   ngOnInit() {
+    this.initComponent();
+  }
 
+  async initComponent() {
     this.activatedRoute.paramMap.subscribe(data => {
       if (data['params'].id === 'all') {
         this.getFeedVideos();
@@ -39,37 +40,41 @@ export class CategoryComponent implements OnInit {
 
 
   async getCategories() {
-    const res = await this.youtube.categories();
-    this.globals.categories = res;
-    if (res) {
-      if (res['items'].find(x => x.id === this.globals.currentCategory)) {
-        this.getCategoriesVideos(this.globals.currentCategory);
-      } else {
-        this.router.navigate(['']);
-      }
-    }
+    this.shared.getSettings().then(() => {
+      this.youtube.categories().then(catData => {
+        this.globals.categories = catData;
+        if (this.globals.categories['items'].find(x => x.id === this.globals.currentCategory)) {
+          this.loading = true;
+          this.getCategoriesVideos(this.globals.currentCategory);
+        } else {
+          this.router.navigate(['']);
+        }
+      });
+    });
   }
 
   async getCategoriesVideos(val: string) {
     const res2 = await this.youtube.videoCategories(val);
     this.shared.convertVideoObject(res2['items'], 'feedVideos');
-
     await this.shared.initChannel();
+    this.loading = false;
   }
 
   async getFeedVideos() {
-    if (!this.globals.feedVideos) {
-      await this.shared.initFeed();
-    }
+    await this.shared.initFeed();
     await this.shared.initChannel();
     this.loading = false;
   }
 
   async resetCategories() {
+    this.loading = true;
     this.globals.currentCategory = 'all';
     this.router.navigate(['category/all']);
-    await this.shared.initFeed();
-    await this.shared.initChannel();
+    this.globals.feedVideos = null;
+    await this.shared.initFeed().then(() => {
+      this.shared.initChannel();
+      this.loading = false;
+    });
   }
 
   onClickVideo(event: Event, i: any, list: number) {

src/app/services/auth.service.ts

@@ -17,7 +17,7 @@ export class AuthService {
     private db2: AngularFireDatabase,
     public afAuth: AngularFireAuth,
     public shared: SharedService,
-    public globals: GlobalsService
+    public globals: GlobalsService,
   ) {
   }
 
@@ -70,14 +70,10 @@ export class AuthService {
             localStorage.removeItem('session_key');
             localStorage.setItem('session_key', data['2']);
 
-            // this.db2.list('sessions/' + data['2']).valueChanges().subscribe((sessionData) => {
-            //   localStorage.removeItem('settings');
-            //   localStorage.removeItem('playlist');
-            //   this.shared.playlist = sessionData[3];
-            //   this.shared.settings = data[3];
-            //   this.shared.updateSettings();
-            //   this.shared.updatePlaylist();
-            // });
+            this.db2.list('sessions/' + data['2']).valueChanges().subscribe((sessionData) => {
+              localStorage.setItem('settings', JSON.parse(data['3']));
+              this.shared.getSettings();
+            });
             this.shared.updateData('normal login');
           }
           this.globals.isLogged = true;

src/app/services/shared.service.ts

@@ -63,9 +63,11 @@ export class SharedService {
     }
 
     async initFeed() {
-        await this.getSettings();
-        const res = await this.youtube.feedVideos();
-        this.convertVideoObject(res['items'], 'feedVideos');
+        if (!this.globals.feedVideos) {
+            await this.getSettings();
+            const res = await this.youtube.feedVideos();
+            this.convertVideoObject(res['items'], 'feedVideos');
+        }
     }
 
     async initChannel() {

src/app/services/youtube.service.ts

@@ -18,7 +18,6 @@ export class YoutubeGetVideo {
         private globals: GlobalsService,
     ) {}
 
-    // Calling 1 time
     async getChannel(query: string) {
         if (this.globals.apiKey) {
             const res = await this.http.get(`${this.url}channels?${this.channelDetails}&id=${query}&key=${this.globals.apiKey}`)
@@ -27,7 +26,6 @@ export class YoutubeGetVideo {
         }
     }
 
-    // Calling 2 times
     async feedVideos() {
         if (this.globals.apiKey) {
             const res = await this.http.get(`${this.url}videos?${this.videoDetails}${this.feedDetails}&regionCode=${this.globals.regionCode}&maxResults=25&key=${this.globals.apiKey}`)
@@ -36,7 +34,6 @@ export class YoutubeGetVideo {
         }
     }
 
-    // Calling 1 time
     async relatedVideos(query: string) {
         if (this.globals.apiKey) {
             const res = await this.http.get(`${this.url}search?part=snippet&relatedToVideoId=${query}&maxResults=${this.globals.numRelatedRes}&type=video&key=${this.globals.apiKey}`)
@@ -52,7 +49,7 @@ export class YoutubeGetVideo {
             return res;
         }
     }
-
+    
     async categories() {
         if (this.globals.apiKey) {
             const res = await this.http.get(`${this.url}videoCategories?part=snippet&regionCode=${this.globals.regionCode}&key=${this.globals.apiKey}`)