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

#133 #224

Merged
Jonas merged 7 commits from #133 into 1.0.0 2023-02-22 19:29:16 +01:00
Conversation 0 Commits 7 Files Changed 28 +18 -23
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 23ee963d65 - Show all commits

21
kdb-web/src/app/modules/view/server/members/members.component.html
View File

@ -97,34 +97,29 @@
<tr>
<th class="table-header-small">
<form [formGroup]="filterForm">
<input type="text" pInputText formControlName="id"
placeholder="{{'view.server.members.headers.id' | translate}}">
<input type="text" pInputText formControlName="id" placeholder="{{'view.server.members.headers.id' | translate}}">
</form>
</th>
<th class="table-header-medium">
<form [formGroup]="filterForm">
<input type="text" pInputText formControlName="discordId"
placeholder="{{'view.server.members.headers.discord_id' | translate}}">
<input type="text" pInputText formControlName="discordId" placeholder="{{'view.server.members.headers.discord_id' | translate}}">
</form>
</th>
<th>
<form [formGroup]="filterForm">
<input type="text" pInputText formControlName="name"
placeholder="{{'view.server.members.headers.name' | translate}}">
<input type="text" pInputText formControlName="name" placeholder="{{'view.server.members.headers.name' | translate}}">
</form>
</th>
<th></th>
<th></th>
<th class="table-header-small-dropdown">
<form [formGroup]="filterForm">
<p-dropdown formControlName="leftServer" [options]="leftServerOptions"
placeholder="{{'view.server.members.headers.left_server' | translate}}"></p-dropdown>
<p-dropdown formControlName="leftServer" [options]="leftServerOptions" placeholder="{{'view.server.members.headers.left_server' | translate}}"></p-dropdown>
</form>
</th>
<th class="table-header-small-dropdown">
<form [formGroup]="filterForm">
<p-dropdown formControlName="level" [options]="levels"
placeholder="{{'view.server.members.headers.level' | translate}}"></p-dropdown>
<p-dropdown formControlName="level" [options]="levels" placeholder="{{'view.server.members.headers.level' | translate}}"></p-dropdown>
</form>
</th>
<th></th>
@ -169,7 +164,8 @@
<p-cellEditor>
<ng-template pTemplate="input">
<p-inputNumber class="table-edit-input" styleClass="input-number" [(ngModel)]="member.xp" mode="decimal" [min]="0" [useGrouping]="false" [showButtons]="true"
inputId="minmax-buttons"></p-inputNumber>
inputId="minmax-buttons">
</p-inputNumber>
</ng-template>
<ng-template pTemplate="output">
{{member.xp}}
@ -199,8 +195,7 @@
<td>
<p-cellEditor>
<ng-template pTemplate="input">
<p-dropdown [options]="levels" [(ngModel)]="member.level"
placeholder="{{'view.server.members.headers.level' | translate}}"></p-dropdown>
<p-dropdown [options]="levels" [(ngModel)]="member.level" placeholder="{{'view.server.members.headers.level' | translate}}"></p-dropdown>
</ng-template>
<ng-template pTemplate="output">
{{member.level.name}}

20
kdb-web/src/app/modules/view/server/server-routing.module.ts
View File

@ -1,15 +1,15 @@
import {NgModule} from "@angular/core";
import {RouterModule, Routes} from "@angular/router";
import {ServerDashboardComponent} from "./server-dashboard/server-dashboard.component";
import {ProfileComponent} from "./profile/profile.component";
import {MembersComponent} from "./members/members.component";
import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router";
import { ServerDashboardComponent } from "./server-dashboard/server-dashboard.component";
import { ProfileComponent } from "./profile/profile.component";
import { MembersComponent } from "./members/members.component";
const routes: Routes = [
{path: '', component: ServerDashboardComponent},
{path: 'members', component: MembersComponent},
{path: 'members/:memberId', component: ProfileComponent},
{path: 'auto-roles', loadChildren: () => import('./auto-role/auto-role.module').then(m => m.AutoRoleModule)},
{path: 'levels', loadChildren: () => import('./levels/levels.module').then(m => m.LevelsModule)},
{ path: "", component: ServerDashboardComponent },
{ path: "members", component: MembersComponent },
{ path: "members/:memberId", component: ProfileComponent },
{ path: "auto-roles", loadChildren: () => import("./auto-role/auto-role.module").then(m => m.AutoRoleModule) },
{ path: "levels", loadChildren: () => import("./levels/levels.module").then(m => m.LevelsModule) }
];
@NgModule({