Merge pull request #946 from Sifchain/prettier2

[ui] Run prettier over the codebase
Sifchain · Mar 16, 2021 · 4778dfc · 4778dfc · github-actions · Mar 16, 2021
2 parents a5d8dae + 10b2cb7
commit 4778dfc
Show file tree

Hide file tree

Showing 169 changed files with 1,895 additions and 3,268 deletions.
diff --git a/ui/.prettierignore b/ui/.prettierignore
@@ -0,0 +1,4 @@
+core/lib
+app/dist
+node_modules
+chains/ethereum/build/contracts
diff --git a/ui/core/.prettierrc → ui/.prettierrc b/ui/core/.prettierrc → ui/.prettierrc
@@ -1,5 +1,5 @@
 {
-  "trailingComma": "es5",
+  "trailingComma": "all",
   "tabWidth": 2,
   "semi": true,
   "singleQuote": false

diff --git a/ui/app/babel.config.js b/ui/app/babel.config.js
@@ -1,5 +1,3 @@
 module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
-}
+  presets: ["@vue/cli-plugin-babel/preset"],
+};
diff --git a/ui/app/src/components/Notifications.vue b/ui/app/src/components/Notifications.vue
@@ -108,7 +108,7 @@ export default defineComponent({
     const { api } = useCore();
     const notifications = reactive<Notification[]>([]);
 
-    api.EventBusService.onAny((event) => {
+    api.EventBusService.onAny(event => {
       const notification = parseEventToNotifications(event);
       if (notification !== null) notifications.unshift(notification);
     });
@@ -239,4 +239,4 @@ export default defineComponent({
     }
   }
 }
-</style>
+</style>
diff --git a/ui/app/src/components/confirmationDialog/AnimatedConfirmation.vue b/ui/app/src/components/confirmationDialog/AnimatedConfirmation.vue
@@ -54,7 +54,10 @@
               </p>
               <br />
               <p class="sub">
-                <a class="anchor" target="_blank" :href="getBlockExplorerUrl(chainId, transactionHash)"
+                <a
+                  class="anchor"
+                  target="_blank"
+                  :href="getBlockExplorerUrl(chainId, transactionHash)"
                   >View transaction on Block Explorer</a
                 >
               </p>
@@ -76,7 +79,7 @@ import { defineComponent } from "vue";
 import Loader from "@/components/shared/Loader.vue";
 import SifButton from "@/components/shared/SifButton.vue";
 import { useCore } from "@/hooks/useCore";
-import { getBlockExplorerUrl } from "../shared/utils"
+import { getBlockExplorerUrl } from "../shared/utils";
 
 export default defineComponent({
   components: { Loader, SifButton },
@@ -100,7 +103,7 @@ export default defineComponent({
       _toAmount: props.toAmount,
       _toToken: props.toToken,
       chainId: config.sifChainId,
-      getBlockExplorerUrl
+      getBlockExplorerUrl,
     };
   },
 });

diff --git a/ui/app/src/components/confirmationDialog/ConfirmationDialog.vue b/ui/app/src/components/confirmationDialog/ConfirmationDialog.vue
@@ -69,5 +69,3 @@ export default defineComponent({
     @closerequested="requestClose"
   />
 </template>
-
-
diff --git a/ui/app/src/components/currencyPairPanel/Index.vue b/ui/app/src/components/currencyPairPanel/Index.vue
@@ -1,8 +1,5 @@
-
-
 <template>
   <div class="field-wrappers">
-
     <CurrencyField
       :label="tokenALabel"
       tabindex="1"
@@ -101,7 +98,7 @@ export default defineComponent({
     "update:fromAmount",
     "update:fromSymbol",
     "handleToggle",
-    "toggleAsyncPooling"
+    "toggleAsyncPooling",
   ],
   setup(props, context) {
     function handleFromUpdateAmount(amount: string) {

diff --git a/ui/app/src/components/currencyfield/BalanceField.vue b/ui/app/src/components/currencyfield/BalanceField.vue
@@ -15,7 +15,7 @@ export default defineComponent({
 
     const available = computed(() => {
       const found = balances.value.find(
-        (bal) => bal.asset.symbol === props.symbol
+        bal => bal.asset.symbol === props.symbol,
       );
       if (!found) return "0";
 

diff --git a/ui/app/src/components/currencyfield/CurrencyField.vue b/ui/app/src/components/currencyfield/CurrencyField.vue
@@ -31,7 +31,7 @@ export default defineComponent({
     symbolFixed: { type: Boolean, default: false },
     toggleLabel: { type: String, default: null },
     asyncPooling: { type: Boolean, default: null },
-    handleToggle: { type: Function, default: null}
+    handleToggle: { type: Function, default: null },
   },
   inheritAttrs: false,
   emits: [
@@ -58,27 +58,32 @@ export default defineComponent({
   setup(props, context) {
     const localAmount = computed({
       get: () => props.amount,
-      set: (amount) => context.emit("update:amount", amount),
+      set: amount => context.emit("update:amount", amount),
     });
 
     const localSymbol = computed({
       get: () => props.symbol,
-      set: (symbol) => context.emit("update:symbol", symbol),
+      set: symbol => context.emit("update:symbol", symbol),
     });
 
     return { localSymbol, localAmount };
   },
   methods: {
-    onClickChild (value: string) {
-      this.handleToggle()
-    }
-  }
+    onClickChild(value: string) {
+      this.handleToggle();
+    },
+  },
 });
 </script>
 
 <template>
   <RaisedPanel>
-    <Checkbox @clicked="onClickChild" v-if="toggleLabel" :toggleLabel="toggleLabel" :checked="asyncPooling" />
+    <Checkbox
+      @clicked="onClickChild"
+      v-if="toggleLabel"
+      :toggleLabel="toggleLabel"
+      :checked="asyncPooling"
+    />
     <RaisedPanelRow>
       <RaisedPanelColumn class="left">
         <Label>{{ label }}</Label>
@@ -115,7 +120,7 @@ export default defineComponent({
           block
           @click="$emit('selectsymbol')"
         >
-          <span><AssetItem :symbol="localSymbol" /></span>
+          <span><AssetItem :symbol="localSymbol"/></span>
           <span><Caret /></span>
         </SifButton>
         <div v-if="localSymbol !== null && symbolFixed">

diff --git a/ui/app/src/components/layout/Layout.vue b/ui/app/src/components/layout/Layout.vue
@@ -85,4 +85,4 @@ export default defineComponent({
   flex-grow: 1;
   text-align: center;
 }
-</style>
+</style>
diff --git a/ui/app/src/components/navigation/PanelNav.vue b/ui/app/src/components/navigation/PanelNav.vue
@@ -35,4 +35,4 @@ export default {
   display: flex;
   justify-content: space-between;
 }
-</style>
+</style>
diff --git a/ui/app/src/components/navigation/PanelNavItem.vue b/ui/app/src/components/navigation/PanelNavItem.vue
@@ -50,7 +50,7 @@ export default defineComponent({
   methods: {
     subPageIsActive(input: string) {
       const paths = [input];
-      return paths.some((path) => {
+      return paths.some(path => {
         return this.$route.path.indexOf(path) === 0; // current path starts with this path string
       });
     },
@@ -178,4 +178,4 @@ export default defineComponent({
     }
   }
 }
-</style>
+</style>
diff --git a/ui/app/src/components/poolList/PoolList.vue b/ui/app/src/components/poolList/PoolList.vue
@@ -5,16 +5,14 @@
 </template>
 
 <script>
-export default {
-
-}
+export default {};
 </script>
 
 <style scoped lang="scss">
 .pool-list {
   height: 175px;
-  overflow-y: auto; 
+  overflow-y: auto;
   background: $c_white;
   border-radius: $br_sm;
 }
-</style>
+</style>
diff --git a/ui/app/src/components/poolList/PoolListItem.vue b/ui/app/src/components/poolList/PoolListItem.vue
@@ -3,7 +3,7 @@ import { computed, ref } from "@vue/reactivity";
 import { defineComponent, PropType } from "vue";
 import { getAssetLabel, useAssetItem } from "@/components/shared/utils";
 import { LiquidityProvider, Pool } from "ui-core";
-import { useRouter } from 'vue-router';
+import { useRouter } from "vue-router";
 import AssetItemPool from "@/components/shared/AssetItemPool.vue";
 
 export default defineComponent({
@@ -19,16 +19,16 @@ export default defineComponent({
 
   setup(props) {
     const router = useRouter();
-    
+
     const fromSymbol = computed(() =>
       props.accountPool?.pool.amounts[1].asset
         ? getAssetLabel(props.accountPool?.pool.amounts[1].asset)
-        : ""
+        : "",
     );
 
     const handleClick = () => {
-      router.push(`/pool/${fromSymbol.value.toLowerCase()}`)
-    }
+      router.push(`/pool/${fromSymbol.value.toLowerCase()}`);
+    };
 
     return {
       handleClick,
@@ -39,9 +39,7 @@ export default defineComponent({
 
 <template>
   <div class="pool-list-item" @click="handleClick">
-    <AssetItemPool 
-      :pool="accountPool"
-    />
+    <AssetItemPool :pool="accountPool" />
     <div class="button">Manage</div>
   </div>
 </template>
@@ -67,4 +65,4 @@ export default defineComponent({
     text-align: right;
   }
 }
-</style>
+</style>
diff --git a/ui/app/src/components/poolStats/PoolStatsListItem.vue b/ui/app/src/components/poolStats/PoolStatsListItem.vue
@@ -33,18 +33,19 @@ export default defineComponent({
     });
 
     const priceToken = formatNumberString(
-      parseFloat(props.pool?.priceToken).toFixed(2)
+      parseFloat(props.pool?.priceToken).toFixed(2),
     );
     const poolDepth = formatNumberString(
-      parseFloat(props.pool?.poolDepth).toFixed(2)
+      parseFloat(props.pool?.poolDepth).toFixed(2),
     );
     const volume = formatNumberString(
-      parseFloat(props.pool?.volume).toFixed(1)
+      parseFloat(props.pool?.volume).toFixed(1),
     );
     const poolAPY = formatNumberString(
       (
-        (parseFloat(props.pool?.volume) / parseFloat(props.pool?.poolDepth)) * 100
-      ).toFixed(1)
+        (parseFloat(props.pool?.volume) / parseFloat(props.pool?.poolDepth)) *
+        100
+      ).toFixed(1),
     );
 
     return {
@@ -68,9 +69,16 @@ export default defineComponent({
         <div class="placeholder" v-else></div>
         <div class="icon">
           <span>{{
-            symbol.toString().toLowerCase().includes("rowan")
+            symbol
+              .toString()
+              .toLowerCase()
+              .includes("rowan")
               ? symbol.toString().toUpperCase()
-              : "c" + symbol.toString().slice(1).toUpperCase()
+              : "c" +
+                symbol
+                  .toString()
+                  .slice(1)
+                  .toUpperCase()
           }}</span>
         </div>
       </div>
@@ -93,7 +101,7 @@ export default defineComponent({
         <span
           >{{
             formatNumberString(
-              (parseFloat(poolAPY) + parseFloat(liqAPY)).toFixed(1)
+              (parseFloat(poolAPY) + parseFloat(liqAPY)).toFixed(1),
             )
           }}%</span
         >

diff --git a/ui/app/src/components/shared/ArrowIconButton.vue b/ui/app/src/components/shared/ArrowIconButton.vue
@@ -26,4 +26,4 @@ export default defineComponent({
     text-align: left;
   }
 }
-</style>
+</style>
diff --git a/ui/app/src/components/shared/AssetItem.vue b/ui/app/src/components/shared/AssetItem.vue
@@ -26,7 +26,7 @@ export default defineComponent({
 </script>
 
 <template>
-  <div class="row" :class="{'inline': inline}">
+  <div class="row" :class="{ inline: inline }">
     <img v-if="token.imageUrl" width="16" :src="token.imageUrl" />
     <div class="placeholder" :style="backgroundStyle" v-else></div>
     <span>{{ tokenLabel }}</span>
@@ -65,4 +65,4 @@ export default defineComponent({
   width: 16px;
   text-align: center;
 }
-</style>
+</style>
diff --git a/ui/app/src/components/shared/AssetItemLarge.vue b/ui/app/src/components/shared/AssetItemLarge.vue
@@ -62,4 +62,4 @@ export default defineComponent({
   text-align: center;
   margin-right: 16px;
 }
-</style>
+</style>
diff --git a/ui/app/src/components/shared/AssetItemPool.vue b/ui/app/src/components/shared/AssetItemPool.vue
@@ -24,9 +24,9 @@ export default defineComponent({
     const fromSymbol = computed(() =>
       props.pool?.pool.amounts[1].asset
         ? getAssetLabel(props.pool?.pool.amounts[1].asset)
-        : props.tokenASymbol
+        : props.tokenASymbol,
     );
-    
+
     const fromAsset = useAssetItem(fromSymbol);
     const fromToken = fromAsset.token;
     const fromBackgroundStyle = fromAsset.background;
@@ -39,7 +39,7 @@ export default defineComponent({
     const toSymbol = computed(() =>
       props.pool?.pool.amounts[0].asset
         ? getAssetLabel(props.pool?.pool.amounts[0].asset)
-        : props.tokenBSymbol
+        : props.tokenBSymbol,
     );
     const toAsset = useAssetItem(toSymbol);
     const toToken = toAsset.token;
@@ -63,7 +63,7 @@ export default defineComponent({
 </script>
 
 <template>
-  <div class="pool-asset" :class="{'inline': inline}">
+  <div class="pool-asset" :class="{ inline: inline }">
     <div class="image">
       <img
         v-if="fromTokenImage"
@@ -137,4 +137,4 @@ export default defineComponent({
     text-align: right;
   }
 }
-</style>
+</style>
diff --git a/ui/app/src/components/shared/Caret.vue b/ui/app/src/components/shared/Caret.vue
@@ -27,4 +27,4 @@
   top: -4px;
   transform: rotate(45deg);
 }
-</style>
+</style>