feat: click on manga page to change page
This commit is contained in:
@@ -1,3 +1,7 @@
|
|||||||
.header {
|
.header {
|
||||||
transition: height 0.3s;
|
transition: height 0.3s;
|
||||||
}
|
}
|
||||||
|
:host {
|
||||||
|
z-index: 20;
|
||||||
|
position: fixed;
|
||||||
|
}
|
||||||
|
|||||||
@@ -14,7 +14,11 @@
|
|||||||
@if (pages.length > 0 && currentPage) {
|
@if (pages.length > 0 && currentPage) {
|
||||||
<div [class]="imageContainerClass">
|
<div [class]="imageContainerClass">
|
||||||
@if (!isManhwa) {
|
@if (!isManhwa) {
|
||||||
<app-scale-image [imageSrc]="currentPage.imageUrl"></app-scale-image>
|
<app-scale-image
|
||||||
|
[imageSrc]="currentPage.imageUrl"
|
||||||
|
(clickLeft)="prevPage()"
|
||||||
|
(clickRight)="nextPage()"
|
||||||
|
></app-scale-image>
|
||||||
} @else {
|
} @else {
|
||||||
@for (page of manhwaPages; track page.id) {
|
@for (page of manhwaPages; track page.id) {
|
||||||
<app-scale-image
|
<app-scale-image
|
||||||
@@ -26,7 +30,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center justify-center space-x-4 my-10">
|
<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 (click)="prevPage()" class="p-3 text-white bg-slate-600 w-[100px] rounded-lg">
|
||||||
←
|
←
|
||||||
</button>
|
</button>
|
||||||
@@ -35,8 +39,10 @@
|
|||||||
→
|
→
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="hidden md:block md:fixed right-10 top-[50%]">
|
@if (isManhwa) {
|
||||||
{{ currentPageIndex + 1 }} / {{ pages.length }}
|
<div class="hidden md:block md:fixed right-10 top-[50%]">
|
||||||
</div>
|
{{ currentPageIndex + 1 }} / {{ pages.length }}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -240,6 +240,6 @@ export class ReaderComponent implements OnInit, OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get imageContainerClass() {
|
get imageContainerClass() {
|
||||||
return `${this.isManhwa ? "h-auto" : "h-[70vh]"} w-[95vw] md:w-[450px] flex flex-col`;
|
return `${this.isManhwa ? "h-auto" : "h-[70vh]"} w-screen md:w-[450px] flex flex-col`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<div class="image-container" #container>
|
<div class="image-container" #container>
|
||||||
@if (imageSrc) {
|
@if (imageSrc) {
|
||||||
<img #image [src]="imageSrc" (load)="onImageLoad()" alt="Manga page" />
|
<img #image [src]="imageSrc" (load)="onImageLoad()" alt="Manga page" class="cursor-pointer" />
|
||||||
} @else {
|
} @else {
|
||||||
<div class="h-screen flex flex-col items-center justify-center"><h1>Loading...</h1></div>
|
<div class="h-screen flex flex-col items-center justify-center"><h1>Loading...</h1></div>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,9 +6,11 @@ import {
|
|||||||
Input,
|
Input,
|
||||||
OnDestroy,
|
OnDestroy,
|
||||||
Output,
|
Output,
|
||||||
|
QueryList,
|
||||||
ViewChild,
|
ViewChild,
|
||||||
|
ViewChildren,
|
||||||
} from "@angular/core";
|
} from "@angular/core";
|
||||||
import { Subscription, debounceTime, fromEvent } from "rxjs";
|
import { Subject, Subscription, debounceTime, fromEvent, map, takeUntil } from "rxjs";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-scale-image",
|
selector: "app-scale-image",
|
||||||
@@ -20,10 +22,16 @@ export class ScaleImageComponent implements AfterViewInit, OnDestroy {
|
|||||||
@Input({ required: true }) imageSrc: string = "";
|
@Input({ required: true }) imageSrc: string = "";
|
||||||
@ViewChild("container", { static: true }) containerRef: ElementRef | null = null;
|
@ViewChild("container", { static: true }) containerRef: ElementRef | null = null;
|
||||||
@ViewChild("image", { static: true }) imageRef: 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() view = new EventEmitter<void>();
|
||||||
|
@Output() clickLeft = new EventEmitter<void>();
|
||||||
|
@Output() clickRight = new EventEmitter<void>();
|
||||||
@Input() host: ElementRef | null = null;
|
@Input() host: ElementRef | null = null;
|
||||||
@Input() hostScrollable: boolean = false;
|
@Input() hostScrollable: boolean = false;
|
||||||
|
|
||||||
|
private destroy$ = new Subject<void>();
|
||||||
private resizeSubscription: Subscription = new Subscription();
|
private resizeSubscription: Subscription = new Subscription();
|
||||||
private observer!: IntersectionObserver;
|
private observer!: IntersectionObserver;
|
||||||
|
|
||||||
@@ -39,11 +47,37 @@ export class ScaleImageComponent implements AfterViewInit, OnDestroy {
|
|||||||
);
|
);
|
||||||
if (this.containerRef) this.observer.observe(this.containerRef.nativeElement);
|
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 {
|
ngOnDestroy(): void {
|
||||||
if (this.resizeSubscription) this.resizeSubscription.unsubscribe();
|
if (this.resizeSubscription) this.resizeSubscription.unsubscribe();
|
||||||
if (this.observer) this.observer.disconnect();
|
if (this.observer) this.observer.disconnect();
|
||||||
|
this.destroy$.next();
|
||||||
|
this.destroy$.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
onImageLoad() {
|
onImageLoad() {
|
||||||
|
|||||||
@@ -101,7 +101,6 @@ export class LibSocialParserService extends Parser {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getPopular(): Observable<IRuLIBPopular[]> {
|
getPopular(): Observable<IRuLIBPopular[]> {
|
||||||
//TODO: мб сделать ассинхрон
|
|
||||||
return this.http
|
return this.http
|
||||||
.get<{ data: { popular: [] } }>(`${this.url}/api/`, {
|
.get<{ data: { popular: [] } }>(`${this.url}/api/`, {
|
||||||
headers: {
|
headers: {
|
||||||
@@ -112,7 +111,6 @@ export class LibSocialParserService extends Parser {
|
|||||||
.pipe(
|
.pipe(
|
||||||
map((data) => {
|
map((data) => {
|
||||||
const res = data.data.popular as IRuLIBPopular[];
|
const res = data.data.popular as IRuLIBPopular[];
|
||||||
console.log(res);
|
|
||||||
return res;
|
return res;
|
||||||
}),
|
}),
|
||||||
catchError((error) => throwError(() => `Now found ${error}`)),
|
catchError((error) => throwError(() => `Now found ${error}`)),
|
||||||
|
|||||||
Reference in New Issue
Block a user