Merge pull request #3366 from kodadot/main

Long and leverage recovery mode
kodadot · Jul 7, 2022 · 7e17a57 · 7e17a57
2 parents 802e7e3 + bccb944
commit 7e17a57
Show file tree

Hide file tree

Showing 230 changed files with 8,467 additions and 4,015 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
@@ -1,19 +1,18 @@
-name: Feature Request
+name: Feature Request / User Experience
 description: Suggest an idea for KodaDot to be better for your friends
 title: "Be descriptive and short"
 labels: ["enhancement"]
 body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this feature request!
+        Thanks for taking the time to fill out this feature request, it would help us upgrade user experience for others users like you!
   - type: textarea
     id: feature-request
     attributes:
       label: Is your feature request related to a problem?
       description: A clear and concise description of what the problem is
       placeholder: I'm always frustrated when [...]
-      value: "I'm always frustrated when [...]"
     validations:
       required: true
   - type: textarea
@@ -22,7 +21,6 @@ body:
       label: Describe the solution you would like
       description: A clear and concise description of what you want to happen.
       placeholder: I would like to see
-      value: "I would like to see"
     validations:
       required: true
   - type: textarea
@@ -31,15 +29,17 @@ body:
       label: Describe alternatives you have considered
       description: A clear and concise description of any alternative solutions or features you have considered.
       placeholder: I have tried this alternative
-      value: "I have tried this alternative"
     validations:
       required: true
   - type: textarea
     id: screenshots
     attributes:
       label: Screeenshots
-      description: Sometimes, visuals are much better than words
+      description: Most times, visuals are much better than words
       placeholder: Paste your vision
-      value: "Paste your vision"
-    validations:
-      required: true
+  - type: textarea
+    id: relatedissues
+    attributes:
+      label: Are there opened related issues?
+      description: Linking it with existing issue would help us sort out things faster on our side
+      placeholder: Link to Github issue in our repository or from elsewhere helps a lot!
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,6 +10,7 @@
 ### What's new?
 
 - [ ] PR closes #<issue_number>
+- [ ] Requires deployment <rubick/magick_issue>
 - [ ] <brief_description_of_what_I've_added>
 
 ### Before submitting Pull Request, please make sure:

diff --git a/.github/diagram.svg b/.github/diagram.svg
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -19,6 +19,7 @@ Before you being:
 - Please have a read the [code of conduct](CODE_OF_CONDUCT.md)
 - [Learn how to set up your environment for the first time](FIRST_TIME.md)
 - Get familiar with our [coding conventions & recommendations](STYLE_GUIDE.md)
