Liosha84andClaude Opus 5.5
3f5a6c26bb
Frontend
- Upgrade Angular 19 -> 22 (TypeScript 6, new control flow), drop unused
packages (bootstrap, jquery, popper, ng-bootstrap, webpack)
- Move the UI to Angular Material: toolbar with user menu, tutorials list,
add/edit forms, admin users table with role editing dialog, profile,
home page with published tutorials, registration form, login dialog
- Guard routes: login required for add/edit/profile, admin role for /admin
- Remove the /login, Moderator and User pages, event bus, auth interceptor
and other dead code
Backend
- Add PUT /api/users/{id}/roles (admin only) that keeps at least one admin
and does not let an admin drop their own admin role
- Tighten security: read tutorials publicly, change them only when logged
in, users/roles API for admins only; hide password hashes in JSON
- Remove unused Settings and Test endpoints, DTO mappers, commented code
- Flyway V2 aligns the schema with the entities (bigint ids, tutorials PK,
identity ids); Hibernate now runs with ddl-auto: validate
Docker
- Three-stage Dockerfile (Node build, Gradle build, JRE runtime) with
layer caching, non-root user and healthcheck; add .dockerignore
- docker-compose waits for a healthy Postgres, always rebuilds the image,
no longer mounts the Docker socket
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
56 lines
2.1 KiB
TypeScript
56 lines
2.1 KiB
TypeScript
import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core';
|
|
import { FormsModule } from '@angular/forms';
|
|
import { RouterLink } from '@angular/router';
|
|
import { MatButtonModule } from '@angular/material/button';
|
|
import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
|
|
import { MatIcon } from '@angular/material/icon';
|
|
import { MatInputModule } from '@angular/material/input';
|
|
|
|
import { AuthService } from 'src/app/services/auth.service';
|
|
import { TokenStorageService } from 'src/app/services/token-storage.service';
|
|
|
|
// Диалог входа: сам выполняет логин и закрывается только при успехе
|
|
@Component({
|
|
selector: 'app-dialog',
|
|
imports: [FormsModule, RouterLink, MatButtonModule, MatDialogModule, MatIcon, MatInputModule],
|
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
templateUrl: './dialog.component.html',
|
|
styleUrl: './dialog.component.scss'
|
|
})
|
|
export class DialogComponent {
|
|
private readonly dialogRef = inject(MatDialogRef<DialogComponent>);
|
|
private readonly authService = inject(AuthService);
|
|
private readonly tokenStorage = inject(TokenStorageService);
|
|
|
|
username = '';
|
|
password = '';
|
|
readonly hidePassword = signal(true);
|
|
readonly submitting = signal(false);
|
|
readonly errorMessage = signal('');
|
|
|
|
togglePassword(event: MouseEvent): void {
|
|
this.hidePassword.update(hide => !hide);
|
|
event.stopPropagation();
|
|
}
|
|
|
|
signIn(): void {
|
|
this.submitting.set(true);
|
|
this.errorMessage.set('');
|
|
|
|
this.authService.login(this.username, this.password).subscribe({
|
|
next: user => {
|
|
this.tokenStorage.saveUser(user);
|
|
this.dialogRef.close(true);
|
|
// Перезагрузка нужна, чтобы шапка и страницы подхватили вошедшего пользователя
|
|
window.location.reload();
|
|
},
|
|
error: err => {
|
|
this.submitting.set(false);
|
|
this.errorMessage.set(err.status === 401
|
|
? 'Wrong username or password'
|
|
: err.error?.message ?? 'Login failed, please try again');
|
|
}
|
|
});
|
|
}
|
|
}
|