diff --git a/kdb-web/src/app/app.component.html b/kdb-web/src/app/app.component.html index a2dc5b50..8c0cfa4f 100644 --- a/kdb-web/src/app/app.component.html +++ b/kdb-web/src/app/app.component.html @@ -1,4 +1,5 @@
+ @@ -33,4 +34,4 @@ -
\ No newline at end of file + diff --git a/kdb-web/src/app/components/spinner/spinner.component.html b/kdb-web/src/app/components/spinner/spinner.component.html index b4f52b87..658b9ba2 100644 --- a/kdb-web/src/app/components/spinner/spinner.component.html +++ b/kdb-web/src/app/components/spinner/spinner.component.html @@ -1,7 +1,7 @@ - +
-
\ No newline at end of file +
diff --git a/kdb-web/src/app/components/spinner/spinner.component.ts b/kdb-web/src/app/components/spinner/spinner.component.ts index 4753534c..4bae2cd0 100644 --- a/kdb-web/src/app/components/spinner/spinner.component.ts +++ b/kdb-web/src/app/components/spinner/spinner.component.ts @@ -8,9 +8,15 @@ import { SpinnerService } from 'src/app/services/spinner/spinner.service'; }) export class SpinnerComponent implements OnInit { + showSpinnerState: boolean = false; + constructor( public spinnerService: SpinnerService - ) { } + ) { + this.spinnerService.showSpinnerState$.subscribe(value => { + this.showSpinnerState = value; + }); + } ngOnInit(): void { } diff --git a/kdb-web/src/app/models/graphql/queries.model.ts b/kdb-web/src/app/models/graphql/queries.model.ts index e0a28f29..436e97a0 100644 --- a/kdb-web/src/app/models/graphql/queries.model.ts +++ b/kdb-web/src/app/models/graphql/queries.model.ts @@ -22,7 +22,7 @@ export class Queries { } `; - static levelQuery= ` + static levelQuery = ` query LevelsList($filter: LevelFilter, $page: Page, $sort: Sort) { levelCount levels(filter: $filter, page: $page, sort: $sort) { @@ -39,7 +39,7 @@ export class Queries { } `; - static usersQuery= ` + static usersQuery = ` query UsersList($filter: UserFilter, $page: Page, $sort: Sort) { userCount users(filter: $filter, page: $page, sort: $sort) { @@ -75,6 +75,9 @@ export class Queries { id gameServer } + + createdAt + modifiedAt } } `; diff --git a/kdb-web/src/app/modules/view/server/members/members.component.html b/kdb-web/src/app/modules/view/server/members/members.component.html index 1b31fc01..a512a85d 100644 --- a/kdb-web/src/app/modules/view/server/members/members.component.html +++ b/kdb-web/src/app/modules/view/server/members/members.component.html @@ -26,7 +26,7 @@ - +
{{'view.server.members.headers.id' | translate}}
@@ -61,33 +61,46 @@
- +
{{'view.server.members.headers.left_server' | translate}}
- +
{{'view.server.members.headers.level' | translate}}
- + +
+
{{'common.created_at' | translate}}
+
+ + + +
+
{{'common.modified_at' | translate}}
+
+ + +
{{'view.server.members.headers.actions' | translate}}
+ - +
- +
@@ -99,17 +112,19 @@ - +
- +
+ +
@@ -185,6 +200,26 @@ + + + + {{member.createdAt | date:'dd.MM.yy HH:mm'}} + + + {{member.createdAt | date:'dd.MM.yy HH:mm'}} + + + + + + + {{member.modifiedAt | date:'dd.MM.yy HH:mm'}} + + + {{member.modifiedAt | date:'dd.MM.yy HH:mm'}} + + +