+- Read up on our [tech stack](https://medium.com/kodadot/the-tech-stack-at-kodadot-8a83880f8624) to get a better picture of the infrastructure we rely on
 
 ### Which issue should you pick?
 

diff --git a/components/Navbar.vue b/components/Navbar.vue
@@ -76,11 +76,25 @@
               {{ $t('simple') }}
             </b-navbar-item>
           </b-tooltip>
+          <b-tooltip
+            label="AI powered process to create your NFT"
+            position="is-right"
+            append-to-body>
+            <b-navbar-item tag="nuxt-link" :to="`/${urlPrefix}/creative`">
+              {{ $t('creative') }}
+            </b-navbar-item>
+          </b-tooltip>
         </template>
       </b-navbar-dropdown>
       <b-navbar-item tag="nuxt-link" :to="`/${urlPrefix}/explore`">
         <span>{{ $t('explore') }}</span>
       </b-navbar-item>
+      <b-navbar-item
+        v-if="urlPrefix === 'bsx'"
+        tag="nuxt-link"
+        :to="`/${urlPrefix}/stats`">
+        <span>{{ $t('stats') }}</span>
+      </b-navbar-item>
       <b-navbar-dropdown arrowless collapsible v-if="isRmrk" id="NavStats">
         <template #label>
           <span>{{ $t('stats') }}</span>
@@ -93,6 +107,7 @@
             Series
           </b-navbar-item>
           <b-navbar-item tag="nuxt-link" to="/sales"> Sales </b-navbar-item>
+          <b-navbar-item tag="nuxt-link" to="/hot"> Hot </b-navbar-item>
         </template>
       </b-navbar-dropdown>
       <LazyChainSelect class="custom-navbar-item" id="NavChainSelect" />
@@ -264,29 +279,29 @@ export default class NavbarMenu extends mixins(PrefixMixin) {
 //   }
 // }
 
-@media only screen and (min-width: 1024px) and (max-width: 1100px) {
-  div#NavHistoryBrowser {
-    display: none;
-  }
-}
-
-@media only screen and (min-width: 1024px) and (max-width: 1200px) {
-  a#NavCreate {
-    display: none;
-  }
-}
-
-@media only screen and (min-width: 1024px) and (max-width: 1250px) {
-  div#NavChainSelect {
-    display: none;
-  }
-}
-
-@media only screen and (min-width: 1024px) and (max-width: 1340px) {
-  div#NavLocaleChanger {
-    display: none;
-  }
-}
+//@media only screen and (min-width: 1024px) and (max-width: 1100px) {
+//  div#NavHistoryBrowser {
+//    display: none;
+//  }
+//}
+
+//@media only screen and (min-width: 1024px) and (max-width: 1200px) {
+//  a#NavCreate {
+//    display: none;
+//  }
+//}
+
+//@media only screen and (min-width: 1024px) and (max-width: 1250px) {
+//  div#NavChainSelect {
+//    display: none;
+//  }
+//}
+
+//@media only screen and (min-width: 1024px) and (max-width: 1340px) {
+//  div#NavLocaleChanger {
+//    display: none;
+//  }
+//}
 
 @include touch {
   .navbar {
@@ -381,7 +396,8 @@ export default class NavbarMenu extends mixins(PrefixMixin) {
   .search-navbar {
     background-color: transparent;
     box-shadow: none;
-    min-width: 350px;
+    width: min-content;
+    min-width: 140px;
     margin: 0 1rem;
     input {
       border: inherit;

diff --git a/components/base/BaseCollectionForm.vue b/components/base/BaseCollectionForm.vue
@@ -50,7 +50,7 @@ const components = {
 
 @Component({ components })
 export default class BaseCollectionForm extends Vue {
-  @Prop({ type: String, default: 'context' }) label!: string
+  @Prop({ type: String, default: 'mint.collection.create' }) label!: string
   @Prop(Boolean) protectiveMargin!: boolean
   @PropSync('name', { type: String }) vName!: string
   @PropSync('description', { type: String }) vDescription!: string

diff --git a/components/base/CarouselCardList.vue b/components/base/CarouselCardList.vue
@@ -11,7 +11,7 @@
     <template #item="list">
       <div class="card mx-4">
         <div class="card-image">
-          <nuxt-link :to="`/rmrk/gallery/${list.id}`">
+          <nuxt-link :to="`/${urlPrefix}/gallery/${list.id}`">
             <PreviewMediaResolver
               v-if="list.animationUrl"
               :src="list.animationUrl"
@@ -28,7 +28,7 @@
           <div class="media">
             <div class="media-content">
               <div class="title is-5 is-ellipsis">
-                <nuxt-link :to="`/rmrk/gallery/${list.id}`">
+                <nuxt-link :to="`/${url}/${list.id}`">
                   {{ list.name }}
                 </nuxt-link>
               </div>
@@ -38,7 +38,7 @@
                 </p>
               </b-field>
               <nuxt-link
-                :to="{ name: 'rmrk-u-id', params: { id: list.issuer } }">
+                :to="{ name: profileUrl, params: { id: list.issuer } }">
                 <div class="is-size-7 icon-text">
                   <b-icon icon="palette" />
                   <Identity
@@ -51,7 +51,7 @@
               <nuxt-link
                 v-if="list.currentOwner"
                 :to="{
-                  name: 'rmrk-u-id',
+                  name: profileUrl,
                   params: { id: list.currentOwner },
                 }">
                 <div class="is-size-7 icon-text">
@@ -63,7 +63,7 @@
                     class="force-clip is-ellipsis" />
                 </div>
               </nuxt-link>
-              <time class="is-size-7 icon-text">
+              <time class="is-size-7 icon-text" v-if="list.timestamp">
                 <b-icon icon="clock" />
                 <span>{{ list.timestamp }}</span>
               </time>
@@ -80,6 +80,7 @@ import { Component, mixins, Prop } from 'nuxt-property-decorator'
 import AuthMixin from '@/utils/mixins/authMixin'
 
 import type { CarouselNFT } from './types'
+import PrefixMixin from '~/utils/mixins/prefixMixin'
 
 const components = {
   // Identicon,
@@ -95,14 +96,18 @@ const components = {
 @Component<CarouselList>({
   components,
 })
-export default class CarouselList extends mixins(AuthMixin) {
+export default class CarouselList extends mixins(AuthMixin, PrefixMixin) {
   @Prop({ type: Array, required: true }) nfts!: CarouselNFT[]
   @Prop({ type: Number, default: 1 }) page!: number
-
+  @Prop({ type: String, default: 'rmrk/gallery' }) url!: string
   get current() {
     return this.page - 1 // 0-indexed
   }
 
+  get profileUrl() {
+    return `${this.urlPrefix}-u-id`
+  }
+
   get options() {
     return {
       itemsToShow: 2,

diff --git a/components/base/SubmitButton.vue b/components/base/SubmitButton.vue
@@ -7,7 +7,9 @@
       :disabled="disabled"
       :loading="loading"
       outlined>
-      {{ $t(label) }}
+      <slot>
+        {{ $t(label) }}
+      </slot>
     </b-button>
   </b-field>
 </template>

diff --git a/components/bsx/Create/Create.vue b/components/bsx/Create/Create.vue
@@ -0,0 +1,21 @@
+<template>
+  <div class="mb-6">
+    <CreateCollection @created="onCollectionCreated" />
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'nuxt-property-decorator'
+import CreateCollection from './CreateCollection.vue'
+
+@Component({
+  components: {
+    CreateCollection,
+  },
+})
+export default class Create extends Vue {
+  onCollectionCreated() {
+    this.$emit('navigateToCreateNftTab')
+  }
+}
+</script>