Fixes issues with non multitenant platforms (#21)

enjin · Aug 14, 2023 · 310caf6 · 310caf6
1 parent f75ced5
commit 310caf6
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 63 deletions.
diff --git a/resources/js/api/auth.ts b/resources/js/api/auth.ts
@@ -4,7 +4,7 @@ import queries from './queries';
 
 export class AuthApi {
     static async sendPlatfromRequest(data: Record<string, unknown>) {
-        return ApiService.sendPlatfromRequest(data, '/multi-tenant');
+        return ApiService.sendPlatformRequest(data, '/multi-tenant');
     }
 
     static async login(email: string, password: string) {

diff --git a/resources/js/api/beam.ts b/resources/js/api/beam.ts
@@ -4,7 +4,7 @@ import queries from './queries';
 
 export class BeamApi {
     static async sendPlatfromRequest(data: Record<string, unknown>) {
-        return ApiService.sendPlatfromRequest(data, '/beam');
+        return ApiService.sendPlatformRequest(data, '/beam');
     }
 
     static async getBeam(getBeamData: Record<string, unknown>) {

diff --git a/resources/js/api/collection.ts b/resources/js/api/collection.ts
@@ -12,7 +12,7 @@ export class CollectionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async getCollectionsIds(first: number = 20) {
@@ -23,7 +23,7 @@ export class CollectionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async getCollection(collectionId: string) {
@@ -34,7 +34,7 @@ export class CollectionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async createCollection(collectionData: Record<string, unknown>) {
@@ -50,7 +50,7 @@ export class CollectionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async approveCollection(collectionData: Record<string, unknown>) {
@@ -65,7 +65,7 @@ export class CollectionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async unapproveCollection(collectionData: Record<string, unknown>) {
@@ -79,7 +79,7 @@ export class CollectionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async destroyCollection(collectionData: Record<string, unknown>) {
@@ -92,7 +92,7 @@ export class CollectionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async mutateCollection(collectionData: Record<string, unknown>) {
@@ -106,7 +106,7 @@ export class CollectionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async setCollectionAttribute(setCollectionAttributeData: Record<string, unknown>) {
@@ -121,7 +121,7 @@ export class CollectionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async removeCollectionAttribute(removeCollectionAttributeData: Record<string, unknown>) {
@@ -135,7 +135,7 @@ export class CollectionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async removeAllAttributes(removeAllAttributesData: Record<string, unknown>) {
@@ -150,6 +150,6 @@ export class CollectionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 }
diff --git a/resources/js/api/fueltank.ts b/resources/js/api/fueltank.ts
@@ -4,7 +4,7 @@ import queries from './queries';
 
 export class FuelTankApi {
     static async sendPlatfromRequest(data: Record<string, unknown>) {
-        return ApiService.sendPlatfromRequest(data, '/fuel-tanks');
+        return ApiService.sendPlatformRequest(data, '/fuel-tanks');
     }
 
     static async getFuelTank(name: string, tankId: string) {

diff --git a/resources/js/api/index.ts b/resources/js/api/index.ts
@@ -45,17 +45,17 @@ export class ApiService {
         if (resp.status === 401) {
             useAppStore().clearLogin();
             snackbar.error({ title: 'Unauthorized', text: 'Session expired, try to sign in again' });
-            throw [{ field: 'Error', message: 'Unauthorized' }];
+            return { field: 'Error', message: 'Unauthorized' };
         }
 
         if (resp.status >= 400 && resp.status < 600) {
-            throw resp as unknown as Error;
+            return resp as unknown as Error;
         }
 
         return resp.json();
     }
 
-    static async sendPlatfromRequest(data: Record<string, unknown>, schema: string = ''): Promise<any> {
+    static async sendPlatformRequest(data: Record<string, unknown>, schema: string = ''): Promise<any> {
         const appStore = useAppStore();
 
         return new Promise((resolve, reject) => {
@@ -78,9 +78,13 @@ export class ApiService {
                     } else {
                         reject({ field: 'Error', message });
                     }
-                } else {
-                    resolve(res);
                 }
+
+                if (res.field == 'Error') {
+                    reject(res);
+                }
+
+                resolve(res);
             });
         });
     }
@@ -108,7 +112,7 @@ export class ApiService {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async thaw(thawData: Record<string, unknown>) {
@@ -125,7 +129,7 @@ export class ApiService {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async batchMint(batchMintData: Record<string, unknown>) {
@@ -142,7 +146,7 @@ export class ApiService {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async batchTransfer(batchTransferData: Record<string, unknown>) {
@@ -159,7 +163,7 @@ export class ApiService {
                 }),
             },
         };
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async batchSetAttribute(batchSetAttributeData: Record<string, unknown>) {
@@ -174,6 +178,6 @@ export class ApiService {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 }
diff --git a/resources/js/api/marketplace.ts b/resources/js/api/marketplace.ts
@@ -4,7 +4,7 @@ import queries from './queries';
 
 export class MarketplaceApi {
     static async sendPlatfromRequest(data: Record<string, unknown>) {
-        return ApiService.sendPlatfromRequest(data, '/marketplace');
+        return ApiService.sendPlatformRequest(data, '/marketplace');
     }
 
     static async getListings(getListingsData: Record<string, unknown>) {

diff --git a/resources/js/api/token.ts b/resources/js/api/token.ts
@@ -15,7 +15,7 @@ export class TokenApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async approveToken(tokenData: Record<string, unknown>) {
@@ -33,7 +33,7 @@ export class TokenApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async unapproveToken(tokenData: Record<string, unknown>) {
@@ -48,7 +48,7 @@ export class TokenApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async burnToken(tokenData: Record<string, unknown>) {
@@ -67,7 +67,7 @@ export class TokenApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async mutateToken(tokenData: Record<string, unknown>) {
@@ -88,7 +88,7 @@ export class TokenApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async transferToken(tokenData: Record<string, unknown>) {
@@ -112,7 +112,7 @@ export class TokenApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async createToken(tokenData: Record<string, unknown>) {
@@ -127,7 +127,7 @@ export class TokenApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async mintToken(tokenData: Record<string, unknown>) {
@@ -142,7 +142,7 @@ export class TokenApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async setTokenAttribute(setTokenAttributeData: Record<string, unknown>) {
@@ -158,7 +158,7 @@ export class TokenApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async removeTokenAttribute(removeTokenAttributeData: Record<string, unknown>) {
@@ -173,7 +173,7 @@ export class TokenApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async removeAllAttributes(removeAllAttributesData: Record<string, unknown>) {
@@ -188,6 +188,6 @@ export class TokenApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 }
diff --git a/resources/js/api/transaction.ts b/resources/js/api/transaction.ts
@@ -11,7 +11,7 @@ export class TransactionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async getTransactions(getTransactionsData: Record<string, unknown>) {
@@ -31,7 +31,7 @@ export class TransactionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async getWallet(walletData: Record<string, unknown>) {
@@ -45,7 +45,7 @@ export class TransactionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async retryTransactions(retryTransactionsData: Record<string, unknown>) {
@@ -57,7 +57,7 @@ export class TransactionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 
     static async updateTransaction(updateTransactionData: Record<string, unknown>) {
@@ -73,6 +73,6 @@ export class TransactionApi {
             },
         };
 
-        return ApiService.sendPlatfromRequest(data);
+        return ApiService.sendPlatformRequest(data);
     }
 }
diff --git a/resources/js/components/marketplace/BidsList.vue b/resources/js/components/marketplace/BidsList.vue
@@ -56,7 +56,8 @@
                                     </span>
                                 </td>
                                 <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                                    {{ bid.price > 100 ? formatPriceFromENJ(bid.price) : bid.price }} {{ currencySymbol }}
+                                    {{ bid.price > 100 ? formatPriceFromENJ(bid.price) : bid.price }}
+                                    {{ currencySymbol }}
                                 </td>
                                 <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
                                     {{ addressShortHex(bid.bidder) }}