From 2660aef4734ad67b688872b91932f5e87e59364f Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Fri, 5 Jul 2024 20:07:13 +0300
Subject: [PATCH] feat: started details page

---
 apps/NwaifuAnime/src/app/app.component.html   |  2 +-
 apps/NwaifuAnime/src/app/app.component.ts     | 33 ++-------
 apps/NwaifuAnime/src/app/app.routes.ts        |  2 +
 .../components/detail/detail.component.html   |  4 ++
 .../components/detail/detail.component.less   |  0
 .../app/components/detail/detail.component.ts | 32 +++++++++
 .../components/header/header.component.html   |  3 +-
 .../app/components/header/header.component.ts | 21 ++++--
 .../src/app/components/home/home.component.ts | 27 ++++++--
 .../rulib/lib.social.parser.service.ts        |  7 +-
 .../parsers/rulib/rulib.detail.dto.ts         | 69 +++++++++++++++++++
 .../{rulib.dto.ts => rulib.search.dto.ts}     |  0
 .../src/app/services/search.service.ts        |  5 +-
 13 files changed, 159 insertions(+), 46 deletions(-)
 create mode 100644 apps/NwaifuAnime/src/app/components/detail/detail.component.html
 create mode 100644 apps/NwaifuAnime/src/app/components/detail/detail.component.less
 create mode 100644 apps/NwaifuAnime/src/app/components/detail/detail.component.ts
 create mode 100644 apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.detail.dto.ts
 rename apps/NwaifuAnime/src/app/services/parsers/rulib/{rulib.dto.ts => rulib.search.dto.ts} (100%)

diff --git a/apps/NwaifuAnime/src/app/app.component.html b/apps/NwaifuAnime/src/app/app.component.html
index e419ca1..fc8bdc9 100644
--- a/apps/NwaifuAnime/src/app/app.component.html
+++ b/apps/NwaifuAnime/src/app/app.component.html
@@ -6,6 +6,6 @@
     <h1>Update not available</h1>
   }
 }
-<app-header (searchEvent)="onSearch($event)"></app-header>
+<app-header></app-header>
 <div class="h-10"></div>
 <router-outlet></router-outlet>
diff --git a/apps/NwaifuAnime/src/app/app.component.ts b/apps/NwaifuAnime/src/app/app.component.ts
index 292517b..c57fac1 100644
--- a/apps/NwaifuAnime/src/app/app.component.ts
+++ b/apps/NwaifuAnime/src/app/app.component.ts
@@ -1,9 +1,8 @@
-import { AfterViewInit, Component } from "@angular/core";
-import { ActivatedRoute, Router, RouterModule } from "@angular/router";
+import { Component } from "@angular/core";
+import { RouterModule } from "@angular/router";
 import { AppService } from "./app.service";
 import { HeaderComponent } from "./components/header/header.component";
-import { Datum } from "./services/parsers/rulib/rulib.dto";
-import { SearchService } from "./services/search.service";
+import { Datum } from "./services/parsers/rulib/rulib.search.dto";
 
 @Component({
   standalone: true,
@@ -13,15 +12,10 @@ import { SearchService } from "./services/search.service";
   styleUrl: "./app.component.less",
   providers: [AppService],
 })
