diff --git a/frontend/package.json b/frontend/package.json index 66ac5aa..31b8387 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -22,6 +22,7 @@ "@vue/cli-service": "^3.4.0", "@vue/eslint-config-prettier": "^4.0.1", "@vue/test-utils": "^1.0.0-beta.20", + "axios": "^0.18.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.0.1", "babel-jest": "^23.6.0", diff --git a/frontend/src/components/forms/Login.vue b/frontend/src/components/forms/Login.vue index b19f0cd..b33981d 100644 --- a/frontend/src/components/forms/Login.vue +++ b/frontend/src/components/forms/Login.vue @@ -1,35 +1,98 @@ - - diff --git a/frontend/src/components/forms/Register.vue b/frontend/src/components/forms/Register.vue new file mode 100644 index 0000000..fd68d1f --- /dev/null +++ b/frontend/src/components/forms/Register.vue @@ -0,0 +1,97 @@ + + + diff --git a/frontend/src/main.js b/frontend/src/main.js index ffea811..e1930c3 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -5,6 +5,14 @@ import router from './router' import 'roboto-fontface/css/roboto/roboto-fontface.css' import 'material-design-icons-iconfont/dist/material-design-icons.css' +import axios from 'axios' +axios.defaults.baseURL = + window.location.protocol + '//' + window.location.hostname + ':3001' + +window.pkgs = { + axios: axios +} + Vue.config.productionTip = false new Vue({ diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue index 5daac67..fabeab2 100644 --- a/frontend/src/views/Home.vue +++ b/frontend/src/views/Home.vue @@ -10,12 +10,13 @@ - + diff --git a/frontend/yarn.lock b/frontend/yarn.lock index c07ef78..499ca49 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1542,6 +1542,14 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== +axios@^0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102" + integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI= + dependencies: + follow-redirects "^1.3.0" + is-buffer "^1.1.5" + babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" @@ -4144,7 +4152,7 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0: +follow-redirects@^1.0.0, follow-redirects@^1.3.0: version "1.7.0" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76" integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==