Merge branch 'main-nuxt' into refactoring/store

Author: yangwao

components/rmrk/Gallery/PaginatedCardList.vue

@@ -1,8 +1,18 @@
 <template>
   <div>
-    <Search v-bind.sync="searchQuery" v-if="showSearchBar" />
-    <Pagination hasMagicBtn replace :total="total" v-model="currentValue" />
-    <GalleryCardList :items="items" />
+    <Search v-bind.sync="searchQuery" v-if="showSearchBar">
+      <Layout class="mr-5" />
+      <b-field>
+        <Pagination
+          hasMagicBtn
+          simple
+          replace
+          :total="total"
+          v-model="currentValue"
+        />
+      </b-field>
+    </Search>
+    <GalleryCardList :items="items" horizontalLayout />
     <Pagination
       class="pt-5 pb-5"
       replace
@@ -22,6 +32,7 @@ const components = {
   GalleryCardList: () => import('./GalleryCardList.vue'),
   Pagination: () => import('@/components/rmrk/Gallery/Pagination.vue'),
   Search: () => import('@/components/rmrk/Gallery/Search/SearchBarCollection.vue'),
+  Layout: () => import('@/components/rmrk/Gallery/Layout.vue'),
 }
 
 @Component({ components })

components/rmrk/Gallery/Pagination.vue

@@ -90,7 +90,7 @@ export default class Pagination extends Vue {
   replaceUrl(value: string, key = 'page') {
     this.$router
       .replace({
-        name: String(this.$route.name),
+        path: String(this.$route.path),
         query: { ...this.$route.query, [key]: value },
       })
       .catch(console.warn /*Navigation Duplicate err fix later */)

components/rmrk/Gallery/Search/SearchBar.vue

@@ -122,7 +122,7 @@ export default class SearchBar extends Vue {
   replaceUrl(value: string, key = 'search'): void {
     this.$router
       .replace({
-        name: String(this.$route.name),
+        path: String(this.$route.path),
         query: { ...this.$route.query, search: this.searchQuery, [key]: value }
       })
       .catch(console.warn /*Navigation Duplicate err fix later */)

components/rmrk/Gallery/Search/SearchBarCollection.vue

@@ -113,7 +113,7 @@ export default class SearchBar extends Vue {
   replaceUrl(value: string, key = 'search'): void {
     this.$router
       .replace({
-        name: String(this.$route.name),
+        path: String(this.$route.path),
         query: {
           ...this.$route.query,
           search: this.searchQuery,

components/series/SeriesTable.vue

@@ -356,7 +356,7 @@ export default class SeriesTable extends Vue {
   @Watch('nbRows')
   public onTopRowsChange(value: string) {
     this.$router.replace({
-      name: String(this.$route.name),
+      path: String(this.$route.path),
       query: { ...this.$route.query, rows: value },
     }).catch((e) => console.warn(e))
     this.fetchCollectionsSeries(Number(value))
@@ -365,7 +365,7 @@ export default class SeriesTable extends Vue {
   @Watch('nbDays')
   public onTopDaysChange(value: string) {
     this.$router.replace({
-      name: String(this.$route.name),
+      path: String(this.$route.path),
       query: { ...this.$route.query, period: value },
     }).catch((e) => console.warn(e))
   }

components/shared/format/Identity.vue

@@ -151,7 +151,7 @@ export default class Identity extends mixins(InlineMixin) {
 
 .twitter-link .icon {
   vertical-align: middle;
-  margin: auto .5em auto 0;
+  margin: auto 0 auto 0;
 }
 
 .overflowWrap {

langDir/en.json

@@ -187,7 +187,7 @@
     "UPDATED_AT_ASC": "Long time no interaction",
     "PRICE_DESC": "From most expensive",
     "PRICE_ASC": "From cheaper",
-    "listed": "BUY NOW"
+    "listed": "YOLO"
   },
   "mint": {
     "submit": "Click to create NFT(s)",

pages/index.vue

@@ -99,6 +99,15 @@
               >
                 Grants
               </b-button>
+              <b-button
+                tag="a"
+                href="https://en.wikipedia.org/wiki/Non-fungible_token"
+                target="_blank"
+                rel="noopener noreferrer"
+                type="is-primary"
+              >
+                What are NFTs?
+              </b-button>
             </div>
           </div>
           <div class="column has-text-right has-text-left-mobile">

pages/transfer.vue

@@ -340,7 +340,7 @@ export default class Transfer extends mixins(
       queryValue.usdamount = this.$route.query.usdamount
     }
     this.$router.replace({
-      name: String(this.$route.name),
+      path: String(this.$route.path),
       query: queryValue,
     })
   }
@@ -355,7 +355,7 @@ export default class Transfer extends mixins(
       queryValue.target = this.$route.query.target
     }
     this.$router.replace({
-      name: String(this.$route.name),
+      path: String(this.$route.path),
       query: queryValue,
     })
   }