10 Commits

Author SHA1 Message Date
8de238028e feat: search pages 2024-07-22 19:23:25 +03:00
3522df4066 feat: start search pages 2024-07-22 16:53:34 +03:00
d5803c4a94 fix: remove unnecessary code 2024-07-22 15:39:17 +03:00
ca7294c3f7 new version: 0.3.1 2024-07-22 15:06:06 +03:00
d109ba8974 feat: nice update indicator in header 2024-07-22 15:04:29 +03:00
8f6193b846 feat: dmca page 2024-07-22 14:42:09 +03:00
448cdcf9c2 new version: 0.3.0 2024-07-22 01:28:21 +03:00
9973637a92 feat: tab-bar 2024-07-22 01:26:19 +03:00
7904abd782 fix: reader scrolling 2024-07-22 00:42:21 +03:00
f53c36bea4 feat: search field 2024-07-22 00:40:40 +03:00
27 changed files with 386 additions and 111 deletions

View File

@@ -1,15 +1,12 @@
@if (serviceWorkerEnabled) {
@if (hasUpdate) {
<h1>Update available</h1>
<button (click)="update()">Update</button>
} @else {
<h1>Update not available</h1>
}
}
<app-header></app-header>
<div class="h-12"></div>
<div class="content">
<div class="md:h-12 h-16"></div>
<div
class="content overflow-y-auto md:h-[calc(100vh-3rem)] h-[calc(100vh-4rem)] flex flex-col justify-between"
>
<div class="h-max">
<router-outlet></router-outlet>
<app-footer></app-footer>
</div>
<app-footer class="md:mb-0 mb-16 flex-shrink-0"></app-footer>
</div>
<app-tab-bar></app-tab-bar>
<app-notification></app-notification>

View File

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

View File

@@ -4,6 +4,7 @@ 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";
import { TabBarComponent } from "./components/tab-bar/tab-bar.component";
@Component({
standalone: true,
@@ -13,6 +14,7 @@ import { NotificationComponent } from "./components/notification/notification.co
NotificationComponent,
NotificationComponent,
FooterComponent,
TabBarComponent,
],
selector: "app-root",
templateUrl: "./app.component.html",
@@ -21,17 +23,4 @@ import { NotificationComponent } from "./components/notification/notification.co
})
export class AppComponent {
title = "NwaifuAnime";
constructor(private sw: AppService) {}
get hasUpdate() {
return this.sw.isUpdateAvailable;
}
update() {
this.sw.update();
}
get serviceWorkerEnabled() {
return this.sw.serviceWorkerEnabled;
}
}

View File

