kdb-web/src/app/models/data/client.model.ts

@@ -1,16 +0,0 @@
-import {Server} from "./server.model";
-import {Data} from "./data.model";
-
-export interface Client extends Data {
-
-  id?: number;
-  discordId?: string;
-  name?: string;
-  sentMessageCount?: number;
-  receivedMessageCount?: number;
-  deletedMessageCount?: number;
-  receivedCommandCount?: number;
-  movedUsersCount?: number;
-  server?: Server;
-
-}

kdb-web/src/app/models/data/server.model.ts

@@ -1,7 +1,6 @@
 import { Data } from "./data.model";
 import { User } from "./user.model";
 import { Level } from "./level.model";
-import {Client} from "./client.model";
 
 export interface Server extends Data {
   id?: number;
@@ -11,7 +10,7 @@ export interface Server extends Data {
   autoRoleCount?: number;
   autoRoles?: [];
   clientCount?: number;
-  clients?: Client[];
+  clients?: [];
   levelCount?: number;
   levels?: Level[];
   userCount?: number;

kdb-web/src/app/models/graphql/queries.model.ts

@@ -1,4 +1,15 @@
 export class Queries {
+  static serversListQuery = `
+    query ServerInfo($filter: ServerFilter, $page: Page, $sort: Sort) {
+      serverCount
+      servers(filter: $filter, page: $page, sort: $sort) {
+        id
+        name
+        iconURL
+        userCount
+      }
+    }
+  `;
 
   static serversQuery = `
     query ServerInfo($filter: ServerFilter, $page: Page, $sort: Sort) {
@@ -7,16 +18,6 @@ export class Queries {
         name
         iconURL
         userCount
-        clients{
-          id
-          discordId
-          name
-          sentMessageCount
-          receivedMessageCount
-          deletedMessageCount
-          receivedCommandCount
-          movedUsersCount
-        }
       }
     }
   `;

kdb-web/src/app/modules/view/dashboard/components/dashboard/dashboard.component.ts

@@ -84,7 +84,7 @@ export class DashboardComponent implements OnInit {
 
   loadNextPage() {
     this.spinnerService.showSpinner();
-    this.data.query<Query>(Queries.serversQuery, {
+    this.data.query<Query>(Queries.serversListQuery, {
       filter: this.filter,
       page: this.page,
       sort: this.sort

kdb-web/src/app/modules/view/server/server-dashboard/components/client/client.component.html

@@ -1,34 +0,0 @@
-<div class="client">
-  <div class="client-info">
-    <label class="client-info-header">{{'view.server.dashboard.id' | translate}}</label>
-    <label class="client-info-value">{{client.id}}</label>
-  </div>
-  <div class="client-info">
-    <label class="client-info-header">{{'view.server.dashboard.discord_id' | translate}}</label>
-    <label class="client-info-value">{{client.discordId}}</label>
-  </div>
-  <div class="client-info">
-    <label class="client-info-header">{{'view.server.dashboard.name' | translate}}</label>
-    <label class="client-info-value">{{client.name}}</label>
-  </div>
-  <div class="client-info">
-    <label class="client-info-header">{{'view.server.dashboard.sent_message_count' | translate}}</label>
-    <label class="client-info-value">{{client.sentMessageCount}}</label>
-  </div>
-  <div class="client-info">
-    <label class="client-info-header">{{'view.server.dashboard.received_message_count' | translate}}</label>
-    <label class="client-info-value">{{client.receivedMessageCount}}</label>
-  </div>
-  <div class="client-info">
-    <label class="client-info-header">{{'view.server.dashboard.deleted_message_count' | translate}}</label>
-    <label class="client-info-value">{{client.deletedMessageCount}}</label>
-  </div>
-  <div class="client-info">
-    <label class="client-info-header">{{'view.server.dashboard.received_command_count' | translate}}</label>
-    <label class="client-info-value">{{client.receivedCommandCount}}</label>
-  </div>
-  <div class="client-info">
-    <label class="client-info-header">{{'view.server.dashboard.moved_users_count' | translate}}</label>
-    <label class="client-info-value">{{client.movedUsersCount}}</label>
-  </div>
-</div>

kdb-web/src/app/modules/view/server/server-dashboard/components/client/client.component.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ClientComponent } from './client.component';
-
-describe('ClientComponent', () => {
-  let component: ClientComponent;
-  let fixture: ComponentFixture<ClientComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ ClientComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(ClientComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

kdb-web/src/app/modules/view/server/server-dashboard/components/client/client.component.ts

@@ -1,25 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {Client} from "../../../../../../models/data/client.model";
-
-@Component({
-  selector: 'app-client',
-  templateUrl: './client.component.html',
-  styleUrls: ['./client.component.scss']
-})
-export class ClientComponent {
-
-  @Input() client: Client = {
-    createdAt: "", modifiedAt: "",
-    deletedMessageCount: 0,
-    discordId: "",
-    id: 0,
-    movedUsersCount: 0,
-    name: "",
-    receivedCommandCount: 0,
-    receivedMessageCount: 0,
-    sentMessageCount: 0,
-    server: undefined
-  };
-
-
-}

kdb-web/src/app/modules/view/server/server-dashboard/server-dashboard.component.html

@@ -27,12 +27,6 @@
                             {{server.userCount}}
                             {{'view.dashboard.server.member_count' | translate}}
                         </div>
-
-            <div class="client-data"
-                 *ngFor="let client of server.clients">
-              <i class="pi pi-discord"></i>
-              <app-client class="client-component" [client]="client"></app-client>
-            </div>
                     </div>
 
                 </div>

kdb-web/src/app/modules/view/server/server.module.ts

@@ -5,7 +5,6 @@ import { ServerRoutingModule } from './server-routing.module';
 import { SharedModule } from '../../shared/shared.module';
 import { ProfileComponent } from './profile/profile.component';
 import { MembersComponent } from './members/members.component';
-import { ClientComponent } from './server-dashboard/components/client/client.component';
 
 
 
@@ -13,8 +12,7 @@ import { ClientComponent } from './server-dashboard/components/client/client.com
   declarations: [
     ServerDashboardComponent,
     ProfileComponent,
-    MembersComponent,
+    MembersComponent
-    ClientComponent
   ],
   imports: [
     CommonModule,

kdb-web/src/assets/i18n/de.json

@@ -158,15 +158,7 @@
     "server": {
       "header": "Server",
       "dashboard": {
-        "header": "Server dashboard",
+        "header": "Server dashboard"
-        "id": "Id",
-        "discord_id": "Discord Id",
-        "name": "Name",
-        "sent_message_count": "Gesendete Nachrichten",
-        "received_message_count": "Empfangene Nachrichten",
-        "deleted_message_count": "Gelöschte Nachrichten",
-        "received_command_count": "Empfangene Befehle",
-        "moved_users_count": "Verschobene Benutzer"
       },
       "profile": {
         "header": "Dein Profil",

kdb-web/src/styles.scss

@@ -258,6 +258,7 @@ header {
                 padding: 20px;
 
                 .logo {
+                  overflow: hidden;
 
                   img {
                     width: 4rem;
@@ -269,7 +270,7 @@ header {
                 .info {
                   display: flex;
                   flex-direction: column;
-                  width: 100%;
+
                   gap: 10px;
 
                   .name {
@@ -281,41 +282,6 @@ header {
 
                   .data {
                   }
-
-                  .client-data {
-                    display: flex;
-                    flex-direction: row;
-                    width: 100%;
-
-                    .client-component {
-
-                      width: 100%;
-
-                      .client {
-                        display: flex;
-                        flex-direction: row;
-                        align-content: stretch !important;
-                        flex-wrap: wrap;
-                        gap: 10px;
-
-                        .client-info {
-                          display: flex;
-                          flex-direction: column;
-                          margin-left: 2%;
-
-                          .client-info-header {
-                            margin-bottom: 5px;
-                            white-space: nowrap;
-                            font-weight: bold
-                          }
-
-                          .client-info-value {
-                            white-space: nowrap;
-                          }
-                        }
-                      }
-                    }
-                  }
                 }
               }
             }

package-lock.json

@@ -1,6 +0,0 @@
-{
-  "name": "kd_discord_bot",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}