feat: initial version of reader
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
import { Route } from "@angular/router";
|
import { Route } from "@angular/router";
|
||||||
import { DetailComponent } from "./components/detail/detail.component";
|
import { DetailComponent } from "./components/detail/detail.component";
|
||||||
import { HomeComponent } from "./components/home/home.component";
|
import { HomeComponent } from "./components/home/home.component";
|
||||||
|
import { ReaderComponent } from "./components/reader/reader.component";
|
||||||
|
|
||||||
export const appRoutes: Route[] = [
|
export const appRoutes: Route[] = [
|
||||||
{
|
{
|
||||||
@@ -8,4 +9,5 @@ export const appRoutes: Route[] = [
|
|||||||
component: HomeComponent,
|
component: HomeComponent,
|
||||||
},
|
},
|
||||||
{ path: "detail", component: DetailComponent },
|
{ path: "detail", component: DetailComponent },
|
||||||
|
{ path: "reader", component: ReaderComponent },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,4 +1,15 @@
|
|||||||
|
<div class="flex flex-col items-center">
|
||||||
@if (detail_item) {
|
@if (detail_item) {
|
||||||
<h1>{{ detail_item.name }}</h1>
|
<h1>{{ detail_item.name }}</h1>
|
||||||
<h2>{{ detail_item.rus_name }}</h2>
|
<h2>{{ detail_item.rus_name }}</h2>
|
||||||
|
<img [src]="detail_item.cover.default" [alt]="detail_item.slug" />
|
||||||
|
@for (chapter of chapters.data; track $index) {
|
||||||
|
<h3>
|
||||||
|
<strong>{{ chapter.number }}.</strong> {{ chapter.name || "Нет названия" }}
|
||||||
|
</h3>
|
||||||
}
|
}
|
||||||
|
<button class="p-3 text-white bg-slate-600 w-[400px] mt-5 rounded-lg" (click)="goToReader()">
|
||||||
|
Читать
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { CommonModule } from "@angular/common";
|
import { CommonModule } from "@angular/common";
|
||||||
import { AfterViewInit, Component } from "@angular/core";
|
import { AfterViewInit, Component } from "@angular/core";
|
||||||
import { ActivatedRoute, Router } from "@angular/router";
|
import { ActivatedRoute, Router } from "@angular/router";
|
||||||
|
import { IRulibChaptersResult } from "../../services/parsers/rulib/rulib.chapters.dto";
|
||||||
import { Data } from "../../services/parsers/rulib/rulib.detail.dto";
|
import { Data } from "../../services/parsers/rulib/rulib.detail.dto";
|
||||||
import { SearchService } from "../../services/search.service";
|
import { SearchService } from "../../services/search.service";
|
||||||
|
|
||||||
@@ -13,20 +14,41 @@ import { SearchService } from "../../services/search.service";
|
|||||||
})
|
})
|
||||||
export class DetailComponent implements AfterViewInit {
|
export class DetailComponent implements AfterViewInit {
|
||||||
detail_item: Data | null = null;
|
detail_item: Data | null = null;
|
||||||
|
chapters: IRulibChaptersResult = { data: [] };
|
||||||
constructor(
|
constructor(
|
||||||
private route: ActivatedRoute,
|
private route: ActivatedRoute,
|
||||||
private searchService: SearchService,
|
private searchService: SearchService,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
private getDetails(url: string) {
|
||||||
|
this.searchService.getDetails(url).subscribe((data) => {
|
||||||
|
this.detail_item = data.data;
|
||||||
|
});
|
||||||
|
this.searchService.getChapters(url).subscribe((data) => {
|
||||||
|
this.chapters = data;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
ngAfterViewInit(): void {
|
ngAfterViewInit(): void {
|
||||||
this.route.queryParams.subscribe((params) => {
|
this.route.queryParams.subscribe((params) => {
|
||||||
const url = params["url"];
|
const url = params["url"];
|
||||||
if (url) {
|
if (url) {
|
||||||
this.searchService.getDetails(url).subscribe((data) => (this.detail_item = data.data));
|
this.getDetails(url);
|
||||||
} else {
|
} else {
|
||||||
this.router.navigate(["/"]);
|
this.router.navigate(["/"]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
class="header fixed flex justify-between w-full p-2 bg-gray-700 md:h-8 h-auto items-center md:flex-row flex-col md:gap-0 gap-3"
|
class="header fixed flex justify-between w-full p-2 bg-gray-700 md:h-8 h-auto items-center md:flex-row flex-col md:gap-0 gap-3"
|
||||||
>
|
>
|
||||||
<div class="flex justify-between flex-row w-full align-middle">
|
<div class="flex justify-between flex-row w-full align-middle">
|
||||||
<a href="/"><h1 class="text-white">NwaifuAnime</h1></a>
|
<a href="/"><h1 class="text-white" title="Main page">NwaifuAnime</h1></a>
|
||||||
<!-- Search bar on small screens -->
|
<!-- Search bar on small screens -->
|
||||||
<button type="button" class="md:hidden" (click)="changeMenu()">
|
<button type="button" class="md:hidden" (click)="changeMenu()">
|
||||||
<i [class]="menuBtnClass"></i>
|
<i [class]="menuBtnClass"></i>
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<h1>It's home component</h1>
|
<h1>It's home component</h1>
|
||||||
<div class="flex flex-col items-center">
|
<div class="flex flex-col items-center">
|
||||||
@for (item of items; track $index) {
|
@for (item of items; track $index) {
|
||||||
<button (click)="getDetails(item.slug)">
|
<button (click)="getDetails(item.slug_url)" title="{{ item.name }}" class="mb-6">
|
||||||
<div class="card flex flex-col items-center">
|
<div class="card flex flex-col items-center border-black border-2 rounded-md p-4">
|
||||||
<h1>{{ item.rus_name }}</h1>
|
<h1>{{ item.rus_name }}</h1>
|
||||||
<img [src]="item.cover.thumbnail" [alt]="item.slug" />
|
<img [src]="item.cover.thumbnail" [alt]="item.slug" class="w-[200px] h-auto aspect-auto" />
|
||||||
</div>
|
</div>
|
||||||
</button>
|
</button>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<h1>It's reader page</h1>
|
||||||
|
<div class="flex flex-col items-center">
|
||||||
|
@for (page of pages; track $index) {
|
||||||
|
<img [src]="page.url" [alt]="page.slug" />
|
||||||
|
}
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
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 { SearchService } from "../../services/search.service";
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: "app-reader",
|
||||||
|
templateUrl: "./reader.component.html",
|
||||||
|
styleUrls: ["./reader.component.less"],
|
||||||
|
standalone: true,
|
||||||
|
imports: [CommonModule],
|
||||||
|
})
|
||||||
|
export class ReaderComponent implements AfterViewInit {
|
||||||
|
pages: Page[] = [];
|
||||||
|
constructor(
|
||||||
|
private route: ActivatedRoute,
|
||||||
|
private router: Router,
|
||||||
|
private searchService: SearchService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
ngAfterViewInit(): void {
|
||||||
|
this.route.queryParams.subscribe((params) => {
|
||||||
|
const url = params["url"];
|
||||||
|
const chapter = params["chapter"];
|
||||||
|
const volume = params["volume"];
|
||||||
|
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 };
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.router.navigate(["/"]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,8 @@ import { HttpClient } from "@angular/common/http";
|
|||||||
import { Injectable } from "@angular/core";
|
import { Injectable } from "@angular/core";
|
||||||
import { Observable, catchError, map, throwError } from "rxjs";
|
import { Observable, catchError, map, throwError } from "rxjs";
|
||||||
import { ESiteUrls } from "../urls";
|
import { ESiteUrls } from "../urls";
|
||||||
|
import { IRulibChapterResult } from "./rulib.chapter.dto";
|
||||||
|
import { IRulibChaptersResult } from "./rulib.chapters.dto";
|
||||||
import { IRulibDetailResult } from "./rulib.detail.dto";
|
import { IRulibDetailResult } from "./rulib.detail.dto";
|
||||||
import { IRulibSearchResult } from "./rulib.search.dto";
|
import { IRulibSearchResult } from "./rulib.search.dto";
|
||||||
|
|
||||||
@@ -13,6 +15,10 @@ export class LibSocialParserService {
|
|||||||
private readonly url = ESiteUrls.LIB_SOCIAL;
|
private readonly url = ESiteUrls.LIB_SOCIAL;
|
||||||
constructor(private readonly http: HttpClient) {}
|
constructor(private readonly http: HttpClient) {}
|
||||||
|
|
||||||
|
get imageServer() {
|
||||||
|
return "https://img33.imgslib.link";
|
||||||
|
}
|
||||||
|
|
||||||
searchManga(query: string): Observable<IRulibSearchResult> {
|
searchManga(query: string): Observable<IRulibSearchResult> {
|
||||||
return this.http
|
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[]=1`)
|
||||||
@@ -40,4 +46,24 @@ export class LibSocialParserService {
|
|||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getChapters(url: string): Observable<IRulibChaptersResult> {
|
||||||
|
return this.http.get(`${this.url}/api/manga/${url}/chapters`).pipe(
|
||||||
|
map((data) => {
|
||||||
|
return data as IRulibChaptersResult;
|
||||||
|
}),
|
||||||
|
catchError((error) => {
|
||||||
|
return throwError(() => `Now found ${error}`);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
getChapter(url: string, chapter: string, volume: string): Observable<IRulibChapterResult> {
|
||||||
|
return this.http
|
||||||
|
.get(`${this.url}/api/manga/${url}/chapter?number=${chapter}&volume=${volume}`)
|
||||||
|
.pipe(
|
||||||
|
map((data) => data as IRulibChapterResult),
|
||||||
|
catchError((error) => throwError(() => `Now found ${error}`)),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
export interface IRulibChapterResult {
|
||||||
|
data: Chapter;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Chapter {
|
||||||
|
id: number;
|
||||||
|
type: string;
|
||||||
|
volume: string;
|
||||||
|
number: string;
|
||||||
|
number_secondary: string;
|
||||||
|
name: string;
|
||||||
|
slug: string;
|
||||||
|
branch_id: null;
|
||||||
|
manga_id: number;
|
||||||
|
created_at: Date;
|
||||||
|
moderated: Moderated;
|
||||||
|
likes_count: number;
|
||||||
|
teams: Team[];
|
||||||
|
pages: Page[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Moderated {
|
||||||
|
id: number;
|
||||||
|
label: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Page {
|
||||||
|
id: number;
|
||||||
|
image: string;
|
||||||
|
slug: number;
|
||||||
|
external: number;
|
||||||
|
chunks: number;
|
||||||
|
chapter_id: number;
|
||||||
|
created_at: Date;
|
||||||
|
updated_at: UpdatedAt;
|
||||||
|
height: number;
|
||||||
|
width: number;
|
||||||
|
url: string;
|
||||||
|
ratio: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum UpdatedAt {
|
||||||
|
The0000011130T000000000000Z = "-000001-11-30T00:00:00.000000Z",
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Team {
|
||||||
|
id: number;
|
||||||
|
slug: string;
|
||||||
|
slug_url: string;
|
||||||
|
model: string;
|
||||||
|
name: string;
|
||||||
|
cover: Cover;
|
||||||
|
vk: null;
|
||||||
|
discord: null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Cover {
|
||||||
|
filename: null;
|
||||||
|
thumbnail: string;
|
||||||
|
default: string;
|
||||||
|
md: string;
|
||||||
|
}
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
export interface IRulibChaptersResult {
|
||||||
|
data: IRulibChapter[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface IRulibChapter {
|
||||||
|
id: number;
|
||||||
|
index: number;
|
||||||
|
item_number: number;
|
||||||
|
volume: string;
|
||||||
|
number: string;
|
||||||
|
number_secondary: string;
|
||||||
|
name: string;
|
||||||
|
branches_count: number;
|
||||||
|
branches: Branch[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Branch {
|
||||||
|
id: number;
|
||||||
|
branch_id: null;
|
||||||
|
created_at: Date;
|
||||||
|
teams: Team[];
|
||||||
|
user: User;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Team {
|
||||||
|
id: number;
|
||||||
|
slug: Slug;
|
||||||
|
slug_url: SlugURL;
|
||||||
|
model: Model;
|
||||||
|
name: Name;
|
||||||
|
cover: Cover;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Cover {
|
||||||
|
filename: null | string;
|
||||||
|
thumbnail: Thumbnail;
|
||||||
|
default: Default;
|
||||||
|
md: Default;
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum Default {
|
||||||
|
StaticImagesPlaceholdersUserAvatarPNG = "/static/images/placeholders/user_avatar.png",
|
||||||
|
UploadsTeamAnyasyavaCoverJSazXO7JdAKV250X350Jpg = "/uploads/team/anyasyava/cover/jSazXO7JdAKV_250x350.jpg",
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum Thumbnail {
|
||||||
|
StaticImagesPlaceholdersUserAvatarPNG = "/static/images/placeholders/user_avatar.png",
|
||||||
|
UploadsTeamAnyasyavaCoverJSazXO7JdAKVThumbJpg = "/uploads/team/anyasyava/cover/jSazXO7JdAKV_thumb.jpg",
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum Model {
|
||||||
|
Team = "team",
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum Name {
|
||||||
|
Abame = "abame",
|
||||||
|
Anyasyava = "ANYASYAVA",
|
||||||
|
Cabel = "Cabel",
|
||||||
|
Deadvm = "deadvm",
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum Slug {
|
||||||
|
Abame = "abame",
|
||||||
|
Anyasyava = "anyasyava",
|
||||||
|
Cabel = "cabel",
|
||||||
|
Deadvm = "deadvm",
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum SlugURL {
|
||||||
|
The13801Anyasyava = "13801--anyasyava",
|
||||||
|
The33106Abame = "33106--abame",
|
||||||
|
The42374Cabel = "42374--cabel",
|
||||||
|
The45635Deadvm = "45635--deadvm",
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface User {
|
||||||
|
username: Username;
|
||||||
|
id: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum Username {
|
||||||
|
Deadvm = "deadvm",
|
||||||
|
Gjunyaa = "gjunyaa ❤️\ud83e\ude79",
|
||||||
|
Oksas = "oksas",
|
||||||
|
}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
import { Injectable } from "@angular/core";
|
import { Injectable } from "@angular/core";
|
||||||
import { BehaviorSubject, Observable, map } from "rxjs";
|
import { BehaviorSubject, Observable, map } from "rxjs";
|
||||||
import { LibSocialParserService } from "./parsers/rulib/lib.social.parser.service";
|
import { LibSocialParserService } from "./parsers/rulib/lib.social.parser.service";
|
||||||
|
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 { IRulibDetailResult } from "./parsers/rulib/rulib.detail.dto";
|
||||||
import { Datum } from "./parsers/rulib/rulib.search.dto";
|
import { Datum } from "./parsers/rulib/rulib.search.dto";
|
||||||
|
|
||||||
@@ -23,4 +25,24 @@ export class SearchService {
|
|||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getChapters(url: string): Observable<IRulibChaptersResult> {
|
||||||
|
return this.parser.getChapters(url).pipe(
|
||||||
|
map((data) => {
|
||||||
|
return data;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
getChapter(url: string, chapter: string, volume: string): Observable<IRulibChapterResult> {
|
||||||
|
return this.parser.getChapter(url, chapter, volume).pipe(
|
||||||
|
map((data) => {
|
||||||
|
return data;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
getImageServer() {
|
||||||
|
return this.parser.imageServer;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user