Forgot Password And Debuging

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');
         }

app/Http/Controllers/MedicalCenterController.php

@@ -22,8 +22,8 @@ class MedicalCenterController extends Controller
 
     public function store(StoreMedicalCenterRequest $request)
     {
-        $MedicalCenter = MedicalCenter::create($request->all());
+        MedicalCenter::create($request->all());
-        return response()->json(trans('messages.success'));
+        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);
+        $MedicalCenter = $MedicalCenter->load('users');
-        return response()->json(['MedicalCenter' => $MedicalCenter]);
+        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'));
     }
 }

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":

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(

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.";
           }

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({
+                if (this.$refs.form.validate()) {
-                  form: this.form
+                  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,

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: {

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";
         }
       }
     };

public/mix-manifest.json

@@ -1,3 +1,3 @@
 {
-    "/vue/js/app.js": "/vue/js/app.js?id=8c04dcb4c96b990c50a9"
+    "/vue/js/app.js": "/vue/js/app.js?id=24a7b3a8d1891f421dee"
 }

public/vue/js/app.js

@@ -3303,6 +3303,81 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
+/***/ "./node_modules/babel-loader/lib/index.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/vue/components/modal/auth/ChangePassword.vue?vue&type=script&lang=js&":
+/*!****************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib??ref--4-0!./node_modules/vue-loader/lib??vue-loader-options!./resources/js/vue/components/modal/auth/ChangePassword.vue?vue&type=script&lang=js& ***!
+  \****************************************************************************************************************************************************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"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");
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, 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; }
+
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+/* harmony default export */ __webpack_exports__["default"] = ({
+  data: function data() {
+    return {
+      form: {
+        password: "",
+        password_confirmation: ""
+      }
+    };
+  },
+  methods: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapActions"])('auth', ['changePassword']), {
+    submitChangePassword: function submitChangePassword() {
+      if (this.form.code != '') {
+        this.changePassword({
+          form: this.form
+        });
+      }
+    }
+  })
+});
+
+/***/ }),
+
 /***/ "./node_modules/babel-loader/lib/index.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/vue/components/modal/auth/VerifyCode.vue?vue&type=script&lang=js&":
 /*!************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib??ref--4-0!./node_modules/vue-loader/lib??vue-loader-options!./resources/js/vue/components/modal/auth/VerifyCode.vue?vue&type=script&lang=js& ***!
@@ -16950,6 +17025,154 @@ render._withStripped = true
 
 
 
+/***/ }),
+
+/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/vue/components/modal/auth/ChangePassword.vue?vue&type=template&id=0cf49b1e&":
+/*!********************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./resources/js/vue/components/modal/auth/ChangePassword.vue?vue&type=template&id=0cf49b1e& ***!
+  \********************************************************************************************************************************************************************************************************************************/
+/*! exports provided: render, staticRenderFns */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "render", function() { return render; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
+var render = function() {
+  var _vm = this
+  var _h = _vm.$createElement
+  var _c = _vm._self._c || _h
+  return _c(
+    "v-form",
+    [
+      _c(
+        "v-container",
+        { attrs: { "grid-list-xs": "" } },
+        [
+          _c(
+            "v-layout",
+            { staticClass: "justify-center", attrs: { row: "", wrap: "" } },
+            [
+              _c(
+                "v-flex",
+                {
+                  staticClass: "WM-WidthScreen-SM WM-WidthScreen-XS",
+                  attrs: { xs12: "", md3: "", sm3: "" }
+                },
+                [
+                  _c(
+                    "material-card",
+                    { attrs: { color: "black", title: "Change Password" } },
+                    [
+                      _c(
+                        "v-layout",
+                        { staticClass: "px-3", attrs: { row: "", wrap: "" } },
+                        [
+                          _c(
+                            "v-flex",
+                            { attrs: { xs12: "", md12: "", sm12: "" } },
+                            [
+                              _c("v-text-field", {
+                                attrs: { label: "Password", color: "black" },
+                                model: {
+                                  value: _vm.form.password,
+                                  callback: function($$v) {
+                                    _vm.$set(_vm.form, "password", $$v)
+                                  },
+                                  expression: "form.password"
+                                }
+                              })
+                            ],
+                            1
+                          ),
+                          _vm._v(" "),
+                          _c(
+                            "v-flex",
+                            { attrs: { xs12: "", md12: "", sm12: "" } },
+                            [
+                              _c("v-text-field", {
+                                attrs: {
+                                  label: "Confirm Password",
+                                  color: "black"
+                                },
+                                model: {
+                                  value: _vm.form.password_confirmation,
+                                  callback: function($$v) {
+                                    _vm.$set(
+                                      _vm.form,
+                                      "password_confirmation",
+                                      $$v
+                                    )
+                                  },
+                                  expression: "form.password_confirmation"
+                                }
+                              })
+                            ],
+                            1
+                          )
+                        ],
+                        1
+                      ),
+                      _vm._v(" "),
+                      _c(
+                        "v-layout",
+                        { staticClass: "px-3", attrs: { row: "", wrap: "" } },
+                        [
+                          _c(
+                            "v-flex",
+                            {
+                              staticClass:
+                                "text-md-left text-sm-center text-xs-center",
+                              attrs: { xs12: "", md6: "", sm6: "" }
+                            },
+                            [
+                              _c(
+                                "v-btn",
+                                {
+                                  staticClass: "WM-CyanBlueGradient-BG",
+                                  staticStyle: { padding: "10px 60px" },
+                                  on: { click: _vm.submitChangePassword }
+                                },
+                                [
+                                  _c(
+                                    "v-icon",
+                                    { staticClass: "white--text mr-2 caption" },
+                                    [_vm._v("fas fa-sign-in-alt")]
+                                  ),
+                                  _vm._v(" "),
+                                  _c("span", { staticClass: "white--text" }, [
+                                    _vm._v("Submit")
+                                  ])
+                                ],
+                                1
+                              )
+                            ],
+                            1
+                          )
+                        ],
+                        1
+                      )
+                    ],
+                    1
+                  )
+                ],
+                1
+              )
+            ],
+            1
+          )
+        ],
+        1
+      )
+    ],
+    1
+  )
+}
+var staticRenderFns = []
+render._withStripped = true
+
+
+
 /***/ }),
 
 /***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/vue/components/modal/auth/VerifyCode.vue?vue&type=template&id=397c9eb9&":
@@ -61700,17 +61923,20 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js */ "./node_modules/vue-loader/lib/runtime/componentNormalizer.js");
+/* harmony import */ var _ChangePassword_vue_vue_type_template_id_0cf49b1e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ChangePassword.vue?vue&type=template&id=0cf49b1e& */ "./resources/js/vue/components/modal/auth/ChangePassword.vue?vue&type=template&id=0cf49b1e&");
-var render, staticRenderFns
+/* harmony import */ var _ChangePassword_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./ChangePassword.vue?vue&type=script&lang=js& */ "./resources/js/vue/components/modal/auth/ChangePassword.vue?vue&type=script&lang=js&");
-var script = {}
+/* empty/unused harmony star reexport *//* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js */ "./node_modules/vue-loader/lib/runtime/componentNormalizer.js");
+
+
+
 
 
 /* normalize component */
 
