feat(admin): achievements list

esoadamo · esoadamo · commit ac7cccd1e89a · 2024-07-06T22:38:46.000+02:00
diff --git a/src/api/backend/model/achievement.ts b/src/api/backend/model/achievement.ts
@@ -14,6 +14,7 @@ export interface Achievement {
     title: string;
     picture: string;
     description: string;
+    persistent: boolean;
     id: number;
     year: number;
 }
diff --git a/src/api/backend/model/achievementBase.ts b/src/api/backend/model/achievementBase.ts
@@ -0,0 +1,18 @@
+/**
+ * web-backend-swagger
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+export interface AchievementBase { 
+    title: string;
+    picture: string;
+    description: string;
+    persistent: boolean;
+}
diff --git a/src/api/backend/model/achievementCreation.ts b/src/api/backend/model/achievementCreation.ts
@@ -11,8 +11,4 @@
  */
 
 export interface AchievementCreation { 
-    title: string;
-    picture: string;
-    description: string;
-    persistent: boolean;
 }
diff --git a/src/api/backend/model/models.ts b/src/api/backend/model/models.ts
@@ -1,4 +1,5 @@
 export * from './achievement';
+export * from './achievementBase';
 export * from './achievementCreation';
 export * from './achievementCreationRequest';
 export * from './achievementGrantRequest';
diff --git a/src/app/components/admin/admin-routing.module.ts b/src/app/components/admin/admin-routing.module.ts
@@ -6,13 +6,15 @@ import { PageAdminTasksComponent } from './page-admin-tasks/page-admin-tasks.com
 import { PageAdminMonitorComponent } from './page-admin-monitor/page-admin-monitor.component';
 import { PageAdminEmailComponent } from './page-admin-email/page-admin-email.component';
 import {PageAdminDiscussionComponent} from './page-admin-discussion/page-admin-discussion.component';
+import {PageAdminAchievementsComponent} from './page-admin-achievements/page-admin-achievements.component';
 
 const routes: Routes = [
   {path: '', component: PageAdminRootComponent},
   {path: ROUTES.admin.tasks, component: PageAdminTasksComponent},
   {path: ROUTES.admin.monitor, component: PageAdminMonitorComponent},
   {path: ROUTES.admin.email, component: PageAdminEmailComponent},
   {path: ROUTES.admin.discussion, component: PageAdminDiscussionComponent},
+  {path: ROUTES.admin.achievements, component: PageAdminAchievementsComponent},
 ];
 
 @NgModule({
diff --git a/src/app/components/admin/admin-sidebar/admin-sidebar.component.html b/src/app/components/admin/admin-sidebar/admin-sidebar.component.html
@@ -15,6 +15,9 @@
       <a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.discussion]" routerLinkActive="active" (click)="hideFullMenu($event)">
         {{'admin.navbar.discussion' | translate}}
       </a>
+      <a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.achievements]" routerLinkActive="active" (click)="hideFullMenu($event)">
+        {{'admin.navbar.achievement' | translate}}
+      </a>
       <ng-container *ngIf="oldFrontendUrl">
         <a *ngFor="let oldLink of oldFrontendButtons"
            class="nav-btn"
