Skip to content

Commit

Permalink
Merge branch 'dev' into symbolgh-928-address-resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
AnthonyLaw authored Oct 29, 2021
2 parents 3d8d61a + be28f66 commit 067fe21
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 80 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ cache:
- "node_modules"
override:
- npx cypress verify
before_install:
- npm i -g npm@7
before_script:
- . ./travis/node-functions.sh
- VERSION="$(node_load_version)"
Expand Down
76 changes: 24 additions & 52 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"description": "Symbol Block and Network Explorer",
"homepage": "https://github.com/nemgrouplimited/symbol-explorer",
"version": "1.1.1",
"engines": {
"node": ">=12.0",
"npm": ">=7"
},
"scripts": {
"dev": "vue-cli-service serve",
"build": "vue-cli-service build",
Expand All @@ -20,8 +24,8 @@
"apexcharts": "^3.24.0",
"await-lock": "^2.0.1",
"axios": "^0.21.1",
"bootstrap": "^4.4.1",
"bootstrap-vue": "^2.7.0",
"bootstrap": "^4.5.3",
"bootstrap-vue": "^2.21.2",
"chart.js": "^2.9.4",
"core-js": "^2.6.11",
"js-sha3": "^0.8.0",
Expand All @@ -30,7 +34,7 @@
"merkletreejs": "^0.2.9",
"moment-timezone": "^0.5.28",
"nem-sdk": "^1.6.8",
"symbol-sdk": "^1.0.2-alpha-202110111207",
"symbol-sdk": "^1.0.2",
"url-parse": "^1.5.2",
"utf8": "^3.0.0",
"vue": "^2.6.11",
Expand All @@ -57,7 +61,7 @@
"eslint-plugin-vue": "^5.0.0",
"isomorphic-fetch": "^2.2.1",
"jest": "^26.0.1",
"node-sass": "^4.14.1",
"sass": "1.32",
"sass-loader": "^8.0.2",
"stylelint": "^11.1.1",
"stylelint-config-standard": "^19.0.0",
Expand Down
8 changes: 2 additions & 6 deletions src/components/layout/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ import NodeSelector from '@/components/controls/NodeSelector.vue';
import IconGithub from 'vue-material-design-icons/GithubCircle.vue';
import IconNewspaper from 'vue-material-design-icons/Newspaper.vue';
import IconReddit from 'vue-material-design-icons/Reddit.vue';
import IconForum from 'vue-material-design-icons/Forum.vue';
import IconTelegram from 'vue-material-design-icons/Telegram.vue';
import IconDiscord from 'vue-material-design-icons/Discord.vue';
import IconHomeCurrencyUsd from 'vue-material-design-icons/HomeCurrencyUsd.vue';
import globalConfig from '../../config/globalConfig';
Expand All @@ -69,9 +67,7 @@ export default {
IconGithub,
IconNewspaper,
IconReddit,
IconForum,
IconTelegram,
IconDiscord,
IconHomeCurrencyUsd
},
Expand Down
26 changes: 8 additions & 18 deletions src/config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,30 +26,20 @@
"footer": {
"link": [
{
"href": "https://nemflash.io/",
"text": "NEM News",
"href": "https://nem.io",
"text": "NEM",
"icon": "IconNewspaper"
},
{
"href": "https://forum.nem.io/",
"text": "Forum",
"icon": "IconForum"
},
{
"href": "https://t.me/nemred",
"text": "Telegram",
"icon": "IconTelegram"
},
{
"href": "https://www.reddit.com/r/nem/",
"text": "Reddit",
"icon": "IconReddit"
},
{
"href": "https://github.com/nemtech",
"href": "https://github.com/symbol",
"text": "Github",
"icon": "IconGithub"
},
{
"href": "https://discord.com/invite/xymcity",
"text": "Join Discord",
"icon": "IconDiscord"
},
{
"href": "http://faucet.testnet.symboldev.network/",
"text": "Faucet",
Expand Down

0 comments on commit 067fe21

Please sign in to comment.