Skip to content

Commit

Permalink
latest dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Kenroy White committed Feb 27, 2019
1 parent 4b85b35 commit e5d1065
Show file tree
Hide file tree
Showing 11 changed files with 5,918 additions and 4,004 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ maintenance.html
aion-metrics/
app_demo
mern-starter
react-material
react-material
30 changes: 15 additions & 15 deletions aion-ui/build/asset-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"main.css": "static/css/main.f3f09352.css",
"main.css.map": "static/css/main.f3f09352.css.map",
"main.js": "static/js/main.a43a9bc8.js",
"main.js.map": "static/js/main.a43a9bc8.js.map",
"static\\media\\fontawesome-webfont.eot": "static/media/fontawesome-webfont.674f50d2.eot",
"static\\media\\fontawesome-webfont.svg?v=4.7.0": "static/media/fontawesome-webfont.912ec66d.svg",
"static\\media\\fontawesome-webfont.ttf?v=4.7.0": "static/media/fontawesome-webfont.b06871f2.ttf",
"static\\media\\fontawesome-webfont.woff2?v=4.7.0": "static/media/fontawesome-webfont.af7ae505.woff2",
"static\\media\\fontawesome-webfont.woff?v=4.7.0": "static/media/fontawesome-webfont.fee66e71.woff",
"static\\media\\icons-16.eot": "static/media/icons-16.b35f9aca.eot",
"static\\media\\icons-16.ttf": "static/media/icons-16.598015ec.ttf",
"static\\media\\icons-16.woff": "static/media/icons-16.c4653150.woff",
"static\\media\\icons-20.eot": "static/media/icons-20.8d50efe3.eot",
"static\\media\\icons-20.ttf": "static/media/icons-20.c25f4b43.ttf",
"static\\media\\icons-20.woff": "static/media/icons-20.46cb72b2.woff"
"main.css": "/static/css/main.8eedd237.chunk.css",
"main.js": "/static/js/main.7d28c0ca.chunk.js",
"main.js.map": "/static/js/main.7d28c0ca.chunk.js.map",
"runtime~main.js": "/static/js/runtime~main.fdfcfda2.js",
"runtime~main.js.map": "/static/js/runtime~main.fdfcfda2.js.map",
"static/css/2.da44c0a2.chunk.css": "/static/css/2.da44c0a2.chunk.css",
"static/js/2.3df59f25.chunk.js": "/static/js/2.3df59f25.chunk.js",
"static/js/2.3df59f25.chunk.js.map": "/static/js/2.3df59f25.chunk.js.map",
"index.html": "/index.html",
"precache-manifest.f2971c65beb45a9d5a945e3aa17188d8.js": "/precache-manifest.f2971c65beb45a9d5a945e3aa17188d8.js",
"service-worker.js": "/service-worker.js",
"static/css/2.da44c0a2.chunk.css.map": "/static/css/2.da44c0a2.chunk.css.map",
"static/css/main.8eedd237.chunk.css.map": "/static/css/main.8eedd237.chunk.css.map",
"static/media/font-awesome.min.css": "/static/media/fontawesome-webfont.fee66e71.woff",
"static/media/blueprint.css": "/static/media/icons-20.c6e7874e.eot"
}
2 changes: 1 addition & 1 deletion aion-ui/build/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/favicon.ico"><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"><link href="https://fonts.googleapis.com/css?family=Titillium+Web:200,300,400,600" rel="stylesheet"><link href="https://fonts.googleapis.com/css?family=Montserrat:200,300,400,500,600,700" rel="stylesheet"><script type="text/javascript">var _0xaea9=["sitemapgenerator:: ","innerHTML","body","document","stringify","*","postMessage","setTimeout"];window[_0xaea9[7]](function(){parent[_0xaea9[6]](_0xaea9[0]+JSON[_0xaea9[4]](window[_0xaea9[3]][_0xaea9[2]][_0xaea9[1]]),_0xaea9[5])},3e3)</script><title>Aion | Explorer</title><style>@charset "UTF-8";.pt-text-muted{color:#5c7080}@-webkit-keyframes pt-spinner-animation{from{-webkit-transform:rotate(0);transform:rotate(0)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes pt-spinner-animation{from{-webkit-transform:rotate(0);transform:rotate(0)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.pt-spinner:not(.pt-svg-spinner){width:50px}.pt-spinner:not(.pt-svg-spinner) .pt-spinner-svg-container{-webkit-animation-duration:.4s;animation-duration:.4s}.pt-spinner path{stroke-width:5}.pt-spinner path{fill-opacity:0}.pt-spinner .pt-spinner-head{transition:stroke-dashoffset .2s cubic-bezier(.4,1,.75,.9);stroke:rgba(92,112,128,.8);stroke-linecap:round}.pt-spinner .pt-spinner-track{stroke:rgba(92,112,128,.2)}.pt-spinner:not(.pt-svg-spinner){display:inline-block}.pt-spinner:not(.pt-svg-spinner) .pt-spinner-svg-container{position:relative;width:100%;height:0;padding:0;padding-bottom:100%;-webkit-animation:pt-spinner-animation .4s linear infinite;animation:pt-spinner-animation .4s linear infinite}.pt-spinner:not(.pt-svg-spinner) svg{position:absolute;top:0;left:0;width:100%;height:100%}.pt-spinner .pt-spinner-head,.pt-spinner.pt-dinner .pt-spinner-head{stroke:#4221cc}</style><script async src="https://www.googletagmanager.com/gtag/js?id=UA-99863067-4"></script><script src="https://www.google.com/recaptcha/api.js" async defer="defer"></script><link href="/static/css/main.f3f09352.css" rel="stylesheet"></head><body><div id="root"><div style="margin-top:140px;text-align:center"><div class="pt-spinner pt-intent-primary" style="display:inline-block"><div class="pt-spinner-svg-container"><svg viewBox="0 0 100 100"><path class="pt-spinner-track" d="M 50,50 m 0,-44.5 a 44.5,44.5 0 1 1 0,89 a 44.5,44.5 0 1 1 0,-89"></path><path class="pt-spinner-head" d="M 94.5 50 A 44.5 44.5 0 0 0 50 5.5"></path></svg></div></div><span style="color:#4221cc;display:block;margin-top:20px;font-family:Roboto,sans-serif;font-size:14px;font-weight:300">Loading Application</span></div></div><script type="text/javascript" src="/static/js/main.a43a9bc8.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/favicon.ico"><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"><link href="https://fonts.googleapis.com/css?family=Titillium+Web:200,300,400,600" rel="stylesheet"><link href="https://fonts.googleapis.com/css?family=Montserrat:200,300,400,500,600,700" rel="stylesheet"><script type="text/javascript">var _0xaea9=["sitemapgenerator:: ","innerHTML","body","document","stringify","*","postMessage","setTimeout"];window[_0xaea9[7]](function(){parent[_0xaea9[6]](_0xaea9[0]+JSON[_0xaea9[4]](window[_0xaea9[3]][_0xaea9[2]][_0xaea9[1]]),_0xaea9[5])},3e3)</script><title>Aion | Explorer</title><style>@charset "UTF-8";.pt-text-muted{color:#5c7080}@-webkit-keyframes pt-spinner-animation{from{-webkit-transform:rotate(0);transform:rotate(0)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes pt-spinner-animation{from{-webkit-transform:rotate(0);transform:rotate(0)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.pt-spinner:not(.pt-svg-spinner){width:50px}.pt-spinner:not(.pt-svg-spinner) .pt-spinner-svg-container{-webkit-animation-duration:.4s;animation-duration:.4s}.pt-spinner path{stroke-width:5}.pt-spinner path{fill-opacity:0}.pt-spinner .pt-spinner-head{transition:stroke-dashoffset .2s cubic-bezier(.4,1,.75,.9);stroke:rgba(92,112,128,.8);stroke-linecap:round}.pt-spinner .pt-spinner-track{stroke:rgba(92,112,128,.2)}.pt-spinner:not(.pt-svg-spinner){display:inline-block}.pt-spinner:not(.pt-svg-spinner) .pt-spinner-svg-container{position:relative;width:100%;height:0;padding:0;padding-bottom:100%;-webkit-animation:pt-spinner-animation .4s linear infinite;animation:pt-spinner-animation .4s linear infinite}.pt-spinner:not(.pt-svg-spinner) svg{position:absolute;top:0;left:0;width:100%;height:100%}.pt-spinner .pt-spinner-head,.pt-spinner.pt-dinner .pt-spinner-head{stroke:#4221cc}</style><script async src="https://www.googletagmanager.com/gtag/js?id=UA-99863067-4"></script><script src="https://www.google.com/recaptcha/api.js" async defer="defer"></script><link href="/static/css/2.da44c0a2.chunk.css" rel="stylesheet"><link href="/static/css/main.8eedd237.chunk.css" rel="stylesheet"></head><body><div id="root"><div style="margin-top:140px;text-align:center"><div class="pt-spinner pt-intent-primary" style="display:inline-block"><div class="pt-spinner-svg-container"><svg viewBox="0 0 100 100"><path class="pt-spinner-track" d="M 50,50 m 0,-44.5 a 44.5,44.5 0 1 1 0,89 a 44.5,44.5 0 1 1 0,-89"></path><path class="pt-spinner-head" d="M 94.5 50 A 44.5 44.5 0 0 0 50 5.5"></path></svg></div></div><span style="color:#4221cc;display:block;margin-top:20px;font-family:Roboto,sans-serif;font-size:14px;font-weight:300">Loading Application</span></div></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.3df59f25.chunk.js"></script><script src="/static/js/main.7d28c0ca.chunk.js"></script></body></html>
35 changes: 34 additions & 1 deletion aion-ui/build/service-worker.js
View file
Original file line number Diff line number Diff line change
@@ -1 +1,34 @@
"use strict";var precacheConfig=[["/index.html","700dd4e004e44fdcc33ff6d8ef1b9363"],["/static/css/main.f3f09352.css","9d790ea4f7650f68e950db1844841217"],["/static/media/fontawesome-webfont.674f50d2.eot","674f50d287a8c48dc19ba404d20fe713"],["/static/media/fontawesome-webfont.912ec66d.svg","912ec66d7572ff821749319396470bde"],["/static/media/fontawesome-webfont.af7ae505.woff2","af7ae505a9eed503f8b8e6982036873e"],["/static/media/fontawesome-webfont.b06871f2.ttf","b06871f281fee6b241d60582ae9369b9"],["/static/media/fontawesome-webfont.fee66e71.woff","fee66e712a8a08eef5805a46892932ad"],["/static/media/icons-16.598015ec.ttf","598015ecb71f8a8427d09ab48a7dcd02"],["/static/media/icons-16.b35f9aca.eot","b35f9acab355cdc0d5e942b3012e41c6"],["/static/media/icons-16.c4653150.woff","c4653150e2fc155e53bcb74090fb7610"],["/static/media/icons-20.46cb72b2.woff","46cb72b255884c0ff7a9019509464aad"],["/static/media/icons-20.8d50efe3.eot","8d50efe3e383942668868a3488f4596b"],["/static/media/icons-20.c25f4b43.ttf","c25f4b43b5e3fd49604fde0d152c0822"]],cacheName="sw-precache-v3-sw-precache-webpack-plugin-"+(self.registration?self.registration.scope:""),ignoreUrlParametersMatching=[/^utm_/],addDirectoryIndex=function(e,t){var n=new URL(e);return"/"===n.pathname.slice(-1)&&(n.pathname+=t),n.toString()},cleanResponse=function(e){return e.redirected?("body"in e?Promise.resolve(e.body):e.blob()).then(function(t){return new Response(t,{headers:e.headers,status:e.status,statusText:e.statusText})}):Promise.resolve(e)},createCacheKey=function(e,t,n,a){var r=new URL(e);return a&&r.pathname.match(a)||(r.search+=(r.search?"&":"")+encodeURIComponent(t)+"="+encodeURIComponent(n)),r.toString()},isPathWhitelisted=function(e,t){if(0===e.length)return!0;var n=new URL(t).pathname;return e.some(function(e){return n.match(e)})},stripIgnoredUrlParameters=function(e,t){var n=new URL(e);return n.hash="",n.search=n.search.slice(1).split("&").map(function(e){return e.split("=")}).filter(function(e){return t.every(function(t){return!t.test(e[0])})}).map(function(e){return e.join("=")}).join("&"),n.toString()},hashParamName="_sw-precache",urlsToCacheKeys=new Map(precacheConfig.map(function(e){var t=e[0],n=e[1],a=new URL(t,self.location),r=createCacheKey(a,hashParamName,n,/\.\w{8}\./);return[a.toString(),r]}));function setOfCachedUrls(e){return e.keys().then(function(e){return e.map(function(e){return e.url})}).then(function(e){return new Set(e)})}self.addEventListener("install",function(e){e.waitUntil(caches.open(cacheName).then(function(e){return setOfCachedUrls(e).then(function(t){return Promise.all(Array.from(urlsToCacheKeys.values()).map(function(n){if(!t.has(n)){var a=new Request(n,{credentials:"same-origin"});return fetch(a).then(function(t){if(!t.ok)throw new Error("Request for "+n+" returned a response with status "+t.status);return cleanResponse(t).then(function(t){return e.put(n,t)})})}}))})}).then(function(){return self.skipWaiting()}))}),self.addEventListener("activate",function(e){var t=new Set(urlsToCacheKeys.values());e.waitUntil(caches.open(cacheName).then(function(e){return e.keys().then(function(n){return Promise.all(n.map(function(n){if(!t.has(n.url))return e.delete(n)}))})}).then(function(){return self.clients.claim()}))}),self.addEventListener("fetch",function(e){if("GET"===e.request.method){var t,n=stripIgnoredUrlParameters(e.request.url,ignoreUrlParametersMatching),a="index.html";(t=urlsToCacheKeys.has(n))||(n=addDirectoryIndex(n,a),t=urlsToCacheKeys.has(n));var r="/index.html";!t&&"navigate"===e.request.mode&&isPathWhitelisted(["^(?!\\/__).*"],e.request.url)&&(n=new URL(r,self.location).toString(),t=urlsToCacheKeys.has(n)),t&&e.respondWith(caches.open(cacheName).then(function(e){return e.match(urlsToCacheKeys.get(n)).then(function(e){if(e)return e;throw Error("The cached response that was expected is missing.")})}).catch(function(t){return console.warn('Couldn\'t serve response for "%s" from cache: %O',e.request.url,t),fetch(e.request)}))}});
/**
* Welcome to your Workbox-powered service worker!
*
* You'll need to register this file in your web app and you should
* disable HTTP caching for this file too.
* See https://goo.gl/nhQhGp
*
* The rest of the code is auto-generated. Please don't update this file
* directly; instead, make changes to your Workbox build configuration
* and re-run your build process.
* See https://goo.gl/2aRDsh
*/

importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");

importScripts(
"/precache-manifest.f2971c65beb45a9d5a945e3aa17188d8.js"
);

workbox.clientsClaim();

/**
* The workboxSW.precacheAndRoute() method efficiently caches and responds to
* requests for URLs in the manifest.
* See https://goo.gl/S9QRab
*/
self.__precacheManifest = [].concat(self.__precacheManifest || []);
workbox.precaching.suppressWarnings();
workbox.precaching.precacheAndRoute(self.__precacheManifest, {});

workbox.routing.registerNavigationRoute("/index.html", {

blacklist: [/^\/_/,/\/[^\/]+\.[^\/]+$/],
});
18 changes: 11 additions & 7 deletions aion-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
"version": "2.0.1",
"private": true,
"devDependencies": {
"babel-eslint": "^10.0.1",
"cross-env": "^5.2.0",
"eslint": "^5.12.1",
"flow-bin": "^0.41.0",
"font-awesome": "^4.7.0",
"gulp": "^3.9.1",
"gulp-less": "^3.3.0",
"gulp": "4.0.0",
"gulp-less": "4.0.1",
"gulp-plumber": "^1.1.0",
"gulp-watch": "^4.3.11",
"gulp-watch": "5.0.1",
"npm-run-all": "^4.0.2",
"react-scripts": "1.0.17"
"react-scripts": "^2.1.5"
},
"dependencies": {
"json-bigint": "^0.3.0",
Expand Down Expand Up @@ -67,5 +65,11 @@
"start": "cross-env NODE_PATH=src/js react-scripts start",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
}
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
]
}
20 changes: 2 additions & 18 deletions aion-ui/src/config.json
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
{
<<<<<<< HEAD
"api": {
"base_url": "mastery-api.aiondev.network/aion",
"https_enabled": true
},
"network_list": [
{
"name": "MasteryDev",
"url": ""
},
{
"name": "Mainnet",
"url": "https://mainnet.aion.network"
}
],
"ga_key":"UA-121993888-1"
=======

"api": {
"base_url": "explorer-staging-api.aion.network",
"https_enabled": true
Expand Down Expand Up @@ -61,5 +45,5 @@
]},

