From 6ddae1f00c48c6e7fb6cc4d66c0515ddd2938784 Mon Sep 17 00:00:00 2001 From: Chneemann Date: Sat, 3 Aug 2024 10:55:58 +0200 Subject: [PATCH] components sorted --- .../auth/forgot-password/forgot-password.component.html | 4 ++-- .../auth/forgot-password/forgot-password.component.ts | 8 ++++---- frontend/src/app/components/home/home.component.ts | 4 ++-- .../components}/footer/footer.component.html | 0 .../components}/footer/footer.component.scss | 0 .../components}/footer/footer.component.spec.ts | 0 .../home => shared/components}/footer/footer.component.ts | 0 .../components}/header/header.component.html | 0 .../components}/header/header.component.scss | 0 .../components}/header/header.component.spec.ts | 0 .../home => shared/components}/header/header.component.ts | 2 +- 11 files changed, 9 insertions(+), 9 deletions(-) rename frontend/src/app/{components/home => shared/components}/footer/footer.component.html (100%) rename frontend/src/app/{components/home => shared/components}/footer/footer.component.scss (100%) rename frontend/src/app/{components/home => shared/components}/footer/footer.component.spec.ts (100%) rename frontend/src/app/{components/home => shared/components}/footer/footer.component.ts (100%) rename frontend/src/app/{components/home => shared/components}/header/header.component.html (100%) rename frontend/src/app/{components/home => shared/components}/header/header.component.scss (100%) rename frontend/src/app/{components/home => shared/components}/header/header.component.spec.ts (100%) rename frontend/src/app/{components/home => shared/components}/header/header.component.ts (76%) diff --git a/frontend/src/app/components/auth/forgot-password/forgot-password.component.html b/frontend/src/app/components/auth/forgot-password/forgot-password.component.html index 5ab990c..9f4cd72 100644 --- a/frontend/src/app/components/auth/forgot-password/forgot-password.component.html +++ b/frontend/src/app/components/auth/forgot-password/forgot-password.component.html @@ -1,7 +1,7 @@
Forgot your password?
- @if (!queryEmail && !sendSuccess && !queryEmailSuccess) { + @if (!queryEmail && !sendMailSuccess && !queryEmailSuccess) {

We will send you an email with instructions to reset your password.

@@ -40,7 +40,7 @@ [disabled]="!isUserEmailValid(authData.mail)" > - } @else { @if (sendSuccess) { + } @else { @if (sendMailSuccess) {

If the email you entered exists on our server, you will receive a diff --git a/frontend/src/app/components/auth/forgot-password/forgot-password.component.ts b/frontend/src/app/components/auth/forgot-password/forgot-password.component.ts index 9811761..e40c5a2 100644 --- a/frontend/src/app/components/auth/forgot-password/forgot-password.component.ts +++ b/frontend/src/app/components/auth/forgot-password/forgot-password.component.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { BtnLargeComponent } from '../../../shared/components/btn-large/btn-large.component'; import { FormsModule, NgForm } from '@angular/forms'; -import { ActivatedRoute, Router, RouterLink } from '@angular/router'; +import { ActivatedRoute, RouterLink } from '@angular/router'; @Component({ selector: 'app-forgot-password', @@ -18,11 +18,11 @@ export class ForgotPasswordComponent { passwordConfirm: '', }; - sendSuccess: boolean = false; + sendMailSuccess: boolean = false; queryEmail: boolean = false; queryEmailSuccess: boolean = false; - constructor(private route: ActivatedRoute, private router: Router) {} + constructor(private route: ActivatedRoute) {} ngOnInit(): void { this.route.queryParams.subscribe((params) => { @@ -40,7 +40,7 @@ export class ForgotPasswordComponent { if (ngForm.submitted && ngForm.form.valid) { if (mailInput.name === 'mail') { ngForm.form.reset(); - this.sendSuccess = true; + this.sendMailSuccess = true; } else if (mailInput.name === 'password') { ngForm.form.reset(); this.queryEmail = false; diff --git a/frontend/src/app/components/home/home.component.ts b/frontend/src/app/components/home/home.component.ts index 0921506..13d1a0b 100644 --- a/frontend/src/app/components/home/home.component.ts +++ b/frontend/src/app/components/home/home.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { HeaderComponent } from './header/header.component'; -import { FooterComponent } from './footer/footer.component'; +import { HeaderComponent } from '../../shared/components/header/header.component'; +import { FooterComponent } from '../../shared/components/footer/footer.component'; import { AuthComponent } from '../auth/auth.component'; import { ActivatedRoute } from '@angular/router'; import { RegisterComponent } from '../auth/register/register.component'; diff --git a/frontend/src/app/components/home/footer/footer.component.html b/frontend/src/app/shared/components/footer/footer.component.html similarity index 100% rename from frontend/src/app/components/home/footer/footer.component.html rename to frontend/src/app/shared/components/footer/footer.component.html diff --git a/frontend/src/app/components/home/footer/footer.component.scss b/frontend/src/app/shared/components/footer/footer.component.scss similarity index 100% rename from frontend/src/app/components/home/footer/footer.component.scss rename to frontend/src/app/shared/components/footer/footer.component.scss diff --git a/frontend/src/app/components/home/footer/footer.component.spec.ts b/frontend/src/app/shared/components/footer/footer.component.spec.ts similarity index 100% rename from frontend/src/app/components/home/footer/footer.component.spec.ts rename to frontend/src/app/shared/components/footer/footer.component.spec.ts diff --git a/frontend/src/app/components/home/footer/footer.component.ts b/frontend/src/app/shared/components/footer/footer.component.ts similarity index 100% rename from frontend/src/app/components/home/footer/footer.component.ts rename to frontend/src/app/shared/components/footer/footer.component.ts diff --git a/frontend/src/app/components/home/header/header.component.html b/frontend/src/app/shared/components/header/header.component.html similarity index 100% rename from frontend/src/app/components/home/header/header.component.html rename to frontend/src/app/shared/components/header/header.component.html diff --git a/frontend/src/app/components/home/header/header.component.scss b/frontend/src/app/shared/components/header/header.component.scss similarity index 100% rename from frontend/src/app/components/home/header/header.component.scss rename to frontend/src/app/shared/components/header/header.component.scss diff --git a/frontend/src/app/components/home/header/header.component.spec.ts b/frontend/src/app/shared/components/header/header.component.spec.ts similarity index 100% rename from frontend/src/app/components/home/header/header.component.spec.ts rename to frontend/src/app/shared/components/header/header.component.spec.ts diff --git a/frontend/src/app/components/home/header/header.component.ts b/frontend/src/app/shared/components/header/header.component.ts similarity index 76% rename from frontend/src/app/components/home/header/header.component.ts rename to frontend/src/app/shared/components/header/header.component.ts index e1ffec8..661096f 100644 --- a/frontend/src/app/components/home/header/header.component.ts +++ b/frontend/src/app/shared/components/header/header.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { BtnLargeComponent } from '../../../shared/components/btn-large/btn-large.component'; +import { BtnLargeComponent } from '../btn-large/btn-large.component'; import { RouterLink } from '@angular/router'; @Component({