diff --git a/src/app/components/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/components/admin/admin-sidebar/admin-sidebar.component.ts
@@ -21,7 +21,6 @@ export class AdminSidebarComponent implements OnInit, OnDestroy {
   oldFrontendUrl = environment.oldFrontendUrl;
 
   oldFrontendButtons = [
-    ['achievements/', 'Trofeje'],
     ['users/', 'Uživatelé'],
     ['years/', 'Ročníky'],
     ['waves/', 'Vlny'],
diff --git a/src/app/components/admin/admin.module.ts b/src/app/components/admin/admin.module.ts
@@ -16,6 +16,7 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { AccordionModule } from 'ngx-bootstrap/accordion';
 import { PageAdminDiscussionComponent } from './page-admin-discussion/page-admin-discussion.component';
 import { AdminWaveSelectorComponent } from './shared/admin-wave-selector/admin-wave-selector.component';
+import { PageAdminAchievementsComponent } from './page-admin-achievements/page-admin-achievements.component';
 
 
 @NgModule({
@@ -27,7 +28,8 @@ import { AdminWaveSelectorComponent } from './shared/admin-wave-selector/admin-w
     PageAdminMonitorComponent,
     PageAdminEmailComponent,
     PageAdminDiscussionComponent,
-    AdminWaveSelectorComponent
+    AdminWaveSelectorComponent,
+    PageAdminAchievementsComponent
   ],
   imports: [
     CommonModule,
diff --git a/src/app/components/admin/page-admin-achievements/page-admin-achievements.component.html b/src/app/components/admin/page-admin-achievements/page-admin-achievements.component.html
@@ -0,0 +1,32 @@
+<ksi-admin-sidebar></ksi-admin-sidebar>
+<div class="content-container">
+  <div class="content">
+    <h2 class="title">{{'admin.achievements.title'|translate}}</h2>
+
+    <button class="btn btn-outline-primary">{{'admin.achievements.new'|translate}}</button>
+
+    <ng-container *ngFor="let x of [{n: 'yearly', x: achievementsYearly$}, {n: 'persistent', x: achievementsPersistent$}]">
+      <h3>{{('admin.achievements.' + x.n) | translate}}</h3>
+      <table class="table table-striped table-hover table-responsive-md" ksiTheme>
+        <thead>
+        <tr>
+          <th scope="col">{{'admin.achievements.picture' | translate}}</th>
+          <th scope="col">{{'admin.achievements.name' | translate}}</th>
+          <th scope="col">{{'admin.achievements.actions' | translate}}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let achievement of (x.x | async)">
+          <td><img [src]="achievement.picture" alt=""></td>
+          <td>{{achievement.title}}</td>
+          <td>
+            <button class="btn btn-outline-primary" (click)="give(achievement)">{{'admin.achievements.give.btn' | translate}}</button>
+            <button class="btn btn-outline-secondary" (click)="editAchievement(achievement)">{{'admin.achievements.edit.btn' | translate}}</button>
+            <button class="btn btn-outline-danger" (click)="deleteAchievement(achievement)">{{'admin.achievements.delete.btn' | translate}}</button>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </ng-container>
+  </div>
+</div>
diff --git a/src/app/components/admin/page-admin-achievements/page-admin-achievements.component.scss b/src/app/components/admin/page-admin-achievements/page-admin-achievements.component.scss
@@ -0,0 +1,22 @@
+@import "src/app/styles/vars";
+@import "src/app/styles/mixins";
+
+@include page-admin;
+
+:host {
+  .content {
+    justify-self: center;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    > * {
+      margin-bottom: $ksi-margin;
+    }
+
+    > .title {
+      margin: $ksi-margin;
+      text-align: center;
+    }
+  }
+}
diff --git a/src/app/components/admin/page-admin-achievements/page-admin-achievements.component.spec.ts b/src/app/components/admin/page-admin-achievements/page-admin-achievements.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PageAdminAchievementsComponent } from './page-admin-achievements.component';
+
+describe('PageAdminAchievementsComponent', () => {
+  let component: PageAdminAchievementsComponent;
+  let fixture: ComponentFixture<PageAdminAchievementsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ PageAdminAchievementsComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PageAdminAchievementsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/admin/page-admin-achievements/page-admin-achievements.component.ts b/src/app/components/admin/page-admin-achievements/page-admin-achievements.component.ts
@@ -0,0 +1,41 @@
+import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
+import {BackendService, ModalService, YearsService} from '../../../services';
+import {map} from 'rxjs/operators';
+import {Achievement} from '../../../../api/backend';
+
+@Component({
+  selector: 'ksi-page-admin-achievements',
+  templateUrl: './page-admin-achievements.component.html',
+  styleUrls: ['./page-admin-achievements.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PageAdminAchievementsComponent implements OnInit {
+  readonly achievementsYearly$ = this.years.achievements$.pipe(map(achievements => achievements.filter(achievement => achievement.persistent)));
+  readonly achievementsPersistent$ = this.years.achievements$.pipe(map(achievements => achievements.filter(achievement => !achievement.persistent)));
+
+  constructor(private backend: BackendService, private years: YearsService, private modal: ModalService) { }
+
+  ngOnInit(): void {
+
+  }
+
+  editAchievement(achievement: Achievement) {
+
+  }
+
+  give(achievement: Achievement) {
+
+  }
+
+  deleteAchievement(achievement: Achievement): void {
+    this.modal.yesNo('admin.achievements.delete.message', false).subscribe(result => {
+      if (!result) {
+        return;
+      }
+
+      this.backend.http.achievementsDeleteSingle(achievement.id).subscribe(() => {
+        location.reload();
+      });
+    });
+  }
+}
diff --git a/src/app/components/admin/page-admin-root/page-admin-root.component.html b/src/app/components/admin/page-admin-root/page-admin-root.component.html
@@ -7,6 +7,7 @@ <h2 class="title">{{'admin.root.title'|translate}}</h2>
       <ksi-admin-section-card name="monitor"></ksi-admin-section-card>
       <ksi-admin-section-card name="email"></ksi-admin-section-card>
       <ksi-admin-section-card name="discussion"></ksi-admin-section-card>
+      <ksi-admin-section-card name="achievements"></ksi-admin-section-card>
     </div>
   </div>
 </div>
diff --git a/src/app/models/routes.ts b/src/app/models/routes.ts
@@ -24,6 +24,7 @@ export interface IRoutes {
     monitor: string;
     email: string;
     discussion: string;
+    achievements: string;
   };
   privacyPolicy: string;
 }
diff --git a/src/app/services/shared/modal.service.ts b/src/app/services/shared/modal.service.ts
@@ -71,7 +71,7 @@ export class ModalService {
         filter((visible) => visible),
         take(1)
       ).subscribe(() => {
-        environment.logger.debug('sending modal ref', template.instance.modalRef);
+        environment.logger.debug('[MODAL] Sending modal ref', template.instance.modalRef);
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         component.instance.onModalOpened(template.instance.modalRef!);
       });
diff --git a/src/app/services/shared/years.service.ts b/src/app/services/shared/years.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
 import { YearSelect, IYear, IUser } from '../../models';
-import { AdminTask, Article, Thread, User } from '../../../api/backend';
+import {Achievement, AdminTask, Article, Thread, User} from '../../../api/backend';
 import {distinctUntilChanged, map, mergeMap, shareReplay, switchMap, take, tap} from 'rxjs/operators';
 import { BackendService } from './backend.service';
 import { Cache, Utils } from '../../util';
@@ -47,6 +47,8 @@ export class YearsService {
 
   readonly adminTasks$: Observable<AdminTask[]>;
 
+  readonly achievements$: Observable<Achievement[]>;
+
   private selectedSubject: Subject<YearSelect | null>;
   private _selected: YearSelect | null;
   private readonly storage = this.storageRoot.open('years');
@@ -169,6 +171,15 @@ export class YearsService {
       map((response) => response.atasks)
     );
 
+    this.achievements$ = this.selected$.pipe(
+      distinctUntilChanged(),
+      mergeMap(
+        (year) => this.backend.http.achievementsGetAll(year?.id)
+      ),
+      shareReplay(1),
+      map((response) => response.achievements)
+    );
+
     // auto select new year when published
     this.all$.pipe(take(1)).subscribe((years) => {
       if (savedYearValue && savedYearValue.$newest && years[0].id !== savedYearValue.id) {
diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json
@@ -464,14 +464,19 @@
       "tasks": "Úlohy",
       "monitor": "Monitor",
       "email": "E-mail",
-      "discussion": "Diskuze"
+      "discussion": "Diskuze",
+      "achievement": "Trofeje"
     },
     "root": {
       "title": "Organizároské rozhraní",
       "tasks": {
         "title": "Správa úloh",
         "description": "Přidávání nových úloh. Vypouštění nových verzí úloh. Merge do masteru."
       },
+      "achievements": {
+        "title": "Správa trofejí",
+        "description": "Přidávání, úprava a přidělování trofejí řešitelům."
+      },
       "discussion": {
         "title": "Diskuze u úloh",
         "description": "Zobrazení všech příspěvků k úlohám z vlny, včetně počtu nepřečtených."
@@ -545,6 +550,25 @@
     "discussion": {
       "title": "Diskuze u úloh"
     },
+    "achievements": {
+      "title": "Trofeje",
+      "new": "Přidat novou trofej",
+      "picture": "Obr.",
+      "name": "Název",
+      "actions": "Akce",
+      "yearly": "Pro tento ročník",
+      "persistent": "Trvalé",
+      "give": {
+        "btn": "Udělit"
+      },
+      "edit": {
+        "btn": "Změnit"
+      },
+      "delete": {
+        "btn": "Smazat",
+        "message": "Opravdu chceš smazat tuto trofej?"
+      }
+    },
     "tasks": {
       "wave-selection": {
         "caption": "Výběr zobrazených vln",
diff --git a/src/routes/routes.cs.ts b/src/routes/routes.cs.ts
@@ -26,7 +26,8 @@ export const ROUTES: IRoutes = {
     tasks: 'ulohy',
     monitor: 'monitor',
     email: 'email',
-    discussion: 'forum'
+    discussion: 'forum',
+    achievements: 'trofeje'
   },
   privacyPolicy: 'zpracovani-osobnich-udaju'
 };

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ export interface Achievement {`
`14`	`14`	`title: string;`
`15`	`15`	`picture: string;`
`16`	`16`	`description: string;`
	`17`	`+ persistent: boolean;`
`17`	`18`	`id: number;`
`18`	`19`	`year: number;`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,4 @@`
`11`	`11`	`*/`
`12`	`12`
`13`	`13`	`export interface AchievementCreation {`
`14`		`- title: string;`
`15`		`- picture: string;`
`16`		`- description: string;`
`17`		`- persistent: boolean;`
`18`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`export * from './achievement';`
	`2`	`+export * from './achievementBase';`
`2`	`3`	`export * from './achievementCreation';`
`3`	`4`	`export * from './achievementCreationRequest';`
`4`	`5`	`export * from './achievementGrantRequest';`