Chneemann/join
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfixes

Browse source
This commit is contained in:
Chneemann 2024-05-22 08:13:04 +02:00
parent a5c4a9e75f
commit 3c146d7fa0
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/app.routes.ts
View file

@ -16,7 +16,7 @@ import { PwResetComponent } from './components/login/forgot-pw/pw-reset/pw-reset
export const routes: Routes = [ export const routes: Routes = [
{ path: '', component: SummaryComponent }, { path: '', component: SummaryComponent },
{ path: 'login', component: LoginComponent }, { path: 'login', component: LoginComponent },
{ path: 'login/:id', component: LoginComponent }, { path: 'login/notice/:id', component: LoginComponent },
{ path: 'login/imprint', component: ImprintComponent }, { path: 'login/imprint', component: ImprintComponent },
{ path: 'login/privacy-policy', component: PrivacyPolicyComponent }, { path: 'login/privacy-policy', component: PrivacyPolicyComponent },
{ path: 'register', component: RegisterComponent }, { path: 'register', component: RegisterComponent },

2
src/app/components/add-task/add-task.component.html
View file

@ -331,7 +331,7 @@
[img]="'check'" [img]="'check'"
[imgFilter]="'none'" [imgFilter]="'none'"
[value]=" [value]="
['none', 'todo', 'inprogress', 'awaitfeedback', 'done'].includes( ['', 'none', 'todo', 'inprogress', 'awaitfeedback', 'done'].includes(
overlayData.toString() overlayData.toString()
) )
? ('addTask.create' | translate) ? ('addTask.create' | translate)

4
src/app/components/contacts/contact-delete/contact-delete.component.html
View file

@ -5,8 +5,8 @@
</p> </p>
<div class="btns"> <div class="btns">
<div class="btn"> <div class="btn">
<div class="btn-cancle" (click)="cancelDeleteContact()"> <div class="btn-cancel" (click)="cancelDeleteContact()">
{{ "contactDeleteDialog.btnCancle" | translate }} {{ "contactDeleteDialog.btnCancel" | translate }}
</div> </div>
</div> </div>
<div class="btn"> <div class="btn">

4
src/app/components/contacts/contact-delete/contact-delete.component.scss
View file

@ -46,7 +46,7 @@ section {
margin: 0 24px; margin: 0 24px;
} }
.btn-cancle { .btn-cancel {
padding: 12px; padding: 12px;
margin: 12px 12px; margin: 12px 12px;
border-radius: 10px; border-radius: 10px;
@ -103,7 +103,7 @@ section {
} }
.btn-delete-contact, .btn-delete-contact,
.btn-cancle { .btn-cancel {
font-size: 18px; font-size: 18px;
} }
} }

4
src/app/services/login.service.ts
View file

@ -212,7 +212,7 @@ export class LoginService {
const auth = getAuth(); const auth = getAuth();
sendPasswordResetEmail(auth, email) sendPasswordResetEmail(auth, email)
.then(() => { .then(() => {
this.router.navigate(['/login/pw-send']); this.router.navigate(['/login/notice/pw-send']);
this.sharedService.isBtnDisabled = false; this.sharedService.isBtnDisabled = false;
}) })
.catch((error) => { .catch((error) => {
@ -226,7 +226,7 @@ export class LoginService {
const auth = getAuth(); const auth = getAuth();
confirmPasswordReset(auth, oobCode, newPW) confirmPasswordReset(auth, oobCode, newPW)
.then(() => { .then(() => {
this.router.navigate(['/login']); this.router.navigate(['/login/notice/pw-change']);
this.sharedService.isBtnDisabled = false; this.sharedService.isBtnDisabled = false;
}) })
.catch((error) => { .catch((error) => {

2
src/assets/i18n/en.json
View file

@ -90,7 +90,7 @@
}, },
"contactDeleteDialog": { "contactDeleteDialog": {
"deleteContact": "Do you really want to delete the contact?", "deleteContact": "Do you really want to delete the contact?",
"btnCancle": "Cancle", "btnCancel": "Cancel",
"btnDelete": "Delete" "btnDelete": "Delete"
}, },
"summary": { "summary": {