@@ -3,6 +3,7 @@ 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";
import { DmcaComponent } from "./components/dmca/dmca.component";
export const appRoutes: Route[] = [
{
@@ -15,4 +16,5 @@ export const appRoutes: Route[] = [
path: "auth",
component: AuthComponent,
},
{ path: "dmca", component: DmcaComponent },
];

View File

@@ -18,13 +18,20 @@
>
Сохранить
</button>
<button
type="button"
(click)="clearToken()"
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"
class="hover:bg-slate-600 bg-slate-400 px-3 md:py-3 py-1 rounded-md text-white tamperMonkey"
>
Вход
</a>

View File

@@ -67,6 +67,12 @@ export class AuthComponent implements AfterViewInit, OnDestroy {
});
}
clearToken() {
this.rulibAuthService.deleteToken();
if (this.libSocialToken) this.libSocialToken.nativeElement.value = "";
this.notificationService.info("Токен успешно удален!", "Вход");
}
ngAfterViewInit(): void {
this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params) => {
const { token, service } = params;

View File

@@ -0,0 +1,17 @@
<p class="text-3xl ps-[3rem] mt-3">DMCA Disclaimer</p>
<div class="h-full px-[3rem] 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>

View File

@@ -0,0 +1,9 @@
import { Component } from "@angular/core";
@Component({
selector: "app-dmca",
standalone: true,
templateUrl: "./dmca.component.html",
styleUrl: "./dmca.component.less",
})
export class DmcaComponent {}

View File

@@ -1,19 +1,14 @@
<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
class="footer w-full border-t border-black bg-gray-300 min-h-[3rem] mt-3 px-12 flex flex-row justify-between items-center"
>
<div class="links flex flex-row flex-start gap-3 items-center">
<a routerLink="/dmca" title="DMCA Disclaimer" class="underline">DMCA</a>
</div>
<a
class="underline flex flex-row items-center gap-1"
target="_blank"
title="Source code"
href="https://git.nwaifu.su/neuro_llc/NwaifuWeb/src/branch/dev/apps/NwaifuAnime"
>Исходный код <i class="lni lni-git"></i
></a>
</div>

View File

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

View File

@@ -1,6 +1,29 @@
<div
class="header fixed flex flex-row items-center px-2 justify-between top-0 left-0 h-12 bg-gray-700 w-full"
class="header fixed flex flex-col items-center px-2 justify-start gap-1 md:justify-between top-0 left-0 md:h-12 h-16 bg-gray-700 w-full md:flex-row"
>
<a routerLink="/" title="Main page"><p class="text-xl text-white">NwaifuAnime</p></a>
<app-search-field></app-search-field>
<button title="Profile" #profileBtn class="hidden md:block">
<div class="profile-btn bg-white rounded-full w-8 h-8 aspect-square ms-3">
<img src="pic/Blank-profile.png" alt="Profile pic" class="w-full h-full" />
</div>
</button>
@if (this.swEnabled && this.swHasUpdate) {
<button title="Update" (click)="swUpdate()" class="md:w-fit w-full">
<div
class="h-8 md:w-8 w-full rounded-md bg-green-300 flex flex-col justify-center items-center md:ms-1 ms-0 md:mt-0 mt-2"
>
<i class="lni lni-download text-gray-700"></i>
</div>
</button>
}
</div>
<div
[class]="
'profile-menu hidden md:flex flex-col overflow-hidden z-20 rounded-md w-32 bg-white border border-black p-3 h-full fixed ' +
(menuOpened ? 'max-h-32 opacity-100' : 'max-h-0 opacity-0')
"
#profileMenu
>
<a routerLink="/auth" title="Auth page"><p class="hover:text-blue-400">Auth</p></a>
</div>

View File

@@ -5,3 +5,6 @@
z-index: 20;
position: fixed;
}
.profile-menu {
transition: max-height 0.3s ease-in-out;
}

View File

