33 Commits

Author SHA1 Message Date
16d631423c feat: header refactor starting 2024-07-21 21:03:41 +03:00
c8168580d6 feat: dmca footer 2024-07-21 19:54:59 +03:00
f3a3344004 feat: started header changing 2024-07-20 23:47:35 +03:00
3713ac502c fix: manga page btns position 2024-07-20 23:08:04 +03:00
a81c7535c5 fix: clear search on going to main page 2024-07-20 23:01:22 +03:00
8c9efd4371 feat: click on manga page to change page 2024-07-20 22:36:31 +03:00
d710d6bac5 feat: popular titles on main page 2024-07-20 15:04:04 +03:00
6b209077ef feat: started popular titles on main page 2024-07-20 00:59:00 +03:00
2becf42487 feat: current page indicator 2024-07-19 15:57:36 +03:00
7b2c6d9fc8 feat: almost abstractions 2024-07-19 15:06:35 +03:00
00213d25a1 fix: manhwa scroll unloading pages 2024-07-18 16:51:30 +03:00
5465d1635c feat: loading indication 2024-07-18 16:50:48 +03:00
d414223df2 feat: auth btn in header 2024-07-18 16:35:46 +03:00
c427c6d0b4 feat: new token saving 2024-07-18 15:41:09 +03:00
4105933098 feat: manhwa scroll and cache pages rework 2024-07-17 23:46:33 +03:00
0fea62b639 todo: scroll offset 2024-07-17 17:00:07 +03:00
e040edb5bd feat: manhwa scroll 2024-07-17 16:58:22 +03:00
8c87401482 feat: manhwa check 2024-07-17 16:38:12 +03:00
c9c959ce76 feat: started work with directive 2024-07-15 00:05:58 +03:00
45389364ff feat: use map instead of interface 2024-07-14 23:50:16 +03:00
5a4206a81e fix(half): manhwa scroll 2024-07-14 01:05:16 +03:00
35ff603849 feat: scrolling manhwa 2024-07-12 01:32:32 +03:00
ccbd9b2f5c feat: started manhwa scrolling 2024-07-10 23:33:40 +03:00
03b200c829 feat: notification component 2024-07-10 23:02:14 +03:00
d1e32a94ca feat(rulib): token check 2024-07-10 19:22:53 +03:00
82a0ba102d feat: error in reader without auth 2024-07-10 16:51:26 +03:00
112e76ab45 feat: auth page 2024-07-10 16:35:14 +03:00
6833105604 feat: abstract classes and destroy subscriptions 2024-07-08 23:24:03 +03:00
9d2373a298 feat: auto-hide search 2024-07-07 23:48:02 +03:00
e6da8b17a7 feat: manhwa scroll 2024-07-07 23:23:40 +03:00
29fb7fd04d feat: chapter changing and manga scaling 2024-07-07 22:18:13 +03:00
8f5f12ad30 feat: caching pages 2024-07-07 00:48:54 +05:00
6bad651312 feat: show one page, nav buttons, cache pages 2024-07-06 22:20:43 +05:00
48 changed files with 1307 additions and 158 deletions

View File

@@ -9,5 +9,8 @@
// "**/node_modules": true,
"**/.angular": true
},
"editor.formatOnSave": true
"editor.formatOnSave": true,
"cSpell.words": [
"Manhwa"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

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

View File

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

View File

@@ -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 { Datum } from "./services/parsers/rulib/rulib.search.dto";
import { NotificationComponent } from "./components/notification/notification.component";
@Component({
standalone: true,
imports: [RouterModule, HeaderComponent],
imports: [
RouterModule,
HeaderComponent,
NotificationComponent,
NotificationComponent,
FooterComponent,
],
selector: "app-root",
templateUrl: "./app.component.html",
styleUrl: "./app.component.less",
@@ -14,7 +21,6 @@ import { Datum } from "./services/parsers/rulib/rulib.search.dto";
})
export class AppComponent {
title = "NwaifuAnime";
items: Datum[] = [];
constructor(private sw: AppService) {}
get hasUpdate() {

View File

@@ -1,8 +1,11 @@
import { provideHttpClient } from "@angular/common/http";
import { provideHttpClient, withFetch } from "@angular/common/http";
import { ApplicationConfig, isDevMode, provideZoneChangeDetection } from "@angular/core";
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: [
@@ -12,6 +15,8 @@ export const appConfig: ApplicationConfig = {
enabled: !isDevMode(),
registrationStrategy: "registerWhenStable:30000",
}),
provideHttpClient(),
provideHttpClient(withFetch()),
{ provide: Parser, multi: true, useClass: MangalibParserService },
{ provide: Parser, multi: true, useClass: SlashlibParserService },
],
};

View File

@@ -1,4 +1,5 @@
import { Route } from "@angular/router";
import { AuthComponent } from "./components/auth/auth.component";
import { DetailComponent } from "./components/detail/detail.component";
import { HomeComponent } from "./components/home/home.component";
import { ReaderComponent } from "./components/reader/reader.component";
@@ -10,4 +11,8 @@ export const appRoutes: Route[] = [
},
{ path: "detail", component: DetailComponent },
{ path: "reader", component: ReaderComponent },
{
path: "auth",
component: AuthComponent,
},
];

