diff --git a/laravel_server/public/js/vueapp.js b/laravel_server/public/js/vueapp.js index be37aa1..39d7fbe 100644 --- a/laravel_server/public/js/vueapp.js +++ b/laravel_server/public/js/vueapp.js @@ -1375,7 +1375,7 @@ module.exports = Cancel; /***/ (function(module, exports, __webpack_require__) { __webpack_require__(13); -module.exports = __webpack_require__(82); +module.exports = __webpack_require__(85); /***/ }), @@ -1405,14 +1405,18 @@ window.Vue = __webpack_require__(38); Vue.use(__WEBPACK_IMPORTED_MODULE_0_vue_router__["a" /* default */]); //Vue.use(VueSocketio, 'http://192.168.10.10:8080'); -Vue.use(__WEBPACK_IMPORTED_MODULE_1_vue_socket_io___default.a, 'http://192.168.10.1:8080'); +Vue.use(__WEBPACK_IMPORTED_MODULE_1_vue_socket_io___default.a, 'http://192.168.10.10:8080'); var user = Vue.component('user', __webpack_require__(43)); var login = Vue.component('login', __webpack_require__(59)); -var singleplayer_game = Vue.component('singlegame', __webpack_require__(62)); -var multiplayerGame = Vue.component('multiplayergame', __webpack_require__(67)); +// const logout = Vue.component('logout', require('./components/logout.vue')); +var register = Vue.component('register', __webpack_require__(62)); +var singleplayer_game = Vue.component('singlegame', __webpack_require__(65)); +var multiplayerGame = Vue.component('multiplayergame', __webpack_require__(70)); -var routes = [{ path: '/', redirect: '/users' }, { path: '/users', component: user }, { path: '/login', component: login }, { path: '/singletictactoe', component: singleplayer_game }, { path: '/multitictactoe', component: multiplayerGame }]; +var routes = [{ path: '/', redirect: '/users' }, { path: '/users', component: user }, { path: '/login', component: login }, +// { path: '/logout', component: logout }, +{ path: '/register', component: register }, { path: '/singletictactoe', component: singleplayer_game }, { path: '/multitictactoe', component: multiplayerGame }]; var router = new __WEBPACK_IMPORTED_MODULE_0_vue_router__["a" /* default */]({ routes: routes @@ -1420,10 +1424,7 @@ var router = new __WEBPACK_IMPORTED_MODULE_0_vue_router__["a" /* default */]({ var app = new Vue({ router: router, - data: { - player1: undefined, - player2: undefined - } + data: {} }).$mount('#app'); /***/ }), @@ -45734,71 +45735,69 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); + /* harmony default export */ __webpack_exports__["default"] = ({ - data: function data() { - return { - title: 'List Users', - showSuccess: false, - successMessage: '', - currentUser: null, - users: [], - departments: [] - }; - }, - methods: { - editUser: function editUser(user) { - this.currentUser = user; - this.showSuccess = false; - }, - deleteUser: function deleteUser(user) { - var _this = this; + data: function data() { + return { + title: 'List Users', + showSuccess: false, + successMessage: '', + currentUser: null, + users: [] - axios.delete('api/users/' + user.id).then(function (response) { - _this.showSuccess = true; - _this.successMessage = 'User Deleted'; - _this.getUsers(); - }); - }, - savedUser: function savedUser() { - this.currentUser = null; - this.$refs.usersListRef.editingUser = null; - this.showSuccess = true; - this.successMessage = 'User Saved'; - }, - cancelEdit: function cancelEdit() { - this.currentUser = null; - this.$refs.usersListRef.editingUser = null; - this.showSuccess = false; - }, - getUsers: function getUsers() { - var _this2 = this; + }; + }, + methods: { + editUser: function editUser(user) { + this.currentUser = user; + this.showSuccess = false; + }, + deleteUser: function deleteUser(user) { + var _this = this; - axios.get('api/users').then(function (response) { - _this2.users = response.data.data; - }); - }, - childMessage: function childMessage(message) { - this.showSuccess = true; - this.successMessage = message; - } - }, - components: { - 'user-list': __WEBPACK_IMPORTED_MODULE_0__userList_vue___default.a, - 'user-edit': __WEBPACK_IMPORTED_MODULE_1__userEdit_vue___default.a - }, - mounted: function mounted() { - var _this3 = this; + axios.delete('api/users/' + user.id).then(function (response) { + _this.showSuccess = true; + _this.successMessage = 'User Deleted'; + _this.getUsers(); + }); + }, + savedUser: function savedUser() { + this.currentUser = null; + this.$refs.usersListRef.editingUser = null; + this.showSuccess = true; + this.successMessage = 'User Saved'; + }, + cancelEdit: function cancelEdit() { + this.currentUser = null; + this.$refs.usersListRef.editingUser = null; + this.showSuccess = false; + }, + getUsers: function getUsers() { + var _this2 = this; - this.getUsers(); - if (this.$root.departments.length === 0) { - axios.get('api/departments').then(function (response) { - _this3.$root.departments = response.data.data; - _this3.departments = _this3.$root.departments; - }); - } else { - this.departments = this.$root.departments; - } - } + /* buscar o user logado através do token guardado na LocalStorage */ + var auth_user_token = { + headers: { + 'Authorization': 'Bearer ' + localStorage.getItem("access_token") + } + }; + axios.get('api/users', auth_user_token).then(function (response) { + _this2.users = response.data.data; + console.log(_this2.users); + }); + }, + childMessage: function childMessage(message) { + this.showSuccess = true; + this.successMessage = message; + } + }, + components: { + 'user-list': __WEBPACK_IMPORTED_MODULE_0__userList_vue___default.a, + 'user-edit': __WEBPACK_IMPORTED_MODULE_1__userEdit_vue___default.a + }, + mounted: function mounted() { + this.getUsers(); + } }); /***/ }), @@ -46463,7 +46462,7 @@ var render = function() { _vm._v(" "), _vm.currentUser ? _c("user-edit", { - attrs: { user: _vm.currentUser, departments: _vm.departments }, + attrs: { user: _vm.currentUser }, on: { "user-saved": _vm.savedUser, "user-canceled": _vm.cancelEdit } }) : _vm._e() @@ -46565,8 +46564,8 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); data: function data() { return { user: { - email: "", - password: "" + email: '', + password: '' }, loginError: false }; @@ -46594,9 +46593,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); loginError = true; console.log(loginError); }); - }, - register: function register() { - this.$router.push('/register'); // vou chamar um component do appvue.vue } } @@ -46610,99 +46606,110 @@ var render = function() { var _vm = this var _h = _vm.$createElement var _c = _vm._self._c || _h - return _c("form", { attrs: { action: "action_page.php" } }, [ - _c("div", { staticClass: "container" }, [ - _c("div", { staticClass: "form-group" }, [ - _c("label", [_vm._v("Email: ")]), - _vm._v(" "), - _c("input", { - directives: [ - { - name: "model", - rawName: "v-model", - value: _vm.user.email, - expression: "user.email" - } - ], - attrs: { - type: "text", - placeholder: "Enter Your Email", - id: "inputEmail", - name: "email", - required: "" - }, - domProps: { value: _vm.user.email }, - on: { - input: function($event) { - if ($event.target.composing) { - return + return _c( + "form", + { + on: { + submit: function($event) { + $event.preventDefault() + _vm.login(_vm.user) + } + } + }, + [ + _c("div", { staticClass: "container" }, [ + _c("div", { staticClass: "form-group" }, [ + _c("label", [_vm._v("Email: ")]), + _vm._v(" "), + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.user.email, + expression: "user.email" } - _vm.$set(_vm.user, "email", $event.target.value) - } - } - }) - ]), - _vm._v(" "), - _c("div", { staticClass: "form-group" }, [ - _c("label", [_vm._v("Password: ")]), - _vm._v(" "), - _c("input", { - directives: [ - { - name: "model", - rawName: "v-model", - value: _vm.user.password, - expression: "user.password" - } - ], - attrs: { - type: "password", - placeholder: "Enter Your Password", - id: "inputPassword", - name: "password", - required: "" - }, - domProps: { value: _vm.user.password }, - on: { - input: function($event) { - if ($event.target.composing) { - return + ], + attrs: { + type: "text", + placeholder: "Enter Your Email", + id: "inputEmail", + name: "email", + required: "" + }, + domProps: { value: _vm.user.email }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.$set(_vm.user, "email", $event.target.value) } - _vm.$set(_vm.user, "password", $event.target.value) } - } - }) - ]), - _vm._v(" "), - _c( - "button", - { - attrs: { type: "submit" }, - on: { - "click()": function($event) { - $event.preventDefault() - _vm.login() + }) + ]), + _vm._v(" "), + _c("div", { staticClass: "form-group" }, [ + _c("label", [_vm._v("Password: ")]), + _vm._v(" "), + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.user.password, + expression: "user.password" + } + ], + attrs: { + type: "password", + placeholder: "Enter Your Password", + id: "inputPassword", + name: "password", + required: "" + }, + domProps: { value: _vm.user.password }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.$set(_vm.user, "password", $event.target.value) + } } - } - }, - [_vm._v("Login")] - ), - _vm._v(" "), - _c( - "button", - { - attrs: { type: "submit" }, - on: { - "click()": function($event) { - $event.preventDefault() - _vm.register() + }) + ]), + _vm._v(" "), + _c( + "button", + { + attrs: { type: "submit" }, + on: { + "click()": function($event) { + $event.preventDefault() + _vm.login() + } } - } - }, - [_vm._v("Register")] - ) - ]) - ]) + }, + [_vm._v("Login")] + ), + _vm._v(" "), + _c( + "button", + { + attrs: { type: "submit" }, + on: { + "click()": function($event) { + $event.preventDefault() + _vm.register() + } + } + }, + [_vm._v("Register")] + ) + ]) + ] + ) } var staticRenderFns = [] render._withStripped = true @@ -46718,16 +46725,314 @@ if (false) { /* 62 */ /***/ (function(module, exports, __webpack_require__) { +var disposed = false +var normalizeComponent = __webpack_require__(1) +/* script */ +var __vue_script__ = __webpack_require__(63) +/* template */ +var __vue_template__ = __webpack_require__(64) +/* template functional */ + var __vue_template_functional__ = false +/* styles */ +var __vue_styles__ = null +/* scopeId */ +var __vue_scopeId__ = null +/* moduleIdentifier (server only) */ +var __vue_module_identifier__ = null +var Component = normalizeComponent( + __vue_script__, + __vue_template__, + __vue_template_functional__, + __vue_styles__, + __vue_scopeId__, + __vue_module_identifier__ +) +Component.options.__file = "resources/assets/js/components/register.vue" +if (Component.esModule && Object.keys(Component.esModule).some(function (key) { return key !== "default" && key.substr(0, 2) !== "__"})) { console.error("named exports are not supported in *.vue files.")} + + +/* hot reload */ +if (false) {(function () { + var hotAPI = require("vue-hot-reload-api") + hotAPI.install(require("vue"), false) + if (!hotAPI.compatible) return + module.hot.accept() + if (!module.hot.data) { + hotAPI.createRecord("data-v-897e4240", Component.options) + } else { + hotAPI.reload("data-v-897e4240", Component.options) +' + ' } + module.hot.dispose(function (data) { + disposed = true + }) +})()} + +module.exports = Component.exports + + +/***/ }), +/* 63 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// + + +/* harmony default export */ __webpack_exports__["default"] = ({ + data: function data() { + return { + user: { + username: '', + email: '', + password: '', + name: '' + + }, + registerError: false + }; + }, + + methods: { + register: function register() { + axios.post('api/register', { + username: user.username, + email: user.email, + password: user.password, + name: user.name + }).then(function (response) { + // guarda logo o token do registado + localStorage.setItem('token', response.data.access_token); + }).catch(function (registerError) { + console.log(registerError); + }); + } + } + +}); + +/***/ }), +/* 64 */ +/***/ (function(module, exports, __webpack_require__) { + +var render = function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c( + "form", + { + on: { + submit: function($event) { + $event.preventDefault() + _vm.register(_vm.user) + } + } + }, + [ + _c("div", { staticClass: "control-group" }, [ + _c( + "label", + { staticClass: "control-label", attrs: { for: "username" } }, + [_vm._v("Username")] + ), + _vm._v(" "), + _c("div", { staticClass: "controls" }, [ + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.user.username, + expression: "user.username" + } + ], + staticClass: "input-xlarge", + attrs: { type: "text", id: "username", name: "username" }, + domProps: { value: _vm.user.username }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.$set(_vm.user, "username", $event.target.value) + } + } + }) + ]) + ]), + _vm._v(" "), + _c("div", { staticClass: "control-group" }, [ + _c("label", { staticClass: "control-label", attrs: { for: "email" } }, [ + _vm._v("E-mail") + ]), + _vm._v(" "), + _c("div", { staticClass: "controls" }, [ + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.user.email, + expression: "user.email" + } + ], + staticClass: "input-xlarge", + attrs: { type: "text", id: "email", name: "email" }, + domProps: { value: _vm.user.email }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.$set(_vm.user, "email", $event.target.value) + } + } + }) + ]) + ]), + _vm._v(" "), + _c("div", { staticClass: "control-group" }, [ + _c( + "label", + { staticClass: "control-label", attrs: { for: "password" } }, + [_vm._v("Password")] + ), + _vm._v(" "), + _c("div", { staticClass: "controls" }, [ + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.user.password, + expression: "user.password" + } + ], + staticClass: "input-xlarge", + attrs: { type: "password", id: "password", name: "password" }, + domProps: { value: _vm.user.password }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.$set(_vm.user, "password", $event.target.value) + } + } + }) + ]) + ]), + _vm._v(" "), + _c("div", { staticClass: "control-group" }, [ + _c("label", { staticClass: "control-label", attrs: { for: "name" } }, [ + _vm._v(" Name ") + ]), + _vm._v(" "), + _c("div", { staticClass: "controls" }, [ + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.user.name, + expression: "user.name" + } + ], + staticClass: "input-xlarge", + attrs: { type: "text", id: "name", name: "name" }, + domProps: { value: _vm.user.name }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.$set(_vm.user, "name", $event.target.value) + } + } + }) + ]) + ]), + _vm._v(" "), + _vm._m(0) + ] + ) +} +var staticRenderFns = [ + function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c("div", { staticClass: "control-group" }, [ + _c("div", { staticClass: "controls" }, [ + _c("button", { staticClass: "btn btn-success" }, [_vm._v("Register")]) + ]) + ]) + } +] +render._withStripped = true +module.exports = { render: render, staticRenderFns: staticRenderFns } +if (false) { + module.hot.accept() + if (module.hot.data) { + require("vue-hot-reload-api") .rerender("data-v-897e4240", module.exports) + } +} + +/***/ }), +/* 65 */ +/***/ (function(module, exports, __webpack_require__) { + var disposed = false function injectStyle (ssrContext) { if (disposed) return - __webpack_require__(63) + __webpack_require__(66) } var normalizeComponent = __webpack_require__(1) /* script */ -var __vue_script__ = __webpack_require__(65) +var __vue_script__ = __webpack_require__(68) /* template */ -var __vue_template__ = __webpack_require__(66) +var __vue_template__ = __webpack_require__(69) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -46767,13 +47072,13 @@ module.exports = Component.exports /***/ }), -/* 63 */ +/* 66 */ /***/ (function(module, exports, __webpack_require__) { // style-loader: Adds some css to the DOM by adding a