bugfixes
This commit is contained in:
parent
a5c4a9e75f
commit
3c146d7fa0
6 changed files with 9 additions and 9 deletions
|
|
@ -16,7 +16,7 @@ import { PwResetComponent } from './components/login/forgot-pw/pw-reset/pw-reset
|
|||
export const routes: Routes = [
|
||||
{ path: '', component: SummaryComponent },
|
||||
{ path: 'login', component: LoginComponent },
|
||||
{ path: 'login/:id', component: LoginComponent },
|
||||
{ path: 'login/notice/:id', component: LoginComponent },
|
||||
{ path: 'login/imprint', component: ImprintComponent },
|
||||
{ path: 'login/privacy-policy', component: PrivacyPolicyComponent },
|
||||
{ path: 'register', component: RegisterComponent },
|
||||
|
|
|
|||
|
|
@ -331,7 +331,7 @@
|
|||
[img]="'check'"
|
||||
[imgFilter]="'none'"
|
||||
[value]="
|
||||
['none', 'todo', 'inprogress', 'awaitfeedback', 'done'].includes(
|
||||
['', 'none', 'todo', 'inprogress', 'awaitfeedback', 'done'].includes(
|
||||
overlayData.toString()
|
||||
)
|
||||
? ('addTask.create' | translate)
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
</p>
|
||||
<div class="btns">
|
||||
<div class="btn">
|
||||
<div class="btn-cancle" (click)="cancelDeleteContact()">
|
||||
{{ "contactDeleteDialog.btnCancle" | translate }}
|
||||
<div class="btn-cancel" (click)="cancelDeleteContact()">
|
||||
{{ "contactDeleteDialog.btnCancel" | translate }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="btn">
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ section {
|
|||
margin: 0 24px;
|
||||
}
|
||||
|
||||
.btn-cancle {
|
||||
.btn-cancel {
|
||||
padding: 12px;
|
||||
margin: 12px 12px;
|
||||
border-radius: 10px;
|
||||
|
|
@ -103,7 +103,7 @@ section {
|
|||
}
|
||||
|
||||
.btn-delete-contact,
|
||||
.btn-cancle {
|
||||
.btn-cancel {
|
||||
font-size: 18px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ export class LoginService {
|
|||
const auth = getAuth();
|
||||
sendPasswordResetEmail(auth, email)
|
||||
.then(() => {
|
||||
this.router.navigate(['/login/pw-send']);
|
||||
this.router.navigate(['/login/notice/pw-send']);
|
||||
this.sharedService.isBtnDisabled = false;
|
||||
})
|
||||
.catch((error) => {
|
||||
|
|
@ -226,7 +226,7 @@ export class LoginService {
|
|||
const auth = getAuth();
|
||||
confirmPasswordReset(auth, oobCode, newPW)
|
||||
.then(() => {
|
||||
this.router.navigate(['/login']);
|
||||
this.router.navigate(['/login/notice/pw-change']);
|
||||
this.sharedService.isBtnDisabled = false;
|
||||
})
|
||||
.catch((error) => {
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@
|
|||
},
|
||||
"contactDeleteDialog": {
|
||||
"deleteContact": "Do you really want to delete the contact?",
|
||||
"btnCancle": "Cancle",
|
||||
"btnCancel": "Cancel",
|
||||
"btnDelete": "Delete"
|
||||
},
|
||||
"summary": {
|
||||
|
|
|
|||
Loading…
Reference in a new issue