View File

@@ -0,0 +1,46 @@
<div class="flex flex-col m-6">
<div class="mangalib-auth">
<h2>Авторизация в MangaLib</h2>
<ol class="list-decimal flex flex-col gap-4">
<li>
<p class="font-bold">Авторизация через токен</p>
<div class="flex flex-row gap-4">
<input
type="text"
placeholder="Token"
class="outline-none border-md border px-2"
#libSocialToken
/>
<button
type="button"
(click)="setLibSocialToken()"
class="hover:bg-slate-600 bg-slate-400 p-3 rounded-md text-white"
>
Сохранить
</button>
</div>
</li>
<li>
Вход через скрипт TamperMonkey. Если нет кнопки, значит вы не установили скрипт
<a
href="https://test-front.mangalib.me"
class="hover:bg-slate-600 bg-slate-400 p-3 rounded-md text-white tamperMonkey"
>
Вход
</a>
</li>
<li>
<div class="flex flex-row gap-3">
<button
type="button"
(click)="checkToken()"
class="hover:bg-slate-600 bg-slate-400 p-3 rounded-md text-white"
>
Проверить токен
</button>
<h3 class="self-center">{{ isRuLibAuth ? "Авторизован" : "Не авторизован" }}</h3>
</div>
</li>
</ol>
</div>
</div>

View File

@@ -0,0 +1,86 @@
import { CommonModule } from "@angular/common";
import { AfterViewInit, Component, ElementRef, OnDestroy, ViewChild } from "@angular/core";
import { ActivatedRoute, Router, RouterLink } from "@angular/router";
import { Subject, takeUntil } from "rxjs";
import { NotificationService } from "../../services/notification/notification.service";
import { RulibAuthService } from "../../services/parsers/rulib/rulib.auth.service";
import { EAuthTokenService } from "./enum";
@Component({
selector: "app-auth",
templateUrl: "./auth.component.html",
styleUrls: ["./auth.component.less"],
standalone: true,
imports: [CommonModule, RouterLink],
})
export class AuthComponent implements AfterViewInit, OnDestroy {
private destroy$ = new Subject<void>();
@ViewChild("libSocialToken") libSocialToken: ElementRef<HTMLInputElement> | null = null;
isRuLibAuth = false;
constructor(
private route: ActivatedRoute,
private router: Router,
private rulibAuthService: RulibAuthService,
private notificationService: NotificationService,
) {}
private setToken(service: EAuthTokenService, token: string) {
switch (service) {
case EAuthTokenService.RULIB:
this.rulibAuthService
.setToken(token)
.pipe(takeUntil(this.destroy$))
.subscribe((data) => {
if (data) {
this.router.navigate(["/"]);
this.notificationService.info("Успешная авторизация в RuLib!", "Вход");
} else {
this.router.navigate(["/", "auth"]);
this.notificationService.error(
"Не удалось авторизоваться в RuLib! Попробуйте ещё раз.",
"Вход",
4000,
);
}
});
break;
default:
this.router.navigate(["/", "auth"]);
this.notificationService.error("Неизвестный сервис авторизации!", "Вход");
return;
}
}
setLibSocialToken() {
if (this.libSocialToken) {
const token = this.libSocialToken.nativeElement.value;
this.setToken(EAuthTokenService.RULIB, token);
}
}
checkToken() {
this.rulibAuthService
.checkToken(this.rulibAuthService.getToken())
.pipe(takeUntil(this.destroy$))
.subscribe((data) => {
this.isRuLibAuth = data;
});
}
ngAfterViewInit(): void {
this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params) => {
const { token, service } = params;
if (token && service) {
this.setToken(service as EAuthTokenService, token);
}
});
if (this.libSocialToken) {
this.libSocialToken.nativeElement.value = this.rulibAuthService.getToken();
}
this.checkToken();
}
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
}
}