@@ -1,7 +1,15 @@
import { CommonModule } from "@angular/common";
import { Component, OnDestroy } from "@angular/core";
import { ActivatedRoute, NavigationEnd, Router, RouterLink } from "@angular/router";
import { Subject, filter, takeUntil } from "rxjs";
import {
AfterViewInit,
Component,
ElementRef,
HostListener,
OnDestroy,
ViewChild,
} from "@angular/core";
import { RouterLink } from "@angular/router";
import { Subject } from "rxjs";
import { AppService } from "../../app.service";
import { SearchFieldComponent } from "../search-field/search-field.component";
@Component({
@@ -11,36 +19,50 @@ import { SearchFieldComponent } from "../search-field/search-field.component";
standalone: true,
imports: [CommonModule, RouterLink, SearchFieldComponent],
})
export class HeaderComponent implements OnDestroy {
export class HeaderComponent implements AfterViewInit, OnDestroy {
menuOpened = false;
@ViewChild("profileBtn") profileBtn: ElementRef<HTMLButtonElement> | null = null;
@ViewChild("profileMenu") profileMenu: ElementRef<HTMLDivElement> | null = null;
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")) {
constructor(private swService: AppService) {}
get swEnabled() {
return this.swService.serviceWorkerEnabled;
}
swUpdate() {
this.swService.update();
}
get swHasUpdate() {
return this.swService.isUpdateAvailable;
}
@HostListener("window:click", ["$event"])
toggleProfileMenu(event: MouseEvent) {
if (this.profileBtn && this.profileBtn.nativeElement.contains(event.target as Node)) {
this.menuOpened = !this.menuOpened;
} else {
this.menuOpened = false;
}
});
}
changeMenu() {
this.menuOpened = !this.menuOpened;
ngAfterViewInit(): void {
this.moveProfileMenu();
}
get menuBtnClass(): string {
return `lni ${this.menuOpened ? "lni-close" : "lni-menu"} text-white`;
@HostListener("window:resize")
moveProfileMenu() {
if (this.profileBtn && this.profileMenu) {
const btnRect = this.profileBtn.nativeElement.getBoundingClientRect();
const menuRect = this.profileMenu.nativeElement.getBoundingClientRect();
const menuWidth = menuRect.width;
const menuX = btnRect.left + btnRect.width / 2 - menuWidth * 0.8;
const menuY = btnRect.top + btnRect.height;
this.profileMenu.nativeElement.style.left = `${menuX}px`;
this.profileMenu.nativeElement.style.top = `calc(${menuY}px + 0.25rem)`;
}
get searchBarClass(): string {
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"}`;
}
ngOnDestroy(): void {

View File

@@ -16,9 +16,15 @@
<img
[src]="popularTitle.cover.thumbnail"
[alt]="popularTitle.slug"
class="w-[200px] h-auto aspect-auto"
class="w-[200px] max-h-[250px] h-auto aspect-auto"
/>
<p>{{ popularTitle.rus_name }}</p>
<p class="text-center">
{{
popularTitle.rus_name.length > 50
? popularTitle.rus_name.slice(0, 50) + "..."
: popularTitle.rus_name
}}
</p>
</div>
</a>
}
@@ -28,31 +34,68 @@
</div>
}
} @else {
<div class="flex flex-col items-center w-full px-3">
<div class="flex justify-center items-center mt-3">
@if (loading) {
<h1>Loading...</h1>
}
@if (notFound && !loading) {
} @else if (notFound && !loading) {
<h1>Not found</h1>
} @else {
<h1>Найдено по запросу "{{ search }}" результатов: {{ items.length }}</h1>
}
@for (item of items; track $index) {
</div>
<div class="flex flex-col items-center justify-start gap-3">
<div
class="flex md:flex-row flex-col flex-nowrap md:flex-wrap gap-2 justify-start items-center w-full px-3 mt-3 md:mx-12"
>
@for (item of currentPageItems; track $index) {
<a
routerLink="/detail"
[queryParams]="{ url: item.slug_url }"
title="{{ item.name }}"
class="mb-6 max-w-[700px] w-full"
class="my-1 max-w-[400px] 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>
<p class="text-center">
{{
item.rus_name.length > 50 ? item.rus_name.substring(0, 50) + "..." : item.rus_name
}}
</p>
<img
[src]="item.cover.thumbnail"
[alt]="item.slug"
class="w-[200px] h-auto max-h-[300px] aspect-auto"
class="w-[200px] h-auto max-h-[250px] aspect-auto"
/>
</div>
</a>
}
</div>
@if (items.length) {
<div class="flex flex-row items-center justify-between w-full px-3">
<button
[ngClass]="{
'bg-slate-600 text-white p-3 rounded-md hover:scale-105': 1,
'opacity-15': currentPage === 0,
}"
[disabled]="currentPage === 0"
(click)="previousSearchPage()"
>
Назад
</button>
<p>Страница {{ currentPage + 1 }} из {{ maxPages + 1 }}</p>
<button
[ngClass]="{
'bg-slate-600 text-white p-3 rounded-md hover:scale-105': 1,
'opacity-15': currentPage === maxPages,
}"
[disabled]="currentPage === maxPages"
*ngIf="currentPage < items.length / 8"
(click)="nextSearchPage()"
>
Вперед
</button>
</div>
}
</div>
}

View File

