2.3 - latest functional code

Author: quead

src/app/app.component.ts

@@ -341,7 +341,6 @@ export class AppComponent implements OnInit {
         playlistItem = this.globals.playlist.find(item => item.id.videoId === listType.id.videoId);
       } else {
         playlistItem = this.globals.playlist.find(item => item.id === listType.id);
-        // playlistItem = this.globals.playlist.find(item => item.id.videoId === listType.id);
       }
 
       if (typeof playlistItem === 'undefined') {

src/app/services/auth.service.ts

@@ -12,7 +12,6 @@ import { map } from 'rxjs/operators';
 
 @Injectable()
 export class AuthService {
-  itemsRef: AngularFireList<any>;
 
   constructor(
     private db2: AngularFireDatabase,
@@ -49,16 +48,15 @@ export class AuthService {
     const provider = new auth.GoogleAuthProvider();
     this.afAuth.auth.signInWithPopup(provider).then(authData => {
       console.log(authData.user.uid);
-      this.itemsRef = this.db2.list('users/' + authData.user.uid);
-      this.itemsRef.valueChanges().subscribe(data => {
+      this.db2.list('users/' + authData.user.uid).valueChanges().subscribe(data => {
         this.db2.list('users/' + authData.user.uid).valueChanges().subscribe(userData => {
           if (userData.length === 0) {
             // First time login create user and session
             const profile = authData.additionalUserInfo.profile;
             const defaultUser = {
               name: profile.name,
               email: profile.email,
-              settings: this.shared.settings,
+              settings: this.globals.settings,
               session: localStorage.getItem('session_key'),
             };
 

src/app/services/globals.service.ts

@@ -12,7 +12,7 @@ export class GlobalsService {
   lastSearchedVideos: Array<any>;
   historyVideos: Array<any> = [];
   searchedVideos: Array<ISearchVideo>;
-  
+
   categories: any;
   currentCategory: string;
   categoriesBlocked = ['19', '22', '25', '27', '29'];