View File

@@ -0,0 +1,3 @@
export enum EAuthTokenService {
RULIB = "rulib",
}

View File

@@ -1,15 +1,44 @@
<div class="flex flex-col items-center">
@if (needAuth) {
<h1>Необходима авторизация</h1>
<a routerLink="/auth" class="text-center bg-slate-600 text-white p-3 rounded-md mb-4">Войти</a>
}
@if (detail_item) {
<h1>{{ detail_item.name }}</h1>
<h2>{{ detail_item.rus_name }}</h2>
<img [src]="detail_item.cover.default" [alt]="detail_item.slug" />
@if (!needAuth) {
<details class="w-full">
<summary class="text-center sticky top-0 bg-white z-10 py-2">
<h3>Главы</h3>
</summary>
<div class="flex flex-col items-center pb-16">
@for (chapter of chapters.data; track $index) {
<a
routerLink="/reader"
[queryParams]="{
url: detail_item.slug_url,
chapter: chapter.number,
volume: chapter.volume,
}"
[title]="chapter.name"
class="p-3 text-white bg-slate-600 w-[300px] mt-3 rounded-lg"
>
<h3>
<strong>{{ chapter.number }}.</strong> {{ chapter.name || "Нет названия" }}
</h3>
</a>
}
<button class="p-3 text-white bg-slate-600 w-[400px] mt-5 rounded-lg" (click)="goToReader()">
</div>
</details>
<a
routerLink="/reader"
class="p-3 text-white bg-slate-600 w-[300px] mt-5 rounded-lg text-center"
[queryParams]="{ url: detail_item.slug_url, volume: 1, chapter: 1 }"
>
Читать
</button>
</a>
}
}
</div>

View File

