Merge pull request #132 from soonaverse/master

Merge master
soonaverse · Feb 12, 2024 · d0c1d68 · d0c1d68
2 parents 3eddd14 + e95a7ee
commit d0c1d68
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 27 deletions.
diff --git a/src/app/@api/file.api.ts b/src/app/@api/file.api.ts
@@ -1,16 +1,13 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { environment } from '@env/environment';
-import {
-  FILE_SIZES,
-  BUILD5_PROD_ADDRESS_API,
-  BUILD5_TEST_ADDRESS_API,
-  WEN_FUNC,
-} from '@build-5/interfaces';
+import { FILE_SIZES } from '@build-5/interfaces';
 import { NzUploadXHRArgs } from 'ng-zorro-antd/upload';
 import { Observable, map, of } from 'rxjs';
+import { Build5, https } from '@build-5/sdk';
 
 const EXTENSION_PAT = /\.[^/.]+$/;
+const ORIGIN = environment.production ? Build5.PROD : Build5.TEST;
 
 @Injectable({
   providedIn: 'root',
@@ -42,22 +39,16 @@ export class FileApi {
     return of(url.match('.mp4$') ? 'video' : 'image');
   };
 
-  public upload(memberId: string, item: NzUploadXHRArgs) {
-    const formData = new FormData();
-    formData.append('file', <Blob>item.postFile);
-    formData.append('member', memberId);
-    formData.append('uid', item.file.uid);
-    formData.append('projectApiKey', environment.build5Token);
-    const origin = environment.production ? BUILD5_PROD_ADDRESS_API : BUILD5_TEST_ADDRESS_API;
-    return this.httpClient
-      .post(origin + WEN_FUNC.uploadFile, formData)
+  public upload = (memberId: string, item: NzUploadXHRArgs) =>
+    https(ORIGIN)
+      .project(environment.build5Token)
+      .uploadFile(<Blob>item.postFile, memberId, item.file.uid)
       .pipe(
-        map((b: any) => {
+        map((r) => {
           if (item.onSuccess) {
-            item.onSuccess(b.data.url, item.file, b.data.url);
+            item.onSuccess(r.url, item.file, r.url);
           }
         }),
       )
       .subscribe();
-  }
 }
diff --git a/src/app/pages/space/pages/upsert/upsert.page.html b/src/app/pages/space/pages/upsert/upsert.page.html
@@ -180,7 +180,7 @@ <h1 class="mt-7" *ngIf="editMode" i18n>Edit space</h1>
                   [nzDirectory]="false"
                   nzType="drag"
                   [nzLimit]="1"
-                  [nzCustomRequest]="uploadFile.bind(this, 'space_avatar')"
+                  [nzCustomRequest]="uploadFile.bind(this)"
                   (nzChange)="uploadChangeAvatar($event)"
                   nzFileType="image/png,image/jpg,image/jpeg,image/webp"
                   [nzShowUploadList]="true"
@@ -210,7 +210,7 @@ <h1 class="mt-7" *ngIf="editMode" i18n>Edit space</h1>
                   nzListType="picture-card"
                   [nzDirectory]="false"
                   [nzLimit]="1"
-                  [nzCustomRequest]="uploadFile.bind(this, 'space_banner')"
+                  [nzCustomRequest]="uploadFile.bind(this)"
                   (nzChange)="uploadChangeBanner($event)"
                   nzFileType="image/png,image/jpg,image/jpeg,image/webp"
                   [nzPreviewFile]="previewFile"

diff --git a/src/app/pages/space/pages/upsert/upsert.page.ts b/src/app/pages/space/pages/upsert/upsert.page.ts
@@ -142,7 +142,7 @@ export class UpsertPage implements OnInit {
     }
   }
 
-  public uploadFile(type: 'space_avatar' | 'space_banner', item: NzUploadXHRArgs): Subscription {
+  public uploadFile(item: NzUploadXHRArgs): Subscription {
     if (!this.auth.member$.value) {
       const err = $localize`Member seems to log out during the file upload request.`;
       this.nzNotification.error(err, '');

diff --git a/src/app/pages/token/pages/new/metrics/metrics.component.html b/src/app/pages/token/pages/new/metrics/metrics.component.html
@@ -254,7 +254,7 @@
               [nzDirectory]="false"
               nzType="drag"
               [nzLimit]="1"
-              [nzCustomRequest]="newService.uploadFile.bind(newService, 'token_icon')"
+              [nzCustomRequest]="newService.uploadFile.bind(newService)"
               (nzChange)="newService.uploadChangeIcon($event)"
               nzFileType="image/png,image/jpg,image/jpeg,image/webp"
               [nzShowUploadList]="true"

diff --git a/src/app/pages/token/pages/new/overview/overview.component.html b/src/app/pages/token/pages/new/overview/overview.component.html
@@ -137,7 +137,7 @@
               nzType="drag"
               nzListType="picture-card"
               [nzLimit]="1"
-              [nzCustomRequest]="newService.uploadFile.bind(newService, 'token_introductionary')"
+              [nzCustomRequest]="newService.uploadFile.bind(newService)"
               (nzChange)="newService.uploadChangeIntroductionary($event)"
               nzFileType="image/png,image/jpg,image/jpeg,image/webp,video/mp4"
               [nzShowUploadList]="{

diff --git a/src/app/pages/token/services/new.service.ts b/src/app/pages/token/services/new.service.ts
@@ -198,10 +198,7 @@ export class NewService {
     }
   }
 
-  public uploadFile(
-    type: 'token_icon' | 'token_introductionary',
-    item: NzUploadXHRArgs,
-  ): Subscription {
+  public uploadFile(item: NzUploadXHRArgs): Subscription {
     if (!this.auth.member$.value) {
       const err = $localize`Member seems to log out during the file upload request.`;
       this.nzNotification.error(err, '');