Merge branch 'nuxt' into refactor/5314/vueClipBoard

kodadot · Sep 11, 2023 · f7475b1 · f7475b1
2 parents a41d5e7 + 2f36718
commit f7475b1
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 93 deletions.
diff --git a/components/collection/voteDrop/DropContainer.vue b/components/collection/voteDrop/DropContainer.vue
@@ -59,7 +59,6 @@
               </div>
               <div>
                 <NeoButton
-                  ref="root"
                   class="mb-2 mt-4 mint-button"
                   variant="k-accent"
                   :disabled="mintButtonDisabled"
@@ -131,7 +130,6 @@ import { ConnectWalletModalConfig } from '@/components/common/ConnectWallet/useC
 import { doWaifu } from '@/services/waifu'
 import { sanitizeIpfsUrl } from '@/utils/ipfs'
 import { NeoButton, NeoIcon } from '@kodadot1/brick'
-import type Vue from 'vue'
 import { useCountDown } from '../unlockable/utils/useCountDown'
 import {
   VOTE_DROP_AHP_CAMPAIGN,
@@ -148,8 +146,8 @@ const Loader = defineAsyncComponent(
   () => import('@/components/collection/unlockable/UnlockableLoader.vue')
 )
 
-const { $neoModal, $i18n } = useNuxtApp()
-const root = ref<Vue>()
+const { $i18n } = useNuxtApp()
+const { neoModal } = useProgrammatic()
 const { accountId } = useAuth()
 
 const imageList = ref<string[]>([])
@@ -275,8 +273,7 @@ const mintButtonDisabled = computed(
 
 const handleMint = async () => {
   if (!isLogIn.value) {
-    $neoModal.open({
-      parent: root?.value,
+    neoModal.open({
       ...ConnectWalletModalConfig,
     })
     return

diff --git a/components/common/ConnectWallet/WalletAssetMenu.vue b/components/common/ConnectWallet/WalletAssetMenu.vue
@@ -63,7 +63,7 @@ import { useLangStore } from '@/stores/lang'
 const { urlPrefix } = usePrefix()
 const { isBasilisk } = useIsChain(urlPrefix)
 const { toggleColorMode, isDarkMode } = useTheme()
-const { $neoModal } = useNuxtApp()
+const { neoModal } = useProgrammatic()
 
 const langStore = useLangStore()
 
@@ -97,7 +97,7 @@ onMounted(() => {
 })
 
 const closeModal = () => {
-  $neoModal.closeAll()
+  neoModal.closeAll()
 }
 </script>
 

diff --git a/components/profile/activityTab/Activity.vue b/components/profile/activityTab/Activity.vue
@@ -53,9 +53,10 @@ const activeFilters = computed(() =>
   filters.filter((queryParam) => route.query[queryParam] === 'true')
 )
 
-const { urlPrefix } = usePrefix()
+const { client, urlPrefix } = usePrefix()
 const queryPrefix = urlPrefix.value === 'ksm' ? 'chain-rmrk' : ''
 const { data } = useGraphql({
+  clientName: client.value,
   queryName: 'allEventsByProfile',
   queryPrefix,
   variables: {
@@ -64,7 +65,7 @@ const { data } = useGraphql({
 })
 
 watch(data, () => {
-  events.value = [...sortedEventByDate(data.value?.events || [], 'DESC')]
+  events.value = [...sortedEventByDate(data.value?.value.events || [], 'DESC')]
 })
 
 const interactionToFilterMap = {

diff --git a/components/shared/TransactionLoader.vue b/components/shared/TransactionLoader.vue
@@ -122,7 +122,7 @@ const estmiatedTimeLeft = computed(() => {
 
 const explorerLink = computed(() => {
   const explorerBaseUrl = chainPropListOf(urlPrefix.value).blockExplorer
-  return `${explorerBaseUrl}extrinsic\\${props.transactionId}`
+  return `${explorerBaseUrl}extrinsic/${props.transactionId}`
 })
 
 const activeStep = computed(() => {

diff --git a/libs/ui/src/components/NeoModalExtend/plugin.js b/libs/ui/src/components/NeoModalExtend/plugin.js
diff --git a/libs/ui/src/components/NeoModalExtend/plugin.ts b/libs/ui/src/components/NeoModalExtend/plugin.ts
@@ -44,7 +44,6 @@ const ModalProgrammatic = {
     return vnode.component?.proxy as InstanceType<typeof Modal>
   },
   closeAll() {
-    console.log(instances)
     instances.walk((entry) => {
       // eslint-disable-next-line prefer-rest-params
       entry.close(...arguments)

diff --git a/nuxt.config.js b/nuxt.config.js
@@ -171,7 +171,6 @@ export default defineNuxtConfig({
     // '~/plugins/filters',
     // '~/plugins/pwa',
     // '~/plugins/vueAudioVisual',
-    // '~/plugins/vueSocialSharing',
     // '~/plugins/vueTippy',
     // '~/plugins/safeHref',
   ],

diff --git a/package.json b/package.json
@@ -116,7 +116,7 @@
     "vue-audio-visual": "2.5.0",
     "vue-dompurify-html": "^4.1.4",
     "vue-infinite-loading": "^2.4.5",
-    "vue-social-sharing": "^3.0.9",
+    "vue-social-sharing": "4.0.0-alpha4",
     "vue-tippy": "^6.3.1",
     "workbox-window": "^6.6.0"
   },

diff --git a/plugins/vueSocialSharing.ts b/plugins/vueSocialSharing.ts
@@ -1,5 +1,5 @@
-// import Vue from 'vue'
-// import VueSocialSharing from 'vue-social-sharing'
+import VueSocialSharing from 'vue-social-sharing'
 
-// Vue.use(VueSocialSharing)
-export default defineNuxtPlugin(() => undefined)
+export default defineNuxtPlugin((nuxtApp) => {
+  nuxtApp.vueApp.use(VueSocialSharing)
+})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/utils/queryPathResolver.ts b/utils/queryPathResolver.ts
@@ -2,8 +2,13 @@ function resolveQueryPath(
   prefix: string,
   queryName: string
 ): Promise<typeof import('*.graphql')> {
+  // TODO: find a better way?
   const path = getPath(prefix)
-  return import(/* @vite-ignore */ `../queries/${path}${queryName}.graphql`)
+  const MODULES = import.meta.glob('../queries/**/*.graphql')
+  return MODULES[`../queries/${path}${queryName}.graphql`]() as Promise<
+    typeof import('*.graphql')
+  >
+  // return import(/* @vite-ignore */ `../queries/${path}${queryName}.graphql`)
 }
 
 function getPath(prefix: string) {