Merge remote-tracking branch 'ksi/main' into main

Author: esoadamo

src/api/backend/api/default.service.ts

@@ -4563,6 +4563,60 @@ export class DefaultService {
         );
     }
 
+    /**
+     * 
+     * 
+     * @param usersId 
+     * @param year 
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public usersGetSingleDiscordInvite(usersId: number, year?: number, observe?: 'body', reportProgress?: boolean): Observable<string>;
+    public usersGetSingleDiscordInvite(usersId: number, year?: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<string>>;
+    public usersGetSingleDiscordInvite(usersId: number, year?: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<string>>;
+    public usersGetSingleDiscordInvite(usersId: number, year?: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (usersId === null || usersId === undefined) {
+            throw new Error('Required parameter usersId was null or undefined when calling usersGetSingleDiscordInvite.');
+        }
+
+
+        let headers = this.defaultHeaders;
+        if (year !== undefined && year !== null) {
+            headers = headers.set('year', String(year));
+        }
+
+        // authentication (ksi) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<string>('get',`${this.basePath}/users/${encodeURIComponent(String(usersId))}/discord`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
     /**
      * 
      * 

src/app/components/profile/page-profile-my/page-profile-my.component.html

@@ -121,14 +121,19 @@ <h2>{{'profile.my.about-me.title'|translate}}</h2>
              [placeholder]="'profile.my.about-me.github'|translate"
       >
 
-      <label class="form-label">{{'profile.my.about-me.discord'|translate}}</label>
+      <label class="form-label">
+        {{'profile.my.about-me.discord'|translate}}
+        <ng-container *ngIf="discordInviteLink$ | async as link">
+          -
+          <a [href]="link" target="_blank">{{'profile.my.discord-join'|translate}}</a>
+        </ng-container>
+      </label>
       <input type="text"
              class="form-control"
              formControlName="discord"
              [placeholder]="'profile.my.about-me.discord'|translate"
       >
 
-
       <!-- Address -->
       <h2>{{'profile.my.address.title'|translate}}</h2>
       <label class="form-label">{{'profile.my.address.country'|translate}}</label>

src/app/components/profile/page-profile-my/page-profile-my.component.ts

@@ -1,8 +1,8 @@
 import { Component, OnInit, ChangeDetectionStrategy, ChangeDetectorRef, OnDestroy } from '@angular/core';
 import { AddressService, BackendService, IconService, RoutesService, UserService } from '../../../services';
 import { FormBuilder, Validators } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
-import { catchError, map, mapTo, mergeMap, shareReplay } from 'rxjs/operators';
+import { ActivatedRoute } from '@angular/router';
+import { catchError, debounceTime, map, mapTo, mergeMap, shareReplay } from 'rxjs/operators';
 import { Observable, of, Subscription } from 'rxjs';
 import { ProfileEdit } from '../../../../api/backend';
 import { environment } from '../../../../environments/environment';
@@ -55,14 +55,14 @@ export class PageProfileMyComponent implements OnInit, OnDestroy {
   countries = AddressService.COUNTRIES;
 
   profilePicture$: Observable<string | null>;
+  discordInviteLink$: Observable<string | null>;
 
   private _subs: Subscription[] = [];
 
   constructor(
     private fb: FormBuilder,
     public backend: BackendService,
     private user: UserService,
-    private router: Router,
     private cd: ChangeDetectorRef,
     public icon: IconService,
     public routes: RoutesService,
@@ -77,6 +77,14 @@ export class PageProfileMyComponent implements OnInit, OnDestroy {
       map((user) => user ? `${user.profile_picture}?${Date.now()}` : user)
     );
 
+    this.discordInviteLink$ = this.user.isLoggedIn$.pipe(
+      mergeMap(() => this.backend.user$),
+      debounceTime(200),
+      shareReplay(1),
+      mergeMap((user) => user ? this.backend.http.usersGetSingleDiscordInvite(user.id) : of(null)),
+      shareReplay(1)
+    );
+
     // add passwords same validator
     this.formPassword.controls.repeat.addValidators((control) => {
       return control.value === this.formPassword.controls.new.value ? null : {'not-same': 'not-same'};
@@ -154,7 +162,10 @@ export class PageProfileMyComponent implements OnInit, OnDestroy {
       discord: this.formProfile.controls.discord.value
     };
 
-    (this.profileEditRequest$ = this.backend.http.profileEditMy(edit).pipe(mapTo(undefined))).subscribe(() => {
+    (this.profileEditRequest$ = this.backend.http.profileEditMy(edit).pipe(
+      shareReplay(1),
+      mapTo(undefined))
+    ).subscribe(() => {
       this.formProfile.enable();
       this.backend.refreshUser();
     });

src/app/components/shared/terms-of-use/terms-of-use.component.html

@@ -2,7 +2,7 @@
   Potřebujeme zpracovávat některé Tvé osobní údaje; která a jak se dozvíš níže.</p>
 <p>Máme údaje Tebou vyplněné v přihlášce, tedy: email, jméno, příjmení, pohlaví, zemi trvalého bydliště, název a
   adresu Tvé aktuální školy a rok maturity. Též můžeš, ale nemusíš, vyplnit svou přezdívku,
-  krátký profil a avatar.</p>
+  krátký profil, GitHub uživatelské jméno, Discord uživatelské jméno a avatar.</p>
 <p>
   Na co je používáme?
 </p>

src/assets/i18n/cs.json

@@ -361,6 +361,7 @@
       "password-change-success": "Změna hesla proběhla úspěšně",
       "save": "Uložit změny",
       "change-picture": "Nahrát nový profilový obrázek",
+      "discord-join": "přidat se na Discord server KSI",
       "about-me": {
         "title": "O mě",
         "first-name": "Křestní jméno",