-var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_0__["default"])(
+var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
-  script,
+  _ChangePassword_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
-  render,
+  _ChangePassword_vue_vue_type_template_id_0cf49b1e___WEBPACK_IMPORTED_MODULE_0__["render"],
-  staticRenderFns,
+  _ChangePassword_vue_vue_type_template_id_0cf49b1e___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
   false,
   null,
   null,
@@ -61718,9 +61944,43 @@ var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_
   
 )
 
+/* hot reload */
+if (false) { var api; }
 component.options.__file = "resources/js/vue/components/modal/auth/ChangePassword.vue"
 /* harmony default export */ __webpack_exports__["default"] = (component.exports);
 
+/***/ }),
+
+/***/ "./resources/js/vue/components/modal/auth/ChangePassword.vue?vue&type=script&lang=js&":
+/*!********************************************************************************************!*\
+  !*** ./resources/js/vue/components/modal/auth/ChangePassword.vue?vue&type=script&lang=js& ***!
+  \********************************************************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _node_modules_babel_loader_lib_index_js_ref_4_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ChangePassword_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../node_modules/babel-loader/lib??ref--4-0!../../../../../../node_modules/vue-loader/lib??vue-loader-options!./ChangePassword.vue?vue&type=script&lang=js& */ "./node_modules/babel-loader/lib/index.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/vue/components/modal/auth/ChangePassword.vue?vue&type=script&lang=js&");
+/* empty/unused harmony star reexport */ /* harmony default export */ __webpack_exports__["default"] = (_node_modules_babel_loader_lib_index_js_ref_4_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ChangePassword_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__["default"]); 
+
+/***/ }),
+
+/***/ "./resources/js/vue/components/modal/auth/ChangePassword.vue?vue&type=template&id=0cf49b1e&":
+/*!**************************************************************************************************!*\
+  !*** ./resources/js/vue/components/modal/auth/ChangePassword.vue?vue&type=template&id=0cf49b1e& ***!
+  \**************************************************************************************************/
+/*! exports provided: render, staticRenderFns */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_ChangePassword_vue_vue_type_template_id_0cf49b1e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../node_modules/vue-loader/lib??vue-loader-options!./ChangePassword.vue?vue&type=template&id=0cf49b1e& */ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/vue/components/modal/auth/ChangePassword.vue?vue&type=template&id=0cf49b1e&");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_ChangePassword_vue_vue_type_template_id_0cf49b1e___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_ChangePassword_vue_vue_type_template_id_0cf49b1e___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+
+
+
 /***/ }),
 
 /***/ "./resources/js/vue/components/modal/auth/VerifyCode.vue":
