feat: adjust conversion and mixins

debionetwork · Oct 20, 2022 · 8ffc2c2 · 8ffc2c2
1 parent cf9e253
commit 8ffc2c2
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 22 deletions.
diff --git a/src/lib/api/conversion.js b/src/lib/api/conversion.js
@@ -1,6 +1,11 @@
 import apiClientRequest from "@/lib/api"
 
-export const getConversionCache = async () => {
-  const { data } = await apiClientRequest.get(`/conversion/cache`)
+export const getConversionCache = async (from, to) => {
+  const { data } = await apiClientRequest.get(`/conversion/cache`, {
+    params: {
+      from, 
+      to
+    }
+  })
   return data
 }
diff --git a/src/lib/serviceHandler.js b/src/lib/serviceHandler.js
@@ -0,0 +1,37 @@
+export default {
+  data: () => ({
+    isLoading: false,
+    isErrors: null 
+  }),
+
+  computed: {
+    loadingPlaceholder() {
+      return this.isLoading ? "Loading Data..." : ""
+    }
+  },
+
+  methods: {
+    /**
+     * Dispatch wrapper that marks the action as loading & parses errors
+     * @param action
+     * @param args
+     * @returns {Promise<*>}
+     */
+    async dispatch(action, ...args) {
+      this.isLoading = true
+      try {
+        const response = await action.apply(this, args)
+
+        return Promise.resolve(response)
+      } catch (error) {
+        this.isErrors = error
+
+        console.error(`[${error?.response?.status}] Something went wrong, Please try again later!`)
+
+        return Promise.reject(error)
+      } finally {
+        this.isLoading = false
+      }
+    }
+  }
+}
diff --git a/src/views/Dashboard/Lab/Account/index.vue b/src/views/Dashboard/Lab/Account/index.vue
@@ -284,7 +284,7 @@ import CryptoJS from "crypto-js"
 import { u8aToHex } from "@polkadot/util"
 import Certification from "./Certification"
 import {uploadFile, getFileUrl} from "@/lib/pinata-proxy"
-import serviceHandler from "@/lib/metamask/mixins/serviceHandler"
+import serviceHandler from "@/lib/serviceHandler"
 import DialogUnstake from "@/components/Dialog/DialogUnstake"
 import { generalDebounce } from "@/utils"
 import Dialog from "@/components/Dialog"

diff --git a/src/views/Dashboard/Lab/Registration/Services/index.vue b/src/views/Dashboard/Lab/Registration/Services/index.vue
@@ -318,7 +318,7 @@ export default {
 
   data: () => ({
     serviceId: "",
-    currentDAIprice: 0,
+    usdRate: 0,
     document: {
       category: "",
       dnaCollectionProcess: "",
@@ -342,7 +342,7 @@ export default {
     isLoading: false,
     isSubmiting: false,
     isUploading: false,
-    currencyList: ["DAI", "Ethereum", "USN", "USDT"],
+    currencyList: ["USN", "USDT"],
     listExpectedDuration: [
       { text: "Hours", value: "Hours" },
       { text: "Days", value: "Days" }
@@ -364,8 +364,7 @@ export default {
   async created() {
     this.dnaCollectionProcessList = (await getDNACollectionProcess()).data
     await this.getServiceCategory()
-    const { daiToUsd } = await getConversionCache()
-    this.currentDAIprice = daiToUsd ?? 1
+    this.usdRate = await getConversionCache(this.document.currency, "USD")
   },
 
   computed: {
@@ -383,11 +382,11 @@ export default {
     }),
 
     priceHint() {
-      return `${this.document.price} ${this.document.currency} = ${(this.currentDAIprice * this.document.price).toFixed(4)} USD`
+      return `${this.document.price} ${this.document.currency} = ${(this.usdRate * this.document.price).toFixed(4)} USD`
     },
 
     qcPriceHint() {
-      return `${this.document.qcPrice} ${this.document.currency} = ${(this.currentDAIprice * this.document.qcPrice).toFixed(4)} USD`
+      return `${this.document.qcPrice} ${this.document.currency} = ${(this.usdRate * this.document.qcPrice).toFixed(4)} USD`
     },
 
     fieldRequiredRule() {

diff --git a/src/views/Dashboard/Lab/Registration/index.vue b/src/views/Dashboard/Lab/Registration/index.vue
@@ -204,7 +204,7 @@ import { uploadFile, getFileUrl } from "@/lib/pinata-proxy"
 import Certification from "./Certification"
 import Stepper from "./Stepper"
 import { getLocations, getStates, getCities } from "@/lib/api"
-import serviceHandler from "@/lib/metamask/mixins/serviceHandler"
+import serviceHandler from "@/lib/serviceHandler"
 import Kilt from "@kiltprotocol/sdk-js"
 import CryptoJS from "crypto-js"
 import { u8aToHex } from "@polkadot/util"

diff --git a/src/views/Dashboard/Lab/Services/Add.vue b/src/views/Dashboard/Lab/Services/Add.vue
@@ -312,7 +312,7 @@ export default {
     kitPurchaseLink: null,
     imageUrl: "",
     testResultSampleUrl: "",
-    currentDAIprice: 0,
+    usdRate: 0,
     statusLab: null,
     labInfo: null,
     messageWarning: {},
@@ -322,7 +322,7 @@ export default {
     listCategories:[],
     isLoading: false,
     showModalAlert: false,
-    currencyList: ["DAI", "Ethereum", "USN", "USDT"],
+    currencyList: ["USN", "USDT"],
     listExpectedDuration: ["Hours", "Days"],
     dnaCollectionProcessList: [],
     isBiomedical: false,
@@ -341,11 +341,11 @@ export default {
     }),
 
     priceHint() {
-      return `${this.document.price} ${this.document.currency} = ${(this.currentDAIprice * this.document.price).toFixed(4)} USD`
+      return `${this.document.price} ${this.document.currency} = ${(this.usdRate * this.document.price).toFixed(4)} USD`
     },
 
     qcPriceHint() {
-      return `${this.document.qcPrice} ${this.document.currency} = ${(this.currentDAIprice * this.document.qcPrice).toFixed(4)} USD`
+      return `${this.document.qcPrice} ${this.document.currency} = ${(this.usdRate * this.document.qcPrice).toFixed(4)} USD`
     },
 
     hasServicePayload() {
@@ -398,8 +398,7 @@ export default {
     this.validate()
     this.prefillValues()
     await this.getServiceCategory()
-    const { daiToUsd } = await getConversionCache()
-    this.currentDAIprice = daiToUsd ?? 1
+    this.usdRate = await getConversionCache(this.document.currency, "USD")
   },
 
   methods: {

diff --git a/src/views/Dashboard/Lab/Services/Detail.vue b/src/views/Dashboard/Lab/Services/Detail.vue
@@ -293,9 +293,9 @@ export default {
     files: [],
     testResultSampleFile:[],
     isLoading: false,
-    currentDAIprice: 0,
+    usdRate: 0,
     isUploading: false,
-    currencyList: ["DAI", "Ethereum", "USN", "USDT"],
+    currencyList: ["USN", "USDT"],
     currencyType: "",
     listExpectedDuration: ["Hours", "Days"],
     listCategories: [],
@@ -317,11 +317,11 @@ export default {
     }),
 
     priceHint() {
-      return `${this.document.price} ${this.document.currency} = ${(this.currentDAIprice * this.document.price).toFixed(4)} USD`
+      return `${this.document.price} ${this.document.currency} = ${(this.usdRate * this.document.price).toFixed(4)} USD`
     },
 
     qcPriceHint() {
-      return `${this.document.qcPrice} ${this.document.currency} = ${(this.currentDAIprice * this.document.qcPrice).toFixed(4)} USD`
+      return `${this.document.qcPrice} ${this.document.currency} = ${(this.usdRate * this.document.qcPrice).toFixed(4)} USD`
     },
 
     fieldRequiredRule() {
@@ -397,8 +397,7 @@ export default {
     this.id = this.$route.params.id
     await this.getServiceCategory()
     await this.getService(this.$route.params.id)
-    const { daiToUsd } = await getConversionCache()
-    this.currentDAIprice = daiToUsd ?? 1
+    this.usdRate = await getConversionCache(this.document.currency, "USD")
   },
 
   methods: {