Merge branch 'release/0.11.0'

.gitignore

@@ -1,4 +1,4 @@
-
+**/*~
 /target
 **/*.rs.bk
 .env

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aepp-middleware"
-version = "0.10.0"
+version = "0.11.0"
 authors = ["John Newby <@johnsnewby>", "Shubhendu Shekhar <@shekhar-shubhendu>", "Andrea Giacobino <@noandrea>" ]
 description = "æternity node middleware: A caching and reporting layer for aeternity blockchain"
 

conf/log4rs.yaml → conf/log4rs-example.yaml

@@ -39,5 +39,4 @@ root:
   level: debug
   appenders:
     - main
-    - email
     - stdout

frontend/Dockerfile

@@ -15,7 +15,7 @@ FROM node:10.16.3-stretch as frontend
 WORKDIR /app
 COPY --from=frontend-build /app/.nuxt /app/.nuxt
 COPY --from=frontend-build /app/static /app/static
-RUN npm install nuxt@2.9.2 @nuxtjs/axios@5.5.4 @download/blockies@1.0.3 clipboard-copy@3.0.0 vue-multiselect@2.1.6 bignumber.js@9.0.0 && \
+RUN npm install nuxt@2.9.2 @nuxtjs/axios@5.5.4 @download/blockies@1.0.3 clipboard-copy@3.0.0 vue-multiselect@2.1.6 bignumber.js@9.0.0 vue-slider-component@3.0.41 && \
     npm cache clean --force
 COPY package.json package.json
 COPY LICENSE.md LICENSE.md

frontend/components/appIcon/index.vue

@@ -1,6 +1,6 @@
 <template>
   <svg-icon
-    :name="name"
+    :name="`${name}/${name}`"
     class="app-icon"
   />
 </template>

frontend/nuxt.config.js

@@ -37,8 +37,8 @@ module.exports = {
     }
   ],
   env: {
-    middlewareURL: process.env.NUXT_APP_NODE_URL || 'https://testnet.mdw.aepps.com',
-    middlewareWS: process.env.NUXT_APP_NODE_WS || 'wss://testnet.mdw.aepps.com/websocket',
+    middlewareURL: process.env.NUXT_APP_NODE_URL || 'https://testnet.aeternal.io',
+    middlewareWS: process.env.NUXT_APP_NODE_WS || 'wss://testnet.aeternal.io/websocket',
     networkName: process.env.NUXT_APP_NETWORK_NAME || 'TEST NET',
     swaggerHub: process.env.NUXT_APP_SWAGGER_HUB || 'https://app.swaggerhub.com/apis-docs/sshekhar/aepp-middleware/1.0',
     enableFaucet: process.env.NUXT_APP_ENABLE_FAUCET || false,
@@ -49,7 +49,8 @@ module.exports = {
   */
   plugins: [
     { src: '~/plugins/directives/copyToClipboard.js' },
-    { src: '~/plugins/directives/removeSpacesOnCopy.js' }
+    { src: '~/plugins/directives/removeSpacesOnCopy.js' },
+    { src: '~/plugins/directives/vueSliderComponent.js', mode: 'client' }
   ],
   /*
     ** Router config

frontend/package.json

@@ -28,7 +28,8 @@
     "normalize-scss": "7.0.1",
     "nuxt": "2.9.2",
     "vue": "2.6.10",
-    "vue-multiselect": "^2.1.6"
+    "vue-multiselect": "2.1.6",
+    "vue-slider-component": "3.0.41"
   },
   "devDependencies": {
     "@vue/eslint-config-standard": "4.0.0",

frontend/pages/auctions/index.vue

@@ -0,0 +1,118 @@
+<template>
+  <div class="app-names">
+    <PageHeader
+      title="Name Auctions"
+      :has-crumbs="true"
+      :page="{to: '/auctions', name: 'Name Auctions'}"
+    />
+    <div class="filter">
+      <multiselect
+        v-model="sortby"
+        track-by="name"
+        label="name"
+        :options="options"
+        :allow-empty="false"
+        :loading="loading"
+        placeholder="Sort By...."
+        @input="processInput"
+      />
+    </div>
+    <div class="auction-slider">
+      <client-only>
+        Name Length: {{ length || 'All' }}
+        <vue-slider
+          ref="slider"
+          v-model="length"
+          :min="0"
+          :max="12"
+          :marks="true"
+          :data="auctionMarks"
+          :tooltip="'focus'"
+          :clickable="true"
+          @change="processInput"
+        />
+      </client-only>
+    </div>
+    <div class="auction-error-messages">
+      <div v-if="!loading && auctions.length > 0">
+        <NameAuctionList>
+          <NameAuction
+            v-for="(item, index) of auctions"
+            :key="index"
+            :data="item"
+          />
+        </NameAuctionList>
+        <LoadMoreButton @update="loadMore" />
+      </div>
+      <div v-if="loading">
+        Loading....
+      </div>
+      <div v-if="!loading && auctions.length == 0">
+        Nothing to see here right now....
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import NameAuctionList from '../../partials/names/nameAuctionList'
+import NameAuction from '../../partials/names/nameAuction'
+import PageHeader from '../../components/PageHeader'
+import LoadMoreButton from '../../components/loadMoreButton'
+import Multiselect from 'vue-multiselect'
+
+export default {
+  name: 'AppNames',
+  components: {
+    NameAuctionList,
+    NameAuction,
+    PageHeader,
+    LoadMoreButton,
+    Multiselect
+  },
+  data () {
+    return {
+      page: 1,
+      loading: true,
+      auctions: [],
+      auctionMarks: ['All', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+      options: [
+        { name: 'Expiring Soon', value: 'expiration' },
+        { name: 'Name', value: 'name' },
+        { name: 'Max Bid', value: 'max_bid' }
+      ],
+      sortby: { name: 'Expiring Soon', value: 'expiration' },
+      length: 0
+    }
+  },
+  computed: {
+    actualLength () {
+      return this.length > 0 ? this.length + 6 : this.length
+    }
+  },
+  async asyncData ({ store }) {
+    const auctions = await store.dispatch('names/getActiveNameAuctions', { 'page': 1, 'limit': 10, sort: 'expiration', length: 0 })
+    return { auctions, page: 2, loading: false }
+  },
+  methods: {
+    async loadMore () {
+      const auctions = await this.$store.dispatch('names/getActiveNameAuctions', { 'page': this.page, 'limit': 10, sort: this.sortby.value, length: this.actualLength })
+      this.auctions = [...this.auctions, ...auctions]
+      this.page += 1
+    },
+    async processInput () {
+      this.loading = true
+      this.page = 1
+      this.auctions = await this.$store.dispatch('names/getActiveNameAuctions', { 'page': this.page, 'limit': 10, sort: this.sortby.value, length: this.actualLength })
+      this.page += 1
+      this.loading = false
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.auction-error-messages {
+  margin-top: 2em;
+}
+</style>

frontend/partials/appMainNav/index.vue

@@ -36,6 +36,9 @@
         <AppNavLink to="/names">
           Names
         </AppNavLink>
+        <AppNavLink to="/auctions">
+          Name Auctions
+        </AppNavLink>
         <AppNavLink to="/oracles">
           Oracles
         </AppNavLink>