refactor

components/protocols/DropdownMakerdao.vue

@@ -57,7 +57,7 @@
 <script>
 import { defineComponent, useRouter } from '@nuxtjs/composition-api'
 import SVGChevronUp from '@/assets/img/icons/chevron-up.svg?inline'
-import { useMakerdaoPosition } from '~/composables/useMakerdaoPosition'
+import { useMakerdaoPosition } from '~/composables/protocols/useMakerdaoPosition'
 import { useSidebar } from '~/composables/useSidebar'
 import Dropdown from '../common/input/Dropdown.vue'
 import DropdownMenu from './DropdownMenu.vue'

components/sidebar/context/SidebarWithdraw.vue

@@ -70,7 +70,7 @@
 import { computed, defineComponent, onMounted, ref } from '@nuxtjs/composition-api'
 import InputNumeric from '~/components/common/input/InputNumeric.vue'
 import Input from '~/components/common/input/Input.vue'
-import { useAaveV2Position } from '~/composables/useAaveV2Position'
+import { useAaveV2Position } from '~/composables/protocols/useAaveV2Position'
 import { useBalances } from '~/composables/useBalances'
 import { useBigNumber } from '~/composables/useBigNumber'
 import { useFormatting } from '~/composables/useFormatting'

components/sidebar/context/aaveV2/SidebarAaveV2Borrow.vue

@@ -67,7 +67,7 @@
 <script>
 import { computed, defineComponent, ref } from '@nuxtjs/composition-api'
 import InputNumeric from '~/components/common/input/InputNumeric.vue'
-import { useAaveV2Position } from '~/composables/useAaveV2Position'
+import { useAaveV2Position } from '~/composables/protocols/useAaveV2Position'
 import { useBalances } from '~/composables/useBalances'
 import { useBigNumber } from '~/composables/useBigNumber'
 import { useFormatting } from '~/composables/useFormatting'

components/sidebar/context/aaveV2/SidebarAaveV2Payback.vue

@@ -90,7 +90,7 @@
 <script>
 import { computed, defineComponent, ref } from '@nuxtjs/composition-api'
 import InputNumeric from '~/components/common/input/InputNumeric.vue'
-import { useAaveV2Position } from '~/composables/useAaveV2Position'
+import { useAaveV2Position } from '~/composables/protocols/useAaveV2Position'
 import { useBalances } from '~/composables/useBalances'
 import { useBigNumber } from '~/composables/useBigNumber'
 import { useFormatting } from '~/composables/useFormatting'

components/sidebar/context/aaveV2/SidebarAaveV2Supply.vue

@@ -70,7 +70,7 @@
 <script>
 import { computed, defineComponent, ref } from '@nuxtjs/composition-api'
 import InputNumeric from '~/components/common/input/InputNumeric.vue'
-import { useAaveV2Position } from '~/composables/useAaveV2Position'
+import { useAaveV2Position } from '~/composables/protocols/useAaveV2Position'
 import { useBalances } from '~/composables/useBalances'
 import { useNotification } from '~/composables/useNotification'
 import { useBigNumber } from '~/composables/useBigNumber'

components/sidebar/context/aaveV2/SidebarAaveV2Withdraw.vue

@@ -72,7 +72,7 @@
 <script>
 import { computed, defineComponent, onMounted, ref } from '@nuxtjs/composition-api'
 import InputNumeric from '~/components/common/input/InputNumeric.vue'
-import { useAaveV2Position } from '~/composables/useAaveV2Position'
+import { useAaveV2Position } from '~/composables/protocols/useAaveV2Position'
 import { useBalances } from '~/composables/useBalances'
 import { useBigNumber } from '~/composables/useBigNumber'
 import { useFormatting } from '~/composables/useFormatting'

components/sidebar/context/compound/SidebarCompoundBorrow.vue

@@ -72,7 +72,7 @@ import ButtonCTA from '~/components/common/input/ButtonCTA.vue'
 import { useNotification } from '~/composables/useNotification'
 import Button from '~/components/Button.vue'
 import { useSidebar } from '~/composables/useSidebar'
-import { useCompoundPosition } from '~/composables/useCompoundPosition'
+import { useCompoundPosition } from '~/composables/protocols/useCompoundPosition'
 import ctokens from '~/constant/ctokens'
 import tokenIdMapping from '~/constant/tokenIdMapping'
 

components/sidebar/context/compound/SidebarCompoundPayback.vue

@@ -97,7 +97,7 @@ import ButtonCTA from '~/components/common/input/ButtonCTA.vue'
 import { useNotification } from '~/composables/useNotification'
 import Button from '~/components/Button.vue'
 import { useSidebar } from '~/composables/useSidebar'
-import { useCompoundPosition } from '~/composables/useCompoundPosition'
+import { useCompoundPosition } from '~/composables/protocols/useCompoundPosition'
 import ctokens from '~/constant/ctokens'
 import tokenIdMapping from '~/constant/tokenIdMapping'
 

components/sidebar/context/compound/SidebarCompoundSupply.vue

