Merge branch 'main' into main

kodadot · Aug 24, 2023 · 41de705 · 41de705
2 parents d21cf41 + 2b2c0af
commit 41de705
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 50 deletions.
diff --git a/components/TheFooter.vue b/components/TheFooter.vue
@@ -241,7 +241,7 @@ const socials = [
   {
     name: 'Twitter',
     url: 'https://twitter.com/KodaDot',
-    icon: 'twitter',
+    icon: 'x-twitter',
   },
   {
     name: 'Discord',

diff --git a/components/collection/HeroButtons.vue b/components/collection/HeroButtons.vue
@@ -5,7 +5,7 @@
       <div class="is-flex">
         <NeoButton
           v-if="twitter"
-          icon="twitter"
+          icon="x-twitter"
           icon-pack="fab"
           class="square-32"
           @click.native="openUrl(`https://twitter.com/${twitter}`)" />

diff --git a/components/common/ChainDropdown.vue b/components/common/ChainDropdown.vue
@@ -32,6 +32,9 @@ const { setUrlPrefix } = usePrefix()
 const { availableChains } = useChain()
 
 const getAddress = (chain: string) => {
+  if (!accountId.value) {
+    return ''
+  }
   const publicKey = decodeAddress(accountId.value)
 
   return encodeAddress(publicKey, CHAINS[chain].ss58Format)

diff --git a/components/common/ConnectWallet/ConnectWalletModal.vue b/components/common/ConnectWallet/ConnectWalletModal.vue
@@ -8,9 +8,13 @@
             : $i18n.t('walletConnect.walletHeading')
         }}
       </span>
-      <a class="is-flex is-align-items-center" @click="emit('close')">
-        <NeoIcon icon="close" />
-      </a>
+      <NeoButton
+        variant="text"
+        no-shadow
+        icon="xmark"
+        icon-pack="fa-sharp"
+        size="medium"
+        @click.native="emit('close')" />
     </header>
     <section v-if="showAccount">
       <WalletAsset />

diff --git a/components/common/NotificationBox/NotificationBoxModal.vue b/components/common/NotificationBox/NotificationBoxModal.vue
@@ -3,13 +3,17 @@
     v-if="isOpen"
     class="notification-modal-container theme-background-color border-left is-flex is-flex-direction-column">
     <header
-      class="py-4 px-6 is-flex is-justify-content-space-between border-bottom mb-4">
+      class="py-5 px-6 is-flex is-justify-content-space-between border-bottom mb-4">
       <span class="modal-card-title is-size-6 has-text-weight-bold">
         {{ $t('notification.notifications') }}
       </span>
-      <a class="is-flex is-align-items-center" @click="closeModal">
-        <NeoIcon icon="close" />
-      </a>
+      <NeoButton
+        variant="text"
+        no-shadow
+        icon="xmark"
+        icon-pack="fa-sharp"
+        size="medium"
+        @click.native="closeModal" />
     </header>
     <div class="px-0 pt-0 pb-3 theme-background-color">
       <div class="notification-filter theme-background-color px-6 pb-5">

diff --git a/components/common/shoppingCart/ShoppingCartModal.vue b/components/common/shoppingCart/ShoppingCartModal.vue
@@ -3,14 +3,16 @@
     <div
       class="shopping-cart-modal-container theme-background-color border-left is-flex is-flex-direction-column">
       <header
-        class="py-4 px-6 is-flex is-justify-content-space-between border-bottom">
+        class="py-5 px-6 is-flex is-justify-content-space-between border-bottom">
         <span class="modal-card-title is-size-6 has-text-weight-bold">
           {{ $t('shoppingCart.title') }}
         </span>
         <NeoButton
           variant="text"
           no-shadow
-          icon="close"
+          icon="xmark"
+          icon-pack="fa-sharp"
+          size="medium"
           @click.native="closeShoppingCart" />
       </header>
       <div

diff --git a/components/identity/module/IdentityPopoverHeader.vue b/components/identity/module/IdentityPopoverHeader.vue
@@ -23,7 +23,7 @@
         target="_blank"
         rel="nofollow noopener noreferrer"
         data-cy="identity-twitter">
-        <NeoIcon pack="fab" icon="twitter" class="has-text-link" />
+        <NeoIcon pack="fab" icon="x-twitter" class="has-text-link" />
       </a>
     </div>
   </div>

diff --git a/components/identity/module/IdentitySocial.vue b/components/identity/module/IdentitySocial.vue
@@ -5,7 +5,7 @@
       v-safe-href="`https://twitter.com/${twitter}`"
       target="_blank"
       rel="nofollow noopener noreferrer">
-      <NeoIcon pack="fab" icon="twitter" />
+      <NeoIcon pack="fab" icon="x-twitter" />
       <span class="aligned">
         {{ twitter }}
       </span>

diff --git a/composables/massmint/useZipValidator.ts b/composables/massmint/useZipValidator.ts
@@ -1,6 +1,7 @@
 import { ref } from 'vue'
 import { ZipEntry, unzip } from 'unzipit'
 import { MAX_UPLOADED_FILE_SIZE } from '@/utils/constants'
+import { mimeTypes } from '@kodadot1/static'
 export interface FileObject {
   imageUrl: string
   file: File
@@ -37,26 +38,6 @@ export const validFormats = [
   'mp3',
   'json',
 ]
-export const mimeTypes: { [key: string]: string } = {
-  bmp: 'image/bmp',
-  gif: 'image/gif',
-  jpg: 'image/jpeg',
-  jpeg: 'image/jpeg',
-  png: 'image/png',
-  svg: 'image/svg+xml',
-  tiff: 'image/tiff',
-  webp: 'image/webp',
-  mp4: 'video/mp4',
-  ogv: 'video/ogg',
-  mov: 'video/quicktime',
-  qt: 'video/quicktime',
-  webm: 'video/webm',
-  glb: 'model/gltf-binary',
-  gltf: 'model/gltf+json',
-  flac: 'audio/flac',
-  mp3: 'audio/mpeg',
-  json: 'application/json',
-}
 
 const toMegaBytes = (bytes: number) => bytes / Math.pow(1024, 2)
 

diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "@braintree/sanitize-url": "^6.0.4",
     "@chenfengyuan/vue-qrcode": "1",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
-    "@fortawesome/free-brands-svg-icons": "^6.2.1",
+    "@fortawesome/free-brands-svg-icons": "^6.4.2",
     "@fortawesome/free-regular-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
     "@fortawesome/vue-fontawesome": "^2.0.10",

diff --git a/pages/blog/index.vue b/pages/blog/index.vue
@@ -12,7 +12,7 @@
     </div>
 
     <div
-      v-for="post in posts.slice(0, 1)"
+      v-for="post in featured.slice(0, 1)"
       :key="post.attributes.title"
       class="content-featured content-list">
       <div
@@ -97,18 +97,32 @@ export default {
     const resolve = require.context('~/content/blog/', true, /\.md$/)
     const imports = resolve.keys().map((key) => resolve(key))
 
+    const tags = {
+      tokens: 'Tokens',
+    }
+
     const latestPosts = imports.sort(
       (a, b) => +new Date(b.attributes.date) - +new Date(a.attributes.date)
     )
 
-    const tokensPosts = latestPosts.filter(
-      (post) => post.attributes.tags === 'Tokens'
+    return latestPosts.reduce(
+      (acc, post, index) => {
+        if (index === 0) {
+          acc.featured.push(post)
+          return acc
+        }
+        if (post.attributes.tags === tags.tokens) {
+          acc.tokensPosts.push(post)
+        }
+        acc.posts.push(post)
+        return acc
+      },
+      {
+        featured: [],
+        posts: [],
+        tokensPosts: [],
+      }
     )
-
-    return {
-      posts: latestPosts,
-      tokensPosts,
-    }
   },
   methods: {
     getPermalink(post) {

diff --git a/plugins/icons.ts b/plugins/icons.ts
@@ -120,9 +120,9 @@ import {
   faRedditAlien,
   faTelegram,
   faTelegramPlane,
-  faTwitter,
   faWhatsapp,
   faWpexplorer,
+  faXTwitter,
   faYoutube,
 } from '@fortawesome/free-brands-svg-icons'
 
@@ -220,7 +220,7 @@ library.add(
   faCheck,
 
   // Social
-  faTwitter,
+  faXTwitter,
   faTelegram,
   faFacebook,
   faFacebookMessenger,

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/styles/components/_connect-wallet.scss b/styles/components/_connect-wallet.scss
@@ -51,7 +51,7 @@
 
     .modal-card-head {
       background: unset;
-      padding: 1rem 2rem;
+      padding: 1.5rem 2rem;
       @include ktheme() {
         border-bottom: 1px solid theme('border-color');
       }