@@ -63594,6 +63854,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:

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});
           }

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` });
         }
     },
 

resources/js/vue/views/Auth/ForgotPassword.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-form>
+  <v-form ref="form">
     <v-container grid-list-xs>
       <v-layout row wrap class="justify-center">
         <v-flex xs12 md3 sm3 class="WM-WidthScreen-SM WM-WidthScreen-XS">
@@ -11,6 +11,8 @@
                   name="cellnumber"
                   label="Cell Number"
                   color="black"
+                  :rules="[rules.required, rules.cellNumberCounter]"
+                  mask="#### ### ####"
                 ></v-text-field>
               </v-flex>
             </v-layout>
@@ -49,6 +51,10 @@ export default {
     return {
       form :{
         cell_number: ""
+      },
+      rules: {
+        required: value => !!value || "Required.",
+        cellNumberCounter: value => (value && value.length == 11) || "must 11 characters"
       }
     };
   },
@@ -56,7 +62,9 @@ export default {
     ...mapActions("auth", ["forgotPassword"]),
     // ...mapMutations("modal", ["changeCurrentModal"]),
     async handleSubmit() {
-      this.forgotPassword({form : this.form});
+      if (this.$refs.form.validate()) { 
+        this.forgotPassword({form : this.form});
+      }
     }
   }
 };

resources/js/vue/views/Auth/Login.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-form >
+  <v-form ref="form" >
     <v-container grid-list-xs>
       <v-layout row wrap class="justify-center">
         <v-flex xs12 md3 sm3 class="WM-WidthScreen-SM WM-WidthScreen-XS">
@@ -12,8 +12,9 @@
                   v-model="cell_number"
                   name="cellnumber"
                   label="Cell Number"
-                  id="id1"
                   color="black"
+                  :rules="[rules.required, rules.cellNumberCounter]"
+                  mask="#### ### ####"
                 ></v-text-field>
               </v-flex>
             </v-layout>
@@ -26,6 +27,7 @@
                   :type="show1 ? 'text' : 'password'"
                   :append-icon="show1 ? 'visibility' : 'visibility_off'"
                   @click:append="show1 = !show1"
+                  :rules="[rules.required, rules.passCounter]"
                   color="black"
                   class="pa-2"
                 ></v-text-field>
@@ -60,6 +62,11 @@ export default {
       cell_number: "",
       password: "",
       show1: false,
+      rules: {
+        required: value => !!value || "Required.",
+        passCounter: value => (value && value.length >= 8) || "Min 8 characters",
+        cellNumberCounter: value => (value && value.length == 11) || "must 11 characters"
+      }
     };
   },
   computed: {
@@ -75,11 +82,10 @@ export default {
       ]),
       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});
-            this.login({cell_number: this.cell_number, password: this.password});
+          this.password = "";
-            this.password = "";
+        }
-          }
       }
   }
 };

resources/js/vue/views/Auth/Register.vue

@@ -101,9 +101,9 @@ export default {
       isLogin: TokenService.getInfo(),
       rules: {
         required: value => !!value || "Required.",
-        nameCounter: value => value.length >= 5 || "Min 5 characters",
+        nameCounter: value => (value && value.length >= 5) || "Min 5 characters",
-        passCounter: value => value.length >= 6 || "Min 6 characters",
+        passCounter: value => (value && value.length >= 8) || "Min 8 characters",
-        cellNumberCounter: value => value.length == 11 || "must 11 characters"
+        cellNumberCounter: value => (value && value.length == 11) || "must 11 characters"
       }
     };
   },

resources/js/vue/views/MedicalCenter/AddEdit.vue

@@ -58,7 +58,9 @@ export default {
   methods: {
     async load(id) {
       const result = await ApiService.get(urls.editMedicalCenter(id));
-      this.medicalCenter = result.data.MedicalCenter;
+      if (result && result.status == 200) {
+        this.medicalCenter = result.data.data;
+      }
     },
     async AddMedicalCenter() {
       if (this.$refs.form.validate()) {

resources/js/vue/views/TestResult/List.vue

@@ -55,8 +55,12 @@
               <td class="title font-weight-light">{{ item.result }}</td>
               <td class="title font-weight-light">{{ item.created_at }}</td>
               <td class="text-xs-right">
+                <v-btn color="cyan" class="mr-2"  >
+                  <v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
+                  <span>Show</span>
+                </v-btn>
                 <router-link :to="{name: 'EditTestResult', params: {testResult: item.id}}">
-                  <v-btn color="cyan" class="mr-2">
+                  <v-btn color="orange" class="mr-2">
                     <v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
                     <span>Edit</span>
                   </v-btn>

resources/js/vue/views/User/MyInfo.vue

@@ -101,9 +101,9 @@ export default {
       rules: {
         required: value => !!value || "Required.",
         counter: value =>
-          value.length == 0 || value.length >= 5 || "Min 5 characters",
+          !value || value.length == 0 || value.length >= 5 || "Min 5 characters",
         email: value => {
-          if (value.length > 0) {
+          if (value && value.length > 0) {
             const 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.";
           }