sh-edraft.de/sh_discord_bot
4
1
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

1.0.0 #253

Merged
edraft merged 262 commits from 1.0.0 into master 2023-03-27 09:30:50 +02:00
Conversation 0 Commits 262 Files Changed 419 +85 -45
5 changed files with 85 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit de8262dae1 - Show all commits

4
kdb-bot/src/bot_data/model/user.py
View File

@ -140,7 +140,7 @@ class User(TableABC):
) VALUES (
{self._discord_id},
{self._xp},
'{"NULL" if self._minecraft_id is None else self._minecraft_id}',
'{self._minecraft_id}',
{self._server.id},
'{self._created_at}',
'{self._modified_at}'
@ -154,7 +154,7 @@ class User(TableABC):
f"""
UPDATE `Users`
SET `XP` = {self._xp},
`MinecraftId` = '{"NULL" if self._minecraft_id is None else self._minecraft_id}',
`MinecraftId` = '{self._minecraft_id}',
`LastModifiedAt` = '{self._modified_at}'
WHERE `UserId` = {self._user_id};
"""

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

@ -87,6 +87,7 @@ export class Queries {
name
xp
ontime
minecraftId
level {
id
name

12
kdb-web/src/app/modules/view/server/profile/profile.component.html
View File

@ -41,6 +41,13 @@
</div>
</div>
<div class="content-row">
<div class="content-column">
<div class="content-data-name">{{'view.server.profile.minecraft_id' | translate}}:</div>
<div class="content-data-value">{{user.minecraftId}}</div>
</div>
</div>
<div class="content-row">
<div class="content-column">
<div class="content-data-name">{{'view.server.profile.level' | translate}}:</div>
@ -81,6 +88,11 @@
<div class="content-data-value">{{join.time}} {{'general.hours' | translate}}</div>
</div>
<div class="content-column">
<div class="content-data-name">{{'view.server.profile.joined_voice_channel.channel' | translate}}:</div>
<div class="content-data-value">{{join.channelName}}</div>
</div>
<div class="content-column">
<div class="content-data-name">{{'view.server.profile.joined_voice_channel.joined_at' | translate}}:</div>
<div class="content-data-value">{{join.joinedOn | date:'dd.MM.yyyy HH:mm:ss'}}</div>

111
kdb-web/src/app/services/sidebar/sidebar.service.ts
View File

@ -18,6 +18,15 @@ export class SidebarService {
menuItems$ = new BehaviorSubject<MenuItem[]>(new Array<MenuItem>());
server$ = new BehaviorSubject<Server | null>(null);
dashboard!: MenuItem;
serverDashboard!: MenuItem;
serverProfile!: MenuItem;
serverMembers!: MenuItem;
serverMenu!: MenuItem;
adminConfig!: MenuItem;
adminUsers!: MenuItem;
adminMenu!: MenuItem;
constructor(
private themeService: ThemeService,
private authService: AuthService,
@ -33,10 +42,6 @@ export class SidebarService {
this.setMenu();
});
this.server$.subscribe(_ => {
this.setMenu();
});
this.router.events.subscribe(event => {
if (!(event instanceof NavigationEnd)) {
return;
@ -50,55 +55,75 @@ export class SidebarService {
setServer(server: Server | null) {
if (server?.id != this.server$.value?.id) {
this.server$.next(server);
if (server) {
this.setMenu(true);
} else {
this.setMenu(false);
}
}
}
setMenu() {
this.authService.hasUserPermission(AuthRoles.Admin).then(async hasPermission => {
let menuItems: MenuItem[] = [
{ label: this.isSidebarOpen ? this.translateService.instant("sidebar.dashboard") : "", icon: "pi pi-th-large", routerLink: "dashboard" }
];
async buildMenu(user: UserDTO | null, hasPermission: boolean) {
this.dashboard = { label: this.isSidebarOpen ? this.translateService.instant("sidebar.dashboard") : "", icon: "pi pi-th-large", routerLink: "dashboard" };
this.serverDashboard = {
label: this.isSidebarOpen ? this.translateService.instant("sidebar.server.dashboard") : "",
icon: "pi pi-th-large",
routerLink: `server/${this.server$.value?.id}`
};
this.serverProfile = {
label: this.isSidebarOpen ? this.translateService.instant("sidebar.server.profile") : "",
icon: "pi pi-user",
routerLink: `server/${this.server$.value?.id}/members/${user?.id}`
};
this.serverMembers = {
label: this.isSidebarOpen ? this.translateService.instant("sidebar.server.members") : "",
icon: "pi pi-users",
visible: true,
routerLink: `server/${this.server$.value?.id}/members`
};
this.serverMenu = {
label: this.isSidebarOpen ? this.server$.value?.name : "",
icon: "pi pi-server",
visible: false,
expanded: true,
items: [this.serverDashboard, this.serverProfile, this.serverMembers]
};
this.adminConfig = { label: this.isSidebarOpen ? this.translateService.instant("sidebar.config") : "", icon: "pi pi-cog", routerLink: "/admin/settings" };
this.adminUsers = {
label: this.isSidebarOpen ? this.translateService.instant("sidebar.auth_user_list") : "",
icon: "pi pi-user-edit",
routerLink: "/admin/users"
};
this.adminMenu = {
label: this.isSidebarOpen ? this.translateService.instant("sidebar.administration") : "",
icon: "pi pi-cog",
visible: hasPermission,
expanded: true,
items: [this.adminConfig, this.adminUsers]
};
}
setMenu(build: boolean = false) {
this.authService.hasUserPermission(AuthRoles.Admin).then(async hasPermission => {
let authUser = await this.authService.getLoggedInUser();
let user: UserDTO | null = authUser?.users?.find(u => u.server == this.server$.value?.id) ?? null;
const serverMenu = {
label: this.isSidebarOpen ? this.server$.value?.name : "", icon: "pi pi-server", items: [
{ label: this.isSidebarOpen ? this.translateService.instant("sidebar.server.dashboard") : "", icon: "pi pi-th-large", routerLink: `server/${this.server$.value?.id}` },
{
label: this.isSidebarOpen ? this.translateService.instant("sidebar.server.profile") : "",
icon: "pi pi-user",
routerLink: `server/${this.server$.value?.id}/members/${user?.id}`
}
// { label: this.isSidebarOpen ? this.translateService.instant("sidebar.members") : "", icon: "pi pi-users", routerLink: "server/members" }
]
};
if (build || this.menuItems$.value.length == 0) {
await this.buildMenu(user, hasPermission);
}
if (this.server$.value) {
if (user?.isAdmin) {
serverMenu.items.push(
{
label: this.isSidebarOpen ? this.translateService.instant("sidebar.server.members") : "",
icon: "pi pi-users",
routerLink: `server/${this.server$.value?.id}/members`
}
);
}
menuItems.push(serverMenu);
} else if (menuItems.find(x => x.icon == "pi pi-server")) {
menuItems.splice(menuItems.indexOf(serverMenu), 1);
this.serverMenu.visible = true;
this.serverMembers.visible = !!user?.isAdmin;
} else {
this.serverMenu.visible = false;
}
if (hasPermission) {
menuItems.push(
{
label: this.isSidebarOpen ? this.translateService.instant("sidebar.administration") : "", icon: "pi pi-cog", items: [
{ label: this.isSidebarOpen ? this.translateService.instant("sidebar.config") : "", icon: "pi pi-cog", routerLink: "/admin/settings" },
{ label: this.isSidebarOpen ? this.translateService.instant("sidebar.auth_user_list") : "", icon: "pi pi-user-edit", routerLink: "/admin/users" }
]
}
);
}
let menuItems: MenuItem[] = [
this.dashboard,
this.serverMenu,
this.adminMenu
];
this.menuItems$.next(menuItems);
});
}

2
kdb-web/src/assets/i18n/de.json
View File

@ -167,11 +167,13 @@
"name": "Name",
"xp": "XP",
"ontime": "Ontime",
"minecraft_id": "Minecraft Id",
"level": "Level",
"left_server": "Hat Server verlassen",
"joined_voice_channel": {
"header": "Sprachkanal-beitritte",
"time": "Zeit",
"channel": "Sprachkanal",
"joined_at": "Beigetreten am",
"leaved_at": "Verlassen am"
},