✨ save news and subscribe websites added

Author: marcode24

src/app/core/components/components.module.ts

@@ -1,13 +1,15 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { SidebarComponent } from './sidebar/sidebar.component';
+import { RouterModule } from '@angular/router';
 
 @NgModule({
   declarations: [
     SidebarComponent
   ],
   imports: [
-    CommonModule
+    CommonModule,
+    RouterModule
   ],
   exports: [
     SidebarComponent

src/app/core/components/sidebar/sidebar.component.html

@@ -19,7 +19,7 @@
       <span class="tooltip">Explore</span>
     </li>
     <li>
-      <a href="#">
+      <a routerLink="/feed/saved">
         <i class='bx bx-bookmark'></i>
         <span class="links_name">Saved</span>
       </a>

src/app/core/guards/is-auth.guard.ts

@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { Observable, tap } from 'rxjs';
+
+import { AuthService } from '@services/auth.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class IsAuthGuard implements CanActivate {
+  constructor(private authService: AuthService,
+    private router: Router) {}
+
+  canActivate(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+      return this.authService.validateToken().pipe(tap(isAuthenticated => {
+        if (!isAuthenticated) {
+          this.router.navigateByUrl('/');
+        }
+      }));
+  }
+
+}

src/app/core/models/feed.model.ts

@@ -10,5 +10,6 @@ export class Feed {
     public link: string,
     public image: string,
     public website: Website,
+    public inUser?: boolean,
   ) {};
 };

src/app/core/models/user.model.ts

@@ -10,8 +10,8 @@ export class User {
     public lastName?: string,
     public image?: string,
     public password?: string,
-    public subscriptions?: Website[],
-    public readFeeds?: Website[],
-    public savedFeeds?: Website[],
+    public subscriptions?: string[],
+    public readFeeds?: string[],
+    public savedFeeds?: string[],
   ) {}
 }

src/app/core/models/website.model.ts

@@ -5,5 +5,7 @@ export class Website {
     public description: string,
     public link: string,
     public linkFeed: string,
+    public _id: string,
+    public inUser?: boolean,
   ) {};
 };

src/app/core/services/auth.service.ts

@@ -56,6 +56,7 @@ export class AuthService {
     const url = `${base_url}/auth/renew`;
     return this.http.get<IResponseLogin>(url, this.headers).pipe(map(resp => {
       this.setUserActiveInfo(resp);
+      console.log(resp);
       return true;
     }), catchError(err => of(false)));
   }

src/app/core/services/feed.service.ts

@@ -6,6 +6,7 @@ import { map, Observable, Subject } from 'rxjs';
 import { IResponseFeed } from '@interfaces/response.interface';
 import { Feed } from '@models/feed.model';
 import Storage from '@utils/storage.util';
+import { AuthService } from './auth.service';
 
 const base_url = environment.base_url;
 
@@ -17,7 +18,10 @@ export class FeedService {
   private recentFeeds: Feed[];
   public changeNews: Subject<boolean> = new Subject();
 
-  constructor(private http: HttpClient) { }
+  constructor(
+    private http: HttpClient,
+    private authService: AuthService,
+  ) { }
 
   public changeToExplore(value: boolean): void{
     this.changeNews.next(value);
@@ -39,20 +43,33 @@ export class FeedService {
     this.recentFeeds = feeds;
   }
 
-  getFeeds(skip = 0, limit = 10, isAuthenticated: boolean = false): Observable<IResponseFeed> {
-    let url: string;
-    if(!isAuthenticated) {
-      url = `${base_url}/feed?skip=${skip}&limit=${limit}`;
-      return this.http.get<IResponseFeed>(url);
-    } else {
-      url = `${base_url}/feed/byUser/subscription`;
-      return this.http.get<IResponseFeed>(url, this.headers);
-    }
+  getFeeds(skip = 0, limit = 10, isAuthenticated: boolean = false): Observable<Feed[]> {
+
+    const url = (!isAuthenticated) ?
+    `${base_url}/feed?skip=${skip}&limit=${limit}` :
+    `${base_url}/feed/byUser/subscription?skip=${skip}&limit=${limit}`;
+    const headers = !isAuthenticated ? {} : this.headers;
+    return this.http.get<IResponseFeed>(url, headers).pipe(map(resp => this.mapInUserResource(resp.feeds)));
+
   }
 
   getFeed(id: string): Observable<Feed> {
     const url = `${base_url}/feed/${id}`;
     return this.http.get<IResponseFeed>(url).pipe(map((resp) => resp.feed));
   }
 
+  getSavedFeeds(skip = 0, limit = 10): Observable<Feed[]> {
+    const url = `${base_url}/feed/byUser/saved?skip=${skip}&limit=${limit}`;
+    return this.http.get<IResponseFeed>(url, this.headers).pipe(map((resp) => this.mapInUserResource(resp.feeds)));
+  }
+
+  private mapInUserResource(feeds: Feed[]): Feed[] {
+    const userActive = this.authService.getUserActive;
+    if(userActive) {
+      const { savedFeeds } = userActive;
+      feeds.map(feed => feed.inUser = savedFeeds?.includes(feed._id));
+    }
+    return feeds;
+  }
+
 }

src/app/core/services/user.service.ts

@@ -0,0 +1,31 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { environment } from 'environments/environment';
+
+import Storage from '@utils/storage.util';
+
+const base_url = environment.base_url;
+
+@Injectable({
+  providedIn: 'root'
+})
+export class UserService {
+
+  get headers() {
+    return {
+      headers: {
+        'x-token': Storage.getItem('x-token'),
+      },
+    };
+  }
+
+  constructor(
+    private http: HttpClient
+  ) { }
+
+  modifyPreferences(resourceID: string, filter: 'subscription' | 'read' | 'saved') {
+    const url = `${base_url}/user/${filter}/${resourceID}`;
+    return this.http.patch(url, {}, this.headers);
+  }
+
+}

src/app/core/services/website.service.ts

@@ -6,18 +6,29 @@ import { environment } from 'environments/environment';
 import { Website } from '@models/website.model';
 import { IResponseWebsite } from '@interfaces/response.interface';
 
+import { AuthService } from './auth.service';
+
 const base_url = environment.base_url;
 
 @Injectable({
   providedIn: 'root'
 })
 export class WebsiteService {
 
-  constructor(private http: HttpClient) { }
+  constructor(private http: HttpClient,
+    private authService: AuthService) { }
 
   getWebsites(all: boolean = false, skip: number = 0, limit: number = 5): Observable<Website[]> {
     const url = `${base_url}/website?all=${all}&limit=${limit}&skip=${skip}`;
-    return this.http.get<IResponseWebsite>(url).pipe(map(resp => resp.websites));
+    return this.http.get<IResponseWebsite>(url).pipe(map(resp => {
+      const { websites } = resp;
+      const userActive = this.authService.getUserActive;
+      if(userActive) {
+        const { subscriptions } = userActive;
+        websites.map(website => website.inUser = subscriptions?.includes(website._id));
+      }
+      return resp.websites
+    }));
   }
 
 }