@@ -1,6 +1,7 @@
import { CommonModule } from "@angular/common";
import { AfterViewInit, Component } from "@angular/core";
import { ActivatedRoute, Router } from "@angular/router";
import { AfterViewInit, Component, OnDestroy } from "@angular/core";
import { ActivatedRoute, Router, RouterLink } from "@angular/router";
import { Subject, takeUntil } from "rxjs";
import { IRulibChaptersResult } from "../../services/parsers/rulib/rulib.chapters.dto";
import { Data } from "../../services/parsers/rulib/rulib.detail.dto";
import { SearchService } from "../../services/search.service";
@@ -10,11 +11,13 @@ import { SearchService } from "../../services/search.service";
templateUrl: "./detail.component.html",
styleUrls: ["./detail.component.less"],
standalone: true,
imports: [CommonModule],
imports: [CommonModule, RouterLink],
})
export class DetailComponent implements AfterViewInit {
export class DetailComponent implements AfterViewInit, OnDestroy {
detail_item: Data | null = null;
chapters: IRulibChaptersResult = { data: [] };
needAuth: boolean = false;
private destroy$ = new Subject<void>();
constructor(
private route: ActivatedRoute,
private searchService: SearchService,
@@ -22,18 +25,38 @@ export class DetailComponent implements AfterViewInit {
) {}
private getDetails(url: string) {
this.searchService.getDetails(url).subscribe((data) => {
this.searchService
.getDetails(url)
.pipe(takeUntil(this.destroy$))
.subscribe({
next: (data) => {
this.detail_item = data.data;
},
error: (error) => {
console.log(error);
},
});
this.searchService.getChapters(url).subscribe((data) => {
this.searchService
.getChapters(url)
.pipe(takeUntil(this.destroy$))
.subscribe({
next: (data) => {
this.chapters = data;
if (data.data.length === 0) {
this.needAuth = true;
}
},
error: (error) => {
console.log(error);
},
});
}
ngAfterViewInit(): void {
this.route.queryParams.subscribe((params) => {
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(["/"]);
@@ -41,14 +64,8 @@ export class DetailComponent implements AfterViewInit {
});
}
goToReader() {
//TODO: Not only first chapter
this.router.navigate(["/", "reader"], {
queryParams: {
url: this.detail_item?.slug_url,
chapter: this.chapters.data[0].number,
volume: this.chapters.data[0].volume,
},
});
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
}
}

View File

@@ -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>

View File

@@ -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 {}

View File

@@ -1,24 +1,6 @@
<div
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"
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 href="/"><h1 class="text-white" title="Main page">NwaifuAnime</h1></a>
<!-- 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" type="submit" (click)="search()">
<span class="text-sm text-black h-full">Поиск</span>
</button>
</div>
<a routerLink="/" title="Main page"><p class="text-xl text-white">NwaifuAnime</p></a>
<app-search-field></app-search-field>
</div>

View File

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

View File

@@ -1,21 +1,36 @@
import { CommonModule } from "@angular/common";
import { AfterViewInit, Component, ElementRef, ViewChild } from "@angular/core";
import { ActivatedRoute, Router } from "@angular/router";
import { Component, OnDestroy } from "@angular/core";
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 {
@ViewChild("searchInput") searchInput: ElementRef<HTMLInputElement> | null = null;
export class HeaderComponent implements OnDestroy {
menuOpened = false;
private destroy$ = new Subject<void>();
constructor(
private router: Router,
private route: ActivatedRoute,
) {}
) {
this.router.events
.pipe(
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")) {
this.menuOpened = false;
}
});
}
changeMenu() {
this.menuOpened = !this.menuOpened;
}
@@ -25,22 +40,11 @@ export class HeaderComponent implements AfterViewInit {
}
get searchBarClass(): string {
return `search-bar bg-slate-300 md:w-[50%] w-full md:m-0 ms-2 me-2 max-h-6 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.subscribe((params) => {
const search = params["search"];
if (search && this.searchInput) {
this.searchInput.nativeElement.value = search;
}
});
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
}
}

View File

@@ -1,11 +1,58 @@
<h1>It's home component</h1>
<div class="flex flex-col items-center">
@for (item of items; track $index) {
<button (click)="getDetails(item.slug_url)" title="{{ item.name }}" class="mb-6">
<div class="card flex flex-col items-center border-black border-2 rounded-md p-4">
<h1>{{ item.rus_name }}</h1>
<img [src]="item.cover.thumbnail" [alt]="item.slug" class="w-[200px] h-auto aspect-auto" />
@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>
</button>
</a>
}
</div>
</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"
[queryParams]="{ url: item.slug_url }"
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 h-[350px]"
>
<h1>{{ item.rus_name }}</h1>
<img
[src]="item.cover.thumbnail"
[alt]="item.slug"
class="w-[200px] h-auto max-h-[300px] aspect-auto"
/>
</div>
</a>
}
</div>
}

View File

@@ -1,7 +1,8 @@
import { CommonModule } from "@angular/common";
import { AfterViewInit, Component, Input, OnDestroy, OnInit } from "@angular/core";
import { ActivatedRoute, Router } from "@angular/router";
import { Subscription } from "rxjs";
import { Component, Input, OnDestroy, OnInit } from "@angular/core";
import { ActivatedRoute, RouterLink } from "@angular/router";
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";
@@ -10,38 +11,81 @@ import { SearchService } from "../../services/search.service";
selector: "app-home",
templateUrl: "./home.component.html",
styleUrls: ["./home.component.less"],
imports: [CommonModule],
imports: [CommonModule, RouterLink],
})
export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
export class HomeComponent implements OnDestroy, OnInit {
@Input() items: Datum[] = [];
private subscription: Subscription = new Subscription();
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,
private router: Router,
) {}
ngOnInit(): void {
this.subscription = this.searchService.currentItemsTerm.subscribe((data) => {
this.items = data;
});
}
getDetails(slug_url: string) {
this.router.navigate(["/", "detail"], { queryParams: { url: slug_url } });
) {
this.searchService.setMangalibParser();
}
ngOnDestroy(): void {
this.subscription.unsubscribe();
this.destroy$.next();
this.destroy$.complete();
this.popularSubscription.unsubscribe();
}
ngAfterViewInit(): void {
this.route.queryParams.subscribe((params) => {
const search = params["search"];
console.log(params);
if (search) {
this.searchService.search(search);
private getPopular(parserName: string) {
this.searchService
.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();
}
});
}

View File

@@ -0,0 +1,12 @@
<div
class="notification-container fixed md:right-0 bottom-0 max-w-[100%] min-w-[100%] min-h-[8rem] h-[8rem] md:min-w-[20rem] px-3 pb-4"
[hidden]="!show_notification"
>
<div [class]="'notification rounded-md bg-white border-2 ' + borderColor + ' h-full'">
<div [class]="'head flex flex-row justify-between px-2 py-2 h-5 border-b-2 ' + borderColor">
<h3 class="self-center">{{ notification.name }}</h3>
<button class="self-center" (click)="closeNotification()" type="button">X</button>
</div>
<div class="notification-text mx-3 my-1">{{ notification.message }}</div>
</div>
</div>

View File

@@ -0,0 +1,53 @@
import { CommonModule } from "@angular/common";
import { AfterViewInit, Component, OnDestroy } from "@angular/core";
import { Subject, takeUntil } from "rxjs";
import { INotification } from "../../services/notification/notification.dto";
import { NotificationService } from "../../services/notification/notification.service";
@Component({
standalone: true,
selector: "app-notification",
templateUrl: "./notification.component.html",
styleUrls: ["./notification.component.less"],
imports: [CommonModule],
})
export class NotificationComponent implements AfterViewInit, OnDestroy {
show_notification = false;
isError = false;
private closeNotificationTimer: ReturnType<typeof setTimeout> | null = null;
notification: INotification = { isError: false, message: "", name: "", time: 0 };
private destroy$ = new Subject<void>();
constructor(private notificationService: NotificationService) {}
ngAfterViewInit(): void {
this.notificationService.notification$
.asObservable()
.pipe(takeUntil(this.destroy$))
.subscribe((data) => {
if (!data) return;
this.notification = data;
this.show_notification = true;
if (this.closeNotificationTimer) {
clearTimeout(this.closeNotificationTimer);
}
this.closeNotificationTimer = setTimeout(() => {
this.show_notification = false;
}, data.time);
});
}
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
}
closeNotification() {
this.show_notification = false;
}
get borderColor(): string {
return this.notification.isError ? "border-red-600" : "border-green-600";
}
}

View File

@@ -1,6 +1,48 @@
<h1>It's reader page</h1>
<div
class="flex flex-row items-center justify-between me-4 max-w-[900px] relative -translate-x-[50%] left-[50%]"
>
<a
[routerLink]="['/', 'detail']"
[queryParams]="{ url: url }"
class="bg-slate-600 text-white rounded-lg p-3 m-4"
>
Назад к тайтлу
</a>
<h3>{{ currentChapterInfo?.number }}. {{ currentChapterInfo?.name || "Нет названия" }}</h3>
</div>
<div class="flex flex-col items-center">
@for (page of pages; track $index) {
<img [src]="page.url" [alt]="page.slug" />
@if (pages.length > 0 && currentPage) {
<div [class]="imageContainerClass">
@if (!isManhwa) {
<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"
[host]="host"
(view)="loadPage(page.index)"
[hostScrollable]="isHostScrollable()"
></app-scale-image>
}
}
</div>
<div class="flex items-center justify-center space-x-4 mt-[6rem]">
<button (click)="prevPage()" class="p-3 text-white bg-slate-600 w-[100px] rounded-lg">
</button>
<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>

View File

@@ -0,0 +1,5 @@
:host {
overflow-y: auto;
height: 100%;
display: block;
}

View File

@@ -1,38 +1,245 @@
import { CommonModule } from "@angular/common";
import { AfterViewInit, Component } from "@angular/core";
import { ActivatedRoute, Router } from "@angular/router";
import { Page } from "../../services/parsers/rulib/rulib.chapter.dto";
import { CommonModule, isPlatformBrowser } from "@angular/common";
import {
Component,
ElementRef,
HostListener,
Inject,
OnDestroy,
OnInit,
PLATFORM_ID,
} from "@angular/core";
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 { CachedPage, CachedPages } from "./reader.dto";
@Component({
selector: "app-reader",
templateUrl: "./reader.component.html",
styleUrls: ["./reader.component.less"],
standalone: true,
imports: [CommonModule],
imports: [CommonModule, ScaleImageComponent, RouterLink],
})
export class ReaderComponent implements AfterViewInit {
export class ReaderComponent implements OnInit, OnDestroy {
pages: Page[] = [];
currentPageIndex = 0;
cachedPages: CachedPages = new Map<number, CachedPage>();
imageUrl: string = "";
isManhwa = false;
currentChapterInfo: Chapter | null = null;
url = "";
private chaptersInfo: IRulibChapter[] = [];
private chapterNum: number = 0;
private chapterVol: number = 0;
private fromTowards = false;
private destroy$ = new Subject<void>();
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();
}
ngAfterViewInit(): void {
this.route.queryParams.subscribe((params) => {
get manhwaPages() {
return this.cachedPages.values();
}
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.getChapter(url, chapter, volume).subscribe((data) => {
this.pages = data.data.pages.map((page) => {
return { ...page, url: this.searchService.getImageServer() + page.url };
this.searchService.setMangalibParser();
if (fromTowards) this.fromTowards = Boolean(+fromTowards);
else this.fromTowards = false;
this.chapterNum = +chapter;
this.chapterVol = +volume;
this.url = url;
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(["/"]);
}
});
}
public isHostScrollable(): boolean {
if (isPlatformBrowser(this.platformId)) {
const style = window.getComputedStyle(this.host.nativeElement);
return (
style.getPropertyValue("overflow") === "auto" ||
style.getPropertyValue("overflow-y") === "scroll"
);
}
return false;
}
backToTitle() {
this.router.navigate(["/", "detail"], { queryParams: { url: this.url } });
}
loadChapter(url: string, chapter: string, volume: string) {
this.searchService
.getChapter(url, chapter, volume)
.pipe(takeUntil(this.destroy$))
.subscribe({
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); // Загрузить последнюю страницу при открытии главы
} else this.loadPage(0); // Загрузить первую страницу при открытии главы
},
error: (error) => {
console.log(error);
this.router.navigate(["/", "detail"], { queryParams: { url: this.url } });
},
});
}
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.clearCache(index - 2);
} else if (index == this.cachedPages.size) {
const thisChapterIndex = this.chaptersInfo.findIndex((chapter) => {
return +chapter.number === this.chapterNum && +chapter.volume === this.chapterVol;
});
const nextChapterIndex = Math.min(thisChapterIndex + 1, this.chaptersInfo.length - 1);
const nextChapter = this.chaptersInfo[nextChapterIndex];
if (nextChapter !== this.chaptersInfo[thisChapterIndex]) {
this.cachedPages.clear();
this.router.navigate(["/", "reader"], {
queryParams: {
url: this.url,
chapter: nextChapter.number,
volume: nextChapter.volume,
},
});
}
} else if (index == -1) {
const thisChapterIndex = this.chaptersInfo.findIndex((chapter) => {
return +chapter.number === this.chapterNum && +chapter.volume === this.chapterVol;
});
const prevChapterIndex = Math.max(thisChapterIndex - 1, 0);
const prevChapter = this.chaptersInfo[prevChapterIndex];
if (prevChapter !== this.chaptersInfo[thisChapterIndex]) {
this.cachedPages.clear();
this.router.navigate(["/", "reader"], {
queryParams: {
url: this.url,
chapter: prevChapter.number,
volume: prevChapter.volume,
from_towards: 1,
},
});
}
}
}
@HostListener("window:keydown", ["$event"])
onKeydown(event: KeyboardEvent) {
if (event.key === "ArrowRight") {
this.nextPage();
} else if (event.key === "ArrowLeft") {
this.prevPage();
}
}
private getImageUrl(imageData?: Uint8Array): string {
if (!imageData) {
return "";
}
const blob = new Blob([imageData], { type: "image/jpeg" });
const urlCreator = window.URL || window.webkitURL;
return urlCreator.createObjectURL(blob);
}
nextPage() {
this.loadPage(this.currentPageIndex + 1);
}
prevPage() {
this.loadPage(this.currentPageIndex - 1);
}
get imageContainerClass() {
return `${this.isManhwa ? "h-auto" : "min-h-[70vh]"} w-screen md:w-[450px] flex flex-col`;
}
}

View File

@@ -0,0 +1,10 @@
import { Page } from "../../services/parsers/rulib/rulib.chapter.dto";
export interface CachedPage extends Page {
imageData?: Uint8Array;
imageUrl: string;
index: number;
isManhwa: boolean;
}
export type CachedPages = Map<number, CachedPage>;

View File

@@ -0,0 +1,7 @@
<div class="image-container" #container>
@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>

View File

@@ -0,0 +1,12 @@
.image-container {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
}
img {
max-width: 100%;
max-height: 100%;
object-fit: contain;
}

View File

@@ -0,0 +1,125 @@
import {
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",
templateUrl: "./scale-image.component.html",
styleUrls: ["./scale-image.component.less"],
standalone: true,
})
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() {
this.scaleImage();
}
private setupResizeListener() {
this.resizeSubscription = fromEvent(window, "resize")
.pipe(debounceTime(200))
.subscribe(() => this.scaleImage());
}
private scaleImage() {
if (this.containerRef && this.imageRef) {
const container = this.containerRef.nativeElement;
const img = this.imageRef.nativeElement;
const containerWidth = container.clientWidth;
const containerHeight = container.clientHeight;
const imgRatio = img.naturalWidth / img.naturalHeight;
const containerRatio = containerWidth / containerHeight;
let newWidth, newHeight;
if (imgRatio > containerRatio) {
newWidth = containerWidth;
newHeight = containerWidth / imgRatio;
} else {
newHeight = containerHeight;
newWidth = containerHeight * imgRatio;
}
newWidth = Math.min(newWidth, img.naturalWidth);
newHeight = Math.min(newHeight, img.naturalHeight);
if (img.naturalHeight / img.naturalWidth >= 5) {
img.style.width = "100%";
img.style.height = "auto";
} else {
img.style.width = `${newWidth}px`;
img.style.height = `${newHeight}px`;
}
}
}
}

View File

@@ -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>

View File

@@ -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();
}
}

View File

@@ -0,0 +1,6 @@
export interface INotification {
message: string;
isError: boolean;
time: number;
name: string;
}

View File

@@ -0,0 +1,36 @@
import { Injectable, OnDestroy } from "@angular/core";
import { Subject } from "rxjs";
import { INotification } from "./notification.dto";
@Injectable({
providedIn: "root",
})
export class NotificationService implements OnDestroy {
readonly notification$ = new Subject<INotification>();
private sendNotification(message: INotification) {
this.notification$.next(message);
}
info(message: string, title: string = "", time = 3000) {
this.sendNotification({
message,
isError: false,
time: time,
name: title,
});
}
error(message: string, title: string = "", time = 3000) {
this.sendNotification({
message,
isError: true,
time: time,
name: title,
});
}
ngOnDestroy(): void {
this.notification$.complete();
}
}

View File

@@ -0,0 +1,19 @@
export function ParserDecorator({
site_name,
url,
nsfw = false,
site_id = 1,
}: {
site_name: string;
url: string;
nsfw?: boolean;
site_id?: number;
}) {
// eslint-disable-next-line @typescript-eslint/ban-types
return function (constructor: Function) {
constructor.prototype.site_name = site_name;
constructor.prototype.nsfw = nsfw;
constructor.prototype.api_url = url;
constructor.prototype.site_id = site_id;
};
}

View File

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

View File

@@ -0,0 +1,20 @@
import { HttpClient } from "@angular/common/http";
import { Injectable } from "@angular/core";
import { Observable } from "rxjs";
@Injectable({ providedIn: "root" })
export abstract class Parser {
constructor(protected http: HttpClient) {}
protected abstract url: string;
abstract searchManga(query: string): Observable<object>;
abstract getDetails(slug_url: string): Observable<object>;
abstract getChapters(url: string): Observable<object>;
abstract getChapter(url: string, chapter: string, volume: string): Observable<object>;
abstract getPopular(): Observable<object[]>;
}

View File

@@ -1,27 +1,38 @@
import { HttpClient } from "@angular/common/http";
import { Injectable } from "@angular/core";
import { Observable, catchError, map, throwError } from "rxjs";
import { ESiteUrls } from "../urls";
import { Parser } from "../parser";
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",
})
export class LibSocialParserService {
private readonly url = ESiteUrls.LIB_SOCIAL;
constructor(private readonly http: HttpClient) {}
export class LibSocialParserService extends Parser {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
protected url = (this as any).api_url;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
private site_id = (this as any).site_id;
get imageServer() {
return "https://img33.imgslib.link";
}
constructor(
private rulibAuthService: RulibAuthService,
override http: HttpClient,
) {
super(http);
}
searchManga(query: string): Observable<IRulibSearchResult> {
return this.http
.get(`${this.url}/api/manga?fields[]=rate_avg&fields[]=rate&q=${query}&site_id[]=1`)
.get(
`${this.url}/api/manga?fields[]=rate_avg&fields[]=rate&q=${query}&site_id[]=${this.site_id}`,
)
.pipe(
map((data: object) => {
return data as IRulibSearchResult;
@@ -36,6 +47,7 @@ export class LibSocialParserService {
return this.http
.get(
`${this.url}/api/manga/${slug_url}?fields[]=summary&fields[]=genres&fields[]=tags&fields[]=authors`,
{ headers: { Authorization: "Bearer " + this.rulibAuthService.getToken() } },
)
.pipe(
map((data: object) => {
@@ -48,7 +60,11 @@ export class LibSocialParserService {
}
getChapters(url: string): Observable<IRulibChaptersResult> {
return this.http.get(`${this.url}/api/manga/${url}/chapters`).pipe(
return this.http
.get(`${this.url}/api/manga/${url}/chapters`, {
headers: { Authorization: "Bearer " + this.rulibAuthService.getToken() },
})
.pipe(
map((data) => {
return data as IRulibChaptersResult;
}),
@@ -60,10 +76,43 @@ export class LibSocialParserService {
getChapter(url: string, chapter: string, volume: string): Observable<IRulibChapterResult> {
return this.http
.get(`${this.url}/api/manga/${url}/chapter?number=${chapter}&volume=${volume}`)
.get(`${this.url}/api/manga/${url}/chapter?number=${chapter}&volume=${volume}`, {
headers: { Authorization: "Bearer " + this.rulibAuthService.getToken() },
})
.pipe(
map((data) => data as IRulibChapterResult),
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}`)),
);
}
}

View File

@@ -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: "MangaLib", url: ESiteUrls.MANGALIB, site_id: 1 })
export class MangalibParserService extends LibSocialParserService {}