-export class AppComponent implements AfterViewInit {
+export class AppComponent {
   title = "NwaifuAnime";
   items: Datum[] = [];
-  constructor(
-    private sw: AppService,
-    private searchService: SearchService,
-    private route: ActivatedRoute,
-    private router: Router,
-  ) {}
+  constructor(private sw: AppService) {}
 
   get hasUpdate() {
     return this.sw.isUpdateAvailable;
@@ -34,21 +28,4 @@ export class AppComponent implements AfterViewInit {
   get serviceWorkerEnabled() {
     return this.sw.serviceWorkerEnabled;
   }
-
-  onSearch(text: string) {
-    const currentParams = this.route.snapshot.queryParams;
-    const newParams = { ...currentParams, search: text };
-    this.router.navigate([], { queryParams: newParams });
-    this.searchService.search(text);
-  }
-
-  ngAfterViewInit(): void {
-    this.route.queryParams.subscribe((params) => {
-      console.log(params);
-      const searchParam: string | undefined = params["search"];
-      if (searchParam) {
-        this.searchService.search(searchParam);
-      }
-    });
-  }
 }
diff --git a/apps/NwaifuAnime/src/app/app.routes.ts b/apps/NwaifuAnime/src/app/app.routes.ts
index 814f55a..c92235c 100644
--- a/apps/NwaifuAnime/src/app/app.routes.ts
+++ b/apps/NwaifuAnime/src/app/app.routes.ts
@@ -1,4 +1,5 @@
 import { Route } from "@angular/router";
+import { DetailComponent } from "./components/detail/detail.component";
 import { HomeComponent } from "./components/home/home.component";
 
 export const appRoutes: Route[] = [
@@ -6,4 +7,5 @@ export const appRoutes: Route[] = [
     path: "",
     component: HomeComponent,
   },
+  { path: "detail", component: DetailComponent },
 ];
diff --git a/apps/NwaifuAnime/src/app/components/detail/detail.component.html b/apps/NwaifuAnime/src/app/components/detail/detail.component.html
new file mode 100644
index 0000000..eab7076
--- /dev/null
+++ b/apps/NwaifuAnime/src/app/components/detail/detail.component.html
@@ -0,0 +1,4 @@
+@if (detail_item) {
+  <h1>{{ detail_item.name }}</h1>
+  <h2>{{ detail_item.rus_name }}</h2>
+}
diff --git a/apps/NwaifuAnime/src/app/components/detail/detail.component.less b/apps/NwaifuAnime/src/app/components/detail/detail.component.less
new file mode 100644
index 0000000..e69de29
diff --git a/apps/NwaifuAnime/src/app/components/detail/detail.component.ts b/apps/NwaifuAnime/src/app/components/detail/detail.component.ts
new file mode 100644
index 0000000..1e2e640
--- /dev/null
+++ b/apps/NwaifuAnime/src/app/components/detail/detail.component.ts
@@ -0,0 +1,32 @@
+import { CommonModule } from "@angular/common";
+import { AfterViewInit, Component } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { Data } from "../../services/parsers/rulib/rulib.detail.dto";
+import { SearchService } from "../../services/search.service";
+
+@Component({
+  selector: "app-detail",
+  templateUrl: "./detail.component.html",
+  styleUrls: ["./detail.component.less"],
+  standalone: true,
+  imports: [CommonModule],
+})
+export class DetailComponent implements AfterViewInit {
+  detail_item: Data | null = null;
+  constructor(
+    private route: ActivatedRoute,
+    private searchService: SearchService,
+    private router: Router,
+  ) {}
+
+  ngAfterViewInit(): void {
+    this.route.queryParams.subscribe((params) => {
+      const url = params["url"];
+      if (url) {
+        this.searchService.getDetails(url).subscribe((data) => (this.detail_item = data.data));
+      } else {
+        this.router.navigate(["/"]);
+      }
+    });
+  }
+}
diff --git a/apps/NwaifuAnime/src/app/components/header/header.component.html b/apps/NwaifuAnime/src/app/components/header/header.component.html
index b81e4c6..eeb7895 100644
--- a/apps/NwaifuAnime/src/app/components/header/header.component.html
+++ b/apps/NwaifuAnime/src/app/components/header/header.component.html
@@ -2,7 +2,7 @@
   class="header fixed flex justify-between w-full p-2 bg-gray-700 md:h-8 h-auto items-center md:flex-row flex-col md:gap-0 gap-3"
 >
   <div class="flex justify-between flex-row w-full align-middle">
-    <h1 class="text-white">NwaifuAnime</h1>
+    <a href="/"><h1 class="text-white">NwaifuAnime</h1></a>
     <!-- Search bar on small screens -->
     <button type="button" class="md:hidden" (click)="changeMenu()">
       <i [class]="menuBtnClass"></i>
@@ -15,6 +15,7 @@
       type="search"
       #searchInput
       class="outline-none ps-1 text-sm leading-6 w-full border-0 bg-transparent border-r border-gray-700"
+      (keydown.enter)="search()"
     />
     <button class="align-middle w-[100px] text-center" type="submit" (click)="search()">
       <span class="text-sm text-black h-full">Поиск</span>
diff --git a/apps/NwaifuAnime/src/app/components/header/header.component.ts b/apps/NwaifuAnime/src/app/components/header/header.component.ts
index feb5ad5..d320acd 100644
--- a/apps/NwaifuAnime/src/app/components/header/header.component.ts
+++ b/apps/NwaifuAnime/src/app/components/header/header.component.ts
@@ -1,5 +1,6 @@
 import { CommonModule } from "@angular/common";
-import { Component, ElementRef, EventEmitter, Output, ViewChild } from "@angular/core";
+import { AfterViewInit, Component, ElementRef, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
 
 @Component({
   selector: "app-header",
@@ -8,10 +9,13 @@ import { Component, ElementRef, EventEmitter, Output, ViewChild } from "@angular
   standalone: true,
   imports: [CommonModule],
 })
-export class HeaderComponent {
-  @Output() searchEvent: EventEmitter<string> = new EventEmitter();
+export class HeaderComponent implements AfterViewInit {
   @ViewChild("searchInput") searchInput: ElementRef<HTMLInputElement> | null = null;
   menuOpened = false;
+  constructor(
+    private router: Router,
+    private route: ActivatedRoute,
+  ) {}
   changeMenu() {
     this.menuOpened = !this.menuOpened;
   }
@@ -27,7 +31,16 @@ export class HeaderComponent {
   search() {
     if (this.searchInput) {
       const text = this.searchInput.nativeElement.value;
-      this.searchEvent.emit(text);
+      this.router.navigateByUrl(`/?search=${text}`);
     }
   }
+
+  ngAfterViewInit(): void {
+    this.route.queryParams.subscribe((params) => {
+      const search = params["search"];
+      if (search && this.searchInput) {
+        this.searchInput.nativeElement.value = search;
+      }
+    });
+  }
 }
diff --git a/apps/NwaifuAnime/src/app/components/home/home.component.ts b/apps/NwaifuAnime/src/app/components/home/home.component.ts
index 79a8f45..29b93e7 100644
--- a/apps/NwaifuAnime/src/app/components/home/home.component.ts
+++ b/apps/NwaifuAnime/src/app/components/home/home.component.ts
@@ -1,7 +1,8 @@
 import { CommonModule } from "@angular/common";
-import { Component, Input, OnDestroy, OnInit } from "@angular/core";
+import { AfterViewInit, Component, Input, OnDestroy, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
 import { Subscription } from "rxjs";
-import { Datum } from "../../services/parsers/rulib/rulib.dto";
+import { Datum } from "../../services/parsers/rulib/rulib.search.dto";
 import { SearchService } from "../../services/search.service";
 
 @Component({
@@ -11,11 +12,15 @@ import { SearchService } from "../../services/search.service";
   styleUrls: ["./home.component.less"],
   imports: [CommonModule],
 })
-export class HomeComponent implements OnInit, OnDestroy {
+export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
   @Input() items: Datum[] = [];
   private subscription: Subscription = new Subscription();
 
-  constructor(private searchService: SearchService) {}
+  constructor(
+    private searchService: SearchService,
+    private route: ActivatedRoute,
+    private router: Router,
+  ) {}
 
   ngOnInit(): void {
     this.subscription = this.searchService.currentItemsTerm.subscribe((data) => {
@@ -24,12 +29,20 @@ export class HomeComponent implements OnInit, OnDestroy {
   }
 
   getDetails(slug_url: string) {
-    this.searchService.getDetails(slug_url).subscribe((data) => {
-      console.log(data);
-    });
+    this.router.navigate(["/", "detail"], { queryParams: { url: slug_url } });
   }
 
   ngOnDestroy(): void {
     this.subscription.unsubscribe();
   }
+
+  ngAfterViewInit(): void {
+    this.route.queryParams.subscribe((params) => {
+      const search = params["search"];
+      console.log(params);
+      if (search) {
+        this.searchService.search(search);
+      }
+    });
+  }
 }
diff --git a/apps/NwaifuAnime/src/app/services/parsers/rulib/lib.social.parser.service.ts b/apps/NwaifuAnime/src/app/services/parsers/rulib/lib.social.parser.service.ts
index a4975f4..b1ac197 100644
--- a/apps/NwaifuAnime/src/app/services/parsers/rulib/lib.social.parser.service.ts
+++ b/apps/NwaifuAnime/src/app/services/parsers/rulib/lib.social.parser.service.ts
@@ -2,7 +2,8 @@ import { HttpClient } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import { Observable, catchError, map, throwError } from "rxjs";
 import { ESiteUrls } from "../urls";
-import { IRulibSearchResult } from "./rulib.dto";
+import { IRulibDetailResult } from "./rulib.detail.dto";
+import { IRulibSearchResult } from "./rulib.search.dto";
 
 //TODO: Make abstract classes
 @Injectable({
@@ -25,14 +26,14 @@ export class LibSocialParserService {
       );
   }
 
-  getDetails(slug_url: string) {
+  getDetails(slug_url: string): Observable<IRulibDetailResult> {
     return this.http
       .get(
         `${this.url}/api/manga/${slug_url}?fields[]=summary&fields[]=genres&fields[]=tags&fields[]=authors`,
       )
       .pipe(
         map((data: object) => {
-          return data;
+          return data as IRulibDetailResult;
         }),
         catchError((error) => {
           return throwError(() => `Now found ${error}`);
diff --git a/apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.detail.dto.ts b/apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.detail.dto.ts
new file mode 100644
index 0000000..1b34cd6
--- /dev/null
+++ b/apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.detail.dto.ts
@@ -0,0 +1,69 @@
+export interface IRulibDetailResult {
+  data: Data;
+  meta: Meta;
+}
+
+export interface Data {
+  id: number;
+  name: string;
+  rus_name: string;
+  eng_name: string;
+  slug: string;
+  slug_url: string;
+  cover: Cover;
+  ageRestriction: AgeRestriction;
+  site: number;
+  type: AgeRestriction;
+  summary: string;
+  is_licensed: boolean;
+  genres: Genre[];
+  tags: Genre[];
+  authors: Author[];
+  model: string;
+  status: AgeRestriction;
+  releaseDateString: string;
+}
+
+export interface AgeRestriction {
+  id: number;
+  label: string;
+}
+
+export interface Author {
+  id: number;
+  slug: string;
+  slug_url: string;
+  model: string;
+  name: string;
+  rus_name: null;
+  alt_name: null;
+  cover: Cover;
+  subscription: Subscription;
+  confirmed: null;
+  user_id: number;
+}
+
+export interface Cover {
+  filename: null | string;
+  thumbnail: string;
+  default: string;
+  md: string;
+}
+
+export interface Subscription {
+  is_subscribed: boolean;
+  source_type: string;
+  source_id: number;
+  relation: null;
+}
+
+export interface Genre {
+  id: number;
+  name: string;
+  adult: boolean;
+  alert: boolean;
+}
+
+export interface Meta {
+  country: string;
+}
diff --git a/apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.dto.ts b/apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.search.dto.ts
similarity index 100%
rename from apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.dto.ts
rename to apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.search.dto.ts
diff --git a/apps/NwaifuAnime/src/app/services/search.service.ts b/apps/NwaifuAnime/src/app/services/search.service.ts
index 822700d..1636d56 100644
--- a/apps/NwaifuAnime/src/app/services/search.service.ts
+++ b/apps/NwaifuAnime/src/app/services/search.service.ts
@@ -1,7 +1,8 @@
 import { Injectable } from "@angular/core";
 import { BehaviorSubject, Observable, map } from "rxjs";
 import { LibSocialParserService } from "./parsers/rulib/lib.social.parser.service";
-import { Datum } from "./parsers/rulib/rulib.dto";
+import { IRulibDetailResult } from "./parsers/rulib/rulib.detail.dto";
+import { Datum } from "./parsers/rulib/rulib.search.dto";
 
 @Injectable({ providedIn: "root" })
 export class SearchService {
@@ -15,7 +16,7 @@ export class SearchService {
     });
   }
 
-  getDetails(slug_url: string): Observable<object> {
+  getDetails(slug_url: string): Observable<IRulibDetailResult> {
     return this.parser.getDetails(slug_url).pipe(
       map((data) => {
         return data;