From c911d355e76d399bd6dfded5fe63bc63f421236f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de> Date: Thu, 22 Aug 2019 17:06:37 +0200 Subject: [PATCH] Add associated rooms of user to confirm dialog --- .../delete-account.component.html | 3 +++ .../delete-account.component.scss | 26 +++++++++++++++++++ .../delete-account.component.ts | 10 ++++++- src/assets/i18n/home/de.json | 2 +- src/assets/i18n/home/en.json | 2 +- 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/src/app/components/shared/_dialogs/delete-account/delete-account.component.html b/src/app/components/shared/_dialogs/delete-account/delete-account.component.html index 08d64539e..21d030478 100644 --- a/src/app/components/shared/_dialogs/delete-account/delete-account.component.html +++ b/src/app/components/shared/_dialogs/delete-account/delete-account.component.html @@ -1,6 +1,9 @@ <h3>{{ 'header.sure' | translate }}</h3> <mat-divider></mat-divider> <p>{{ 'header.really-delete-account' | translate }}</p> +<mat-list *ngFor="let room of rooms; let i = index"> + <mat-list-item><strong>{{ i+1 }}: {{ room.name }}</strong></mat-list-item> +</mat-list> <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px"> <button mat-raised-button class="abort" (click)="close('abort')"> {{ 'header.abort' | translate }} diff --git a/src/app/components/shared/_dialogs/delete-account/delete-account.component.scss b/src/app/components/shared/_dialogs/delete-account/delete-account.component.scss index e69de29bb..dcc4bad13 100644 --- a/src/app/components/shared/_dialogs/delete-account/delete-account.component.scss +++ b/src/app/components/shared/_dialogs/delete-account/delete-account.component.scss @@ -0,0 +1,26 @@ +h3 { + color: var(--on-surface); +} + +p { + color: var(--on-surface); + margin-bottom: 0; +} + +button { + margin-top: 10px; +} + +.delete { + background-color: var(--red); + color: var(--on-secondary); +} + +.abort { + background-color: var(--secondary); + color: var(--on-secondary); +} + +.mat-list-item { + color: var(--on-surface); +} diff --git a/src/app/components/shared/_dialogs/delete-account/delete-account.component.ts b/src/app/components/shared/_dialogs/delete-account/delete-account.component.ts index ff6d4af4e..7f88f7f34 100644 --- a/src/app/components/shared/_dialogs/delete-account/delete-account.component.ts +++ b/src/app/components/shared/_dialogs/delete-account/delete-account.component.ts @@ -1,6 +1,8 @@ import { Component, Inject, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; import { RoomEditComponent } from '../../../creator/_dialogs/room-edit/room-edit.component'; +import { RoomService } from '../../../../services/http/room.service'; +import { Room } from '../../../../models/room'; @Component({ selector: 'app-delete-account', @@ -9,10 +11,16 @@ import { RoomEditComponent } from '../../../creator/_dialogs/room-edit/room-edit }) export class DeleteAccountComponent implements OnInit { + rooms: Room[]; + constructor(public dialogRef: MatDialogRef<RoomEditComponent>, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any, + private roomService: RoomService) { } ngOnInit() { + this.roomService.getCreatorRooms().subscribe(rooms => { + this.rooms = rooms; + }); } close(type: string): void { diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json index cc91281ea..be716918c 100644 --- a/src/assets/i18n/home/de.json +++ b/src/assets/i18n/home/de.json @@ -11,7 +11,7 @@ "moderation-enabled": "Moderiert", "delete-account": "Account löschen", "sure": "Sind Sie sicher?", - "really-delete-account": "Wollen Sie ihr Konto wirklich löschen?", + "really-delete-account": "Wollen sie ihr Konto mit den zugehörigen Sessions wirklich unwiderruflich löschen?", "account-deleted": "Ihr Konto wurde erfolgreich gelöscht.", "abort": "Abbrechen", "delete": "Löschen" diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json index 382fa00a7..91a22cf73 100644 --- a/src/assets/i18n/home/en.json +++ b/src/assets/i18n/home/en.json @@ -11,7 +11,7 @@ "moderation-enabled": "Moderated", "delete-account": "Delete account", "sure": "Are you sure?", - "really-delete-account": "Do you really want to delete your account?", + "really-delete-account": "Do you really want to irrevocably delete your account with the associated sessions?", "account-deleted": "Your account has been deleted successfully.", "abort": "Cancel", "delete": "Delete" -- GitLab