root
/
gitdeploy
2
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

work

This commit is contained in:
Ryan Burnette 2020-09-24 15:04:31 -04:00
parent 466df90e7c
commit ec128a13ac
5 changed files with 1024 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1300
html/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

18
html/package.json
View File

@ -1,14 +1,18 @@
{ {
"dependencies": { "dependencies": {},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.11.5",
"@ryanburnette/html-remove-empty-lines": "^1.1.4", "@ryanburnette/html-remove-empty-lines": "^1.1.4",
"@ryanburnette/spawn-in-parallel": "^1.0.1", "@ryanburnette/spawn-in-parallel": "^1.0.1",
"autoprefixer": "^8.6.5", "autoprefixer": "^8.6.5",
"axios": "^0.20.0", "axios": "^0.20.0",
"babel-loader": "^8.1.0",
"bulma": "^0.9.0", "bulma": "^0.9.0",
"css-loader": "^3.5.3", "css-loader": "^3.5.3",
"http-server": "^0.12.3", "http-server": "^0.12.3",
"jshint": "^2.12.0", "jshint": "^2.12.0",
"mini-css-extract-plugin": "^0.9.0", "mini-css-extract-plugin": "^0.11.2",
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"postcss-loader": "^4.0.2", "postcss-loader": "^4.0.2",
"prettier": "^2.1.2", "prettier": "^2.1.2",
@ -17,12 +21,8 @@
"style-loader": "^1.2.1", "style-loader": "^1.2.1",
"vue": "^2.6.12", "vue": "^2.6.12",
"vue-router": "^3.4.3", "vue-router": "^3.4.3",
"webpack": "5.0.0-beta.31", "webpack": "v5.0.0-rc.0",
"webpack-cli": "^3.3.12", "webpack-cli": "^3.3.12",
"webpack-merge": "^5.1.4", "webpack-merge": "^5.1.4"
"@babel/core": "^7.11.6", }
"@babel/preset-env": "^7.11.5",
"babel-loader": "^8.1.0"
},
"devDependencies": {}
} }

2
html/src/index.html
View File

@ -41,7 +41,7 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <script src="/vendor.js"></script> --> <script src="/vendor.js"></script>
<script src="/main.js"></script> <script src="/main.js"></script>
</body> </body>
</html> </html>

29
html/src/js/main.js
View File

@ -31,20 +31,23 @@ components.signin = Vue.component('signin', function (resolve, reject) {
window.localStorage.setItem('token', _this.email); window.localStorage.setItem('token', _this.email);
} }
}, },
beforeMount: function () {
console.log('beforeMount signin');
},
mounted: function () { mounted: function () {
var _this = this; // var _this = this;
var token = window.localStorage.getItem('token'); // var token = window.localStorage.getItem('token');
if (token) { // if (token) {
getMe().then(function (result) { // getMe().then(function (result) {
if (result) { // if (result) {
router.push('/'); // router.push('/');
} else { // } else {
_this.state = 'signingIn'; // _this.state = 'signingIn';
} // }
}); // });
} else { // } else {
_this.state = 'signingIn'; // _this.state = 'signingIn';
} // }
} }
}); });
}); });

6
html/webpack.common.js
View File

@ -7,10 +7,10 @@ var MiniCssExtractPlugin = require('mini-css-extract-plugin');
module.exports = { module.exports = {
context: path.resolve(__dirname, 'src'), context: path.resolve(__dirname, 'src'),
entry: { entry: {
// vendor: ['vue'], vendor: ['vue'],
main: { main: {
import: './js/main.js' import: './js/main.js',
// dependOn: 'vendor' dependOn: 'vendor'
} }
}, },
output: { output: {