@@ -87,7 +87,7 @@ import Button from '~/components/Button.vue'
 import { useSidebar } from '~/composables/useSidebar'
 import tokenIdMapping from '~/constant/tokenIdMapping'
 import ctokens from '~/constant/ctokens'
-import { useCompoundPosition } from '~/composables/useCompoundPosition'
+import { useCompoundPosition } from '~/composables/protocols/useCompoundPosition'
 
 export default defineComponent({
   components: { InputNumeric, ToggleButton, ButtonCTA, Button },

components/sidebar/context/compound/SidebarCompoundWithdraw.vue

@@ -88,7 +88,7 @@ import Button from '~/components/Button.vue'
 import { useSidebar } from '~/composables/useSidebar'
 import tokenIdMapping from '~/constant/tokenIdMapping'
 import ctokens from '~/constant/ctokens'
-import { useCompoundPosition } from '~/composables/useCompoundPosition'
+import { useCompoundPosition } from '~/composables/protocols/useCompoundPosition'
 
 export default defineComponent({
   components: { InputNumeric, ToggleButton, ButtonCTA, Button },

components/sidebar/context/makerdao/SidebarMakerdaoBorrow.vue

@@ -77,7 +77,7 @@ import { useNotification } from '~/composables/useNotification'
 import Button from '~/components/Button.vue'
 import { useSidebar } from '~/composables/useSidebar'
 import ctokens from '~/constant/ctokens'
-import { useMakerdaoPosition } from '~/composables/useMakerdaoPosition'
+import { useMakerdaoPosition } from '~/composables/protocols/useMakerdaoPosition'
 
 export default defineComponent({
   components: { InputNumeric, ToggleButton, ButtonCTA, Button },

components/sidebar/context/makerdao/SidebarMakerdaoCollateral.vue

@@ -42,7 +42,7 @@
 <script>
 import { defineComponent, useContext, computed } from '@nuxtjs/composition-api'
 import { useFormatting } from '~/composables/useFormatting'
-import { useMakerdaoPosition } from '~/composables/useMakerdaoPosition'
+import { useMakerdaoPosition } from '~/composables/protocols/useMakerdaoPosition'
 import { useSearchFilter } from '~/composables/useSearchFilter'
 import { useSidebar } from '~/composables/useSidebar'
 

components/sidebar/context/makerdao/SidebarMakerdaoPayback.vue

@@ -97,7 +97,7 @@ import ButtonCTA from '~/components/common/input/ButtonCTA.vue'
 import { useNotification } from '~/composables/useNotification'
 import Button from '~/components/Button.vue'
 import { useSidebar } from '~/composables/useSidebar'
-import { useMakerdaoPosition } from '~/composables/useMakerdaoPosition'
+import { useMakerdaoPosition } from '~/composables/protocols/useMakerdaoPosition'
 
 export default defineComponent({
   components: { InputNumeric, ToggleButton, ButtonCTA, Button },

components/sidebar/context/makerdao/SidebarMakerdaoSupply.vue

@@ -85,7 +85,7 @@ import { useDSA } from '~/composables/useDSA'
 import ButtonCTA from '~/components/common/input/ButtonCTA.vue'
 import Button from '~/components/Button.vue'
 import { useSidebar } from '~/composables/useSidebar'
-import { useMakerdaoPosition } from '~/composables/useMakerdaoPosition'
+import { useMakerdaoPosition } from '~/composables/protocols/useMakerdaoPosition'
 
 export default defineComponent({
   components: { InputNumeric, ToggleButton, ButtonCTA, Button },

components/sidebar/context/makerdao/SidebarMakerdaoWithdraw.vue

@@ -84,7 +84,7 @@ import ButtonCTA from '~/components/common/input/ButtonCTA.vue'
 import { useNotification } from '~/composables/useNotification'
 import Button from '~/components/Button.vue'
 import { useSidebar } from '~/composables/useSidebar'
-import { useMakerdaoPosition } from '~/composables/useMakerdaoPosition'
+import { useMakerdaoPosition } from '~/composables/protocols/useMakerdaoPosition'
 
 export default defineComponent({
   components: { InputNumeric, ToggleButton, ButtonCTA, Button },

composables/protocols/useAaveV2Position.ts

@@ -2,16 +2,16 @@ import { AbiItem } from "web3-utils";
 
 import aaveV2ABI from "~/abis/read/aaveV2.json";
 import { computed, ref, watch } from "@nuxtjs/composition-api";
-import { useDSA } from "./useDSA";
+import { useDSA } from "~/composables/useDSA";
-import { useWeb3 } from "./useWeb3";
+import { useWeb3 } from "~/composables/useWeb3";
 import BigNumber from "bignumber.js";
 import atokensV2 from "~/constant/atokensV2";
 import tokens from "~/constant/tokens";
-import { Network } from "./useNetwork";
+import { Network } from "~/composables/useNetwork";
-import { useBigNumber } from "./useBigNumber";
+import { useBigNumber } from "~/composables/useBigNumber";
-import { usePosition } from "./usePosition";
+import { usePosition } from "~/composables/usePosition";
-import { useToken } from "./useToken";
+import { useToken } from "~/composables/useToken";
-import { useSorting } from "./useSorting";
+import { useSorting } from "~/composables/useSorting";
 
 const {
   times,

composables/protocols/useCompoundPosition.ts

@@ -2,18 +2,18 @@ import { AbiItem } from "web3-utils";
 
 import compoundABI from "~/abis/read/compound.json";
 import { computed, ref, watch } from "@nuxtjs/composition-api";
-import { useDSA } from "./useDSA";
+import { useDSA } from "~/composables/useDSA";
-import { useWeb3 } from "./useWeb3";
+import { useWeb3 } from "~/composables/useWeb3";
 import BigNumber from "bignumber.js";
 import tokens from "~/constant/tokens";
-import { Network } from "./useNetwork";
+import { Network } from "~/composables/useNetwork";
-import { useBigNumber } from "./useBigNumber";
+import { useBigNumber } from "~/composables/useBigNumber";
-import { usePosition } from "./usePosition";
+import { usePosition } from "~/composables/usePosition";
-import { useToken } from "./useToken";
+import { useToken } from "~/composables/useToken";
 import addresses from "~/constant/addresses";
 import ctokens from "~/constant/ctokens";
 import tokenIdMapping from "~/constant/tokenIdMapping";
-import { useSorting } from "./useSorting";
+import { useSorting } from "~/composables/useSorting";
 
 const {
   times,

composables/protocols/useMakerdaoPosition.ts

@@ -4,10 +4,10 @@ BigNumber.config({ POW_PRECISION: 200 });
 import abis from "~/constant/abis";
 import addresses from "~/constant/addresses";
 import makerVaults from "~/constant/tokens/vaults";
-import { useBigNumber } from "./useBigNumber";
+import { useBigNumber } from "~/composables/useBigNumber";
-import { useDSA } from "./useDSA";
+import { useDSA } from "~/composables/useDSA";
-import { useToken } from "./useToken";
+import { useToken } from "~/composables/useToken";
-import { useWeb3 } from "./useWeb3";
+import { useWeb3 } from "~/composables/useWeb3";
 import { AbiItem } from "web3-utils";
 
 const defaultVault = {

composables/useValidators.ts

@@ -1,6 +1,6 @@
 import { useBigNumber } from "./useBigNumber";
 import { useFormatting } from "./useFormatting";
-import { useMakerdaoPosition } from "./useMakerdaoPosition";
+import { useMakerdaoPosition } from "~/composables/protocols/useMakerdaoPosition";
 
 export function useValidators() {
   const { formatNumber } = useFormatting();

pages/mainnet/aave-v2.vue

@@ -149,7 +149,7 @@
 <script lang="ts">
 import { defineComponent, computed } from "@nuxtjs/composition-api";
 import BackIcon from "~/assets/icons/back.svg?inline";
-import { useAaveV2Position } from "~/composables/useAaveV2Position";
+import { useAaveV2Position } from "~/composables/protocols/useAaveV2Position";
 import { useFormatting } from "~/composables/useFormatting";
 import { useSearchFilter } from "~/composables/useSearchFilter";
 import { useStatus } from "~/composables/useStatus";

pages/mainnet/compound.vue

@@ -147,7 +147,7 @@
 <script lang="ts">
 import { defineComponent, computed } from "@nuxtjs/composition-api";
 import BackIcon from "~/assets/icons/back.svg?inline";
-import { useCompoundPosition } from "~/composables/useCompoundPosition";
+import { useCompoundPosition } from "~/composables/protocols/useCompoundPosition";
 import { useFormatting } from "~/composables/useFormatting";
 import { useSearchFilter } from "~/composables/useSearchFilter";
 import { useStatus } from "~/composables/useStatus";

pages/mainnet/maker.vue

@@ -147,7 +147,7 @@ import SVGPercent from "@/assets/img/icons/percent.svg?inline";
 import CardMakerdao from "~/components/protocols/CardMakerdao.vue";
 import { useBigNumber } from "~/composables/useBigNumber";
 import { useFormatting } from "~/composables/useFormatting";
-import { useMakerdaoPosition } from "~/composables/useMakerdaoPosition";
+import { useMakerdaoPosition } from "~/composables/protocols/useMakerdaoPosition";
 import { useStatus } from "~/composables/useStatus";
 import { useNotification } from "~/composables/useNotification";
 import DropdownMakerdao from "~/components/protocols/DropdownMakerdao.vue";

pages/polygon/aave-v2.vue

@@ -149,7 +149,7 @@
 <script lang="ts">
 import { defineComponent, computed } from "@nuxtjs/composition-api";
 import BackIcon from "~/assets/icons/back.svg?inline";
-import { useAaveV2Position } from "~/composables/useAaveV2Position";
+import { useAaveV2Position } from "~/composables/protocols/useAaveV2Position";
 import { useFormatting } from "~/composables/useFormatting";
 import { useSearchFilter } from "~/composables/useSearchFilter";
 import { useStatus } from "~/composables/useStatus";