diff --git a/public/js/app.js b/public/js/app.js index 110526b..bb9c745 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -2074,14 +2074,6 @@ __webpack_require__.r(__webpack_exports__); "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony import */ var vuex__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vuex */ "./node_modules/vuex/dist/vuex.esm.js"); -/* harmony import */ var _Avatar__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Avatar */ "./resources/js/components/Avatar.vue"); -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - // // // @@ -2108,25 +2100,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope // // // - - /* harmony default export */ __webpack_exports__["default"] = ({ - name: "Nav", - components: { - Avatar: _Avatar__WEBPACK_IMPORTED_MODULE_1__["default"] - }, - computed: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapGetters"])({ - authUser: 'authUser' - })), - methods: { - logout: function logout() { - axios.post('logout').then(function (res) { - if (res.status === 302 || 401) { - window.location.href = '/login'; - } - })["catch"](function (error) {}); - } - } + name: "Nav" }); /***/ }), @@ -2253,7 +2228,16 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope }, computed: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapGetters"])({ authUser: 'authUser' - })) + })), + methods: { + logout: function logout() { + axios.post('logout').then(function (res) { + if (res.status === 302 || 401) { + window.location.href = '/login'; + } + })["catch"](function (error) {}); + } + } }); /***/ }), @@ -2353,7 +2337,6 @@ __webpack_require__.r(__webpack_exports__); // // // -// /* harmony default export */ __webpack_exports__["default"] = ({ name: "Home" }); @@ -2752,10 +2735,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope // // // -// -// -// -// @@ -2786,21 +2765,21 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope mounted: function mounted() { var _this = this; - axios.get('/api/users').then(function (response) { - _this.users = response.data.data; - _this.loading = false; - })["catch"](function (error) { - _this.loading = false; - alert('Unable to fetch users.'); - }); + if (authUser.data.attributes.is_admin) { + axios.get('/api/users').then(function (response) { + _this.users = response.data.data; + _this.loading = false; + })["catch"](function (error) { + _this.loading = false; + alert('Unable to fetch users.'); + }); + } }, methods: { addMember: function addMember() { var _this2 = this; - console.log('addMember'); - - if (this.form.name.length <= 4 && this.form.name.email <= 12) { + if (authUser.data.attributes.is_admin && this.form.name.length >= 4 && this.form.email.length >= 12) { axios.post('/api/users', { name: this.form.name, email: this.form.email @@ -29968,20 +29947,16 @@ var render = function() { var _vm = this var _h = _vm.$createElement var _c = _vm._self._c || _h - return _c( - "div", - { staticClass: "p-2" }, - [ - _c("h1", [_vm._v("Home")]), - _vm._v(" "), - _c("router-link", { attrs: { to: "/css-testeur" } }, [ - _vm._v("Css Testeur") - ]) - ], - 1 - ) + return _vm._m(0) } -var staticRenderFns = [] +var staticRenderFns = [ + function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c("div", { staticClass: "p-2" }, [_c("h1", [_vm._v("Home")])]) + } +] render._withStripped = true @@ -30505,37 +30480,48 @@ var render = function() { _c("button", [_vm._v("Ajouter")]) ], 1 + ), + _vm._v(" "), + _c("div", [ + _c("h2", [_vm._v("Liste des utilisateurs")]), + _vm._v(" "), + _c( + "ul", + [ + _vm.loading + ? _c("li", [_vm._v("> Loading...")]) + : _vm._l(_vm.users, function(user) { + return _c("li", [ + _c("a", { attrs: { href: user.links.self } }, [ + _vm._v(_vm._s(user.data.attributes.name)) + ]), + _vm._v( + " - " + + _vm._s(user.data.attributes.email) + + " - " + + _vm._s(user.data.attributes.is_admin) + ) + ]) + }) + ], + 2 + ) + ]), + _vm._v(" "), + _c( + "div", + [ + _vm._v("\n Css Testeur pour constituer un thème : "), + _c("router-link", { attrs: { to: "/css-testeur" } }, [ + _vm._v("Css Testeur") + ]) + ], + 1 ) ], 1 ) - : _vm._e(), - _vm._v(" "), - _c("div", [ - _c("h2", [_vm._v("Liste des utilisateurs")]), - _vm._v(" "), - _c( - "ul", - [ - _vm.loading - ? _c("li", [_vm._v("> Loading...")]) - : _vm._l(_vm.users, function(user) { - return _c("li", [ - _c("a", { attrs: { href: user.links.self } }, [ - _vm._v(_vm._s(user.data.attributes.name)) - ]), - _vm._v( - " - " + - _vm._s(user.data.attributes.email) + - " - " + - _vm._s(user.data.attributes.is_admin) - ) - ]) - }) - ], - 2 - ) - ]) + : _vm._e() ]) } var staticRenderFns = [] diff --git a/resources/js/components/Nav.vue b/resources/js/components/Nav.vue index ec4cd22..9e31b0a 100644 --- a/resources/js/components/Nav.vue +++ b/resources/js/components/Nav.vue @@ -25,30 +25,7 @@ diff --git a/resources/js/components/TopBar.vue b/resources/js/components/TopBar.vue index 37ac547..d82982b 100644 --- a/resources/js/components/TopBar.vue +++ b/resources/js/components/TopBar.vue @@ -46,5 +46,17 @@ authUser: 'authUser', }) }, + methods: { + logout: function () { + axios.post('logout') + .then(res => { + if(res.status ===302 || 401) { + window.location.href = '/login' + } + }).catch(error => { + + }) + } + } } diff --git a/resources/js/views/Home.vue b/resources/js/views/Home.vue index 568cb8e..db42c07 100644 --- a/resources/js/views/Home.vue +++ b/resources/js/views/Home.vue @@ -1,7 +1,6 @@ diff --git a/resources/js/views/User/UserAdmin.vue b/resources/js/views/User/UserAdmin.vue index 8a2273a..586d700 100644 --- a/resources/js/views/User/UserAdmin.vue +++ b/resources/js/views/User/UserAdmin.vue @@ -32,24 +32,20 @@ :errors="errors" @update:field="form.name = $event" /> - + +
+

Liste des utilisateurs

+ +
+
+ Css Testeur pour constituer un thème : Css Testeur +
-
-

Liste des utilisateurs

- -
@@ -83,20 +79,21 @@ }) }, mounted() { - axios.get('/api/users') - .then(response => { - this.users = response.data.data - this.loading = false - }) - .catch(error => { - this.loading = false - alert('Unable to fetch users.') - }) + if(authUser.data.attributes.is_admin) { + axios.get('/api/users') + .then(response => { + this.users = response.data.data + this.loading = false + }) + .catch(error => { + this.loading = false + alert('Unable to fetch users.') + }) + } }, methods: { addMember: function () { - console.log('addMember') - if(this.form.name.length <= 4 && this.form.name.email <= 12) { + if(authUser.data.attributes.is_admin && this.form.name.length >= 4 && this.form.email.length >= 12) { axios.post('/api/users', {name: this.form.name, email: this.form.email}) .then(res => { console.log(res) diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 60ecb01..8cae861 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -7,7 +7,7 @@
@if (session('status')) -