Skip to content

Commit

Permalink
Merge pull request #2 from smart-signature/master
Browse files Browse the repository at this point in the history
pull from base
  • Loading branch information
flyq authored Feb 19, 2019
2 parents eb2b3a8 + 6d4d47d commit 2d31962
Show file tree
Hide file tree
Showing 5 changed files with 1,423 additions and 3,016 deletions.
2 changes: 1 addition & 1 deletion build/webpack.dev.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const HOST = process.env.HOST
const PORT = process.env.PORT && Number(process.env.PORT)

const devWebpackConfig = merge(baseWebpackConfig, {
mode: 'development',
// mode: 'development',
module: {
rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
},
Expand Down
14 changes: 2 additions & 12 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,8 @@
</head>

<body>
<div id="app">
<h1>Hello Smart Signature!</h1>
<p>
<!-- use router-link component for navigation. -->
<!-- specify the link by passing the `to` prop. -->
<!-- `<router-link>` will be rendered as an `<a>` tag by default -->

</p>
<!-- route outlet -->
<!-- component matched by the route will render here -->
<router-view></router-view>
</div>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>

</html>
71 changes: 31 additions & 40 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,76 +12,67 @@
"deploy": "gh-pages -d dist"
},
"dependencies": {
"atob": ">=2.1.0",
"bignumber.js": "^6.0.0",
"bluebird": "^3.5.1",
"js-cookie": "^2.2.0",
"macaddress": ">=0.2.9",
"randomatic": ">=3.0.0",
"superagent": "^3.8.2",
"timeout-then": "^1.1.0",
"url-parse": ">=1.4.3",
"vue": "^2.6.6",
"vue": "^2.5.2",
"vue-config": "^1.0.0",
"vue-i18n": "^7.4.2",
"vue-lazyload": "^1.2.1",
"vue-markdown": "^2.2.4",
"vue-moment": "^4.0.0",
"vue-resource": "^1.5.0",
"vue-router": "^3.0.1",
"vue-spinner": "^1.0.3",
"vuex": "^3.0.1",
"web3": "1.0.0-beta.46"
"web3": "0.20.4"
},
"devDependencies": {
"autoprefixer": "^9.4.7",
"babel-core": "^6.26.3",
"babel-eslint": "^10.0.1",
"autoprefixer": "^7.1.2",
"babel-core": "^6.22.1",
"babel-eslint": "^8.2.1",
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-loader": "^7.1.5",
"babel-loader": "^7.1.1",
"babel-plugin-syntax-jsx": "^6.18.0",
"babel-plugin-transform-runtime": "^6.22.0",
"babel-plugin-transform-vue-jsx": "^3.7.0",
"babel-preset-env": "^1.7.0",
"babel-plugin-transform-vue-jsx": "^3.5.0",
"babel-preset-env": "^1.3.2",
"babel-preset-stage-2": "^6.22.0",
"chalk": "^2.4.2",
"chalk": "^2.0.1",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^2.1.0",
"eslint": "^5.14.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-friendly-formatter": "^4.0.0",
"eslint-import-resolver-webpack": "^0.11.0",
"eslint-loader": "^2.1.2",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-vue": "^5.2.1",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^3.0.1",
"friendly-errors-webpack-plugin": "^1.7.0",
"css-loader": "^0.28.0",
"eslint": "^4.15.0",
"eslint-config-airbnb-base": "^11.3.0",
"eslint-friendly-formatter": "^3.0.0",
"eslint-import-resolver-webpack": "^0.8.3",
"eslint-loader": "^1.7.1",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-vue": "^4.0.0",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^1.1.4",
"friendly-errors-webpack-plugin": "^1.6.1",
"gh-pages": "^1.1.0",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^3.2.0",
"html-webpack-plugin": "^2.30.1",
"node-notifier": "^5.1.2",
"optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^3.1.0",
"ora": "^1.2.0",
"portfinder": "^1.0.13",
"postcss-import": "^11.0.0",
"postcss-loader": "^3.0.0",
"postcss-loader": "^2.0.8",
"postcss-url": "^7.2.1",
"raw-loader": "^1.0.0",
"raw-loader": "^0.5.1",
"rimraf": "^2.6.0",
"semver": "^5.3.0",
"shelljs": "^0.7.6",
"uglifyjs-webpack-plugin": "^2.1.1",
"url-loader": "^1.1.2",
"vue-cli-plugin-webpack-bundle-analyzer": "^1.2.0",
"vue-loader": "^14.2.2",
"vue-markdown-loader": "^2.4.1",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.6",
"webpack": "^4.29.4",
"uglifyjs-webpack-plugin": "^1.1.1",
"url-loader": "^0.5.8",
"vue-loader": "^13.3.0",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2",
"webpack": "^3.6.0",
"webpack-bundle-analyzer": "^2.9.0",
"webpack-cli": "^3.2.3",
"webpack-dev-server": ">=3.1.11",
"webpack-dev-server": "^2.9.1",
"webpack-merge": "^4.1.0"
},
"engines": {
Expand Down
1 change: 0 additions & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<template>
<div id="app">
<Header />
<router-link :to="{ name: 'Home' }">Home</router-link>
<router-view class="container view"
:key="key"></router-view>

Expand Down
Loading

0 comments on commit 2d31962

Please sign in to comment.