From 8f6193b84610a7f0b1aacc91e77a12dd5e94d899 Mon Sep 17 00:00:00 2001 From: Sergey Elpashev Date: Mon, 22 Jul 2024 14:42:09 +0300 Subject: [PATCH] feat: dmca page --- apps/NwaifuAnime/src/app/app.component.html | 9 +++--- apps/NwaifuAnime/src/app/app.routes.ts | 2 ++ .../app/components/auth/auth.component.html | 7 +++++ .../src/app/components/auth/auth.component.ts | 6 ++++ .../app/components/dmca/dmca.component.html | 17 +++++++++++ .../app/components/dmca/dmca.component.less | 0 .../src/app/components/dmca/dmca.component.ts | 9 ++++++ .../components/footer/footer.component.html | 29 ++++++++----------- .../app/components/footer/footer.component.ts | 5 +++- .../app/components/home/home.component.less | 3 -- .../src/app/components/home/home.component.ts | 12 ++++++-- .../parsers/rulib/rulib.auth.service.ts | 6 ++++ 12 files changed, 78 insertions(+), 27 deletions(-) create mode 100644 apps/NwaifuAnime/src/app/components/dmca/dmca.component.html create mode 100644 apps/NwaifuAnime/src/app/components/dmca/dmca.component.less create mode 100644 apps/NwaifuAnime/src/app/components/dmca/dmca.component.ts diff --git a/apps/NwaifuAnime/src/app/app.component.html b/apps/NwaifuAnime/src/app/app.component.html index fa61d3f..f333933 100644 --- a/apps/NwaifuAnime/src/app/app.component.html +++ b/apps/NwaifuAnime/src/app/app.component.html @@ -9,11 +9,12 @@
- - -
+
+ +
+
diff --git a/apps/NwaifuAnime/src/app/app.routes.ts b/apps/NwaifuAnime/src/app/app.routes.ts index 9e5c0e6..acae829 100644 --- a/apps/NwaifuAnime/src/app/app.routes.ts +++ b/apps/NwaifuAnime/src/app/app.routes.ts @@ -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 }, ]; diff --git a/apps/NwaifuAnime/src/app/components/auth/auth.component.html b/apps/NwaifuAnime/src/app/components/auth/auth.component.html index c9e8e75..62ea43e 100644 --- a/apps/NwaifuAnime/src/app/components/auth/auth.component.html +++ b/apps/NwaifuAnime/src/app/components/auth/auth.component.html @@ -18,6 +18,13 @@ > Сохранить +
  • diff --git a/apps/NwaifuAnime/src/app/components/auth/auth.component.ts b/apps/NwaifuAnime/src/app/components/auth/auth.component.ts index a6a103c..c31639f 100644 --- a/apps/NwaifuAnime/src/app/components/auth/auth.component.ts +++ b/apps/NwaifuAnime/src/app/components/auth/auth.component.ts @@ -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; diff --git a/apps/NwaifuAnime/src/app/components/dmca/dmca.component.html b/apps/NwaifuAnime/src/app/components/dmca/dmca.component.html new file mode 100644 index 0000000..70e9aa0 --- /dev/null +++ b/apps/NwaifuAnime/src/app/components/dmca/dmca.component.html @@ -0,0 +1,17 @@ +

    DMCA Disclaimer

    +
    +
    +

    На русском:

    +

    + Разработчики этого приложения не имеют никакого отношения к контенту, доступному в приложении. + Оно собрано из источников, свободно доступных через любой веб-браузер. +

    +
    +
    +

    English:

    +

    + 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. +

    +
    +
    diff --git a/apps/NwaifuAnime/src/app/components/dmca/dmca.component.less b/apps/NwaifuAnime/src/app/components/dmca/dmca.component.less new file mode 100644 index 0000000..e69de29 diff --git a/apps/NwaifuAnime/src/app/components/dmca/dmca.component.ts b/apps/NwaifuAnime/src/app/components/dmca/dmca.component.ts new file mode 100644 index 0000000..e7cb2e1 --- /dev/null +++ b/apps/NwaifuAnime/src/app/components/dmca/dmca.component.ts @@ -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 {} diff --git a/apps/NwaifuAnime/src/app/components/footer/footer.component.html b/apps/NwaifuAnime/src/app/components/footer/footer.component.html index 0740172..563b82b 100644 --- a/apps/NwaifuAnime/src/app/components/footer/footer.component.html +++ b/apps/NwaifuAnime/src/app/components/footer/footer.component.html @@ -1,19 +1,14 @@ -
    -

    DMCA Disclaimer

    -
    -
    -

    На русском:

    -

    - Разработчики этого приложения не имеют никакого отношения к контенту, доступному в - приложении. Оно собрано из источников, свободно доступных через любой веб-браузер. -

    -
    -
    -

    English:

    -

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

    -
    +
    +
    + DMCA
    + Исходный код
    diff --git a/apps/NwaifuAnime/src/app/components/footer/footer.component.ts b/apps/NwaifuAnime/src/app/components/footer/footer.component.ts index ce19e33..8a25f43 100644 --- a/apps/NwaifuAnime/src/app/components/footer/footer.component.ts +++ b/apps/NwaifuAnime/src/app/components/footer/footer.component.ts @@ -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 {} diff --git a/apps/NwaifuAnime/src/app/components/home/home.component.less b/apps/NwaifuAnime/src/app/components/home/home.component.less index a022478..e69de29 100644 --- a/apps/NwaifuAnime/src/app/components/home/home.component.less +++ b/apps/NwaifuAnime/src/app/components/home/home.component.less @@ -1,3 +0,0 @@ -:host { - height: max-content; -} diff --git a/apps/NwaifuAnime/src/app/components/home/home.component.ts b/apps/NwaifuAnime/src/app/components/home/home.component.ts index e7ea50e..8488457 100644 --- a/apps/NwaifuAnime/src/app/components/home/home.component.ts +++ b/apps/NwaifuAnime/src/app/components/home/home.component.ts @@ -2,6 +2,7 @@ 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 { 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"; @@ -26,6 +27,7 @@ export class HomeComponent implements OnDestroy, OnInit { constructor( private searchService: SearchService, private route: ActivatedRoute, + private ruLibAuthService: RulibAuthService, ) { this.searchService.setMangalibParser(); } @@ -60,8 +62,14 @@ export class HomeComponent implements OnDestroy, OnInit { } private getPopularSlashlib() { - this.searchService.setSlashlibParser(); - this.getPopular(this.searchService.getRuLibName()); + 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() { diff --git a/apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.auth.service.ts b/apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.auth.service.ts index e23bd4d..e929040 100644 --- a/apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.auth.service.ts +++ b/apps/NwaifuAnime/src/app/services/parsers/rulib/rulib.auth.service.ts @@ -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 { return this.http .get(this.api_url + "/api/auth/me", {