feat(profile): add discord

Author: esoadamo

src/api/backend/model/pickProfileEditExcludeKeyofProfileEditAddrStreetOrAddrCityOrAddrZip_.ts

@@ -27,6 +27,7 @@ export interface PickProfileEditExcludeKeyofProfileEditAddrStreetOrAddrCityOrAdd
     gender: string;
     short_info: string;
     github: string;
+    discord: string;
     addr_country: string;
     school_name: string;
     school_street: string;

src/api/backend/model/profile.ts

@@ -24,6 +24,7 @@ export interface Profile {
     gender: string;
     short_info: string;
     github: string | null;
+    discord: string | null;
     addr_country: string;
     school_name: string;
     school_street: string;

src/api/backend/model/profileEdit.ts

@@ -18,6 +18,7 @@ export interface ProfileEdit {
     gender: string;
     short_info: string;
     github: string | null;
+    discord: string | null;
     addr_street: string;
     addr_city: string;
     addr_zip: string;

src/api/backend/model/registrationRequest.ts

@@ -18,6 +18,7 @@ export interface RegistrationRequest {
     gender: string;
     short_info: string;
     github: string | null;
+    discord: string | null;
     addr_street: string;
     addr_city: string;
     addr_zip: string;

src/api/backend/model/user.ts

@@ -18,6 +18,7 @@ export interface User {
     profile_picture: string;
     gender: string;
     email?: string;
+    discord?: string;
     role: UserRole;
     score: number;
     tasks_num: number;

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

@@ -129,6 +129,13 @@ <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>
+      <input type="text"
+             class="form-control"
+             formControlName="discord"
+             [placeholder]="'profile.my.about-me.discord'|translate"
+      >
+
 
       <!-- Address -->
       <h2>{{'profile.my.address.title'|translate}}</h2>

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

@@ -23,6 +23,7 @@ export class PageProfileMyComponent implements OnInit, OnDestroy {
     nick: [undefined],
     sex: ['', Validators.required],
     github: [''],
+    discord: [''],
 
     address: ['', Validators.required],
     city: ['', Validators.required],
@@ -116,7 +117,8 @@ export class PageProfileMyComponent implements OnInit, OnDestroy {
         schoolCountry: profile.school_country,
         schoolEnd: profile.school_finish,
         shirtSize: profile.tshirt_size,
-        github: profile.github
+        github: profile.github,
+        discord: profile.discord
       });
       this.formProfile.enable();
       this.cd.markForCheck();
@@ -148,7 +150,8 @@ export class PageProfileMyComponent implements OnInit, OnDestroy {
       school_country: this.formProfile.controls.schoolCountry.value,
       school_finish: this.formProfile.controls.schoolEnd.value,
       tshirt_size: this.formProfile.controls.shirtSize.value,
-      github: this.formProfile.controls.github.value
+      github: this.formProfile.controls.github.value,
+      discord: this.formProfile.controls.discord.value
     };
 
     (this.profileEditRequest$ = this.backend.http.profileEditMy(edit).pipe(mapTo(undefined))).subscribe(() => {

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

@@ -45,21 +45,27 @@
         </ng-template>
       </div>
 
-      <div class="contact" *ngIf="!user.$isOrg">
+      <div class="contact">
         <table class="contact table table-borderless">
           <tbody>
           <tr *ngIf="user.email">
             <th scope="col">{{icon.EMAIL}}</th>
             <td><a [href]="'mailto:' + user.email">{{user.email}}</a></td>
           </tr>
-          <tr>
-            <th scope="col">{{icon.SCHOOL}}</th>
-            <td>{{user.school_name}}</td>
-          </tr>
-          <tr>
-            <th scope="col">{{icon.LOCATION}}</th>
-            <td>{{countries[user.addr_country!] || countries[user.addr_country!.toUpperCase()] || user.addr_country}}</td>
+          <tr *ngIf="user.discord">
+            <th scope="col">{{icon.DISCORD}}</th>
+            <td>{{user.discord}}</td>
           </tr>
+          <ng-container *ngIf="!user.$isOrg">
+            <tr>
+              <th scope="col">{{icon.SCHOOL}}</th>
+              <td>{{user.school_name}}</td>
+            </tr>
+            <tr *ngIf="user.addr_country">
+              <th scope="col">{{icon.LOCATION}}</th>
+              <td>{{countries[user.addr_country] || countries[user.addr_country.toUpperCase()] || user.addr_country}}</td>
+            </tr>
+          </ng-container>
           </tbody>
         </table>
       </div>

src/app/components/shared/modal-register/modal-register.component.ts

@@ -179,7 +179,8 @@ export class ModalRegisterComponent implements OnInit, OnDestroy, ModalComponent
       tshirt_size: this.form.controls.shirtSize.value,
       password: this.form.controls.password.value,
       referral: '',
-      github: null
+      github: null,
+      discord: null
     };
 
     const registration$ = this.backend.http.registerNewUser(req).pipe(shareReplay(1));

src/app/services/shared/icon.service.ts

@@ -14,8 +14,7 @@ export class IconService {
   public readonly SCHOOL = '🎓';
   public readonly LOCATION = '🖈';
   public readonly EDIT = '🖉';
-  public readonly SUN = '☀️';
-  public readonly MOON = '🌜';
   public readonly CROSS = '☓';
   public readonly WARNING = '⚠';
+  public readonly DISCORD = '💬';
 }