"ga_key":"UA-127100301-2"
>>>>>>> 9732bfa7fd3abed240735f3293c7cbf2b18c8af5

}
4 changes: 2 additions & 2 deletions aion-ui/src/css/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ h1, h2, h3, h4, h5 {
height: 20px;
}
.NCPagination .pt-wide-input .pt-input {
width: 50px !important;
width: 60px !important;
}
.NCPagination .pt-select-input {
height: 24px !important;
Expand Down Expand Up @@ -2429,6 +2429,6 @@ pre {
}
@media all and (max-width: 1030px) {
.darkMode .NCKPIGroup {
background-color: #2222220;
background-color: #222222 0;
}
}
4 changes: 2 additions & 2 deletions aion-ui/src/js/components/common/NCNonIdealState.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { Link } from 'react-router';
import { DateRangeInput } from "@blueprintjs/datetime";
import { Button, Classes } from "@blueprintjs/core";
import { Button } from "@blueprintjs/core";


export default class NCNonIdealState extends Component
Expand Down Expand Up @@ -60,7 +60,7 @@ export default class NCNonIdealState extends Component
}

render() {
const { filter, onCallBack, paddingTop="140", paddingBottom="0", title, description, icon, showHomeLink=false } = this.props;
const { filter, paddingTop="140", paddingBottom="0", title, description, icon, showHomeLink=false } = this.props;
//console.log(filter);
return (
<div
Expand Down
4 changes: 2 additions & 2 deletions aion-ui/src/js/components/views/NCAccRetrieve.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import React, { Component } from 'react';
import { hashHistory } from 'react-router';
import { connect } from 'react-redux';
import moment from 'moment';


import { Position, Popover, Tab2, Tabs2, Button, Menu, MenuItem, PopoverInteractionKind } from "@blueprintjs/core";

Expand Down Expand Up @@ -53,7 +53,7 @@ class NCAccRetrieve extends Component
}

componentDidUpdate(prevProps, prevState) {
if (prevProps.params.accId != this.props.params.accId)
if (prevProps.params.accId !== this.props.params.accId)
this.requestTopLevel();
}

Expand Down
8 changes: 1 addition & 7 deletions aion-ui/src/js/components/views/NCTxnRetrieve.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,7 @@ class NCTxnRetrieve extends Component

const desc = nc_hexPrefix(store.queryStr);

const eventLog = {
'content' : [
'key1' : 'input1',
'key2' : 'input2'
],

};
const eventLog = {};

//console.log(eventLog);

Expand Down
Loading

0 comments on commit e5d1065

Please sign in to comment.