@@ -1,7 +1,8 @@
import { CommonModule } from "@angular/common";
import { Component, Input, OnDestroy, OnInit } from "@angular/core";
import { ActivatedRoute, RouterLink } from "@angular/router";
import { map, Subject, Subscription, takeUntil } from "rxjs";
import { ActivatedRoute, Router, RouterLink } from "@angular/router";
import { Subject, Subscription, map, takeUntil } from "rxjs";
import { RulibAuthService } from "../../services/parsers/rulib/rulib.auth.service";
import { IRuLIBPopular } from "../../services/parsers/rulib/rulib.popular.dto";
import { Datum } from "../../services/parsers/rulib/rulib.search.dto";
import { SearchService } from "../../services/search.service";
@@ -19,6 +20,7 @@ export class HomeComponent implements OnDestroy, OnInit {
notFound = false;
search: string = "";
popularItemsMap: Map<string, IRuLIBPopular[]> = new Map<string, IRuLIBPopular[]>();
currentPage = 0;
private destroy$ = new Subject<void>();
private popularSubscription = new Subscription();
@@ -26,6 +28,8 @@ export class HomeComponent implements OnDestroy, OnInit {
constructor(
private searchService: SearchService,
private route: ActivatedRoute,
private ruLibAuthService: RulibAuthService,
private router: Router,
) {
this.searchService.setMangalibParser();
}
@@ -60,17 +64,58 @@ export class HomeComponent implements OnDestroy, OnInit {
}
private getPopularSlashlib() {
this.ruLibAuthService
.checkToken(this.ruLibAuthService.getToken())
.pipe(takeUntil(this.destroy$))
.subscribe((loggedIn) => {
if (!loggedIn) return;
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));
}
get currentPageItems() {
return this.items.slice(
8 * this.currentPage,
Math.min(this.items.length, 8 * (this.currentPage + 1)),
);
}
get maxPages() {
return Math.ceil(this.items.length / 8) - 1;
}
nextSearchPage() {
this.currentPage = Math.min(this.currentPage + 1, Math.ceil(this.items.length / 8) - 1);
this.router.navigate([], {
queryParams: { page: this.currentPage },
relativeTo: this.route,
queryParamsHandling: "merge",
});
}
previousSearchPage() {
this.currentPage = Math.max(this.currentPage - 1, 0);
this.router.navigate([], {
queryParams: { page: this.currentPage },
relativeTo: this.route,
queryParamsHandling: "merge",
});
}
ngOnInit(): void {
this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params) => {
if (this.search && params["search"] && this.search === params["search"]) return;
this.search = params["search"] ?? "";
try {
this.currentPage = Math.max(0, +params["page"] || 0);
} catch {
this.currentPage = 0;
}
this.items = [];
this.loading = true;
if (this.search) {
@@ -81,6 +126,9 @@ export class HomeComponent implements OnDestroy, OnInit {
.subscribe((data) => {
this.loading = false;
this.items = data.data;
const maxPage = Math.ceil(this.items.length / 8) - 1;
console.log(maxPage);
this.currentPage = Math.min(this.currentPage, maxPage);
this.notFound = this.items.length === 0;
});
} else {

View File

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

View File

@@ -1,6 +1,21 @@
<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 class="flex flex-row gap-3 justify-between items-center md:justify-end">
<div
[class]="
'input-block rounded-md bg-white transition-[width] delay-150 duration-300 ease-in-out h-full overflow-hidden flex justify-center items-center w-full ' +
(openSearchField ? 'md:w-[300px]' : 'md:w-0')
"
>
<input
type="search"
#searchInput
class="outline-none ps-1 text-sm leading-6 w-full border-0 bg-transparent border-r border-gray-700"
placeholder="Начать поиск"
(keydown.enter)="search()"
/>
</div>
<button (click)="toggleSearchField()" class="hidden md:block">
<div class="input-btn rounded-full w-8 h-8 bg-slate-400 flex justify-center items-center">
<i class="lni lni-search-alt text-white"></i>
</div>
</button>
</div>

View File

@@ -0,0 +1,3 @@
:host {
width: 100%;
}

View File

@@ -1,7 +1,7 @@
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";
import { ActivatedRoute, NavigationEnd, Router } from "@angular/router";
import { Subject, filter, takeUntil } from "rxjs";
@Component({
selector: "app-search-field",
@@ -12,6 +12,7 @@ import { Subject, takeUntil } from "rxjs";
})
export class SearchFieldComponent implements AfterViewInit, OnDestroy {
@ViewChild("searchInput") searchInput: ElementRef<HTMLInputElement> | null = null;
openSearchField = false;
private destroy$ = new Subject<void>();
constructor(
@@ -24,17 +25,38 @@ export class SearchFieldComponent implements AfterViewInit, OnDestroy {
const search = params["search"];
if (search && this.searchInput) {
this.searchInput.nativeElement.value = search;
this.openSearchField = true;
}
});
this.router.events
.pipe(
filter((event) => event instanceof NavigationEnd),
takeUntil(this.destroy$),
)
// eslint-disable-next-line @typescript-eslint/no-explicit-any
.subscribe((event: any) => {
if (event.url === "/" && this.searchInput) {
this.searchInput.nativeElement.value = "";
this.openSearchField = false;
}
});
}
search() {
console.log(this.searchInput);
if (this.searchInput && this.searchInput.nativeElement.value)
this.router.navigate(["/", "search"], {
this.router.navigate(["/"], {
queryParams: { search: this.searchInput.nativeElement.value },
});
}
toggleSearchField() {
this.openSearchField = !this.openSearchField;
if (this.openSearchField && this.searchInput) {
this.searchInput.nativeElement.focus();
}
}
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();

View File

@@ -0,0 +1,16 @@
<div
class="flex flex-row justify-start items-center md:hidden fixed bottom-0 w-full bg-gray-700 h-16 px-3"
>
@for (link of links; track link.link) {
<a [routerLink]="link.link">
<div class="tab-bar__item flex flex-col justify-center items-center h-full center w-16">
<i
[class]="
'text-3xl ' + link.line_icon + ' ' + (link.active ? 'text-white' : 'text-gray-500')
"
></i>
<span [class]="link.active ? 'text-white' : 'text-gray-500'">Auth</span>
</div>
</a>
}
</div>

View File

@@ -0,0 +1,3 @@
:host {
display: block;
}

View File

@@ -0,0 +1,41 @@
import { CommonModule } from "@angular/common";
import { Component, OnDestroy } from "@angular/core";
import { NavigationEnd, Router, RouterLink } from "@angular/router";
import { Subject, filter, takeUntil } from "rxjs";
import { ITab } from "./tab-bar.dto";
@Component({
selector: "app-tab-bar",
standalone: true,
imports: [CommonModule, RouterLink],
templateUrl: "./tab-bar.component.html",
styleUrl: "./tab-bar.component.less",
})
export class TabBarComponent implements OnDestroy {
links: ITab[] = [
{
link: "/auth",
line_icon: "lni lni-user",
name: "Auth",
active: false,
},
];
private destroy$ = new Subject<void>();
constructor(private router: Router) {
this.router.events
.pipe(
filter((event) => event instanceof NavigationEnd),
takeUntil(this.destroy$),
)
// eslint-disable-next-line @typescript-eslint/no-explicit-any
.subscribe((event: any) => {
this.links.forEach((link) => {
link.active = event.url.startsWith(link.link);
});
});
}
ngOnDestroy(): void {
throw new Error("Method not implemented.");
}
}

View File

@@ -0,0 +1,6 @@
export interface ITab {
link: string;
line_icon: string;
name: string;
active: boolean;
}

View File

@@ -28,6 +28,12 @@ export class RulibAuthService implements OnDestroy {
return token_data.rulib_token ?? "";
}
deleteToken(): void {
const token_data: IToken = JSON.parse(localStorage.getItem("token") ?? "{}");
token_data.rulib_token = "";
localStorage.setItem("token", JSON.stringify(token_data));
}
checkToken(token: string): Observable<boolean> {
return this.http
.get(this.api_url + "/api/auth/me", {

View File

@@ -36,5 +36,10 @@
]
}
},
"nxCloudAccessToken": "${NX_CLOUD_ACCESS_TOKEN}"
"nxCloudAccessToken": "${NX_CLOUD_ACCESS_TOKEN}",
"generators": {
"@nx/angular:component": {
"style": "less"
}
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "nwaifu-web",
"version": "0.2.3",
"version": "0.3.1",
"scripts": {
"ng": "ng",
"start": "nx serve NwaifuWeb",