Merge pull request #801 from telosnetwork/develop

v1.2.8-rc

.gitignore

@@ -22,3 +22,5 @@ yarn-error.log*
 *.ntvs*
 *.njsproj
 *.sln
+.yarn
+.yarnrc

package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-block-explorer",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "..",
   "productName": "Telos Block Explorer",
   "author": "DonaldPeat <[email protected]>",

src/components/Footer.vue

@@ -5,7 +5,7 @@ import { computed } from 'vue';
 export default {
     name: 'AppFooter',
     setup() {
-        const footerLinks = computed(() => ConfigManager.get().getCurrentChain().getUiCustomization().footerLinks);
+        const footerLinks = computed(() => ConfigManager.get().getCurrentChain().getFooterLinks());
 
         return {
             footerLinks,
@@ -18,7 +18,7 @@ export default {
 
 <div class="row footer-background justify-center text-center q-py-md">
     <div v-for="footerLink in footerLinks" :key="footerLink.label" class="col-lg-1 col-md-2 col-sm-2 col-xs-4 q-pa-md">
-        <a class="no-dec" :href="footerLink.url">{{footerLink.label}}</a>
+        <a class="no-dec" :href="footerLink.url" target="_blank">{{footerLink.label}}</a>
     </div>
 </div>
 

src/components/MapData.vue

@@ -34,7 +34,7 @@ export default defineComponent({
     <div class="col-3">
         <div class="row">
             <div class="col-12 text-subtitle1 text-weight-thin text-uppercase">Head Block</div>
-            <div class="col-12 text-subtitle1 text-bold">{{HeadBlock}}</div>
+            <div class="col-12 text-subtitle1 text-bold">{{HeadBlock.toLocaleString()}}</div>
         </div>
     </div>
     <div class="col-1">
@@ -52,7 +52,7 @@ export default defineComponent({
     <div class="col-3">
         <div class="row">
             <div class="col-12 text-subtitle1 text-weight-thin text-uppercase">Irreversible Block</div>
-            <div class="col-12 text-subtitle1 text-bold">{{lastIrreversibleBlock}}</div>
+            <div class="col-12 text-subtitle1 text-bold">{{lastIrreversibleBlock.toLocaleString()}}</div>
         </div>
     </div>
 </div>

src/config/BaseChain.ts

@@ -3,7 +3,7 @@ import { RpcEndpoint } from 'universal-authenticator-library';
 import { PriceChartData } from 'src/types/PriceChartData';
 import { Theme } from 'src/types/Theme';
 import { Token } from 'src/types';
-import { UiCustomization } from 'src/types/UiCustomization';
+import { FooterLink, UiCustomization } from 'src/types/UiCustomization';
 
 export const DEFAULT_THEME = {
     primary: '#11589e',
@@ -35,11 +35,6 @@ export const DEFAULT_THEME = {
 };
 
 export const baseUiConfiguration: UiCustomization = {
-    footerLinks: [
-        { label: 'LEGAL', url: 'https://telos.net/legal' },
-        { label: 'PRIVACY', url: 'https://telos.net/privacy-policy' },
-        { label: 'REPOSITORY', url: 'https://github.com/telosnetwork/open-block-explorer' },
-    ],
     headerSettings: {
         hideLoginHandler: false,
 
@@ -98,6 +93,7 @@ export default abstract class BaseChain implements Chain {
   abstract getUsdPrice(): Promise<number>;
   abstract getMapDisplay(): boolean;
   abstract getTheme(): Theme;
+  abstract getFooterLinks(): FooterLink[];
 
   getUiCustomization(): UiCustomization {
       return baseUiConfiguration;

src/config/chains/eos/index.ts

@@ -7,6 +7,7 @@ import {
 import { PriceChartData } from 'src/types/PriceChartData';
 import { Theme } from 'src/types/Theme';
 import { Token } from 'src/types';
+import { FooterLink } from 'src/types/UiCustomization';
 
 const CHAIN_ID =
   'aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906';
@@ -124,4 +125,12 @@ export default class EOS extends BaseChain {
         }
         return true;
     }
+
+    getFooterLinks(): FooterLink[] {
+        return [
+            { label: 'TERMS', url: 'https://eosnetwork.com/terms-of-use/' },
+            { label: 'PRIVACY', url: 'https://eosnetwork.com/privacy-policy/' },
+            { label: 'REPOSITORY', url: 'https://github.com/telosnetwork/open-block-explorer' },
+        ];
+    }
 }

src/config/chains/jungle/index.ts

@@ -22,6 +22,7 @@ import { PriceChartData } from 'src/types/PriceChartData';
 import { getEmptyPriceChartData } from 'src/api/price';
 import { Theme } from 'src/types/Theme';
 import { Token } from 'src/types';
+import { FooterLink } from 'src/types/UiCustomization';
 
 const CHAIN_ID =
   '73e4385a2708e6d7048834fbc1079f2fabb17b3c125b146af438971e90716c4d';
@@ -136,4 +137,12 @@ export default class TelosTestnet extends BaseChain {
     isTestnet(): boolean {
         return true;
     }
+
+    getFooterLinks(): FooterLink[] {
+        return [
+            { label: 'TERMS', url: 'https://eosnetwork.com/terms-of-use/' },
+            { label: 'PRIVACY', url: 'https://eosnetwork.com/privacy-policy/' },
+            { label: 'REPOSITORY', url: 'https://github.com/telosnetwork/open-block-explorer' },
+        ];
+    }
 }

src/config/chains/telos-testnet/index.ts

@@ -22,6 +22,7 @@ import { PriceChartData } from 'src/types/PriceChartData';
 import { getEmptyPriceChartData } from 'src/api/price';
 import { Theme } from 'src/types/Theme';
 import { Token } from 'src/types';
+import { FooterLink } from 'src/types/UiCustomization';
 
 const CHAIN_ID =
   '1eaa0824707c8c16bd25145493bf062aecddfeb56c736f6ba6397f3195f33c9f';
@@ -138,4 +139,12 @@ export default class TelosTestnet extends BaseChain {
     isTestnet(): boolean {
         return true;
     }
+
+    getFooterLinks(): FooterLink[] {
+        return [
+            { label: 'LEGAL', url: 'https://telos.net/legal' },
+            { label: 'PRIVACY', url: 'https://telos.net/privacy-policy' },
+            { label: 'REPOSITORY', url: 'https://github.com/telosnetwork/open-block-explorer' },
+        ];
+    }
 }

src/config/chains/telos/index.ts

@@ -22,6 +22,7 @@ import {
 import { PriceChartData } from 'src/types/PriceChartData';
 import { Theme } from 'src/types/Theme';
 import { Token } from 'src/types';
+import { FooterLink } from 'src/types/UiCustomization';
 
 const CHAIN_ID =
   '4667b205c6838ef70ff7988f6e8257e8be0e1284a2f59699054a018f743b1d11';
@@ -141,4 +142,12 @@ export default class Telos extends BaseChain {
         }
         return true;
     }
+
+    getFooterLinks(): FooterLink[] {
+        return [
+            { label: 'LEGAL', url: 'https://telos.net/legal' },
+            { label: 'PRIVACY', url: 'https://telos.net/privacy-policy' },
+            { label: 'REPOSITORY', url: 'https://github.com/telosnetwork/open-block-explorer' },
+        ];
+    }
 }

src/config/chains/ux/index.ts

@@ -4,6 +4,7 @@ import { getEmptyPriceChartData } from 'src/api/price';
 import { PriceChartData } from 'src/types/PriceChartData';
 import { Theme } from 'src/types/Theme';
 import { Token } from 'src/types';
+import { FooterLink } from 'src/types/UiCustomization';
 
 const CHAIN_ID =
   '8fc6dce7942189f842170de953932b1f66693ad3788f766e777b6f9d22335c02';
@@ -93,4 +94,12 @@ export default class UX extends BaseChain {
         }
         return true;
     }
+
+    getFooterLinks(): FooterLink[] {
+        return [
+            { label: 'TERMS', url: 'https://uxnetwork.io/static/Terms.pdf' },
+            { label: 'PRIVACY', url: 'https://uxnetwork.io/static/PP.pdf' },
+            { label: 'REPOSITORY', url: 'https://github.com/telosnetwork/open-block-explorer' },
+        ];
+    }
 }

src/config/chains/wax/index.ts

@@ -7,6 +7,7 @@ import {
 import { PriceChartData } from 'src/types/PriceChartData';
 import { Theme } from 'src/types/Theme';
 import { Token } from 'src/types';
+import { FooterLink } from 'src/types/UiCustomization';
 
 const CHAIN_ID =
   '1064487b3cd1a897ce03ae5b6a865651747e2e152090f99c1d19d44e01aea5a4';
@@ -96,4 +97,12 @@ export default class EOS extends BaseChain {
         }
         return true;
     }
+
+    getFooterLinks(): FooterLink[] {
+        return [
+            { label: 'TERMS', url: 'https://www.wax.io/terms-of-service' },
+            { label: 'PRIVACY', url: 'https://www.wax.io/privacy-policy' },
+            { label: 'REPOSITORY', url: 'https://github.com/telosnetwork/open-block-explorer' },
+        ];
+    }
 }

src/pages/Error404.vue

@@ -1,20 +1,26 @@
 <script lang="ts">
+import { DEFAULT_THEME } from 'src/config/BaseChain';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
     name: 'Error404Page',
+    setup () {
+        return {
+            secondary: DEFAULT_THEME.secondary,
+        };
+    },
 });
 </script>
 
 <template>
-<div class="fullscreen bg-blue text-white text-center q-pa-md flex flex-center">
-    <div>
+<div class="text-primary text-center q-pa-md flex flex-center q-my-lg">
+    <div class="message-404">
         <div class="text-xl">404</div>
         <div class="text-h2">Oops. Nothing here...</div>
         <q-btn
             class="q-mt-xl"
             color="white"
-            text-color="blue"
+            :text-color="secondary"
             unelevated
             to="/"
             label="Go Home"
@@ -23,3 +29,8 @@ export default defineComponent({
     </div>
 </div>
 </template>
+
+<style lang="sass">
+  .message-404
+    color: var(--q-secondary)
+</style>

src/router/routes.ts

@@ -92,7 +92,8 @@ const routes: RouteRecordRaw[] = [
     // but you can also remove it
     {
         path: '/:catchAll(.*)*',
-        component: () => import('pages/Error404.vue'),
+        component: () => import('layouts/MainLayout.vue'),
+        children: [{ path: '', component: () => import('pages/Error404.vue') }],
     },
 ];
 

src/types/Chain.d.ts

@@ -2,7 +2,7 @@ import { RpcEndpoint } from 'universal-authenticator-library';
 import { PriceChartData } from 'src/types/PriceChartData';
 import { Theme } from 'src/types/Theme';
 import { Token } from 'src/types/Actions';
-import { UiCustomization } from 'src/types/UiCustomization';
+import { FooterLink, UiCustomization } from 'src/types/UiCustomization';
 
 export interface Chain {
   getName(): string;
@@ -23,4 +23,5 @@ export interface Chain {
   getUiCustomization(): UiCustomization;
   getFiltersSupported(prop: string): boolean;
   isTestnet(): boolean;
+  getFooterLinks(): FooterLink[];
 }

src/types/UiCustomization.ts

@@ -31,7 +31,6 @@ export interface AccountPageSettings {
 }
 
 export interface UiCustomization {
-    footerLinks: FooterLink[];
     headerSettings: HeaderSettings;
     accountPageSettings: AccountPageSettings;
 }