View File

@@ -0,0 +1,47 @@
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",
})
export class RulibAuthService implements OnDestroy {
private destroy$ = new Subject<void>();
private api_url = "https://api.lib.social";
constructor(private http: HttpClient) {}
setToken(token: string): Observable<boolean> {
return this.checkToken(token).pipe(
takeUntil(this.destroy$),
map((data) => {
if (!data) return false;
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 {
const token_data: IToken = JSON.parse(localStorage.getItem("token") ?? "{}");
return token_data.rulib_token ?? "";
}
checkToken(token: string): Observable<boolean> {
return this.http
.get(this.api_url + "/api/auth/me", {
headers: { Authorization: `Bearer ${token}` },
})
.pipe(
takeUntil(this.destroy$),
map(() => true),
catchError(() => of(false)),
);
}
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
}
}

View File

@@ -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;
}

View File

@@ -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 {}

View File

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

View File

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

View File

@@ -1,27 +1,45 @@
import { Injectable } from "@angular/core";
import { BehaviorSubject, Observable, map } from "rxjs";
import { LibSocialParserService } from "./parsers/rulib/lib.social.parser.service";
import { HttpClient } from "@angular/common/http";
import { Inject, Injectable } from "@angular/core";
import { Observable, map } from "rxjs";
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 } 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[]>([]);
currentItemsTerm = this.itemsTerm.asObservable();
constructor(private parser: LibSocialParserService) {}
private parser!: Parser;
constructor(
private http: HttpClient,
@Inject(Parser) private parsers: Parser[],
) {}
search(query: string) {
this.parser.searchManga(query).subscribe((data) => {
this.itemsTerm.next(data.data);
});
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 as IRulibSearchResult;
}),
);
}
getDetails(slug_url: string): Observable<IRulibDetailResult> {
return this.parser.getDetails(slug_url).pipe(
map((data) => {
return data;
return data as IRulibDetailResult;
}),
);
}
@@ -29,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;
}),
);
}
@@ -37,12 +55,35 @@ 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> {
return this.http.get(imageUrl, { responseType: "arraybuffer" }).pipe(
map((arrayBuffer: ArrayBuffer) => {
return new Uint8Array(arrayBuffer);
}),
);
}
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;
}
}

View File

@@ -1,3 +1,6 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
body {
overflow-y: hidden;
}