,
@@ -74,7 +72,9 @@ export class LevelsComponent extends ComponentWithTable implements OnInit, OnDes
private sidebar: SidebarService,
private route: ActivatedRoute
) {
- super("level", ["id", "name", "color", "min_xp", "permissions"]);
+ super("level", ["id", "name", "color", "min_xp", "permissions"], (oldElement: Level, newElement: Level) => {
+ return oldElement.name === newElement.name;
+ });
}
public ngOnInit(): void {
@@ -166,15 +166,7 @@ export class LevelsComponent extends ComponentWithTable implements OnInit, OnDes
this.clonedLevels[index] = { ...user };
}
- public onRowEditSave(table: Table, newLevel: Level, index: number): void {
- // const oldUser = this.clonedUsers[index];
- // delete this.clonedUsers[index];
-
- // if (JSON.stringify(oldUser) === JSON.stringify(newUser) && !this.isEditingNew) {
- // console.log(1, oldUser, newUser, JSON.stringify(oldUser) === JSON.stringify(newUser), !this.isEditingNew);
- // return;
- // }
-
+ public override onRowEditSave(newLevel: Level, index: number): void {
if (this.isEditingNew && JSON.stringify(newLevel) === JSON.stringify(this.newLevelTemplate)) {
this.isEditingNew = false;
this.levels.splice(index, 1);
diff --git a/kdb-web/src/app/modules/view/server/levels/levels-routing.module.ts b/web/src/app/modules/view/server/levels/levels-routing.module.ts
similarity index 100%
rename from kdb-web/src/app/modules/view/server/levels/levels-routing.module.ts
rename to web/src/app/modules/view/server/levels/levels-routing.module.ts
diff --git a/kdb-web/src/app/modules/view/server/levels/levels.module.ts b/web/src/app/modules/view/server/levels/levels.module.ts
similarity index 100%
rename from kdb-web/src/app/modules/view/server/levels/levels.module.ts
rename to web/src/app/modules/view/server/levels/levels.module.ts
diff --git a/kdb-web/src/app/modules/view/server/members/members.component.html b/web/src/app/modules/view/server/members/members.component.html
similarity index 97%
rename from kdb-web/src/app/modules/view/server/members/members.component.html
rename to web/src/app/modules/view/server/members/members.component.html
index 1054f688..a5b465b2 100644
--- a/kdb-web/src/app/modules/view/server/members/members.component.html
+++ b/web/src/app/modules/view/server/members/members.component.html
@@ -72,10 +72,10 @@
- |
+ |
|
@@ -204,7 +204,7 @@
{{'common.level' | translate}}:
-
+
{{member.level.name}}
@@ -242,7 +242,7 @@
[routerLink]="member.id">
+ icon="pi pi-check-circle" (click)="onRowEditSave(member, ri)">
diff --git a/kdb-web/src/app/modules/view/server/members/members.component.scss b/web/src/app/modules/view/server/members/members.component.scss
similarity index 100%
rename from kdb-web/src/app/modules/view/server/members/members.component.scss
rename to web/src/app/modules/view/server/members/members.component.scss
diff --git a/kdb-web/src/app/modules/view/server/members/members.component.spec.ts b/web/src/app/modules/view/server/members/members.component.spec.ts
similarity index 100%
rename from kdb-web/src/app/modules/view/server/members/members.component.spec.ts
rename to web/src/app/modules/view/server/members/members.component.spec.ts
diff --git a/kdb-web/src/app/modules/view/server/members/members.component.ts b/web/src/app/modules/view/server/members/members.component.ts
similarity index 94%
rename from kdb-web/src/app/modules/view/server/members/members.component.ts
rename to web/src/app/modules/view/server/members/members.component.ts
index bfb65b75..32855b6e 100644
--- a/kdb-web/src/app/modules/view/server/members/members.component.ts
+++ b/web/src/app/modules/view/server/members/members.component.ts
@@ -34,7 +34,6 @@ export class MembersComponent extends ComponentWithTable implements OnInit, OnDe
loading = true;
clonedUsers: { [s: string]: User; } = {};
- isEditingNew: boolean = false;
newUserTemplate: User = {
discordId: 0,
@@ -213,15 +212,7 @@ export class MembersComponent extends ComponentWithTable implements OnInit, OnDe
this.clonedUsers[index] = { ...user };
}
- onRowEditSave(table: Table, newUser: User, index: number) {
- // const oldUser = this.clonedUsers[index];
- // delete this.clonedUsers[index];
-
- // if (JSON.stringify(oldUser) === JSON.stringify(newUser) && !this.isEditingNew) {
- // console.log(1, oldUser, newUser, JSON.stringify(oldUser) === JSON.stringify(newUser), !this.isEditingNew);
- // return;
- // }
-
+ public override onRowEditSave(newUser: User, index: number) {
if (this.isEditingNew && JSON.stringify(newUser) === JSON.stringify(this.newUserTemplate)) {
this.isEditingNew = false;
this.members.splice(index, 1);
diff --git a/web/src/app/modules/view/server/profile/profile.component.html b/web/src/app/modules/view/server/profile/profile.component.html
new file mode 100644
index 00000000..43cca8b0
--- /dev/null
+++ b/web/src/app/modules/view/server/profile/profile.component.html
@@ -0,0 +1,299 @@
+
+ {{'view.server.profile.header' | translate}}
+
+
+
+
+
+
+
+
{{'common.id' | translate}}:
+
{{user.id}}
+
+
+
{{'common.discord_id' | translate}}:
+
{{user.discordId}}
+
+
+
+
+
+
{{'view.server.profile.name' | translate}}:
+
{{user.name}}
+
+
+
+
+
+
{{'view.server.profile.xp' | translate}}:
+
{{user.xp}}
+
+
+
+
+
+
+
{{'view.server.profile.message_count' | translate}}:
+
{{user.messageCount}}
+
+
+
+
+
+
{{'view.server.profile.reaction_count' | translate}}:
+
{{user.reactionCount}}
+
+
+
+
+
+
{{'view.server.profile.birthday' | translate}}:
+
{{user.birthday}}
+
+
+
+
+
+
+
{{'view.server.profile.ontime' | translate}}:
+
{{user.ontime}}
+
+
+
+
+
+
{{'view.server.profile.level' | translate}}:
+
{{user.level?.name}}
+
+
+
+
+
+
+
{{'view.server.profile.left_server' | translate}}:
+
{{user.leftServer | bool}}
+
+
+
+
+
+
{{'common.created_at' | translate}}:
+
{{user.createdAt | date:'dd.MM.yyyy HH:mm:ss'}}
+
+
+
+
+
+
{{'common.modified_at' | translate}}:
+
{{user.modifiedAt | date:'dd.MM.yyyy HH:mm:ss'}}
+
+
+
+
+
+
+
+
+
+
+
{{'common.user_warnings' | translate}}
+
+
+
+
+
+
+ |
+
+ |
+
+
+
+ |
+
+
+
+ |
+
+
+
+
+
+
+ |
+
+
+
+
+
+ {{value.description}}
+
+
+ |
+
+
+
+ {{value.author?.name}}
+
+
+ {{value.author?.name}}
+
+
+ |
+
+
+ {{'common.created_at' | translate}}:
+
+
+ {{value.createdAt | date:'dd.MM.yy HH:mm'}}
+
+
+ {{value.createdAt | date:'dd.MM.yy HH:mm'}}
+
+
+ |
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
{{'common.name' | translate}}:
+
{{achievement.name}}
+
+
+
+
{{'common.description' | translate}}:
+
{{achievement.description}}
+
+
+
+
{{'view.server.profile.achievements.time' | translate}}:
+
{{achievement.createdAt | date:'dd.MM.yyyy HH:mm:ss'}}
+
+
+
+
+
+
+
+
+
{{'view.server.profile.joined_voice_channel.time' | translate}}:
+
{{join.time}} {{'general.hours' | translate}}
+
+
+
+
{{'view.server.profile.joined_voice_channel.channel' | translate}}:
+
{{join.channelName}}
+
+
+
+
{{'common.joined_at' | translate}}:
+
{{join.joinedOn | date:'dd.MM.yyyy HH:mm:ss'}}
+
+
+
+
{{'common.leaved_at' | translate}}:
+
{{join.leavedOn | date:'dd.MM.yyyy HH:mm:ss'}}
+
+
+
+
+
+
+
+
+
{{'view.server.profile.joined_game_server.time' | translate}}:
+
{{join.time}} {{'general.hours' | translate}}
+
+
+
+
{{'view.server.profile.joined_game_server.name' | translate}}:
+
{{join.gameServer}}
+
+
+
+
{{'common.joined_at' | translate}}:
+
{{join.joinedOn | date:'dd.MM.yyyy HH:mm:ss'}}
+
+
+
+
{{'common.leaved_at' | translate}}:
+
{{join.leavedOn | date:'dd.MM.yyyy HH:mm:ss'}}
+
+
+
+
+
+
+
+
+
{{'common.joined_at' | translate}}:
+
{{join.joinedOn | date:'dd.MM.yyyy HH:mm:ss'}}
+
+
+
+
{{'common.leaved_at' | translate}}:
+
{{join.leavedOn | date:'dd.MM.yyyy HH:mm:ss'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- {{server ? server.userCount : ''}}
+ {{server ? server.userCount : ''}}
{{'view.dashboard.server.member_count' | translate}}
+ {{'view.dashboard.server.active_members' | translate}} {{server ? server.activeUserCount : ''}}
+
+
+
+
+
diff --git a/kdb-web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.scss b/web/src/app/modules/view/server/server-dashboard/server-dashboard.component.scss
similarity index 100%
rename from kdb-web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.scss
rename to web/src/app/modules/view/server/server-dashboard/server-dashboard.component.scss
diff --git a/kdb-web/src/app/modules/view/server/server-dashboard/server-dashboard.component.spec.ts b/web/src/app/modules/view/server/server-dashboard/server-dashboard.component.spec.ts
similarity index 100%
rename from kdb-web/src/app/modules/view/server/server-dashboard/server-dashboard.component.spec.ts
rename to web/src/app/modules/view/server/server-dashboard/server-dashboard.component.spec.ts
diff --git a/kdb-web/src/app/modules/view/server/server-dashboard/server-dashboard.component.ts b/web/src/app/modules/view/server/server-dashboard/server-dashboard.component.ts
similarity index 100%
rename from kdb-web/src/app/modules/view/server/server-dashboard/server-dashboard.component.ts
rename to web/src/app/modules/view/server/server-dashboard/server-dashboard.component.ts
diff --git a/kdb-web/src/app/modules/view/server/server-routing.module.ts b/web/src/app/modules/view/server/server-routing.module.ts
similarity index 100%
rename from kdb-web/src/app/modules/view/server/server-routing.module.ts
rename to web/src/app/modules/view/server/server-routing.module.ts
diff --git a/web/src/app/modules/view/server/server.module.ts b/web/src/app/modules/view/server/server.module.ts
new file mode 100644
index 00000000..d1810268
--- /dev/null
+++ b/web/src/app/modules/view/server/server.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+import { ServerDashboardComponent } from "./server-dashboard/server-dashboard.component";
+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";
+import { ServerStatisticComponent } from './server-dashboard/components/server-statistic/server-statistic.component';
+
+
+@NgModule({
+ declarations: [
+ ServerDashboardComponent,
+ ProfileComponent,
+ MembersComponent,
+ ClientComponent,
+ ServerStatisticComponent,
+ ],
+ imports: [
+ CommonModule,
+ ServerRoutingModule,
+ SharedModule
+ ]
+})
+export class ServerModule { }
diff --git a/kdb-web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.html b/web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.html
similarity index 90%
rename from kdb-web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.html
rename to web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.html
index 0cbc7ead..bfceb38e 100644
--- a/kdb-web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.html
+++ b/web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.html
@@ -3,7 +3,8 @@
-
@@ -17,16 +18,20 @@
{{'view.server.short_role_names.short_role_names' | translate}}
-
+
+
@@ -100,7 +105,8 @@
|
@@ -156,7 +162,7 @@
placeholder="{{'common.position' | translate}}">
- {{shortRoleName.position}}
+ {{ 'common.positions.' + shortRoleName.position | translate }}
@@ -185,14 +191,15 @@
-
+
+ icon="pi pi-check-circle" (click)="onRowEditSave(shortRoleName, ri)">
|