feat: header refactor starting

apps/NwaifuAnime/src/app/app.component.html

@@ -7,8 +7,9 @@
   }
 }
 <app-header></app-header>
-<div class="h-10"></div>
+<div class="h-12"></div>
-<main>
+<div class="content">
   <router-outlet></router-outlet>
-</main>
+  <app-footer></app-footer>
+</div>
 <app-notification></app-notification>

apps/NwaifuAnime/src/app/app.component.less

@@ -1,4 +1,4 @@
-main {
+.content {
   overflow-y: auto;
   height: calc(100vh - 3rem);
 }

apps/NwaifuAnime/src/app/app.component.ts

@@ -1,12 +1,19 @@
 import { Component } from "@angular/core";
 import { RouterModule } from "@angular/router";
 import { AppService } from "./app.service";
+import { FooterComponent } from "./components/footer/footer.component";
 import { HeaderComponent } from "./components/header/header.component";
 import { NotificationComponent } from "./components/notification/notification.component";
 
 @Component({
   standalone: true,
-  imports: [RouterModule, HeaderComponent, NotificationComponent, NotificationComponent],
+  imports: [
+    RouterModule,
+    HeaderComponent,
+    NotificationComponent,
+    NotificationComponent,
+    FooterComponent,
+  ],
   selector: "app-root",
   templateUrl: "./app.component.html",
   styleUrl: "./app.component.less",

apps/NwaifuAnime/src/app/app.config.ts

@@ -3,6 +3,9 @@ import { ApplicationConfig, isDevMode, provideZoneChangeDetection } from "@angul
 import { provideRouter } from "@angular/router";
 import { provideServiceWorker } from "@angular/service-worker";
 import { appRoutes } from "./app.routes";
+import { Parser } from "./services/parsers/parser";
+import { MangalibParserService } from "./services/parsers/rulib/mangalib.parser.service";
+import { SlashlibParserService } from "./services/parsers/rulib/slashlib.parser.service";
 
 export const appConfig: ApplicationConfig = {
   providers: [
@@ -13,5 +16,7 @@ export const appConfig: ApplicationConfig = {
       registrationStrategy: "registerWhenStable:30000",
     }),
     provideHttpClient(withFetch()),
+    { provide: Parser, multi: true, useClass: MangalibParserService },
+    { provide: Parser, multi: true, useClass: SlashlibParserService },
   ],
 };

apps/NwaifuAnime/src/app/components/detail/detail.component.ts

@@ -56,6 +56,7 @@ export class DetailComponent implements AfterViewInit, OnDestroy {
     this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params) => {
       const url = params["url"];
       if (url) {
+        this.searchService.setMangalibParser();
         this.getDetails(url);
       } else {
         this.router.navigate(["/"]);

apps/NwaifuAnime/src/app/components/footer/footer.component.html

@@ -0,0 +1,19 @@
+<div class="footer w-full border-t border-black bg-gray-300 pt-3">
+  <p class="text-3xl ps-[5rem]">DMCA Disclaimer</p>
+  <div class="footer-content h-full px-[5rem] py-6 flex flex-col gap-3">
+    <div class="block">
+      <p>На русском:</p>
+      <p>
+        Разработчики этого приложения не имеют никакого отношения к контенту, доступному в
+        приложении. Оно собрано из источников, свободно доступных через любой веб-браузер.
+      </p>
+    </div>
+    <div class="block">
+      <p>English:</p>
+      <p>
+        The developers of this application does not have any affiliation with the content available
+        in the app. It is collecting from the sources freely available through any web browser.
+      </p>
+    </div>
+  </div>
+</div>

apps/NwaifuAnime/src/app/components/footer/footer.component.ts

@@ -0,0 +1,9 @@
+import { Component } from "@angular/core";
+
+@Component({
+  selector: "app-footer",
+  templateUrl: "./footer.component.html",
+  styleUrls: ["./footer.component.less"],
+  standalone: true,
+})
+export class FooterComponent {}

apps/NwaifuAnime/src/app/components/header/header.component.html

@@ -1,28 +1,6 @@
 <div
-  class="header fixed flex justify-between w-full p-2 bg-gray-700 md:h-8 items-center md:flex-row flex-col md:gap-0 gap-3 text-xl md:text-base"
+  class="header fixed flex flex-row items-center px-2 justify-between top-0 left-0 h-12 bg-gray-700 w-full"
 >
-  <div class="flex justify-between flex-row w-full align-middle">
+  <a routerLink="/" title="Main page"><p class="text-xl text-white">NwaifuAnime</p></a>
-    <a href="/"><h1 class="text-white" title="Main page">NwaifuAnime</h1></a>
+  <app-search-field></app-search-field>
-    <!-- Search bar on small screens -->
-    <button type="button" class="md:hidden" (click)="changeMenu()">
-      <i [class]="menuBtnClass"></i>
-    </button>
-  </div>
-
-  <!-- Search bar on big screens -->
-  <div [class]="searchBarClass">
-    <input
-      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 border-0 flex flex-col items-center justify-center"
-      type="submit"
-      (click)="search()"
-    >
-      <span class="text-sm text-black h-full">Поиск</span>
-    </button>
-  </div>
 </div>

apps/NwaifuAnime/src/app/components/header/header.component.less

@@ -1,3 +1,7 @@
 .header {
   transition: height 0.3s;
 }
+:host {
+  z-index: 20;
+  position: fixed;
+}

apps/NwaifuAnime/src/app/components/header/header.component.ts

@@ -1,17 +1,17 @@
 import { CommonModule } from "@angular/common";
-import { AfterViewInit, Component, ElementRef, OnDestroy, ViewChild } from "@angular/core";
+import { Component, OnDestroy } from "@angular/core";
-import { ActivatedRoute, NavigationEnd, Router } from "@angular/router";
+import { ActivatedRoute, NavigationEnd, Router, RouterLink } from "@angular/router";
 import { Subject, filter, takeUntil } from "rxjs";
+import { SearchFieldComponent } from "../search-field/search-field.component";
 
 @Component({
   selector: "app-header",
   templateUrl: "./header.component.html",
   styleUrls: ["./header.component.less"],
   standalone: true,
-  imports: [CommonModule],
+  imports: [CommonModule, RouterLink, SearchFieldComponent],
 })
-export class HeaderComponent implements AfterViewInit, OnDestroy {
+export class HeaderComponent implements OnDestroy {
-  @ViewChild("searchInput") searchInput: ElementRef<HTMLInputElement> | null = null;
   menuOpened = false;
   private destroy$ = new Subject<void>();
   constructor(
@@ -19,8 +19,10 @@ export class HeaderComponent implements AfterViewInit, OnDestroy {
     private route: ActivatedRoute,
   ) {
     this.router.events
-      .pipe(filter((event) => event instanceof NavigationEnd))
+      .pipe(
-      .pipe(takeUntil(this.destroy$))
+        filter((event) => event instanceof NavigationEnd),
+        takeUntil(this.destroy$),
+      )
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       .subscribe((val: any) => {
         if (val.url.startsWith("/detail") || val.url.startsWith("/reader")) {
@@ -28,6 +30,7 @@ export class HeaderComponent implements AfterViewInit, OnDestroy {
         }
       });
   }
+
   changeMenu() {
     this.menuOpened = !this.menuOpened;
   }
@@ -37,23 +40,7 @@ export class HeaderComponent implements AfterViewInit, OnDestroy {
   }
 
   get searchBarClass(): string {
-    return `search-bar bg-slate-300 md:w-[50%] w-full md:m-0 ms-2 me-2 md:h-6 h-10 md:flex justify-start flex-row items-center rounded-md ${this.menuOpened ? "flex" : "hidden"}`;
+    return `search-bar bg-slate-300 md:w-full w-full md:m-0 ms-2 me-2 md:h-6 h-10 md:flex justify-start flex-row items-center rounded-md ${this.menuOpened ? "flex" : "hidden"}`;
-  }
-
-  search() {
-    if (this.searchInput) {
-      const text = this.searchInput.nativeElement.value;
-      this.router.navigateByUrl(`/?search=${text}`);
-    }
-  }
-
-  ngAfterViewInit(): void {
-    this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params) => {
-      const search = params["search"];
-      if (search && this.searchInput) {
-        this.searchInput.nativeElement.value = search;
-      }
-    });
   }
 
   ngOnDestroy(): void {

apps/NwaifuAnime/src/app/components/home/home.component.html

@@ -1,5 +1,40 @@
-<h1>It's home component</h1>
+@if (!search) {
+  @if (loading) {
+    <p class="text-5xl text-center mb-16">Подождите...</p>
+  } @else {
+    <p class="text-5xl text-center mb-10">Популярное:</p>
+    <div class="flex flex-col gap-3 items-center w-full px-4 overflow-x-hidden">
+      @for (popular of popularItems; track popular[0]) {
+        <p class="text-5xl text-center">{{ popular[0] }}</p>
+        <div class="w-full overflow-x-auto py-3">
+          <div class="flex flex-row items-center gap-4 h-[400px] w-max">
+            @for (popularTitle of popular[1]; track popularTitle.id) {
+              <a routerLink="/detail" [queryParams]="{ url: popularTitle.slug_url }" class="h-full">
+                <div
+                  class="flex flex-col justify-around border-black rounded-md p-4 w-[400px] items-center border h-full flex-shrink-0"
+                >
+                  <img
+                    [src]="popularTitle.cover.thumbnail"
+                    [alt]="popularTitle.slug"
+                    class="w-[200px] h-auto aspect-auto"
+                  />
+                  <p>{{ popularTitle.rus_name }}</p>
+                </div>
+              </a>
+            }
+          </div>
+        </div>
+      }
+    </div>
+  }
+} @else {
   <div class="flex flex-col items-center w-full px-3">
+    @if (loading) {
+      <h1>Loading...</h1>
+    }
+    @if (notFound && !loading) {
+      <h1>Not found</h1>
+    }
     @for (item of items; track $index) {
       <a
         routerLink="/detail"
@@ -7,10 +42,17 @@
         title="{{ item.name }}"
         class="mb-6 max-w-[700px] w-full"
       >
-      <div class="card flex flex-col items-center border-black border-2 rounded-md p-4 w-full">
+        <div
+          class="card flex flex-col items-center border-black border-2 rounded-md p-4 w-full h-[350px]"
+        >
           <h1>{{ item.rus_name }}</h1>
-        <img [src]="item.cover.thumbnail" [alt]="item.slug" class="w-[200px] h-auto aspect-auto" />
+          <img
+            [src]="item.cover.thumbnail"
+            [alt]="item.slug"
+            class="w-[200px] h-auto max-h-[300px] aspect-auto"
+          />
         </div>
       </a>
     }
   </div>
+}

apps/NwaifuAnime/src/app/components/home/home.component.ts

@@ -1,7 +1,8 @@
 import { CommonModule } from "@angular/common";
-import { AfterViewInit, Component, Input, OnDestroy } from "@angular/core";
+import { Component, Input, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute, RouterLink } from "@angular/router";
-import { Subject, takeUntil } from "rxjs";
+import { map, Subject, Subscription, takeUntil } from "rxjs";
+import { IRuLIBPopular } from "../../services/parsers/rulib/rulib.popular.dto";
 import { Datum } from "../../services/parsers/rulib/rulib.search.dto";
 import { SearchService } from "../../services/search.service";
 
@@ -12,31 +13,79 @@ import { SearchService } from "../../services/search.service";
   styleUrls: ["./home.component.less"],
   imports: [CommonModule, RouterLink],
 })
-export class HomeComponent implements OnDestroy, AfterViewInit {
+export class HomeComponent implements OnDestroy, OnInit {
   @Input() items: Datum[] = [];
+  loading = false;
+  notFound = false;
+  search: string = "";
+  popularItemsMap: Map<string, IRuLIBPopular[]> = new Map<string, IRuLIBPopular[]>();
 
   private destroy$ = new Subject<void>();
+  private popularSubscription = new Subscription();
 
   constructor(
     private searchService: SearchService,
     private route: ActivatedRoute,
-  ) {}
+  ) {
+    this.searchService.setMangalibParser();
+  }
 
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
+    this.popularSubscription.unsubscribe();
   }
 
-  ngAfterViewInit(): void {
+  private getPopular(parserName: string) {
-    this.route.queryParams.subscribe((params) => {
-      const search = params["search"];
-      if (search) {
     this.searchService
-          .search(search)
+      .getPopular()
+      .pipe(
+        map((data) => data as IRuLIBPopular[]),
+        takeUntil(this.destroy$),
+      )
+      .subscribe({
+        next: (data) => {
+          this.popularItemsMap.set(parserName, data);
+          this.loading = false;
+        },
+        error: (error) => {
+          console.error(error);
+        },
+      });
+  }
+
+  private getPopularMangalib() {
+    this.searchService.setMangalibParser();
+    this.getPopular(this.searchService.getRuLibName());
+  }
+
+  private getPopularSlashlib() {
+    this.searchService.setSlashlibParser();
+    this.getPopular(this.searchService.getRuLibName());
+  }
+
+  get popularItems() {
+    return Array.from(this.popularItemsMap.entries()).sort((a, b) => (a[0] > b[0] ? 1 : -1));
+  }
+
+  ngOnInit(): void {
+    this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params) => {
+      this.search = params["search"] ?? "";
+      this.items = [];
+      this.loading = true;
+      if (this.search) {
+        this.searchService.setMangalibParser();
+        this.searchService
+          .search(this.search)
           .pipe(takeUntil(this.destroy$))
           .subscribe((data) => {
+            this.loading = false;
             this.items = data.data;
+            this.notFound = this.items.length === 0;
           });
+      } else {
+        this.getPopularMangalib();
+        this.getPopularSlashlib();
       }
     });
   }

apps/NwaifuAnime/src/app/components/reader/lazyscroll.directive.ts

@@ -1,19 +0,0 @@
-import { Directive, ElementRef } from "@angular/core";
-
-@Directive({
-  selector: "[appLazyLoad]",
-  standalone: true,
-})
-export class LazyLoadDirective {
-  constructor({ nativeElement }: ElementRef) {
-    const observer = new IntersectionObserver(
-      (entries) => {
-        console.log(entries);
-      },
-      {
-        rootMargin: "1000px",
-      },
-    );
-    observer.observe(nativeElement);
-  }
-}

apps/NwaifuAnime/src/app/components/reader/reader.component.html

@@ -11,25 +11,38 @@
   <h3>{{ currentChapterInfo?.number }}. {{ currentChapterInfo?.name || "Нет названия" }}</h3>
 </div>
 <div class="flex flex-col items-center">
-  @if (pages.length > 0 && cachedPages.get(currentPageIndex)) {
+  @if (pages.length > 0 && currentPage) {
     <div [class]="imageContainerClass">
-      @if (!isManhwa$.value) {
+      @if (!isManhwa) {
-        <app-scale-image [imageSrc]="imageUrl"></app-scale-image>
+        <app-scale-image
+          [imageSrc]="currentPage.imageUrl"
+          (clickLeft)="prevPage()"
+          (clickRight)="nextPage()"
+        ></app-scale-image>
       } @else {
         @for (page of manhwaPages; track page.id) {
-          <app-scale-image [imageSrc]="page.imageUrl"></app-scale-image>
+          <app-scale-image
+            [imageSrc]="page.imageUrl"
+            [host]="host"
+            (view)="loadPage(page.index)"
+            [hostScrollable]="isHostScrollable()"
+          ></app-scale-image>
         }
       }
     </div>
-    <div appLazyLoad></div>
+    <div class="flex items-center justify-center space-x-4 mt-[6rem]">
-    <div class="flex items-center justify-center space-x-4 my-10">
       <button (click)="prevPage()" class="p-3 text-white bg-slate-600 w-[100px] rounded-lg">
         ←
       </button>
-      <p *ngIf="!isManhwa$.value">{{ pages[currentPageIndex].slug }} / {{ pages.length }}</p>
+      <p *ngIf="!isManhwa">{{ pages[currentPageIndex].slug }} / {{ pages.length }}</p>
       <button (click)="nextPage()" class="p-3 text-white bg-slate-600 w-[100px] rounded-lg">
         →
       </button>
     </div>
+    @if (isManhwa) {
+      <div class="hidden md:block md:fixed right-10 top-[50%]">
+        {{ currentPageIndex + 1 }} / {{ pages.length }}
+      </div>
+    }
   }
 </div>

apps/NwaifuAnime/src/app/components/reader/reader.component.ts

@@ -1,21 +1,19 @@
-import { CommonModule } from "@angular/common";
+import { CommonModule, isPlatformBrowser } from "@angular/common";
-import { AfterViewInit, Component, OnDestroy } from "@angular/core";
-import { ActivatedRoute, Router, RouterLink } from "@angular/router";
 import {
-  BehaviorSubject,
+  Component,
-  Observable,
+  ElementRef,
-  Subject,
+  HostListener,
-  Subscription,
+  Inject,
-  fromEvent,
+  OnDestroy,
-  map,
+  OnInit,
-  takeUntil,
+  PLATFORM_ID,
-  throttleTime,
+} from "@angular/core";
-} from "rxjs";
+import { ActivatedRoute, Router, RouterLink } from "@angular/router";
+import { Subject, takeUntil } from "rxjs";
 import { Chapter, Page } from "../../services/parsers/rulib/rulib.chapter.dto";
 import { IRulibChapter } from "../../services/parsers/rulib/rulib.chapters.dto";
 import { SearchService } from "../../services/search.service";
 import { ScaleImageComponent } from "../scale-image/scale-image.component";
-import { LazyLoadDirective } from "./lazyscroll.directive";
 import { CachedPage, CachedPages } from "./reader.dto";
 
 @Component({
@@ -23,10 +21,9 @@ import { CachedPage, CachedPages } from "./reader.dto";
   templateUrl: "./reader.component.html",
   styleUrls: ["./reader.component.less"],
   standalone: true,
-  imports: [CommonModule, ScaleImageComponent, RouterLink, LazyLoadDirective],
+  imports: [CommonModule, ScaleImageComponent, RouterLink],
 })
-export class ReaderComponent implements AfterViewInit, OnDestroy {
+export class ReaderComponent implements OnInit, OnDestroy {
-  //FIXME: Scrolling to top when manhwa
   pages: Page[] = [];
   currentPageIndex = 0;
   cachedPages: CachedPages = new Map<number, CachedPage>();
@@ -34,95 +31,70 @@ export class ReaderComponent implements AfterViewInit, OnDestroy {
   isManhwa = false;
   currentChapterInfo: Chapter | null = null;
   url = "";
-  isManhwa$ = new BehaviorSubject<boolean>(false);
   private chaptersInfo: IRulibChapter[] = [];
   private chapterNum: number = 0;
   private chapterVol: number = 0;
   private fromTowards = false;
   private destroy$ = new Subject<void>();
-  private scrollSubscription = new Subscription();
 
   constructor(
     private route: ActivatedRoute,
     private router: Router,
     private searchService: SearchService,
+    public host: ElementRef,
+    @Inject(PLATFORM_ID) private platformId: object,
   ) {}
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
-    this.isManhwa$.complete();
   }
 
   get manhwaPages() {
     return this.cachedPages.values();
   }
 
-  ngAfterViewInit(): void {
+  ngOnInit(): void {
     this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params) => {
       const url = params["url"];
       const chapter = params["chapter"];
       const volume = params["volume"];
       const fromTowards = params["from_towards"];
       if (url && chapter && volume) {
+        this.searchService.setMangalibParser();
         if (fromTowards) this.fromTowards = Boolean(+fromTowards);
         else this.fromTowards = false;
         this.chapterNum = +chapter;
         this.chapterVol = +volume;
         this.url = url;
-        this.loadChapter(url, chapter, volume);
         this.searchService
           .getChapters(url)
           .pipe(takeUntil(this.destroy$))
           .subscribe((data) => {
             this.chaptersInfo = data.data;
           });
+        this.searchService
+          .isManhwa(url)
+          .pipe(takeUntil(this.destroy$))
+          .subscribe((data) => {
+            this.isManhwa = data;
+            this.loadChapter(url, chapter, volume);
+          });
       } else {
         this.router.navigate(["/"]);
       }
     });
-    // this.isManhwa$.pipe(takeUntil(this.destroy$)).subscribe((isManhwa) => {
-    //   this.isManhwa = isManhwa;
-    //   if (isManhwa) this.initManhwaScroll();
-    //   else this.noManhwaScroll();
-    // });
   }
 
-  private handleScrollManhwa(event: Event) {
+  public isHostScrollable(): boolean {
-    if (event.currentTarget) {
+    if (isPlatformBrowser(this.platformId)) {
-      if (
+      const style = window.getComputedStyle(this.host.nativeElement);
-        (event.currentTarget as HTMLElement).scrollHeight -
+      return (
-          (event.currentTarget as HTMLElement).scrollTop <
+        style.getPropertyValue("overflow") === "auto" ||
-        3000
+        style.getPropertyValue("overflow-y") === "scroll"
-      ) {
+      );
-        this.loadPage(this.currentPageIndex + 1);
-        console.log("load");
-      }
-    }
     }
 
-  private initManhwaScroll() {
+    return false;
-    const component = document.querySelector("app-reader");
-    if (component && this.isManhwa) {
-      this.scrollSubscription = fromEvent(component, "scroll")
-        .pipe(
-          throttleTime(300),
-          map((data) => {
-            console.log("throttle");
-            return data;
-          }),
-          takeUntil(this.destroy$),
-        )
-        .subscribe((event) => {
-          this.handleScrollManhwa(event);
-        });
-    }
-  }
-
-  private noManhwaScroll() {
-    const component = document.querySelector("app-reader");
-    if (component && !this.isManhwa) {
-      this.scrollSubscription.unsubscribe();
-    }
   }
 
   backToTitle() {
@@ -137,6 +109,15 @@ export class ReaderComponent implements AfterViewInit, OnDestroy {
         next: (data) => {
           this.currentChapterInfo = data.data;
           this.pages = data.data.pages;
+          this.pages.forEach((page, index) => {
+            this.cachedPages.set(index, {
+              ...page,
+              imageUrl: "",
+              isManhwa: this.isManhwa,
+              index,
+            });
+          });
+          this.loadPage(0);
           if (this.fromTowards) {
             this.currentPageIndex = this.pages.length - 1;
             this.loadPage(this.pages.length - 1); // Загрузить последнюю страницу при открытии главы
@@ -149,32 +130,54 @@ export class ReaderComponent implements AfterViewInit, OnDestroy {
       });
   }
 
+  public intersectionLoadPage(id: number) {
+    const data = Array.from(this.cachedPages.values()).find((page) => page.id === id)!;
+    this.fetchPage(data);
+  }
+
+  private loadPageByIndex(index: number) {
+    const data = this.cachedPages.get(index)!;
+    this.fetchPage(data);
+  }
+
+  get currentPage() {
+    return this.cachedPages.get(this.currentPageIndex);
+  }
+
+  private fetchPage(page: CachedPage) {
+    if (!page.imageUrl)
+      this.searchService
+        .getImageData(this.searchService.getImageServer() + page.url)
+        .pipe(takeUntil(this.destroy$))
+        .subscribe((data) => {
+          const url = this.getImageUrl(data);
+          this.cachedPages.set(page.index, {
+            ...page,
+            imageUrl: url,
+          });
+        });
+  }
+
+  private cachePage(index: number) {
+    for (let i = index; i < Math.min(index + 2, this.cachedPages.size); i++) {
+      this.loadPageByIndex(i);
+    }
+  }
+
+  private clearCache(index: number) {
+    for (let i = 0; i <= index; i++) {
+      const imgUrl = this.cachedPages.get(i)!.imageUrl;
+      this.cachedPages.get(i)!.imageUrl = "";
+      URL.revokeObjectURL(imgUrl);
+    }
+  }
+
   loadPage(index: number) {
     if (index >= 0 && index < this.pages.length) {
       this.currentPageIndex = index;
-      this.cachePage(index); // Кэшируем текущую и соседние страницы
+      this.cachePage(index);
-      if (!this.isManhwa$.value) this.unloadCachedPages(index); // Сгружаем ненужные страницы из кэша
+      this.clearCache(index - 2);
-      if (!this.isManhwa$.value) {
+    } else if (index == this.cachedPages.size) {
-        const container = document.querySelector("app-reader");
-        if (container) {
-          container.scrollTo({
-            top: 0,
-            behavior: "smooth",
-          });
-        }
-      }
-      if (!this.cachedPages.get(index)?.imageData) {
-        // Если страница не закэширована, загружаем её
-        this.fetchAndCachePage(index)
-          .pipe(takeUntil(this.destroy$))
-          .subscribe(() => {
-            this.updateImage();
-          });
-      } else {
-        // Если страница уже в кэше, просто обновляем изображение
-        this.updateImage();
-      }
-    } else if (index == this.pages.length && !this.isManhwa$.value) {
       const thisChapterIndex = this.chaptersInfo.findIndex((chapter) => {
         return +chapter.number === this.chapterNum && +chapter.volume === this.chapterVol;
       });
@@ -190,7 +193,7 @@ export class ReaderComponent implements AfterViewInit, OnDestroy {
           },
         });
       }
-    } else if (index == -1 && !this.isManhwa$.value) {
+    } else if (index == -1) {
       const thisChapterIndex = this.chaptersInfo.findIndex((chapter) => {
         return +chapter.number === this.chapterNum && +chapter.volume === this.chapterVol;
       });
@@ -210,56 +213,16 @@ export class ReaderComponent implements AfterViewInit, OnDestroy {
     }
   }
 
-  // Кэширование текущей страницы и несколько соседних для ускорения процесса навигации по страницам
+  @HostListener("window:keydown", ["$event"])
-  private cachePage(index: number) {
+  onKeydown(event: KeyboardEvent) {
-    const startIndex = Math.max(0, index - 2);
+    if (event.key === "ArrowRight") {
-    const endIndex = Math.min(this.pages.length - 1, index + 2);
+      this.nextPage();
-
+    } else if (event.key === "ArrowLeft") {
-    for (let i = startIndex; i <= endIndex; i++) {
+      this.prevPage();
-      if (!this.isPageCached(i)) {
-        this.fetchAndCachePage(i)
-          .pipe(takeUntil(this.destroy$))
-          .subscribe(() => {
-            if (i === this.currentPageIndex) {
-              this.updateImage();
-            }
-          });
-      }
     }
   }
 
-  private isPageCached(index: number): boolean {
+  private getImageUrl(imageData?: Uint8Array): string {
-    return !!this.cachedPages.get(index)?.imageData;
-  }
-
-  // Загрузка и сохранение изображения в кэш
-  private fetchAndCachePage(index: number): Observable<void> {
-    return this.searchService
-      .getImageData(this.searchService.getImageServer() + this.pages[index].url)
-      .pipe(
-        map((imageData) => {
-          const url = this.getImageUrl(imageData);
-          this.cachedPages.set(index, {
-            ...this.pages[index],
-            imageData,
-            imageUrl: url,
-            isManhwa: +this.pages[index].ratio < 0.5,
-          });
-        }),
-      );
-  }
-
-  // Выгрузка из кэша старых страниц
-  private unloadCachedPages(index: number) {
-    for (const key in this.cachedPages) {
-      const pageIndex = +key;
-      if (index - pageIndex > 2) {
-        this.cachedPages.delete(pageIndex);
-      }
-    }
-  }
-
-  getImageUrl(imageData?: Uint8Array): string {
     if (!imageData) {
       return "";
     }
@@ -268,23 +231,6 @@ export class ReaderComponent implements AfterViewInit, OnDestroy {
     return urlCreator.createObjectURL(blob);
   }
 
-  // Обновляем изображение на странице
-  private updateImage() {
-    const currentPage = this.cachedPages.get(this.currentPageIndex);
-    if (currentPage && currentPage.imageData && !this.isManhwa$.value) {
-      const blob = new Blob([currentPage.imageData], { type: "image/jpeg" });
-      const urlCreator = window.URL || window.webkitURL;
-      this.imageUrl = urlCreator.createObjectURL(blob);
-      const imageUrl = this.imageUrl;
-      const image = new Image();
-      image.onload = () => {
-        if (currentPage.isManhwa) this.isManhwa$.next(currentPage.isManhwa);
-        URL.revokeObjectURL(imageUrl);
-      };
-      image.src = imageUrl;
-    }
-  }
-
   nextPage() {
     this.loadPage(this.currentPageIndex + 1);
   }
@@ -294,6 +240,6 @@ export class ReaderComponent implements AfterViewInit, OnDestroy {
   }
 
   get imageContainerClass() {
-    return `${this.isManhwa ? "h-auto" : "h-[70vh]"} w-[95vw] md:w-[700px] md:h-auto flex flex-col`;
+    return `${this.isManhwa ? "h-auto" : "min-h-[70vh]"} w-screen md:w-[450px] flex flex-col`;
   }
 }

apps/NwaifuAnime/src/app/components/reader/reader.dto.ts

@@ -3,7 +3,7 @@ import { Page } from "../../services/parsers/rulib/rulib.chapter.dto";
 export interface CachedPage extends Page {
   imageData?: Uint8Array;
   imageUrl: string;
-
+  index: number;
   isManhwa: boolean;
 }
 

apps/NwaifuAnime/src/app/components/scale-image/scale-image.component.html

@@ -1,3 +1,7 @@
 <div class="image-container" #container>
-  <img #image [src]="imageSrc" (load)="onImageLoad()" alt="Manga page" />
+  @if (imageSrc) {
+    <img #image [src]="imageSrc" (load)="onImageLoad()" alt="Manga page" class="cursor-pointer" />
+  } @else {
+    <div class="h-screen flex flex-col items-center justify-center"><h1>Loading...</h1></div>
+  }
 </div>

apps/NwaifuAnime/src/app/components/scale-image/scale-image.component.ts

@@ -1,5 +1,16 @@
-import { AfterViewInit, Component, ElementRef, Input, OnDestroy, ViewChild } from "@angular/core";
+import {
-import { Subscription, debounceTime, fromEvent } from "rxjs";
+  AfterViewInit,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  Output,
+  QueryList,
+  ViewChild,
+  ViewChildren,
+} from "@angular/core";
+import { Subject, Subscription, debounceTime, fromEvent, map, takeUntil } from "rxjs";
 
 @Component({
   selector: "app-scale-image",
@@ -11,15 +22,62 @@ export class ScaleImageComponent implements AfterViewInit, OnDestroy {
   @Input({ required: true }) imageSrc: string = "";
   @ViewChild("container", { static: true }) containerRef: ElementRef | null = null;
   @ViewChild("image", { static: true }) imageRef: ElementRef | null = null;
+  @ViewChildren("image") imageList: QueryList<ElementRef<HTMLImageElement>> = new QueryList<
+    ElementRef<HTMLImageElement>
+  >();
+  @Output() view = new EventEmitter<void>();
+  @Output() clickLeft = new EventEmitter<void>();
+  @Output() clickRight = new EventEmitter<void>();
+  @Input() host: ElementRef | null = null;
+  @Input() hostScrollable: boolean = false;
 
+  private destroy$ = new Subject<void>();
   private resizeSubscription: Subscription = new Subscription();
+  private observer!: IntersectionObserver;
 
   ngAfterViewInit(): void {
     this.setupResizeListener();
+    if (this.host) {
+      this.observer = new IntersectionObserver(
+        ([entry]) => entry.isIntersecting && this.view.emit(),
+        {
+          root: this.hostScrollable ? this.host.nativeElement : null,
+          rootMargin: "100px",
+        },
+      );
+      if (this.containerRef) this.observer.observe(this.containerRef.nativeElement);
+    }
+    if (!this.host) {
+      this.imageList.changes
+        .pipe<QueryList<ElementRef<HTMLImageElement>>>(takeUntil(this.destroy$))
+        .subscribe((imageList) => {
+          fromEvent(imageList.first.nativeElement, "click")
+            .pipe(
+              takeUntil(this.destroy$),
+              map((e) => e as MouseEvent),
+            )
+            .subscribe((e) => {
+              const target = e.target as HTMLImageElement;
+              const imageWidth = target.clientWidth;
+              const clickX = e.offsetX;
+              if (clickX < imageWidth / 2) this.clickLeft.emit();
+              else this.clickRight.emit();
+            });
+        });
+    }
+
+    // fromEvent(this.imageRef.first.nativeElement, "click")
+    //   .pipe(takeUntil(this.destroy$))
+    //   .subscribe((e) => {
+    //     console.log(e);
+    //   });
   }
 
   ngOnDestroy(): void {
     if (this.resizeSubscription) this.resizeSubscription.unsubscribe();
+    if (this.observer) this.observer.disconnect();
+    this.destroy$.next();
+    this.destroy$.complete();
   }
 
   onImageLoad() {

apps/NwaifuAnime/src/app/components/search-field/search-field.component.html

@@ -0,0 +1,6 @@
+<div class="flex flex-row gap-3 justify-between items-center">
+  <div class="input-block max-h-0"></div>
+  <div class="input-btn rounded-full w-8 h-8 bg-slate-400 flex justify-center items-center">
+    <i class="lni lni-search-alt"></i>
+  </div>
+</div>

apps/NwaifuAnime/src/app/components/search-field/search-field.component.ts

@@ -0,0 +1,42 @@
+import { CommonModule } from "@angular/common";
+import { AfterViewInit, Component, ElementRef, OnDestroy, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { Subject, takeUntil } from "rxjs";
+
+@Component({
+  selector: "app-search-field",
+  standalone: true,
+  imports: [CommonModule],
+  templateUrl: "./search-field.component.html",
+  styleUrl: "./search-field.component.less",
+})
+export class SearchFieldComponent implements AfterViewInit, OnDestroy {
+  @ViewChild("searchInput") searchInput: ElementRef<HTMLInputElement> | null = null;
+  private destroy$ = new Subject<void>();
+
+  constructor(
+    private route: ActivatedRoute,
+    private router: Router,
+  ) {}
+
+  ngAfterViewInit(): void {
+    this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params) => {
+      const search = params["search"];
+      if (search && this.searchInput) {
+        this.searchInput.nativeElement.value = search;
+      }
+    });
+  }
+
+  search() {
+    if (this.searchInput && this.searchInput.nativeElement.value)
+      this.router.navigate(["/", "search"], {
+        queryParams: { search: this.searchInput.nativeElement.value },
+      });
+  }
+
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+}

apps/NwaifuAnime/src/app/services/parsers/enums/parser.ts

@@ -0,0 +1,4 @@
+export enum EParser {
+  MangaLib = 0,
+  SlashLib = 1,
+}

apps/NwaifuAnime/src/app/services/parsers/parser.ts

@@ -15,4 +15,6 @@ export abstract class Parser {
   abstract getChapters(url: string): Observable<object>;
 
   abstract getChapter(url: string, chapter: string, volume: string): Observable<object>;
+
+  abstract getPopular(): Observable<object[]>;
 }

apps/NwaifuAnime/src/app/services/parsers/rulib/lib.social.parser.service.ts

@@ -6,9 +6,9 @@ import { RulibAuthService } from "./rulib.auth.service";
 import { IRulibChapterResult } from "./rulib.chapter.dto";
 import { IRulibChaptersResult } from "./rulib.chapters.dto";
 import { IRulibDetailResult } from "./rulib.detail.dto";
+import { IRuLIBPopular } from "./rulib.popular.dto";
 import { IRulibSearchResult } from "./rulib.search.dto";
 
-//TODO: Make abstract classes
 @Injectable({
   providedIn: "root",
 })
@@ -84,4 +84,35 @@ export class LibSocialParserService extends Parser {
         catchError((error) => throwError(() => `Now found ${error}`)),
       );
   }
+
+  isManhwa(slug_url: string): Observable<boolean> {
+    return this.http
+      .get(
+        `${this.url}/api/manga/${slug_url}?fields[]=summary&fields[]=genres&fields[]=tags&fields[]=authors`,
+      )
+      .pipe(
+        map((data) => {
+          const res = data as IRulibDetailResult;
+          return [5, 6, 4].includes(res.data.type.id);
+        }),
+        catchError((error) => throwError(() => `Now found ${error}`)),
+      );
+  }
+
+  getPopular(): Observable<IRuLIBPopular[]> {
+    return this.http
+      .get<{ data: { popular: IRuLIBPopular[] } }>(`${this.url}/api/`, {
+        headers: {
+          Authorization: "Bearer " + this.rulibAuthService.getToken(),
+          "Site-Id": this.site_id,
+        },
+      })
+      .pipe(
+        map((data) => {
+          const res = data.data.popular;
+          return res;
+        }),
+        catchError((error) => throwError(() => `Now found ${error}`)),
+      );
+  }
 }

apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.auth.service.ts

@@ -1,6 +1,7 @@
 import { HttpClient } from "@angular/common/http";
 import { Injectable, OnDestroy } from "@angular/core";
 import { Observable, Subject, catchError, map, of, takeUntil } from "rxjs";
+import { IToken } from "../token.dto";
 @Injectable({
   providedIn: "root",
 })
@@ -10,19 +11,21 @@ export class RulibAuthService implements OnDestroy {
   constructor(private http: HttpClient) {}
 
   setToken(token: string): Observable<boolean> {
-    return this.checkToken(token)
+    return this.checkToken(token).pipe(
-      .pipe(takeUntil(this.destroy$))
+      takeUntil(this.destroy$),
-      .pipe(
       map((data) => {
         if (!data) return false;
-          localStorage.setItem("token", token);
+        const token_data: IToken = JSON.parse(localStorage.getItem("token") ?? "{}");
+        token_data.rulib_token = token;
+        localStorage.setItem("token", JSON.stringify(token_data));
         return true;
       }),
     );
   }
 
   getToken(): string {
-    return localStorage.getItem("token") ?? "";
+    const token_data: IToken = JSON.parse(localStorage.getItem("token") ?? "{}");
+    return token_data.rulib_token ?? "";
   }
 
   checkToken(token: string): Observable<boolean> {

apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.popular.dto.ts

@@ -0,0 +1,61 @@
+export interface IRuLIBPopular {
+  id: number;
+  name: string;
+  rus_name: string;
+  eng_name: string;
+  slug: string;
+  slug_url: string;
+  cover: Cover;
+  ageRestriction: AgeRestriction;
+  site: number;
+  type: AgeRestriction;
+  rating: Rating;
+  last_item_at: Date;
+  metadata: Metadata;
+  model: Model;
+  status: AgeRestriction;
+  releaseDateString: string;
+}
+
+export interface AgeRestriction {
+  id: number;
+  label: string;
+}
+
+export interface Cover {
+  filename: string;
+  thumbnail: string;
+  default: string;
+  md: string;
+}
+
+export interface Metadata {
+  last_item: LastItem;
+}
+
+export interface LastItem {
+  id: number;
+  number: string;
+  volume: number | string;
+  name: string;
+  branch_id: number | null;
+  status?: null;
+  type?: string;
+  number_secondary?: string;
+  slug?: number;
+  manga_id?: null;
+  created_at?: Date;
+  likes_count?: null;
+}
+
+export enum Model {
+  Manga = "manga",
+}
+
+export interface Rating {
+  average: string;
+  averageFormated: string;
+  votes: number;
+  votesFormated: string;
+  user: number;
+}

apps/NwaifuAnime/src/app/services/parsers/rulib/slashlib.parser.service.ts

@@ -0,0 +1,10 @@
+import { Injectable } from "@angular/core";
+import { ParserDecorator } from "../decorators/parser.decorator";
+import { ESiteUrls } from "../urls";
+import { LibSocialParserService } from "./lib.social.parser.service";
+
+@Injectable({
+  providedIn: "root",
+})
+@ParserDecorator({ site_name: "Slashlib", url: ESiteUrls.LIB_SOCIAL, site_id: 2 })
+export class SlashlibParserService extends LibSocialParserService {}

apps/NwaifuAnime/src/app/services/parsers/token.dto.ts

@@ -0,0 +1,3 @@
+export interface IToken {
+  rulib_token?: string;
+}

apps/NwaifuAnime/src/app/services/parsers/urls.ts

@@ -1,4 +1,5 @@
 export enum ESiteUrls {
   LIB_SOCIAL = "https://api.lib.social",
   MANGALIB = "https://api.mangalib.me",
+  SLASHLIB = "https://api.slashlib.me",
 }

apps/NwaifuAnime/src/app/services/search.service.ts

@@ -1,25 +1,37 @@
 import { HttpClient } from "@angular/common/http";
-import { Injectable } from "@angular/core";
+import { Inject, Injectable } from "@angular/core";
-import { BehaviorSubject, Observable, map } from "rxjs";
+import { Observable, map } from "rxjs";
-import { MangalibParserService } from "./parsers/rulib/mangalib.parser.service";
+import { EParser } from "./parsers/enums/parser";
+import { Parser } from "./parsers/parser";
 import { IRulibChapterResult } from "./parsers/rulib/rulib.chapter.dto";
 import { IRulibChaptersResult } from "./parsers/rulib/rulib.chapters.dto";
 import { IRulibDetailResult } from "./parsers/rulib/rulib.detail.dto";
-import { Datum, IRulibSearchResult } from "./parsers/rulib/rulib.search.dto";
+import { IRulibSearchResult } from "./parsers/rulib/rulib.search.dto";
 
 @Injectable({ providedIn: "root" })
 export class SearchService {
-  private itemsTerm = new BehaviorSubject<Datum[]>([]);
+  private parser!: Parser;
-  currentItemsTerm = this.itemsTerm.asObservable();
   constructor(
-    private parser: MangalibParserService,
     private http: HttpClient,
+    @Inject(Parser) private parsers: Parser[],
   ) {}
 
+  setMangalibParser() {
+    this.setParser(EParser.MangaLib);
+  }
+
+  setSlashlibParser() {
+    this.setParser(EParser.SlashLib);
+  }
+
+  private setParser(parser: EParser) {
+    this.parser = this.parsers[parser];
+  }
+
   search(query: string): Observable<IRulibSearchResult> {
     return this.parser.searchManga(query).pipe(
       map((data) => {
-        return data;
+        return data as IRulibSearchResult;
       }),
     );
   }
@@ -27,7 +39,7 @@ export class SearchService {
   getDetails(slug_url: string): Observable<IRulibDetailResult> {
     return this.parser.getDetails(slug_url).pipe(
       map((data) => {
-        return data;
+        return data as IRulibDetailResult;
       }),
     );
   }
@@ -35,7 +47,7 @@ export class SearchService {
   getChapters(url: string): Observable<IRulibChaptersResult> {
     return this.parser.getChapters(url).pipe(
       map((data) => {
-        return data;
+        return data as IRulibChaptersResult;
       }),
     );
   }
@@ -43,13 +55,14 @@ export class SearchService {
   getChapter(url: string, chapter: string, volume: string): Observable<IRulibChapterResult> {
     return this.parser.getChapter(url, chapter, volume).pipe(
       map((data) => {
-        return data;
+        return data as IRulibChapterResult;
       }),
     );
   }
 
   getImageServer() {
-    return this.parser.imageServer;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (this.parser as any).imageServer;
   }
 
   getImageData(imageUrl: string): Observable<Uint8Array> {
@@ -59,4 +72,18 @@ export class SearchService {
       }),
     );
   }
+
+  isManhwa(url: string): Observable<boolean> {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (this.parser as any).isManhwa(url);
+  }
+
+  getPopular(): Observable<object[]> {
+    return this.parser.getPopular();
+  }
+
+  getRuLibName(): string {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (this.parser as any).site_name;
+  }
 }