diff --git a/app/Http/Controllers/Api/Auth/ResetPasswordController.php b/app/Http/Controllers/Api/Auth/ResetPasswordController.php index f4365420..681384f1 100644 --- a/app/Http/Controllers/Api/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Api/Auth/ResetPasswordController.php @@ -25,7 +25,7 @@ class ResetPasswordController extends Controller if (auth('api')->check()) { $user = auth('api')->user(); - $user->password = Hash::make($request->password); + $user->password = \Hash::make($request->password); $user->save(); return \MessageResponse::success('Success Change Password'); } diff --git a/app/Http/Controllers/MedicalCenterController.php b/app/Http/Controllers/MedicalCenterController.php index 572a7516..b42482b7 100644 --- a/app/Http/Controllers/MedicalCenterController.php +++ b/app/Http/Controllers/MedicalCenterController.php @@ -22,8 +22,8 @@ class MedicalCenterController extends Controller public function store(StoreMedicalCenterRequest $request) { - $MedicalCenter = MedicalCenter::create($request->all()); - return response()->json(trans('messages.success')); + MedicalCenter::create($request->all()); + return \MessageResponse::success(trans('messages.success')); } public function show($id) @@ -32,22 +32,24 @@ class MedicalCenterController extends Controller // return response()->json(['MedicalCenter' => $MedicalCenter]); } - public function edit($id) + public function edit(MedicalCenter $MedicalCenter) { - $MedicalCenter = MedicalCenter::with('users')->findOrFail($id); - return response()->json(['MedicalCenter' => $MedicalCenter]); + $MedicalCenter = $MedicalCenter->load('users'); + return \MessageResponse::data($MedicalCenter); } public function update(StoreMedicalCenterRequest $request, MedicalCenter $MedicalCenter) { $MedicalCenter->update($request->all()); - return response()->json(trans('messages.success')); + return \MessageResponse::success(trans('messages.success')); } public function destroy(MedicalCenter $MedicalCenter) { if ($MedicalCenter->users->count() == 0) { $MedicalCenter->delete(); + return \MessageResponse::success(trans('messages.success')); } + return \MessageResponse::error(trans('messages.failed')); } } diff --git a/public/10.js b/public/10.js index 8b5d54a2..97fae306 100644 --- a/public/10.js +++ b/public/10.js @@ -94,7 +94,10 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar case 2: result = _context.sent; - this.medicalCenter = result.data.MedicalCenter; + + if (result && result.status == 200) { + this.medicalCenter = result.data.data; + } case 4: case "end": diff --git a/public/16.js b/public/16.js index 114f86be..732bcebe 100644 --- a/public/16.js +++ b/public/16.js @@ -155,6 +155,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar // // // +// +// /* harmony default export */ __webpack_exports__["default"] = ({ @@ -244,10 +246,15 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar if (result.data.data.inputs[key].type == 'Form') { for (keyForm in result.data.data.inputs[key].children) { if (result.data.data.inputs[key].children.hasOwnProperty(keyForm)) { - this.formData[result.data.data.inputs[key].children[keyForm].name] = ''; + if (result.data.data.inputs[key].children[keyForm].type == 'Checkbox' || result.data.data.inputs[key].children[keyForm].type == 'Select') { + this.formData[result.data.data.inputs[key].children[keyForm].name] = []; + console.log(this.formData[result.data.data.inputs[key].children[keyForm].name]); + } else { + this.formData[result.data.data.inputs[key].children[keyForm].name] = ''; + } } } - } else if (result.data.data.inputs[key].type == 'Checkbox') { + } else if (result.data.data.inputs[key].type == 'Checkbox' || result.data.data.inputs[key].type == 'Select') { this.formData[result.data.data.inputs[key].name] = []; } else { this.formData[result.data.data.inputs[key].name] = ''; @@ -288,8 +295,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar var _submitForm = _asyncToGenerator( /*#__PURE__*/ _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.mark(function _callee3() { - var _result2, _result3; - + var result; return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee3$(_context3) { while (1) { switch (_context3.prev = _context3.next) { @@ -303,7 +309,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar return _services__WEBPACK_IMPORTED_MODULE_1__["ApiService"].put(_config_urls__WEBPACK_IMPORTED_MODULE_2__["urls"].updateTestResult(this.$route.params.testResult), this.formData); case 3: - _result2 = _context3.sent; + result = _context3.sent; _context3.next = 9; break; @@ -312,7 +318,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar return _services__WEBPACK_IMPORTED_MODULE_1__["ApiService"].post(_config_urls__WEBPACK_IMPORTED_MODULE_2__["urls"].storeTestResult, this.formData); case 8: - _result3 = _context3.sent; + result = _context3.sent; case 9: if (result && result.status == 200) { @@ -554,6 +560,7 @@ var render = function() { item.type == "Select" ? _c("v-select", { attrs: { + multiple: "", items: item.options, label: item.name, color: "black", @@ -645,6 +652,7 @@ var render = function() { children.type == "Select" ? _c("v-select", { attrs: { + multiple: "", items: children.options, label: children.name, color: "black", diff --git a/public/17.js b/public/17.js index d7ebb6ff..31ebf3bd 100644 --- a/public/17.js +++ b/public/17.js @@ -109,6 +109,10 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar // // // +// +// +// +// /* harmony default export */ __webpack_exports__["default"] = ({ @@ -410,6 +414,27 @@ var render = function() { "td", { staticClass: "text-xs-right" }, [ + _c( + "v-btn", + { + staticClass: "mr-2", + attrs: { color: "cyan" } + }, + [ + _c( + "v-icon", + { + staticClass: + "white--text mr-1 caption" + }, + [_vm._v("fas fa-pen")] + ), + _vm._v(" "), + _c("span", [_vm._v("Show")]) + ], + 1 + ), + _vm._v(" "), _c( "router-link", { @@ -425,7 +450,7 @@ var render = function() { "v-btn", { staticClass: "mr-2", - attrs: { color: "cyan" } + attrs: { color: "orange" } }, [ _c( diff --git a/public/19.js b/public/19.js index b709310c..825ec8f3 100644 --- a/public/19.js +++ b/public/19.js @@ -123,10 +123,10 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar return !!value || "Required."; }, counter: function counter(value) { - return value.length == 0 || value.length >= 5 || "Min 5 characters"; + return !value || value.length == 0 || value.length >= 5 || "Min 5 characters"; }, email: function email(value) { - if (value.length > 0) { + if (value && value.length > 0) { var pattern = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; return pattern.test(value) || "Invalid e-mail."; } diff --git a/public/6.js b/public/6.js index a1189332..d668a61e 100644 --- a/public/6.js +++ b/public/6.js @@ -66,6 +66,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope // // // +// +// @@ -74,6 +76,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope return { form: { cell_number: "" + }, + rules: { + required: function required(value) { + return !!value || "Required."; + }, + cellNumberCounter: function cellNumberCounter(value) { + return value && value.length == 11 || "must 11 characters"; + } } }; }, @@ -87,9 +97,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope while (1) { switch (_context.prev = _context.next) { case 0: - this.forgotPassword({ - form: this.form - }); + if (this.$refs.form.validate()) { + this.forgotPassword({ + form: this.form + }); + } case 1: case "end": @@ -127,6 +139,7 @@ var render = function() { var _c = _vm._self._c || _h return _c( "v-form", + { ref: "form" }, [ _c( "v-container", @@ -159,7 +172,12 @@ var render = function() { attrs: { name: "cellnumber", label: "Cell Number", - color: "black" + color: "black", + rules: [ + _vm.rules.required, + _vm.rules.cellNumberCounter + ], + mask: "#### ### ####" }, model: { value: _vm.form.cell_number, diff --git a/public/7.js b/public/7.js index e365828c..8714ac2e 100644 --- a/public/7.js +++ b/public/7.js @@ -68,20 +68,33 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope // // // +// +// /* harmony default export */ __webpack_exports__["default"] = ({ data: function data() { return { cell_number: "", password: "", - show1: false + show1: false, + rules: { + required: function required(value) { + return !!value || "Required."; + }, + passCounter: function passCounter(value) { + return value && value.length >= 8 || "Min 8 characters"; + }, + cellNumberCounter: function cellNumberCounter(value) { + return value && value.length == 11 || "must 11 characters"; + } + } }; }, computed: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapGetters"])('auth', ['authenticating', 'authenticationError', 'authenticationErrorCode'])), methods: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapActions"])('auth', ['login']), { handleSubmit: function handleSubmit() { // Perform a simple validation that cell_number and password have been typed in - if (this.cell_number != '' && this.password != '') { + if (this.$refs.form.validate()) { this.login({ cell_number: this.cell_number, password: this.password @@ -111,6 +124,7 @@ var render = function() { var _c = _vm._self._c || _h return _c( "v-form", + { ref: "form" }, [ _c( "v-container", @@ -143,8 +157,12 @@ var render = function() { attrs: { name: "cellnumber", label: "Cell Number", - id: "id1", - color: "black" + color: "black", + rules: [ + _vm.rules.required, + _vm.rules.cellNumberCounter + ], + mask: "#### ### ####" }, model: { value: _vm.cell_number, @@ -178,6 +196,10 @@ var render = function() { "append-icon": _vm.show1 ? "visibility" : "visibility_off", + rules: [ + _vm.rules.required, + _vm.rules.passCounter + ], color: "black" }, on: { diff --git a/public/8.js b/public/8.js index 3d986a6f..0c91664e 100644 --- a/public/8.js +++ b/public/8.js @@ -120,13 +120,13 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar return !!value || "Required."; }, nameCounter: function nameCounter(value) { - return value.length >= 5 || "Min 5 characters"; + return value && value.length >= 5 || "Min 5 characters"; }, passCounter: function passCounter(value) { - return value.length >= 6 || "Min 6 characters"; + return value && value.length >= 8 || "Min 8 characters"; }, cellNumberCounter: function cellNumberCounter(value) { - return value.length == 11 || "must 11 characters"; + return value && value.length == 11 || "must 11 characters"; } } }; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index cc938a8e..97647277 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,3 +1,7 @@ { +<<<<<<< HEAD "/vue/js/app.js": "/vue/js/app.js?id=834d97fecc500a7e0804" +======= + "/vue/js/app.js": "/vue/js/app.js?id=24a7b3a8d1891f421dee" +>>>>>>> d147ecaacb2020c2dedb3090eb9bcb56de3f6c95 } diff --git a/public/vue/js/app.js b/public/vue/js/app.js index 416bdb99..19419e3b 100644 --- a/public/vue/js/app.js +++ b/public/vue/js/app.js @@ -3366,7 +3366,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope }; }, methods: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapActions"])('auth', ['changePassword']), { +<<<<<<< HEAD submitVerifyCode: function submitVerifyCode() { +======= + submitChangePassword: function submitChangePassword() { +>>>>>>> d147ecaacb2020c2dedb3090eb9bcb56de3f6c95 if (this.form.code != '') { this.changePassword({ form: this.form @@ -63854,6 +63858,9 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar commit('modal/closeModal', {}, { root: true }); + _router__WEBPACK_IMPORTED_MODULE_2__["default"].push({ + name: "Dashboard" + }); } case 6: diff --git a/resources/js/vue/components/modal/auth/ChangePassword.vue b/resources/js/vue/components/modal/auth/ChangePassword.vue index f4466ec4..e39ac829 100644 --- a/resources/js/vue/components/modal/auth/ChangePassword.vue +++ b/resources/js/vue/components/modal/auth/ChangePassword.vue @@ -51,7 +51,7 @@ export default { ...mapActions('auth', [ 'changePassword' ]), - submitVerifyCode() { + submitChangePassword() { if (this.form.code != '') { this.changePassword({form: this.form}); } diff --git a/resources/js/vue/store/modules/auth/actions.js b/resources/js/vue/store/modules/auth/actions.js index a52a7d80..ede3e81d 100644 --- a/resources/js/vue/store/modules/auth/actions.js +++ b/resources/js/vue/store/modules/auth/actions.js @@ -47,6 +47,7 @@ export default { var response = await ApiService.post(urls.changePassword, form); if(response && response.status == 200 ) { commit('modal/closeModal', {}, {root: true}); + router.push({ name: `Dashboard` }); } }, diff --git a/resources/js/vue/views/Auth/ForgotPassword.vue b/resources/js/vue/views/Auth/ForgotPassword.vue index b54bb94d..3fdae59e 100644 --- a/resources/js/vue/views/Auth/ForgotPassword.vue +++ b/resources/js/vue/views/Auth/ForgotPassword.vue @@ -1,5 +1,5 @@