Compare commits
4 Commits
feature/he
...
v0.3.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 448cdcf9c2 | |||
| 9973637a92 | |||
| 7904abd782 | |||
| f53c36bea4 |
@@ -7,9 +7,13 @@
|
||||
}
|
||||
}
|
||||
<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 flex-shrink-0"
|
||||
>
|
||||
<router-outlet></router-outlet>
|
||||
<app-footer></app-footer>
|
||||
<div class="md:min-h-0 min-h-16"></div>
|
||||
</div>
|
||||
<app-tab-bar></app-tab-bar>
|
||||
<app-notification></app-notification>
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
.content {
|
||||
overflow-y: auto;
|
||||
height: calc(100vh - 3rem);
|
||||
}
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<div class="footer w-full border-t border-black bg-gray-300 pt-3">
|
||||
<div class="footer w-full border-t border-black bg-gray-300 pt-3 min-h-[15rem] mt-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="footer-content h-full px-[5rem] flex flex-col gap-3">
|
||||
<div class="block">
|
||||
<p>На русском:</p>
|
||||
<p>
|
||||
|
||||
@@ -1,6 +1,20 @@
|
||||
<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>
|
||||
</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>
|
||||
|
||||
@@ -5,3 +5,6 @@
|
||||
z-index: 20;
|
||||
position: fixed;
|
||||
}
|
||||
.profile-menu {
|
||||
transition: max-height 0.3s ease-in-out;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,14 @@
|
||||
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 { SearchFieldComponent } from "../search-field/search-field.component";
|
||||
|
||||
@Component({
|
||||
@@ -11,28 +18,37 @@ 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")) {
|
||||
this.menuOpened = false;
|
||||
}
|
||||
});
|
||||
|
||||
@HostListener("window:click", ["$event"])
|
||||
toggleProfileMenu(event: MouseEvent) {
|
||||
if (this.profileBtn && this.profileBtn.nativeElement.contains(event.target as Node)) {
|
||||
this.menuOpened = !this.menuOpened;
|
||||
console.log(this.menuOpened);
|
||||
} else {
|
||||
this.menuOpened = false;
|
||||
}
|
||||
}
|
||||
|
||||
changeMenu() {
|
||||
this.menuOpened = !this.menuOpened;
|
||||
ngAfterViewInit(): void {
|
||||
this.moveProfileMenu();
|
||||
}
|
||||
|
||||
@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 menuBtnClass(): string {
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
</div>
|
||||
}
|
||||
} @else {
|
||||
<div class="flex flex-col items-center w-full px-3">
|
||||
<div class="flex flex-col items-center w-full px-3 mt-3">
|
||||
@if (loading) {
|
||||
<h1>Loading...</h1>
|
||||
}
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
:host {
|
||||
height: max-content;
|
||||
}
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
:host {
|
||||
overflow-y: auto;
|
||||
height: 100%;
|
||||
display: block;
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
:host {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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>
|
||||
@@ -0,0 +1,3 @@
|
||||
:host {
|
||||
display: block;
|
||||
}
|
||||
@@ -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.");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
export interface ITab {
|
||||
link: string;
|
||||
line_icon: string;
|
||||
name: string;
|
||||
active: boolean;
|
||||
}
|
||||
7
nx.json
7
nx.json
@@ -36,5 +36,10 @@
|
||||
]
|
||||
}
|
||||
},
|
||||
"nxCloudAccessToken": "${NX_CLOUD_ACCESS_TOKEN}"
|
||||
"nxCloudAccessToken": "${NX_CLOUD_ACCESS_TOKEN}",
|
||||
"generators": {
|
||||
"@nx/angular:component": {
|
||||
"style": "less"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "nwaifu-web",
|
||||
"version": "0.2.3",
|
||||
"version": "0.3.0",
|
||||
"scripts": {
|
||||
"ng": "ng",
|
||||
"start": "nx serve NwaifuWeb",
|
||||
|
||||
Reference in New Issue
Block a user