Use Id on Resort pages - add validation

package-lock.json

@@ -12,6 +12,8 @@
         "animate.css": "^3.7.2",
         "aos": "^3.0.0-beta.6",
         "axios": "^0.24.0",
+        "bootstrap": "^5.1.3",
+        "bootstrap-vue": "^2.22.0",
         "core-js": "^2.6.12",
         "crypto-js": "^4.0.0",
         "datatables.net": "^1.11.3",
@@ -1193,6 +1195,87 @@
         "node": ">= 6"
       }
     },
+    "node_modules/@nuxt/opencollective": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@nuxt/opencollective/-/opencollective-0.3.2.tgz",
+      "integrity": "sha512-XG7rUdXG9fcafu9KTDIYjJSkRO38EwjlKYIb5TQ/0WDbiTUTtUtgncMscKOYzfsY86kGs05pAuMOR+3Fi0aN3A==",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "consola": "^2.15.0",
+        "node-fetch": "^2.6.1"
+      },
+      "bin": {
+        "opencollective": "bin/opencollective.js"
+      },
+      "engines": {
+        "node": ">=8.0.0",
+        "npm": ">=5.0.0"
+      }
+    },
+    "node_modules/@nuxt/opencollective/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@nuxt/opencollective/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@nuxt/opencollective/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@nuxt/opencollective/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/@nuxt/opencollective/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@nuxt/opencollective/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@nuxtjs/axios": {
       "version": "5.13.1",
       "resolved": "https://registry.npmjs.org/@nuxtjs/axios/-/axios-5.13.1.tgz",
@@ -1321,6 +1404,16 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/@popperjs/core": {
+      "version": "2.11.5",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
+      "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==",
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
     "node_modules/@soda/friendly-errors-webpack-plugin": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz",
@@ -2896,6 +2989,44 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
+    "node_modules/bootstrap": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",
+      "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/bootstrap"
+      },
+      "peerDependencies": {
+        "@popperjs/core": "^2.10.2"
+      }
+    },
+    "node_modules/bootstrap-vue": {
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.22.0.tgz",
+      "integrity": "sha512-denjR/ae0K7Jrcqud3TrZWw0p/crtyigeGUNunWQ4t+KFi+7rzJ6j6lx1W5/gpUtSSUgNbWrXcHH4lIWXzXOOQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@nuxt/opencollective": "^0.3.2",
+        "bootstrap": "^4.6.1",
+        "popper.js": "^1.16.1",
+        "portal-vue": "^2.1.7",
+        "vue-functional-data-merge": "^3.1.0"
+      }
+    },
+    "node_modules/bootstrap-vue/node_modules/bootstrap": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.1.tgz",
+      "integrity": "sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/bootstrap"
+      },
+      "peerDependencies": {
+        "jquery": "1.9.1 - 3",
+        "popper.js": "^1.16.1"
+      }
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -3029,16 +3160,6 @@
         "url": "https://opencollective.com/browserslist"
       }
     },
-    "node_modules/browserslist/node_modules/caniuse-lite": {
-      "version": "1.0.30001274",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001274.tgz",
-      "integrity": "sha512-+Nkvv0fHyhISkiMIjnyjmf5YJcQ1IQHZN6U9TLUMroWR38FNwpsC51Gb68yueafX1V6ifOisInSgP9WJFS13ew==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
-    },
     "node_modules/browserslist/node_modules/electron-to-chromium": {
       "version": "1.3.886",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.886.tgz",
@@ -3263,10 +3384,20 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001022",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001022.tgz",
-      "integrity": "sha512-FjwPPtt/I07KyLPkBQ0g7/XuZg6oUkYBVnPHNj3VHJbOjmmJ/GdSo/GUY6MwINEQvjhP6WZVbX8Tvms8xh0D5A==",
-      "dev": true
+      "version": "1.0.30001332",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
+      "integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
     },
     "node_modules/canvg": {
       "version": "3.0.9",
@@ -10029,6 +10160,25 @@
         "lower-case": "^1.1.1"
       }
     },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/node-gyp": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
@@ -11024,6 +11174,24 @@
         "node": ">=4"
       }
     },
+    "node_modules/popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
+    "node_modules/portal-vue": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/portal-vue/-/portal-vue-2.1.7.tgz",
+      "integrity": "sha512-+yCno2oB3xA7irTt0EU5Ezw22L2J51uKAacE/6hMPMoO/mx3h4rXFkkBkT4GFsMDv/vEe8TNKC3ujJJ0PTwb6g==",
+      "peerDependencies": {
+        "vue": "^2.5.18"
+      }
+    },
     "node_modules/portfinder": {
       "version": "1.0.25",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
@@ -14173,6 +14341,11 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
     "node_modules/trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -14758,6 +14931,11 @@
       "resolved": "https://registry.npmjs.org/vue-float-label/-/vue-float-label-1.6.1.tgz",
       "integrity": "sha1-I1HnGyXyGwbUNWOwRveNlRKgjGY="
     },
+    "node_modules/vue-functional-data-merge": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz",
+      "integrity": "sha512-leT4kdJVQyeZNY1kmnS1xiUlQ9z1B/kdBFCILIjYYQDqZgLqCLa0UhjSSeRX6c3mUe6U5qYeM8LrEqkHJ1B4LA=="
+    },
     "node_modules/vue-head": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/vue-head/-/vue-head-2.2.0.tgz",
@@ -14984,6 +15162,11 @@
         "defaults": "^1.0.3"
       }
     },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
     "node_modules/webpack": {
       "version": "4.46.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
@@ -15886,6 +16069,15 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/when": {
       "version": "3.6.4",
       "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
@@ -17017,6 +17209,61 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
       "dev": true
     },
+    "@nuxt/opencollective": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@nuxt/opencollective/-/opencollective-0.3.2.tgz",
+      "integrity": "sha512-XG7rUdXG9fcafu9KTDIYjJSkRO38EwjlKYIb5TQ/0WDbiTUTtUtgncMscKOYzfsY86kGs05pAuMOR+3Fi0aN3A==",
+      "requires": {
+        "chalk": "^4.1.0",
+        "consola": "^2.15.0",
+        "node-fetch": "^2.6.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "@nuxtjs/axios": {
       "version": "5.13.1",
       "resolved": "https://registry.npmjs.org/@nuxtjs/axios/-/axios-5.13.1.tgz",
@@ -17114,6 +17361,12 @@
         }
       }
     },
+    "@popperjs/core": {
+      "version": "2.11.5",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
+      "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==",
+      "peer": true
+    },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz",
@@ -18431,6 +18684,32 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
+    "bootstrap": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",
+      "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",
+      "requires": {}
+    },
+    "bootstrap-vue": {
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.22.0.tgz",
+      "integrity": "sha512-denjR/ae0K7Jrcqud3TrZWw0p/crtyigeGUNunWQ4t+KFi+7rzJ6j6lx1W5/gpUtSSUgNbWrXcHH4lIWXzXOOQ==",
+      "requires": {
+        "@nuxt/opencollective": "^0.3.2",
+        "bootstrap": "^4.6.1",
+        "popper.js": "^1.16.1",
+        "portal-vue": "^2.1.7",
+        "vue-functional-data-merge": "^3.1.0"
+      },
+      "dependencies": {
+        "bootstrap": {
+          "version": "4.6.1",
+          "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.1.tgz",
+          "integrity": "sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==",
+          "requires": {}
+        }
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -18550,12 +18829,6 @@
         "picocolors": "^1.0.0"
       },
       "dependencies": {
-        "caniuse-lite": {
-          "version": "1.0.30001274",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001274.tgz",
-          "integrity": "sha512-+Nkvv0fHyhISkiMIjnyjmf5YJcQ1IQHZN6U9TLUMroWR38FNwpsC51Gb68yueafX1V6ifOisInSgP9WJFS13ew==",
-          "dev": true
-        },
         "electron-to-chromium": {
           "version": "1.3.886",
           "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.886.tgz",
@@ -18747,9 +19020,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001022",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001022.tgz",
-      "integrity": "sha512-FjwPPtt/I07KyLPkBQ0g7/XuZg6oUkYBVnPHNj3VHJbOjmmJ/GdSo/GUY6MwINEQvjhP6WZVbX8Tvms8xh0D5A==",
+      "version": "1.0.30001332",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
+      "integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
       "dev": true
     },
     "canvg": {
@@ -24323,6 +24596,14 @@
         "lower-case": "^1.1.1"
       }
     },
+    "node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
+    },
     "node-gyp": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
@@ -25109,6 +25390,17 @@
       "dev": true,
       "optional": true
     },
+    "popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
+    },
+    "portal-vue": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/portal-vue/-/portal-vue-2.1.7.tgz",
+      "integrity": "sha512-+yCno2oB3xA7irTt0EU5Ezw22L2J51uKAacE/6hMPMoO/mx3h4rXFkkBkT4GFsMDv/vEe8TNKC3ujJJ0PTwb6g==",
+      "requires": {}
+    },
     "portfinder": {
       "version": "1.0.25",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
@@ -27684,6 +27976,11 @@
         }
       }
     },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -28177,6 +28474,11 @@
       "resolved": "https://registry.npmjs.org/vue-float-label/-/vue-float-label-1.6.1.tgz",
       "integrity": "sha1-I1HnGyXyGwbUNWOwRveNlRKgjGY="
     },
+    "vue-functional-data-merge": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz",
+      "integrity": "sha512-leT4kdJVQyeZNY1kmnS1xiUlQ9z1B/kdBFCILIjYYQDqZgLqCLa0UhjSSeRX6c3mUe6U5qYeM8LrEqkHJ1B4LA=="
+    },
     "vue-head": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/vue-head/-/vue-head-2.2.0.tgz",
@@ -28378,6 +28680,11 @@
         "defaults": "^1.0.3"
       }
     },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
     "webpack": {
       "version": "4.46.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
@@ -29122,6 +29429,15 @@
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true
     },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "when": {
       "version": "3.6.4",
       "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",

package.json

@@ -13,6 +13,8 @@
     "animate.css": "^3.7.2",
     "aos": "^3.0.0-beta.6",
     "axios": "^0.24.0",
+    "bootstrap": "^5.1.3",
+    "bootstrap-vue": "^2.22.0",
     "core-js": "^2.6.12",
     "crypto-js": "^4.0.0",
     "datatables.net": "^1.11.3",

src/components/shared/navBar.vue

@@ -56,7 +56,7 @@
                       Commercial
                     </a>
                     <ul style="margin-top:-10px; text-align:left" :class="commercialClass">
-                      <li>                     
+                      <li>
                       </li>
                       <hr />
                       <li>
@@ -341,7 +341,7 @@
                   </li>
 
                   <li v-if="!USER">
-                    <router-link class="btn-solid-blue pt-2 pb-2" to="/user/register"
+                    <router-link class="btn-white-border p-2 ml-1 mr-1" to="/user/register"
                       >Register</router-link
                     >
                   </li>

src/components/timeshare/buy/carouselSection.vue

@@ -143,7 +143,7 @@ export default {
         this.searchParams.regionObj = this.regionObj;
         this.$router.push("/timeshareToByResults");
       } else {
-        this.$router.push(`/resort/${this.searchParams.resort.resortCode}`);
+        this.$router.push(`/resort/${this.searchParams.resort.resortId}`);
       }
     }
   },

src/components/timeshare/buy/searchSection.vue

@@ -145,7 +145,7 @@ export default {
     },
     ShowResort() {
       if (this.selectedResort) {
-        this.$router.push(`/resort/${this.selectedResort.resortCode}`);
+        this.$router.push(`/resort/${this.selectedResort.resortId}`);
       }
     },
   },

src/components/timeshare/buy/weekListComponent.vue

@@ -168,9 +168,9 @@ export default {
     }
   },
   mounted() {
-    if (this.resortCode) {
-      this.applyResortFilter(this.resortCode);
-    }
+    //if (this.resortCode) {
+    //  this.applyResortFilter(this.resortCode);
+    //}
     this.getByResortCode(this.$route.params.resortCode);
     //this.getWeeks();
   },

src/components/timeshare/resort/resortPage.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- <carouselSection v-if="boolLoaded" :resortImages="resort.images" /> -->
     <main id="main" style="margin-top:-20px">
-      <contentSection :resortCode="resortCode" />
+      <contentSection :resortId="resortId" />
     </main>
   </div>
 </template>
@@ -23,10 +23,10 @@ export default {
     };
   },
   props: {
-    resortCode: {}
+    resortId: {}
   },
   async created() {
-    this.getResortData(this.resortCode);
+    this.getResortData(this.resortId);
     // .then(() => {
     //   setTimeout(() => (this.boolLoaded = true), 2000);
     // });

src/components/user/forgotPassword.vue

@@ -10,13 +10,27 @@
       </div>
       <div class="row mb-4">
         <div class="col">
-          <alert :text="message" :type="status" />
+          <alert :text="errorMessage" :type="errorOccurred" />
         </div>
       </div>
       <div class="row">
         <div class="col-md-6">
           <float-label>
-            <input v-model="email" type="text" placeholder="EMAIL" class="form-control uniInput" />
+            <input
+            type="email"
+            id="email"
+            name="email"
+            placeholder="EMAIL"
+            class="form-control uniInput"
+            v-model="email"
+            v-bind:class="{'is-valid': email,
+             'is-invalid': !validEmail(email) && emailLoad}"
+            v-on:keyup="emailLoad = true"
+            v-on:blur="emailLoad = true"
+            required
+            icon
+            />
+            <div class="invalid-feedback">Valid Email is required!</div>
           </float-label>
         </div>
       </div>
@@ -30,7 +44,7 @@
 </template>
 
 <script>
-import { mapActions } from "vuex";
+import { mapActions } from 'vuex';
 /* eslint-disable */
 
 import alert from "../shared/alert";
@@ -42,25 +56,45 @@ export default {
   data() {
     return {
       email: "",
-      message: "",
-      status: ""
+      emailLoad: false,
+      errorOccurred: "",
+      errorMessage: ""
     };
   },
   methods: {
     ...mapActions("register", ["forgotPasswordCheck"]),
     checkMail() {
-      this.forgotPasswordCheck(this.email)
-        .then(res => {
-          this.message = "An email has been sent with instructions to reset your password.";
-          this.status = "SUCCESS";
+      if (this.email){
+        console.log(this.email);
+        this.forgotPasswordCheck(this.email)
+        .then(() => {
+          this.errorMessage = "An email has been sent with instructions to reset your password.";
+          this.errorOccurred = "SUCCESS";
         })
-        .catch(e => {
-          this.message = "The email was not found";
-          this.status = "ERROR";
+        .catch(err => {
+          //console.log(err);
+          this.errorOccurred = "ERROR";
+          this.errorMessage = "Server Error: CONNECTION_REFUSED";
+          if (err.status) {
+            if (err.data.message) {
+              this.errorMessage = err.data.message;
+            } else {
+              this.errorMessage = "Email address not found!"
+            }
+          }
         });
+      } else {
+          this.errorMessage = "A valid email is required.";
+          this.errorOccurred = "ERROR";
+      }
+    },
+    validEmail : function(email) {
+        var re = /(.+)@(.+){2,}\.(.+){2,}/;
+        return re.test(email.toLowerCase());
     }
   }
 };
 </script>
 
 <style lang="scss" scoped></style>
+

src/components/user/loginPage.vue

@@ -15,35 +15,52 @@
                     <div v-if="page">
                       <alert :text="page.text" :type="'INFO'" />
                     </div>
-                    <div class="form-label-group">
-                      <input
+                      <div class="form-label-group">
+                        <input
                         type="text"
-                        id="inputEmail"
+                        id="inputUsername"
+                        name="username"
+                        class="form-control uniInput"
                         v-model="username"
-                        class="form-control"
+                        v-bind:class="{'is-valid': username,
+                         'is-invalid': !requiredField(username) && usernameLoad}"
+                        v-on:keyup="usernameLoad = true"
+                        v-on:blur="usernameLoad = true"
                         placeholder="Username"
                         required
+                        icon
                         autofocus
-                      />
-                    </div>
+                        />
+                      <div class="invalid-feedback">Name is required!</div>
+                      </div>
+
                     <div class="form-label-group">
                       <input
                         type="password"
+                        id="inputPassword"
+                        name="password"
+                        class="form-control uniInput"
                         placeholder="Password"
                         v-model="password"
-                        id="inputPassword"
-                        class="form-control"
+                        v-bind:class="{'is-valid': password,
+                         'is-invalid': !requiredField(password) && passwordLoad}"
+                        v-on:keyup="passwordLoad = true"
+                        v-on:blur="passwordLoad = true"
+                        aria-required="icon"
                         required
+                        icon
                       />
+                      <div class="invalid-feedback">Password is required!</div>
                     </div>
+
                     <div class="custom-control custom-checkbox mb-3">
                       <input type="checkbox" class="custom-control-input" id="customCheck1" />
                       <label class="custom-control-label" for="customCheck1"
                         >Remember password?</label
                       >
                     </div>
-
                     <button v-on:click="Login()" class="btn-solid-blue" type="submit">
+                    <!-- <button class="btn-solid-blue" type="submit"> -->
                       LOGIN
                     </button>
                     <router-link style="float:right" to="/user/forgotPassword"
@@ -97,7 +114,9 @@ export default {
   data() {
     return {
       username: "",
+      usernameLoad: false,
       password: "",
+      passwordLoad: false,
       errorOccurred: "",
       errorMessage: "",
       isPasswordShown: "password",
@@ -127,10 +146,10 @@ export default {
     },
     Login() {
       console.log(this.username + " " + this.password);
+      if (this.validate()){
       this.login({ username: this.username, password: this.password })
         .then(() => {
-          // console.log(Log.getUser());
-
+          console.log(Log.getUser());
           if (!this.page) {
             if (!Log.getUser().loginPasswordChange) {
               this.$router.push("/");
@@ -142,12 +161,21 @@ export default {
           }
         })
         .catch(err => {
+          console.log("Catch here");
+          console.log(this.status);
+          this.errorOccurred = "ERROR";
+          this.errorMessage = "Server Error: CONNECTION_REFUSED"; 
           console.log(err.status);
-          if (err.status === 401) {
-            this.errorOccurred = "ERROR";
-            this.errorMessage = err.data.message;
+          if (err.status) {
+            if (err.data.message) {
+              this.errorMessage = err.data.message;
+            } else {
+              this.errorMessage = "Username or passord is incorrect."
+            }
           }
-        });
+        }
+        ); 
+      }
     },
     checkUserStatus() {
       if (Log.isLoggedIn()) {
@@ -166,6 +194,24 @@ export default {
     SendMail() {},
     routerGoTo(goTo) {
       this.$router.push(goTo);
+    },
+    validate : function(){
+      if (this.username && this.password){
+        this.errorOccurred = '';
+        this.errorMessage = '';
+        return true;
+      } else {
+        this.errorOccurred = "ERROR";
+        this.errorMessage = "Username or passord is incorrect.";
+        return false;
+      }
+    },
+    requiredField : function(tfield) {
+      if(tfield){
+        return true;
+      } else {
+        return false;
+      }
     }
   }
 };

src/components/user/registerAgencySection.vue

@@ -5,7 +5,7 @@
       <div class="col-sm-12 col-md-6">
         <input
           type="text"
-          id="inputName"
+          id="inputAgencyName"
           v-model="registerAgency.name"
           class="form-control uniInput"
           placeholder="Agency Name"
@@ -16,7 +16,7 @@
       <div class="col-sm-12 col-md-6">
         <input
           type="text"
-          id="inputName"
+          id="inputAgencyNumber"
           v-model="registerAgency.eaabeffcNumber"
           class="form-control uniInput"
           placeholder="EAAB FFC Number"
@@ -29,7 +29,7 @@
       <div class="col-sm-12">
         <input
           type="text"
-          id="inputName"
+          id="inputAgencyCompanyRegistration"
           v-model="registerAgency.companyRegNumber"
           class="form-control uniInput"
           placeholder="Company Registration Number"
@@ -44,7 +44,7 @@
       <div class="col-sm-12 col-md-6">
         <input
           type="text"
-          id="inputName"
+          id="inputAgencyAdmin"
           v-model="registerAgency.user.name"
           class="form-control uniInput my-3"
           placeholder="Name"
@@ -54,7 +54,7 @@
 
         <input
           type="text"
-          id="inputSurname"
+          id="inputAgencySurname"
           v-model="registerAgency.user.surname"
           class="form-control uniInput my-3"
           placeholder="Surname"
@@ -64,7 +64,7 @@
 
         <input
           type="email"
-          id="inputEmail"
+          id="inputAgencyEmail"
           v-model="registerAgency.user.email"
           class="form-control uniInput my-3"
           placeholder="Email"
@@ -75,7 +75,7 @@
       <div class="col-sm-12 col-md-6">
         <input
           type="text"
-          id="inputCellphone"
+          id="inputAgencyCellphone"
           v-model="registerAgency.user.cellNumber"
           class="form-control uniInput my-3"
           placeholder="Cellphone Number"
@@ -85,7 +85,7 @@
 
         <input
           type="text"
-          id="inputLandLine"
+          id="inputAgencyLandLine"
           v-model="registerAgency.user.telephone"
           class="form-control uniInput"
           placeholder="Landline Number"
@@ -99,7 +99,7 @@
       <div class="col-sm-12">
         <input
           type="text"
-          id="inputUsername"
+          id="inputAgencyUsername"
           v-model="registerAgency.user.username"
           class="form-control uniInput"
           placeholder="Username"
@@ -114,7 +114,7 @@
           type="password"
           placeholder="Password"
           v-model="registerAgency.user.password"
-          id="inputPassword uniInput"
+          id="inputAgencyPassword uniInput"
           class="form-control uniInput"
           required
         />
@@ -124,7 +124,7 @@
           type="password"
           placeholder="Confirm Password"
           v-model="registerAgency.user.password"
-          id="inputPasswordConfirm"
+          id="inputAgencyPasswordConfirm"
           class="form-control uniInput"
           required
         />
@@ -144,10 +144,11 @@
       </div>
     </div>
     <button
-      v-if="registerAgency.user.acceptedTerms"
-      v-on:click="SubmitData()"
-      class="btn-solid-blue"
-      type="submit"
+        v-if="registerAgency.user.acceptedTerms"
+        :disabled="isDisabled"
+        v-on:click="SubmitData()"
+        :class="isDisabled ? 'btn-disabled' : 'btn-solid-blue'"
+        type="submit"
     >
       SUBMIT
     </button>
@@ -233,4 +234,26 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.btn-disabled {
+  font-family: "Muli";
+  font-size: 15px;
+  letter-spacing: 1px;
+  display: inline-block;
+  padding: 10px 32px;
+  border-radius: 2px;
+  transition: 0.5s;
+  margin: 10px;
+  color: #fff;
+  background: grey;
+  border-color: black;
+  color: black;
+  cursor: not-allowed;
+}
+.btn-disabled :hover {
+  background: grey;
+  border-color: black;
+  color: black;
+  cursor: not-allowed;
+}
+</style>

src/components/user/registerIndividual.vue

@@ -13,61 +13,78 @@
       </div>
       <div v-if="boolValidationError" class="row">
         <div class="col">
-          <alert :text="validationErrorMessage" :type="'ERROR'" />
+          <alert :text="errorMessage" :type="errorOccurred" />
         </div>
       </div>
-      <div class="row">
+      <div class="row needs-validation">
         <div class="col-sm-12 col-md-6 ">
-          <input
-            type="text"
-            id="inputName"
-            v-model="indivUser.name"
-            class="form-control uniInput my-2"
-            placeholder="Name"
-            required
-            autofocus
-          />
-
-          <input
-            type="text"
-            id="inputSurname"
-            v-model="indivUser.surname"
-            class="form-control uniInput my-2"
-            placeholder="Surname"
-            required
-            autofocus
-          />
-
-          <input
-            type="email"
-            id="inputEmail"
-            v-model="indivUser.email"
-            class="form-control uniInput my-2"
-            placeholder="Email"
-            required
-            autofocus
-          />
+          <div class="form-group">
+            <b-form-input
+              type="text"
+              id="inputName"
+              class="form-control uniInput my-2"
+              v-model="indivUser.name"
+              v-bind:class="{'is-valid': indivUser.name,
+                'is-invalid': !requiredField(indivUser.name) && nameLoad}"
+              v-on:keyup="nameLoad = true"
+              v-on:blur="nameLoad = true"
+              placeholder="Name"
+            />
+            <div class="invalid-feedback">Name is required!</div>
+          </div>
+          <div class="form-group">
+            <b-form-input
+              type="text"
+              id="inputSurname"
+              class="form-control uniInput my-2"
+              v-model="indivUser.surname"
+              v-bind:class="{'is-valid': indivUser.surname,
+                'is-invalid': !requiredField(indivUser.surname) && surnameLoad}"
+              v-on:keyup="surnameLoad = true"
+              v-on:blur="surnameLoad = true"
+              placeholder="Surname"
+            />
+            <div class="invalid-feedback">Surname is required!</div>
+          </div>
+          <div class="form-group">
+            <input
+              type="email"
+              id="inputEmail"
+              v-model="indivUser.email"
+              class="form-control uniInput my-2"
+              v-bind:class="{'is-valid': indivUser.email,
+                'is-invalid': !validEmail(indivUser.email) && emailLoad}"
+              v-on:keyup="emailLoad = true"
+              v-on:blur="emailLoad = true"
+              placeholder="Email"
+            />
+            <div class="invalid-feedback">Valid email address is required!</div>
+          </div>
         </div>
+
         <div class="col-sm-12 col-md-6">
           <input
             type="text"
-            id="inputCellphone"
+            id="inputCellNumber"
+            name="inputCellNumber"
             v-model="indivUser.cellNumber"
             class="form-control uniInput my-2"
+            v-bind:class="{'is-valid': indivUser.cellNumber,
+                'is-invalid': !requiredField(indivUser.cellNumber) && cellNumberLoad}"
+            v-on:keyup="cellNumberLoad = true"
+            v-on:blur="cellNumberLoad = true"
             placeholder="Cellphone Number"
-            required
-            autofocus
           />
+          <div class="invalid-feedback">Cellphone number is required!</div>
 
           <input
             type="text"
-            id="inputLandLine"
+            id="inputTelephone"
             v-model="indivUser.telephone"
             class="form-control uniInput my-2"
             placeholder="Landline Number"
-            required
-            autofocus
           />
+          <div class="invalid-feedback">Landline number is required!</div>
         </div>
       </div>
       <hr />
@@ -78,10 +95,13 @@
             id="inputUsername"
             v-model="indivUser.username"
             class="form-control uniInput my-2"
+            v-bind:class="{'is-valid': indivUser.username,
+                'is-invalid': !requiredField(indivUser.username) && usernameLoad}"
+            v-on:keyup="usernameLoad = true"
+            v-on:blur="usernameLoad = true"
             placeholder="Username"
-            required
-            autofocus
           />
+          <div class="invalid-feedback">Username is required!</div>
         </div>
       </div>
       <div class="row">
@@ -92,18 +112,26 @@
             v-model="indivUser.password"
             id="inputPassword"
             class="form-control uniInput my-2"
-            required
+            v-bind:class="{'is-valid': indivUser.password,
+                'is-invalid': !requiredField(indivUser.password) && passwordLoad}"
+            v-on:keyup="passwordLoad = true"
+            v-on:blur="passwordLoad = true"
           />
+          <div class="invalid-feedback">Password is required!</div>
         </div>
         <div class="col">
           <input
             type="password"
             placeholder="Confirm Password"
-            v-model="indivUser.confirmpassword"
-            id="inputPasswordConfirm"
+            v-model="indivUser.confirmPassword"
+            id="inputConfirmPassword"
             class="form-control uniInput my-2"
-            required
+            v-bind:class="{'is-valid': indivUser.confirmPassword,
+                'is-invalid': !validConfirm(indivUser.confirmPassword) && confirmPasswordLoad}"
+            v-on:keyup="confirmPasswordLoad = true"
+            v-on:blur="confirmPasswordLoad = true"
           />
+          <div class="invalid-feedback">Password and Confirm password must be the same!</div>
         </div>
       </div>
       <div class="row">
@@ -116,9 +144,9 @@
         </div>
       </div>
       <button
-        :disabled="isDisabled"
+        v-if="terms"
+        class="btn-white-border"
         v-on:click="SubmitData()"
-        :class="isDisabled ? 'btn-disabled' : 'btn-solid-blue'"
         type="submit"
       >
         SUBMIT
@@ -155,7 +183,6 @@ export default {
   name: "PrivateIndividual",
   data() {
     return {
-      user: undefined,
       isPasswordShown: "password",
       selectItems: [{ text: "password", value: 0 }],
       selectErrors: "Some error with the field",
@@ -165,10 +192,29 @@ export default {
       showPassword: false,
       boolMessage: false,
       terms: false,
-      indivUser: {},
+      indivUser: {
+        name: '',
+        surname: '',
+        email:'',
+        cellNumber: '',
+        telephone: '',
+        username: '',
+        password: '',
+        confirmPassword: ''
+      },
       boolUserExists: false,
       boolValidationError: false,
-      validationErrorMessage: ""
+      nameLoad: false,
+      surnameLoad: false,
+      emailLoad: false,
+      cellNumberLoad: false,
+      telephoneLoad: false,
+      usernameLoad: false,
+      passwordLoad: false,
+      confirmPasswordLoad: false,
+      errorOccurred: "",
+      errorMessage: "",
+      valid: false
     };
   },
   computed: {
@@ -203,7 +249,7 @@ export default {
     SubmitData() {
       this.indivUser.acceptedTerms = this.terms;
       console.log(this.indivUser.email);
-      if (this.indivUser.email) {
+      if (this.validatePage()) {
         console.log(this.indivUser.username);
         if (this.indivUser.username) {
           this.saveIndividual(this.indivUser)
@@ -233,6 +279,55 @@ export default {
     },
     Close() {
       this.$router.push("/user/login");
+    },
+    validatePage : function(){
+      console.log('validatePage')
+      if (this.indivUser.name && this.indivUser.surname && this.indivUser.email 
+         && this.indivUser.cellNumber && this.indivUser.telephone && this.indivUser.username && this.indivUser.password
+         && this.indivUser.password === this.indivUser.confirmPassword){
+        this.errorOccurred = '';
+        this.errorMessage = '';
+        this.valid = true;
+        return true;
+      } else {
+        this.valid = false;
+        this.nameLoad = true,
+        this.surnameLoad = true,
+        this.emailLoad = true,
+        this.cellNumberLoad= true,
+        this.telephoneLoad = true,
+        this.usernameLoad = true,
+        this.passwordLoad = true,
+        this.confirmPasswordLoad = true,
+        this.errorOccurred = "ERROR";
+        this.errorMessage = "Please check form and correct all input fields!";
+        return false;
+      }
+    },
+    requiredField : function(tfield) {
+      if(tfield){
+        return true;
+      } else {
+        return false;
+      }
+    },
+    validEmail : function(email) {
+        var re = /(.+)@(.+){2,}\.(.+){2,}/;
+        return re.test(email.toLowerCase());
+    },
+    validConfirm : function(tfield) {
+      console.log(tfield);
+      if (this.requiredField(tfield)){
+        console.log(tfield);
+        console.log(this.indivUser.password);
+        if(tfield === this.indivUser.password){
+          return true;
+        } else {
+          return false;
+        } 
+      } else {
+        return false;
+      }
     }
   }
 };

src/components/user/registerPage.vue

@@ -134,6 +134,7 @@ export default {
   border-top: none;
   border-left: none;
   border-right: none;
+  background-color: rgb(221, 221, 221);
   border-bottom-color: rgb(221, 221, 221);
 }
 
@@ -145,6 +146,7 @@ export default {
   border-top: none;
   border-left: none;
   border-right: none;
+  background-color: rgb(80, 133, 240);
   border-bottom-color: rgb(221, 221, 221);
 }
 

src/main.js

@@ -1,116 +1,122 @@
 /* eslint-disable */
-import Vue from "vue";
-import EvaIcons from "vue-eva-icons";
-import axios from "axios";
-import moment from "moment";
-import App from "./App.vue";
-import router from "./router";
-import store from "./store";
-import * as VueGoogleMaps from "vue2-google-maps";
-import Vuetify from "vuetify";
-import VueSocialSharing from "vue-social-sharing";
-import VueCurrencyInput from "vue-currency-input";
-import VueFloatLabel from "vue-float-label";
-import VueCryptojs from "vue-cryptojs";
-import VueAnalytics from 'vue-analytics';
-import JsonExcel from "vue-json-excel";
-import VModal from "vue-js-modal";
-import vueFloatLabel from "vue-float-label";
-import 'vue-loaders/dist/vue-loaders.css';
-import VueLoaders from 'vue-loaders';
+import Vue from 'vue'
+import EvaIcons from 'vue-eva-icons'
+import axios from 'axios'
+import moment from 'moment'
+import App from './App.vue'
+import router from './router'
+import store from './store'
+import * as VueGoogleMaps from 'vue2-google-maps'
+import Vuetify from 'vuetify'
+import VueSocialSharing from 'vue-social-sharing'
+import VueCurrencyInput from 'vue-currency-input'
+import VueFloatLabel from 'vue-float-label'
+import VueCryptojs from 'vue-cryptojs'
+import VueAnalytics from 'vue-analytics'
+import JsonExcel from 'vue-json-excel'
+import VModal from 'vue-js-modal'
+import vueFloatLabel from 'vue-float-label'
+import 'vue-loaders/dist/vue-loaders.css'
+import VueLoaders from 'vue-loaders'
 import VueQuillEditor from 'vue-quill-editor'
-
+import 'bootstrap/dist/css/bootstrap.css'
+import 'bootstrap-vue/dist/bootstrap-vue.css'
+import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
 import 'quill/dist/quill.core.css' // import styles
 import 'quill/dist/quill.snow.css' // for snow theme
 import 'quill/dist/quill.bubble.css' // for bubble theme
 
-Vue.use(VueQuillEditor, /* { default global options } */)
-Vue.use(VueLoaders);
-Vue.use(VueSocialSharing);
-Vue.use(EvaIcons);
-Vue.use(Vuetify);
-Vue.use(VueFloatLabel);
-Vue.use(VueCryptojs);
-Vue.component("downloadExcel", JsonExcel);
+Vue.use(VueQuillEditor /* { default global options } */ )
+Vue.use(VueLoaders)
+Vue.use(VueSocialSharing)
+Vue.use(EvaIcons)
+Vue.use(Vuetify)
+Vue.use(VueFloatLabel)
+Vue.use(VueCryptojs)
+Vue.component('downloadExcel', JsonExcel)
+Vue.use(BootstrapVue)
+Vue.use(IconsPlugin)
 
 Vue.use(VueGoogleMaps, {
-  load: {
-    key: "AIzaSyD8k_Kwml_C8IDfs-gX8JFV8acli3L9cAE",
-    libraries: "places,directions" // This is required if you use the Autocomplete plugin
-    // OR: libraries: 'places,drawing'
-    // OR: libraries: 'places,drawing,visualization'
-    // (as you require)
+        load: {
+            key: 'AIzaSyD8k_Kwml_C8IDfs-gX8JFV8acli3L9cAE',
+            libraries: 'places,directions', // This is required if you use the Autocomplete plugin
+            // OR: libraries: 'places,drawing'
+            // OR: libraries: 'places,drawing,visualization'
+            // (as you require)
 
-    //// If you want to set the version, you can do so:
-    // v: '3.26',
-  }
-});
-//More info @ https://webdeasy.de/en/vue-analytics-en/
+            //// If you want to set the version, you can do so:
+            // v: '3.26',
+        },
+    })
+    //More info @ https://webdeasy.de/en/vue-analytics-en/
 Vue.use(VueAnalytics, {
-  id: 'UA-128891091-1',
-  router
-});
+    id: 'UA-128891091-1',
+    router,
+})
 
-Vue.config.productionTip = false;
-//axios.defaults.baseURL = "http://localhost:57260";
-//axios.defaults.baseURL = "https://www.pvsl.co.za:86/";
-axios.defaults.baseURL = "http://training.provision-sa.com:120/";
-//axios.defaults.baseURL = "http://localhost:8080/"
+Vue.config.productionTip = false
+axios.defaults.baseURL = 'http://localhost:57260'
+    //axios.defaults.baseURL = "https://www.pvsl.co.za:86/";
+    //axios.defaults.baseURL = "http://training.provision-sa.com:120/";
+    //axios.defaults.baseURL = "http://localhost:8080/"
 
-Vue.prototype.$axios = axios;
+Vue.prototype.$axios = axios
 const pluginOptions = {
-  /* see config reference */
-  globalOptions: {
-    currency: ["ZAR", null, { prefix: "R" }][2],
-    precision: 0
-  }
-};
-Vue.use(VueCurrencyInput, pluginOptions);
-Vue.prototype.$http = axios;
-const token = localStorage.getItem("token");
+    /* see config reference */
+    globalOptions: {
+        currency: ['ZAR', null, { prefix: 'R' }][2],
+        precision: 0,
+    },
+}
+Vue.use(VueCurrencyInput, pluginOptions)
+Vue.prototype.$http = axios
+const token = localStorage.getItem('token')
 if (token) {
-  Vue.prototype.$http.defaults.headers.common.Authorization = token;
+    Vue.prototype.$http.defaults.headers.common.Authorization = token
 }
 
 router.beforeEach((to, from, next) => {
-  if (to.matched.some(record => record.meta.requiresAuth)) {
-    if (store.getters.isLoggedIn) {
-      next();
-      return;
+    if (to.matched.some((record) => record.meta.requiresAuth)) {
+        if (store.getters.isLoggedIn) {
+            next()
+            return
+        }
+        next('/users/login')
+    } else {
+        next()
     }
-    next("/users/login");
-  } else {
-    next();
-  }
-});
+})
 
-Vue.filter("toCurrency", value => {
-  if (typeof value !== "number") {
-    return value;
-  }
-  const formatter = new Intl.NumberFormat("en-US", {
-    minimumFractionDigits: 0
-  });
-  return `R ${formatter.format(value)}`;
-});
+Vue.filter('toCurrency', (value) => {
+    if (typeof value !== 'number') {
+        return value
+    }
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 0,
+    })
+    return `R ${formatter.format(value)}`
+})
 
-Vue.filter("toProper", value => {
-  if (typeof value !== "string") {
-    console.log(typeof value);
-    return value;
-  }
-  value = value.replace(/([a-z])([A-Z])/g, "$1 $2");
-  return value.charAt(0).toUpperCase() + value.slice(1);
-});
+Vue.filter('toProper', (value) => {
+    if (typeof value !== 'string') {
+        console.log(typeof value)
+        return value
+    }
+    value = value.replace(/([a-z])([A-Z])/g, '$1 $2')
+    return value.charAt(0).toUpperCase() + value.slice(1)
+})
 
-Vue.filter("toDate", value => value.substring(0, value.length > 9 ? 10 : value.length));
+Vue.filter('toDate', (value) =>
+    value.substring(0, value.length > 9 ? 10 : value.length),
+)
 
-Vue.filter("toTime", value => moment(String(value)).format("hh:mm"));
+Vue.filter('toTime', (value) => moment(String(value)).format('hh:mm'))
 
 new Vue({
-  render: h => h(App),
-  router,
-  store
-}).$mount("#app");
+    render: (h) => h(App),
+    router,
+    store,
+}).$mount('#app')
 
-Vue.use(VModal);
+Vue.use(VModal)

src/store/modules/timeshare/region.js

@@ -1,139 +1,131 @@
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable guard-for-in */
-import axios from 'axios';
+import axios from 'axios'
 
 export default {
-  namespaced: true,
-  state: {
-    regions: [],
-    detailedRegion: [],
-    availRegion: [],
-    initFlag: false,
-  },
-  mutations: {
-    addItem(state, item) {
-      state[item.name].push(item.value);
+    namespaced: true,
+    state: {
+        regions: [],
+        detailedRegion: [],
+        availRegion: [],
+        initFlag: false,
     },
-    setItem(state, item) {
-      state[item.name] = item.value;
+    mutations: {
+        addItem(state, item) {
+            state[item.name].push(item.value)
+        },
+        setItem(state, item) {
+            state[item.name] = item.value
+        },
     },
-  },
-  getters: {},
-  actions: {
-    init({
-      state,
-      commit,
-      dispatch,
-    }) {
-      if (!state.initFlag) {
-        commit('setItem', {
-          name: 'availRegion',
-          value: [],
-        });
-        dispatch('getAvail');
-        dispatch('getRegions');
-        commit('setItem', {
-          name: 'initFlag',
-          value: true,
-        });
-      }
-    },
-    forceInit({
-      commit,
-      dispatch,
-    }) {
-      commit('setItem', {
-        name: 'initFlag',
-        value: false,
-      });
-      dispatch('init');
-    },
-    getAvail({
-      commit,
-    }) {
-      axios.get('/api/timeshareweek/getAvailResort').then((r) => {
-        for (const reg in r.data) {
-          const newRegion = {};
-          newRegion.regionCode = r.data[reg].regionCode;
-          newRegion.regionName = r.data[reg].regionName;
-          newRegion.available = r.data[reg].available;
-          newRegion.resorts = [];
-          for (const res in r.data[reg].resorts) {
-            const newResort = {
-              resortCode: '',
-              resortName: '',
-              lat: 0,
-              long: 0,
-            };
-            newResort.resortCode = r.data[reg].resorts[res].resortCode;
-            newResort.resortName = r.data[reg].resorts[res].resortName;
-            newResort.available = r.data[reg].resorts[res].available;
-            if (r.data[reg].resorts[res]) {
-              axios.get(
-                `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/TRESORT/${
-                  r.data[reg].resorts[res].resortCode}`,
-              )
-                .then((result) => {
-                  newResort.lat = result.data.prLatitude;
-                  newResort.long = result.data.prLongitude;
+    getters: {},
+    actions: {
+        init({ state, commit, dispatch }) {
+            if (!state.initFlag) {
+                commit('setItem', {
+                    name: 'availRegion',
+                    value: [],
+                })
+                dispatch('getAvail')
+                dispatch('getRegions')
+                commit('setItem', {
+                    name: 'initFlag',
+                    value: true,
                 })
-                .catch(console.error);
             }
-            newRegion.resorts.push(newResort);
-          }
-          commit('addItem', {
-            name: 'availRegion',
-            value: newRegion,
-          });
-        }
-      }).catch(
-        console
-          .error,
-      );
-    },
-    getRegions({
-      commit,
-      dispatch,
-    }) {
-      commit('setItem', {
-        name: 'detailedRegion',
-        value: [],
-      });
-      axios.get(
-        'https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/regions/list/ZA/',
-      )
-        .then((result) => {
-          commit('setItem', {
-            name: 'regions',
-            value: result.data,
-          });
-          if (result.data) {
-            for (const i in result.data) {
-              const region = result.data[i];
-              dispatch('getDetailedRegion', region);
+        },
+        forceInit({ commit, dispatch }) {
+            commit('setItem', {
+                name: 'initFlag',
+                value: false,
+            })
+            dispatch('init')
+        },
+        getAvail({ commit }) {
+            axios
+                .get('/api/timeshareweek/getAvailResort')
+                .then((r) => {
+                    for (const reg in r.data) {
+                        const newRegion = {}
+                        newRegion.regionCode = r.data[reg].regionCode
+                        newRegion.regionName = r.data[reg].regionName
+                        newRegion.available = r.data[reg].available
+                        newRegion.resorts = []
+                        for (const res in r.data[reg].resorts) {
+                            const newResort = {
+                                resortId: '',
+                                resortCode: '',
+                                resortName: '',
+                                lat: 0,
+                                long: 0,
+                            }
+                            newResort.resortCode = r.data[reg].resorts[res].resortCode
+                            newResort.resortName = r.data[reg].resorts[res].resortName
+                            newResort.available = r.data[reg].resorts[res].available
+                            newResort.resortId = r.data[reg].resorts[res].resortId
+                            if (r.data[reg].resorts[res]) {
+                                axios
+                                    .get(
+                                        `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/TRESORT/${r.data[reg].resorts[res].resortId}`,
+                                    )
+                                    .then((result) => {
+                                        newResort.lat = result.data.prLatitude
+                                        newResort.long = result.data.prLongitude
+                                    })
+                                    .catch(console.error)
+                            }
+                            newRegion.resorts.push(newResort)
+                        }
+                        commit('addItem', {
+                            name: 'availRegion',
+                            value: newRegion,
+                        })
+                    }
+                })
+                .catch(console.error)
+        },
+        getRegions({ commit, dispatch }) {
+            commit('setItem', {
+                name: 'detailedRegion',
+                value: [],
+            })
+            axios
+                .get(
+                    'https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/regions/list/ZA/',
+                )
+                .then((result) => {
+                    commit('setItem', {
+                        name: 'regions',
+                        value: result.data,
+                    })
+                    if (result.data) {
+                        for (const i in result.data) {
+                            const region = result.data[i]
+                            dispatch('getDetailedRegion', region)
+                        }
+                    }
+                })
+                .catch(console.error)
+        },
+        getDetailedRegion({ commit }, region) {
+            if (region) {
+                axios
+                    .get(
+                        `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/${region.regionCode}/`,
+                    )
+                    .then((result) =>
+                        commit('addItem', {
+                            name: 'detailedRegion',
+                            value: {
+                                id: region.id,
+                                regionCode: region.regionCode,
+                                regionName: region.regionName,
+                                resorts: result.data,
+                            },
+                        }),
+                    )
+                    .catch(console.error)
             }
-          }
-        })
-        .catch(console.error);
-    },
-    getDetailedRegion({
-      commit,
-    }, region) {
-      if (region) {
-        axios
-          .get(`https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/${
-            region.regionCode}/`)
-          .then(result => commit('addItem', {
-            name: 'detailedRegion',
-            value: {
-              id: region.id,
-              regionCode: region.regionCode,
-              regionName: region.regionName,
-              resorts: result.data,
-            },
-          }))
-          .catch(console.error);
-      }
+        },
     },
-  },
-};
+}

src/store/modules/timeshare/resort.js

@@ -1,171 +1,173 @@
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable guard-for-in */
 /* eslint-disable */
-import axios from "axios";
-import { reject } from "core-js/fn/promise";
+import axios from 'axios'
+import { reject } from 'core-js/fn/promise'
 
 export default {
-  namespaced: true,
-  state: {
-    resorts: [],
-    resort: {},
-    images: [],
-    layout: "",
-    description: "",
-    resortMedia: undefined,
-    resortsWithListings: []
-  },
-  mutations: {
-    setResort(state, resort) {
-      state.resort = resort;
-    },
-    setDescription(state, description) {
-      state.description = description;
-    },
-    addImage(state, image) {
-      state.images.push(`data:image/jpeg;base64,${image}`);
-    },
-    clear(state) {
-      state.resort = {};
-      state.images = [];
-      state.layout = "";
-    },
-    setLayout(state, image) {
-      state.layout = `data:image/jpeg;base64,${image}`;
-    },
-    setResorts(state, list) {
-      state.resorts = list;
-    },
-    setResortMedia(state, media) {
-      state.resortMedia = media;
-    },
-    setResortsWithListings(state, data){
-      state.resortsWithListings = data
-    }
-  },
-  getters: {},
-  actions: {
-    async initResort({ commit, dispatch }, resortCode) {
-      commit("clear");
-      await dispatch("getResort", resortCode);
-      dispatch("getDescription", resortCode);
-      dispatch("getImage1", resortCode);
-      dispatch("getImage2", resortCode);
-      dispatch("getImage3", resortCode);
-      dispatch("getImage4", resortCode);
-      dispatch("getImage5", resortCode);
-      dispatch("getLayout", resortCode);
-    },
-    getDescription({ commit }, resortCode) {
-      axios
-        .get(
-          `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${resortCode}/dsc`
-        )
-        .then(result => {
-          commit("setDescription", result.data);
-        })
-        .catch(console.error);
-    },
-    getResort({ commit }, resortCode) {
-      axios
-        .get(
-          `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/TRESORT/${resortCode}`
-        )
-        .then(result => {
-          commit("setResort", result.data);
-          console.log(result.data);
-        })
-        .catch(console.error);
-    },
-    async getImage1({ commit }, resortCode) {
-      return axios
-        .get(
-          `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${resortCode}/image/1`
-        )
-        .then(result => {
-          commit("addImage", result.data);
-          return Promise.resolve(result.data);
-        })
-        .catch(console.error);
-    },
-    getImage2({ commit }, resortCode) {
-      axios
-        .get(
-          `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${resortCode}/image/2`
-        )
-        .then(result => commit("addImage", result.data))
-        .catch(console.error);
-    },
-    getImage3({ commit }, resortCode) {
-      axios
-        .get(
-          `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${resortCode}/image/3`
-        )
-        .then(result => commit("addImage", result.data))
-        .catch(console.error);
-    },
-    getImage4({ commit }, resortCode) {
-      axios
-        .get(
-          `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${resortCode}/image/4`
-        )
-        .then(result => {
-          if (result.data && result.data.length > 0) {
-            commit("addImage", result.data);
-          }
-        })
-        .catch(console.error);
-    },
-    getImage5({ commit }, resortCode) {
-      axios
-        .get(
-          `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${resortCode}/image/5`
-        )
-        .then(result => {
-          if (result.data && result.data.length > 0) {
-            commit("addImage", result.data);
-          }
-        })
-        .catch(console.error);
-    },
-    getLayout({ commit }, resortCode) {
-      axios
-        .get(
-          `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${resortCode}/layout`
-        )
-        .then(result => commit("setLayout", result.data))
-        .catch(console.error);
-    },
-    getResorts({ commit }, regionCode) {
-      return new Promise((resolve, reject) => {
-        axios
-          .get(`/api/resort/${regionCode}`)
-          .then(result => {
-            commit("setResorts", result.data);
-            resolve();
-          })
-          .catch(error => reject(new Error(error.message)));
-      });
-    },
-    getResortMedia({ commit }, resortCode) {
-      axios
-        .get(
-          `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/social/${resortCode}`
-        )
-        .then(result => commit("setResortMedia", result.data));
-    },
-    async getResortData({ commit }, resortCode) {
-      await axios
-        .get(`/api/resort/GetResortData/${resortCode}`)
-        .then(result => {
-          commit("setResort", result.data);
-        })
-        .catch(error => console.log(new Error(error.message)));
-    },
-    async getResortWithListings({commit}, resortCode){
-      await axios.get("/api/resort/GetPublishedResortsWithListings").then(result => {
-        commit("setResortsWithListings", result.data)
-      })
-    }
-  }
-};
+    namespaced: true,
+    state: {
+        resorts: [],
+        resort: {},
+        images: [],
+        layout: '',
+        description: '',
+        resortMedia: undefined,
+        resortsWithListings: [],
+    },
+    mutations: {
+        setResort(state, resort) {
+            state.resort = resort
+        },
+        setDescription(state, description) {
+            state.description = description
+        },
+        addImage(state, image) {
+            state.images.push(`data:image/jpeg;base64,${image}`)
+        },
+        clear(state) {
+            state.resort = {}
+            state.images = []
+            state.layout = ''
+        },
+        setLayout(state, image) {
+            state.layout = `data:image/jpeg;base64,${image}`
+        },
+        setResorts(state, list) {
+            state.resorts = list
+        },
+        setResortMedia(state, media) {
+            state.resortMedia = media
+        },
+        setResortsWithListings(state, data) {
+            state.resortsWithListings = data
+        },
+    },
+    getters: {},
+    actions: {
+        async initResort({ commit, dispatch }, id) {
+            commit('clear')
+            await dispatch('getResort', id)
+            dispatch('getDescription', id)
+            dispatch('getImage1', id)
+            dispatch('getImage2', id)
+            dispatch('getImage3', id)
+            dispatch('getImage4', id)
+            dispatch('getImage5', id)
+            dispatch('getLayout', id)
+        },
+        getDescription({ commit }, id) {
+            axios
+                .get(
+                    `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${id}/dsc`,
+                )
+                .then((result) => {
+                    commit('setDescription', result.data)
+                })
+                .catch(console.error)
+        },
+        getResort({ commit }, id) {
+            axios
+                .get(
+                    `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/TRESORT/${id}`,
+                )
+                .then((result) => {
+                    commit('setResort', result.data)
+                    console.log(result.data)
+                })
+                .catch(console.error)
+        },
+        async getImage1({ commit }, id) {
+            return axios
+                .get(
+                    `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${id}/image/0`,
+                )
+                .then((result) => {
+                    commit('addImage', result.data)
+                    return Promise.resolve(result.data)
+                })
+                .catch(console.error)
+        },
+        getImage2({ commit }, id) {
+            axios
+                .get(
+                    `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${id}/image/1`,
+                )
+                .then((result) => commit('addImage', result.data))
+                .catch(console.error)
+        },
+        getImage3({ commit }, id) {
+            axios
+                .get(
+                    `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${id}/image/2`,
+                )
+                .then((result) => commit('addImage', result.data))
+                .catch(console.error)
+        },
+        getImage4({ commit }, id) {
+            axios
+                .get(
+                    `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${id}/image/3`,
+                )
+                .then((result) => {
+                    if (result.data && result.data.length > 0) {
+                        commit('addImage', result.data)
+                    }
+                })
+                .catch(console.error)
+        },
+        getImage5({ commit }, id) {
+            axios
+                .get(
+                    `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${id}/image/4`,
+                )
+                .then((result) => {
+                    if (result.data && result.data.length > 0) {
+                        commit('addImage', result.data)
+                    }
+                })
+                .catch(console.error)
+        },
+        getLayout({ commit }, id) {
+            axios
+                .get(
+                    `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/${id}/layout`,
+                )
+                .then((result) => commit('setLayout', result.data))
+                .catch(console.error)
+        },
+        getResorts({ commit }, regionCode) {
+            return new Promise((resolve, reject) => {
+                axios
+                    .get(`/api/resort/${regionCode}`)
+                    .then((result) => {
+                        commit('setResorts', result.data)
+                        resolve()
+                    })
+                    .catch((error) => reject(new Error(error.message)))
+            })
+        },
+        getResortMedia({ commit }, id) {
+            axios
+                .get(
+                    `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/social/${id}`,
+                )
+                .then((result) => commit('setResortMedia', result.data))
+        },
+        async getResortData({ commit }, id) {
+            await axios
+                .get(`/api/resort/GetResortData/${id}`)
+                .then((result) => {
+                    commit('setResort', result.data)
+                })
+                .catch((error) => console.log(new Error(error.message)))
+        },
+        async getResortWithListings({ commit }, id) {
+            await axios
+                .get('/api/resort/GetPublishedResortsWithListings')
+                .then((result) => {
+                    commit('setResortsWithListings', result.data)
+                })
+        },
+    },
+}

src/store/modules/timeshare/weekList.js

@@ -3,187 +3,211 @@
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable guard-for-in */
 /* eslint-disable */
-import axios from "axios";
-import _, { min } from "lodash";
+import axios from 'axios'
+import _, { min } from 'lodash'
 
 export default {
-  namespaced: true,
-  state: {
-    weeks: [],
-    status: undefined,
-    filter: {
-      season: undefined,
-      status: undefined,
-      region: undefined,
-      resort: undefined,
-      bedrooms: undefined,
-      date: undefined,
-      ddate: undefined,
-      minPrice: undefined,
-      maxPrice: undefined,
-      keyword: undefined
+    namespaced: true,
+    state: {
+        weeks: [],
+        status: undefined,
+        filter: {
+            season: undefined,
+            status: undefined,
+            region: undefined,
+            resort: undefined,
+            bedrooms: undefined,
+            date: undefined,
+            ddate: undefined,
+            minPrice: undefined,
+            maxPrice: undefined,
+            keyword: undefined,
+        },
+        prevFilter: undefined,
+        difFilter: undefined,
+        searchParams: {
+            region: undefined,
+            resort: undefined,
+            regionObj: undefined,
+        },
     },
-    prevFilter: undefined,
-    difFilter: undefined,
-    searchParams: {
-      region: undefined,
-      resort: undefined,
-      regionObj: undefined
-    }
-  },
-  mutations: {
-    onLoading(state) {
-      state.status = "Loading...";
+    mutations: {
+        onLoading(state) {
+            state.status = 'Loading...'
+        },
+        onError(state) {
+            state.status = 'Error occurred getting data.'
+        },
+        onClearFilter(state, filter) {
+            state.filter[filter] = undefined
+        },
+        setWeeks(state, weeks) {
+            state.weeks = weeks
+            state.status = ''
+        },
+        addWeek(state, week) {
+            state.weeks.push(week)
+        },
+        applyResort(state, resort) {
+            state.filter.resort = resort
+        },
     },
-    onError(state) {
-      state.status = "Error occurred getting data.";
-    },
-    onClearFilter(state, filter) {
-      state.filter[filter] = undefined;
-    },
-    setWeeks(state, weeks) {
-      state.weeks = weeks;
-      state.status = "";
-    },
-    addWeek(state, week) {
-      state.weeks.push(week);
-    },
-    applyResort(state, resort) {
-      state.filter.resort = resort;
-    }
-  },
-  getters: {
-    filteredWeeks: state => {
-      let weekList = state.weeks;
-      const { filter } = state;
-      if (filter) {
-        if (filter.keyword) {
-          const list = [];
-          for (const i in weekList) {
-            const item = weekList[i];
-            for (const r in item) {
-              const innerItem = item[r];
-              if (
-                innerItem &&
-                JSON.stringify(innerItem)
-                  .toLowerCase()
-                  .includes(filter.keyword.toLowerCase())
-              ) {
-                list.push(item);
-                break;
-              }
+    getters: {
+        filteredWeeks: (state) => {
+            let weekList = state.weeks
+            const { filter } = state
+            if (filter) {
+                if (filter.keyword) {
+                    const list = []
+                    for (const i in weekList) {
+                        const item = weekList[i]
+                        for (const r in item) {
+                            const innerItem = item[r]
+                            if (
+                                innerItem &&
+                                JSON.stringify(innerItem)
+                                .toLowerCase()
+                                .includes(filter.keyword.toLowerCase())
+                            ) {
+                                list.push(item)
+                                break
+                            }
+                        }
+                    }
+                    weekList = list
+                }
+                if (filter.region) {
+                    weekList = _.filter(
+                        weekList,
+                        (x) => x.region && x.region.regionCode === filter.region.regionCode,
+                    )
+                }
+                if (filter.resort) {
+                    weekList = _.filter(
+                        weekList,
+                        (x) =>
+                        x.resort.resortCode &&
+                        x.resort.resortCode === filter.resort.resortCode,
+                    )
+                }
+                if (filter.bedrooms) {
+                    if (filter.bedrooms === 'Studio') {
+                        weekList = _.filter(
+                            weekList,
+                            (x) => (x.bedrooms && x.bedrooms === '0') || !x.bedrooms,
+                        )
+                    } else {
+                        weekList = _.filter(
+                            weekList,
+                            (x) => x.bedrooms && x.bedrooms === filter.bedrooms,
+                        )
+                    }
+                }
+                if (filter.date) {
+                    const minDate = new Date(filter.date)
+                    minDate.setDate(minDate.getDate() - 1)
+                    weekList = _.filter(
+                        weekList,
+                        (x) => new Date(x.arrivalDate) >= minDate,
+                    )
+                }
+                if (filter.ddate) {
+                    const maxDate = new Date(filter.ddate)
+                    weekList = _.filter(
+                        weekList,
+                        (x) => new Date(x.departureDate) <= maxDate,
+                    )
+                }
+                if (filter.minPrice && filter.minPrice !== 0) {
+                    weekList = _.filter(
+                        weekList,
+                        (x) => x.sellPrice && x.sellPrice >= filter.minPrice,
+                    )
+                }
+                if (filter.maxPrice && filter.maxPrice !== 0) {
+                    weekList = _.filter(
+                        weekList,
+                        (x) => x.sellPrice && x.sellPrice <= filter.maxPrice,
+                    )
+                }
+                if (filter.season) {
+                    weekList = _.filter(weekList, (x) => x.season === filter.season.name)
+                }
             }
-          }
-          weekList = list;
-        }
-        if (filter.region) {
-          weekList = _.filter(
-            weekList,
-            x => x.region && x.region.regionCode === filter.region.regionCode
-          );
-        }
-        if (filter.resort) {
-          weekList = _.filter(
-            weekList,
-            x => x.resort.resortCode && x.resort.resortCode === filter.resort.resortCode
-          );
-        }
-        if (filter.bedrooms) {
-          if (filter.bedrooms === "Studio") {
-            weekList = _.filter(weekList, x => (x.bedrooms && x.bedrooms === "0") || !x.bedrooms);
-          } else {
-            weekList = _.filter(weekList, x => x.bedrooms && x.bedrooms === filter.bedrooms);
-          }
-        }
-        if (filter.date) {
-          const minDate = new Date(filter.date);
-          minDate.setDate(minDate.getDate() - 1);
-          weekList = _.filter(weekList, x => new Date(x.arrivalDate) >= minDate);
-        }
-        if (filter.ddate) {
-          const maxDate = new Date(filter.ddate);
-          weekList = _.filter(weekList, x => new Date(x.departureDate) <= maxDate);
-        }
-        if (filter.minPrice && filter.minPrice !== 0) {
-          weekList = _.filter(weekList, x => x.sellPrice && x.sellPrice >= filter.minPrice);
-        }
-        if (filter.maxPrice && filter.maxPrice !== 0) {
-          weekList = _.filter(weekList, x => x.sellPrice && x.sellPrice <= filter.maxPrice);
-        }
-        if (filter.season) {
-          weekList = _.filter(weekList, x => x.season === filter.season.name);
-        }
-      }
-      return _.sortBy(_.sortBy(weekList, "arrivalDate"), "resort.resortName");
-    },
-    getRegions(state, getters, rootState, rootGetters) {
-      return rootGetters["timeshare/getRegionCode"]("KK");
-    },
-    weekById(state) {
-      return (resortCode, unitNumber) => {
-        const w = state.weeks.find(
-          week =>
-            week.resort !== undefined &&
-            week.resort.resortCode === resortCode &&
-            week.unitNumber === unitNumber
-        );
-        console.log(resortCode, unitNumber);
+            return _.sortBy(_.sortBy(weekList, 'arrivalDate'), 'resort.resortName')
+        },
+        getRegions(state, getters, rootState, rootGetters) {
+            return rootGetters['timeshare/getRegionCode']('KK')
+        },
+        weekById(state) {
+            return (resortCode, unitNumber) => {
+                const w = state.weeks.find(
+                    (week) =>
+                    week.resort !== undefined &&
+                    week.resort.resortCode === resortCode &&
+                    week.unitNumber === unitNumber,
+                )
+                console.log(resortCode, unitNumber)
 
-        if (w) {
-          return w;
-        }
-      };
-    }
-  },
-  actions: {
-    applyResortFilter({ commit }, resortCode) {
-      commit("applyResort", {
-        resortCode
-      });
-    },
-    async getByResortCode({ commit }, resortCode) {
-      commit("onLoading");
-      await axios.get("/api/timeshareweek/getByResortCode/" + resortCode).then(result => {
-        commit("setWeeks", result.data);
-        console.log(result);
-      });
-    },
-    async getWeeks({ commit, rootGetters }) {
-      //commit("onLoading");
-      await axios
-        .get("/api/timeshareweek")
-        .then(result => {
-          const arr2 = result.data.filter(x => x.region !== null);
-          console.log(arr2);
-          const arr3 = result.data.filter(x => x.region === null);
-          for (const item in arr3) {
-            const myItem = arr3[item];
-            if (myItem !== undefined) {
-              const code = myItem.resort.resortCode;
-              myItem.region = {
-                regionName: rootGetters["timeshare/getRegionCode"](code)
-              };
-              myItem.resort = {
-                resortName: rootGetters["timeshare/getResortName"](code),
-                resortCode: code
-              };
+                if (w) {
+                    return w
+                }
             }
-          }
-          console.log(arr3);
-          commit("setWeeks", arr2);
-        })
-        .catch(console.error);
+        },
+    },
+    actions: {
+        applyResortFilter({ commit }, resortCode) {
+            commit('applyResort', {
+                resortCode,
+            })
+        },
+        async getByResortCode({ commit }, resortCode) {
+            commit('onLoading')
+            await axios
+                .get('/api/timeshareweek/getByResortCode/' + resortCode)
+                .then((result) => {
+                    commit('setWeeks', result.data)
+                    console.log(result)
+                })
+        },
+        async getWeeks({ commit, rootGetters }) {
+            //commit("onLoading");
+            await axios
+                .get('/api/timeshareweek')
+                .then((result) => {
+                    const arr2 = result.data.filter((x) => x.region !== null)
+                        //console.log(arr2)
+                    const arr3 = result.data.filter((x) => x.region === null)
+                    for (const item in arr3) {
+                        const myItem = arr3[item]
+                        if (myItem !== undefined) {
+                            const code = myItem.resort.resortCode
+                            myItem.region = {
+                                regionName: rootGetters['timeshare/getRegionCode'](code),
+                            }
+                            myItem.resort = {
+                                resortName: rootGetters['timeshare/getResortName'](code),
+                                resortCode: code,
+                            }
+                        }
+                    }
+
+                    console.log(code)
+                        //console.log(arr3)
+                    commit('setWeeks', arr2)
+                })
+                .catch(console.error)
+        },
+        // getWeeks({ commit }) {
+        //   axios.get("api/timeshareweek").then(result =>
+        //     commit(
+        //       "setWeeks",
+        //       result.data.filter(x => x.region !== null)
+        //     )
+        //   );
+        // },
+        clearFilter({ commit }, filter) {
+            commit('onClearFilter', filter)
+        },
     },
-    // getWeeks({ commit }) {
-    //   axios.get("api/timeshareweek").then(result =>
-    //     commit(
-    //       "setWeeks",
-    //       result.data.filter(x => x.region !== null)
-    //     )
-    //   );
-    // },
-    clearFilter({ commit }, filter) {
-      commit("onClearFilter", filter);
-    }
-  }
-};
+}

src/store/modules/user/authentication.js

@@ -1,98 +1,99 @@
 /* eslint-disable */
-import Vue from "vue";
-import Vuex from "vuex";
-import axios from "axios";
-import log from "../../../assets/Log";
+import Vue from 'vue'
+import Vuex from 'vuex'
+import axios from 'axios'
+import log from '../../../assets/Log'
 
-Vue.use(Vuex);
+Vue.use(Vuex)
 export default {
-  namespaced: true,
-  state: {
-    isLoggedIn: log.isLoggedIn(),
-    flag: false,
-    status: undefined,
-    token: undefined,
-    user: undefined,
-    person: undefined,
-    agency: undefined
-  },
-  mutations: {
-    auth_request(state) {
-      state.status = "loading";
+    namespaced: true,
+    state: {
+        isLoggedIn: log.isLoggedIn(),
+        flag: false,
+        status: '',
+        token: undefined,
+        user: undefined,
+        person: undefined,
+        agency: undefined,
     },
-    auth_success(state, user) {
-      state.status = "success";
-      state.token = user.token;
-      state.user = user.user;
-      state.person = user.person;
-      state.agency = user.agency;
-    },
-    auth_error(state) {
-      state.status = "error";
-    },
-    logout(state) {
-      state.status = undefined;
-      state.token = undefined;
-      state.person = undefined;
-      state.agency = undefined;
-      state.user = undefined;
-    },
-    runInit(state, item) {
-      state.flag = true;
-      state.user = item.user;
-      state.token = item.token;
-      state.person = item.person;
-      state.agency = item.agency;
+    mutations: {
+        auth_request(state) {
+            state.status = 'loading'
+        },
+        auth_success(state, user) {
+            state.status = 'success'
+            state.token = user.token
+            state.user = user.user
+            state.person = user.person
+            state.agency = user.agency
+        },
+        auth_error(state) {
+            state.status = 'error'
+        },
+        logout(state) {
+            state.status = ''
+            state.token = undefined
+            state.person = undefined
+            state.agency = undefined
+            state.user = undefined
+        },
+        runInit(state, item) {
+            state.flag = true
+            state.user = item.user
+            state.token = item.token
+            state.person = item.person
+            state.agency = item.agency
+        },
+        updateFlag(state) {
+            state.flag = true
+        },
     },
-    updateFlag(state) {
-      state.flag = true;
-    }
-  },
-  getters: {
-    authStatus: state => state.status,
-    getPerson: () => log.getPerson(),
-    getUser: () => log.getUser()
-  },
-  actions: {
-    init({ commit }) {
-      if (!log.isLoggedIn() && log.tokenExpired) {
-        log.clearValues();
-      } else log.updateTokenExpiry();
-      commit("runInit", {
-        user: log.getJSONObject("user"),
-        token: log.getJSONObject("token"),
-        person: log.getJSONObject("person"),
-        agency: log.getJSONObject("agency")
-      });
+    getters: {
+        authStatus: (state) => state.status,
+        getPerson: () => log.getPerson(),
+        getUser: () => log.getUser(),
     },
-    async login({ commit }, user) {
-      await axios({
-        url: "/api/register/authenticate",
-        data: {
-          username: user.username,
-          password: user.password
+    actions: {
+        init({ commit }) {
+            if (!log.isLoggedIn() && log.tokenExpired) {
+                log.clearValues()
+            } else log.updateTokenExpiry()
+            commit('runInit', {
+                user: log.getJSONObject('user'),
+                token: log.getJSONObject('token'),
+                person: log.getJSONObject('person'),
+                agency: log.getJSONObject('agency'),
+            })
+        },
+        async login({ commit }, user) {
+            await axios({
+                    url: '/api/register/authenticate',
+                    data: {
+                        username: user.username,
+                        password: user.password,
+                    },
+                    method: 'POST',
+                })
+                .then((resp) => {
+                    log.clearValues()
+                    log.setValues(resp.data)
+                    commit('auth_success', resp.data)
+                    return Promise.resolve()
+                })
+                .catch((ex) => {
+                    commit('auth_error')
+                    log.clearValues()
+                    commit('auth_error', 'error occurred')
+                    console.log(Promise.reject(ex.response));
+                    return Promise.reject(ex.response)
+                })
+        },
+        logout({ commit }) {
+            return new Promise(() => {
+                commit('logout')
+                log.clearValues()
+                delete axios.defaults.headers.common.Authorization
+            })
         },
-        method: "POST"
-      }).then((resp) => {
-        log.clearValues();
-        log.setValues(resp.data);
-        commit("auth_success", resp.data);
-        return Promise.resolve();
-      })
-      .catch((ex) => {        
-        commit("auth_error");
-        log.clearValues();
-        commit("auth_error", "error occurred");
-        return Promise.reject(ex.response);
-      })
-      
     },
-    logout({ commit }) {
-      return new Promise(() => {
-        commit("logout");
-        log.clearValues();
-        delete axios.defaults.headers.common.Authorization;
-      });
-    }
-  }
-};
+}

src/store/modules/user/individual.js

@@ -1,61 +1,59 @@
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable guard-for-in */
-import axios from "axios";
+/* eslint-disable */
+import axios from 'axios'
 
 export default {
-  namespaced: true,
-  state: {
-    items: [],
-    indiv: undefined
-  },
-  mutations: {
-    addItem(state, item) {
-      state[item.name].push(item.value);
+    namespaced: true,
+    state: {
+        items: [],
+        indiv: undefined,
     },
-    setItem(state, item) {
-      state[item.name] = item.value;
-    }
-  },
-  getters: {},
-  actions: {
-    async getIndividual({ commit, rootGetters }, userId) {
-      let id = 0;
-      if (!userId || userId === 0) {
-        const rootItem = rootGetters["authentication/getUser"];
-        id = rootItem ? rootItem.id : 0;
-      } else id = userId;
-
-      if (!id) {
-        id = 0;
-      }
+    mutations: {
+        addItem(state, item) {
+            state[item.name].push(item.value)
+        },
+        setItem(state, item) {
+            state[item.name] = item.value
+        },
+    },
+    getters: {},
+    actions: {
+        async getIndividual({ commit, rootGetters }, userId) {
+            let id = 0
+            if (!userId || userId === 0) {
+                const rootItem = rootGetters['authentication/getUser']
+                id = rootItem ? rootItem.id : 0
+            } else id = userId
 
+            if (!id) {
+                id = 0
+            }
 
-      await axios
-        .get(`/api/individual/getIndividual/${id}`)
-        .then(r => {
-          commit("setItem", {
-            name: "indiv",
-            value: r.data
-          });
-        })
-        .catch(console.error);
-    },
-    getAllIndividuals({ commit }) {
-      axios
-        .get("/api/individual/getAllIndividuals")
-        .then(x => {
-          commit("setItem", {
-            name: "items",
-            value: x.data
-          });
-        })
-        .catch(console.error);
+            await axios
+                .get(`/api/individual/getIndividual/${id}`)
+                .then((r) => {
+                    commit('setItem', {
+                        name: 'indiv',
+                        value: r.data,
+                    })
+                })
+                .catch(console.error)
+        },
+        getAllIndividuals({ commit }) {
+            axios
+                .get('/api/individual/getAllIndividuals')
+                .then((x) => {
+                    commit('setItem', {
+                        name: 'items',
+                        value: x.data,
+                    })
+                })
+                .catch(console.error)
+        },
+        async updateIndividual({ commit }, item) {
+            await axios
+                .put('/api/individual', item)
+                .then((result) => commit('setItem', item))
+                .catch(console.error)
+        },
     },
-    async updateIndividual({ commit }, item) {
-      await axios
-        .put("/api/individual", item)
-        .then(result => commit("setItem", item))
-        .catch(console.error);
-    }
-  }
-};
+}

src/store/modules/user/nonRegIndividual.js

@@ -1,27 +1,28 @@
 /* eslint-disable */
-import axios from 'axios';
+import axios from 'axios'
 
 export default {
-  namespaced: true,
-  state: {
-    nonRegIndiv: [],
-  },
-  mutations: {
-    getIndiv(state, indiv) {
-      state.nonRegIndiv = indiv;
+    namespaced: true,
+    state: {
+        nonRegIndiv: [],
     },
-  },
-  getters: {
-    getIndiv: (state) => state.nonRegIndiv
-  },
-  actions: {
-    async retrieveNonRegIndiv({commit}, id){
-        console.log('twas here');
-        await axios.get('/api/nonRegIndividual/' + id)
-        .then((result) => {
-            commit('getIndiv', result.data)
-        })
-        .catch((e) => console.log(e))
-    }
-  },
-};
+    mutations: {
+        getIndiv(state, indiv) {
+            state.nonRegIndiv = indiv
+        },
+    },
+    getters: {
+        getIndiv: (state) => state.nonRegIndiv,
+    },
+    actions: {
+        async retrieveNonRegIndiv({ commit }, id) {
+            console.log('twas here')
+            await axios
+                .get('/api/nonRegIndividual/' + id)
+                .then((result) => {
+                    commit('getIndiv', result.data)
+                })
+                .catch((e) => console.log(e))
+        },
+    },
+}

src/store/modules/user/register.js

@@ -1,232 +1,237 @@
 /* eslint-disable */
-import axios from "axios";
-import promise from "core-js/fn/promise";
+import axios from 'axios'
+import promise from 'core-js/fn/promise'
 
 export default {
-  namespaced: true,
-  state: {
-    individuals: [],
-    agents: [],
-    agent: {},
-    registerIndividual: {
-      name: "",
-      surname: "",
-      email: "",
-      cellNumber: "",
-      username: "",
-      password: "",
-      acceptedTerms: false
-    },
-    registerAgency: {
-      name: "",
-      eaabeffcNumber: "",
-      companyRegNumber: "",
-      user: {
-        name: "",
-        surname: "",
-        email: "",
-        cellNumber: "",
-        username: "",
-        password: "",
-        role: ""
-      }
-    }
-  },
-  mutations: {
-    setIndividual(state, type) {
-      state.registerIndividual = type;
-    },
-    setIndividuals(state, type) {
-      state.individuals = type;
-    },
-    setAgents(state, type) {
-      state.agents = type;
-    },
-    setSingleAgent(state, agent){
-      state.agent = agent
-    },
-    setAgency(state, type) {
-      state.registerAgency = type;
-    },
-    addIndividual(state, type) {
-      state.registerIndividual = type;
-    },
-    addAgency(state, type) {
-      state.registerAgency = type;
-    },
-    addAgent(state, type) {
-      state.registerIndividual = type;
-    },
-    updateIndividual(state, type) {
-      state.registerIndividual.find(item => item.id === type.id).username = type.username;
-      state.registerIndividual.find(item => item.id === type.id).password = type.password;
-    },
-    updateAgency(state, type) {
-      state.registerAgency.find(item => item.id === type.id).eaabeffcNumber = type.eaabeffcNumber;
-      state.registerAgency.find(item => item.id === type.id).companyRegNumber =
-        type.companyRegNumber;
-    },
-    clearIndividual(state) {
-      state.registerIndividual = {
-        name: "",
-        surname: "",
-        email: "",
-        cellNumber: "",
-        username: "",
-        password: "",
-        acceptedTerms: false
-      };
-    },
-    clearAgency(state) {
-      state.registerAgency = {
-        name: "",
-        eaabeffcNumber: "",
-        companyRegNumber: "",
-        user: {
-          name: "",
-          surname: "",
-          email: "",
-          cellNumber: "",
-          username: "",
-          password: ""
-        }
-      };
-    },
-    removeIndividual(state, id) {
-      var index = state.individuals.findIndex((indiv) => indiv.id === id)
-      state.individuals.splice(index, 1)
-    },
-    removeAgency(state, id) {
-      state.registerAgency.pop(state.registerAgency.find(a => a.id === id));
-    },
-    removeAgent(state, id) {
-      var index = state.agents.findIndex((agent) => agent.id === id)
-      state.agents.splice(index, 1)      
-    }
-  },
-  getters: {},
-  actions: {
-    async forgotPasswordCheck({commit}, mail){
-      await axios.post('api/register/forgotPassword/'+ mail).then((resp) => {
-        return Promise.resolve(resp.data)
-      })
-      .catch((ex) => {
-        console.log(ex.response);
-        return Promise.reject(ex.response)
-      })
-      // if(response.status === 200){
-      //   return Promise.resolve()
-      // }else{
-      //   console.log(response.response);
-      //   return Promise.reject()
-      // }
-    },
-    getIndividuals({ commit }) {
-      axios
-        .get("/api/individual")
-        .then(result => commit("setIndividuals", result.data))
-        .catch(console.error);
-    },
-    getAgents({ commit }) {
-      axios
-        .get("/api/agent")
-        .then(result => commit("setAgents", result.data))
-        .catch(console.error);
-    },
-    async getAgentById({commit}, userId){
-      await axios
-        .get('/api/agent/single/' +  userId)
-        .then((result) => {
-          console.log(result);
-          commit("setSingleAgent", result.data)
-        })
-        .catch((e) => {
-          console.log(e);
-        })
-    },
-    // getAgency({
-    //   commit,
-    // }, id) {
-    //   axios
-    //     .get(`/api/agency/${id}`)
-    //     .then(result => commit('setAgency', result.data))
-    //     .catch(console.error);
-    // },
+    namespaced: true,
+    state: {
+        individuals: [],
+        agents: [],
+        agent: {},
+        registerIndividual: {
+            name: '',
+            surname: '',
+            email: '',
+            cellNumber: '',
+            telephone: '',
+            username: '',
+            password: '',
+            acceptedTerms: false,
+        },
+        registerAgency: {
+            name: '',
+            eaabeffcNumber: '',
+            companyRegNumber: '',
+            user: {
+                name: '',
+                surname: '',
+                email: '',
+                cellNumber: '',
+                telephone: '',
+                username: '',
+                password: '',
+                role: '',
+            },
+        },
+    },
+    mutations: {
+        setIndividual(state, type) {
+            state.registerIndividual = type
+        },
+        setIndividuals(state, type) {
+            state.individuals = type
+        },
+        setAgents(state, type) {
+            state.agents = type
+        },
+        setSingleAgent(state, agent) {
+            state.agent = agent
+        },
+        setAgency(state, type) {
+            state.registerAgency = type
+        },
+        addIndividual(state, type) {
+            state.registerIndividual = type
+        },
+        addAgency(state, type) {
+            state.registerAgency = type
+        },
+        addAgent(state, type) {
+            state.registerIndividual = type
+        },
+        updateIndividual(state, type) {
+            state.registerIndividual.find((item) => item.id === type.id).username =
+                type.username
+            state.registerIndividual.find((item) => item.id === type.id).password =
+                type.password
+        },
+        updateAgency(state, type) {
+            state.registerAgency.find((item) => item.id === type.id).eaabeffcNumber =
+                type.eaabeffcNumber
+            state.registerAgency.find(
+                (item) => item.id === type.id,
+            ).companyRegNumber = type.companyRegNumber
+        },
+        clearIndividual(state) {
+            state.registerIndividual = {
+                name: '',
+                surname: '',
+                email: '',
+                cellNumber: '',
+                username: '',
+                password: '',
+                acceptedTerms: false,
+            }
+        },
+        clearAgency(state) {
+            state.registerAgency = {
+                name: '',
+                eaabeffcNumber: '',
+                companyRegNumber: '',
+                user: {
+                    name: '',
+                    surname: '',
+                    email: '',
+                    cellNumber: '',
+                    username: '',
+                    password: '',
+                },
+            }
+        },
+        removeIndividual(state, id) {
+            var index = state.individuals.findIndex((indiv) => indiv.id === id)
+            state.individuals.splice(index, 1)
+        },
+        removeAgency(state, id) {
+            state.registerAgency.pop(state.registerAgency.find((a) => a.id === id))
+        },
+        removeAgent(state, id) {
+            var index = state.agents.findIndex((agent) => agent.id === id)
+            state.agents.splice(index, 1)
+        },
+    },
+    getters: {},
+    actions: {
+        async forgotPasswordCheck({ commit }, mail) {
+            await axios
+                .post('api/register/forgotPassword/' + mail)
+                .then((resp) => {
+                    return Promise.resolve(resp.data)
+                })
+                .catch((ex) => {
+                    console.log(ex.response)
+                    return Promise.reject(ex.response)
+                })
+                // if(response.status === 200){
+                //   return Promise.resolve()
+                // }else{
+                //   console.log(response.response);
+                //   return Promise.reject()
+                // }
+        },
+        getIndividuals({ commit }) {
+            axios
+                .get('/api/individual')
+                .then((result) => commit('setIndividuals', result.data))
+                .catch(console.error)
+        },
+        getAgents({ commit }) {
+            axios
+                .get('/api/agent')
+                .then((result) => commit('setAgents', result.data))
+                .catch(console.error)
+        },
+        async getAgentById({ commit }, userId) {
+            await axios
+                .get('/api/agent/single/' + userId)
+                .then((result) => {
+                    console.log(result)
+                    commit('setSingleAgent', result.data)
+                })
+                .catch((e) => {
+                    console.log(e)
+                })
+        },
+        getAgency({ commit }, id) {
+            axios
+                .get(`/api/agency/${id}`)
+                .then((result) => commit('setAgency', result.data))
+                .catch(console.error)
+        },
 
-    async saveIndividual({ commit }, item) {
-      
-      await axios
-        .post("/api/register/register", item)
-        .then(res => {
-          commit("addIndividual", res.data);
-          return promise.resolve()
-        })
-        .catch((ex) => {
-          console.log(ex.response);
-          return promise.reject(ex.response)
-          //console.error;
-        });
-    },
-    saveAgency({ commit }, item) {
-      axios
-        .post("/api/register/registeragency", item)
-        .then(result => commit("addAgency", result.data))
-        .catch(ex => console.log(ex.response));
-    },
-    async saveAgent({ commit }, item) {
-      await axios
-        .post("/api/agent/AgentFromUser", item)
-        .then((res) => {
-          commit("addAgent", res.data)
-          return Promise.resolve(res)
-        })
-        .catch((ex) => {
-          return Promise.reject(ex.response)
-        });
-    },
-    async updateIndividual({ commit }, userParam) {
-      await axios
-        .put("/api/user/", userParam)
-        .then(result => console.log(result))
-        .catch(console.error);
-    },
-    // updateAgency({
-    //   commit,
-    // }, item) {
-    //   axios
-    //     .put('/api/agency', item)
-    //     .then(result => commit('updateAgency', item))
-    //     .catch(console.error);
-    // },
-    // clearIndividual({
-    //   commit,
-    // }) {
-    //   commit('clearIndividual');
-    // },
-    // clearAgency({
-    //   commit,
-    // }) {
-    //   commit('clearAgency');
-    // },
-    deleteIndividual({ commit }, id) {
-      axios
-        .delete(`/api/individual/${id}`)
-        .then(result => commit("removeIndividual", id))
-        .catch(console.error);
-    },
-    deleteAgent({ commit }, id) {
-      axios
-        .delete(`/api/agent/${id}`)
-        .then(result => commit("removeAgent", id))
-        .catch(ex => console.log(ex.response));
-    }
-    // deleteAgency({
-    //   commit,
-    // }, id) {
-    //   axios
-    //     .delete(`/api/agency/${id}`)
-    //     .then(result => commit('removeAgency', id))
-    //     .catch(console.error);
-    // },
-  }
-};
+        async saveIndividual({ commit }, item) {
+            await axios
+                .post('/api/register/register', item)
+                .then((res) => {
+                    commit('addIndividual', res.data)
+                    return promise.resolve()
+                })
+                .catch((ex) => {
+                    console.log(ex.response)
+                    return promise.reject(ex.response)
+                        //console.error;
+                })
+        },
+        saveAgency({ commit }, item) {
+            axios
+                .post('/api/register/registeragency', item)
+                .then((result) => commit('addAgency', result.data))
+                .catch((ex) => console.log(ex.response))
+        },
+        async saveAgent({ commit }, item) {
+            await axios
+                .post('/api/agent/AgentFromUser', item)
+                .then((res) => {
+                    commit('addAgent', res.data)
+                    return Promise.resolve(res)
+                })
+                .catch((ex) => {
+                    return Promise.reject(ex.response)
+                })
+        },
+        async updateIndividual({ commit }, userParam) {
+            await axios
+                .put('/api/user/', userParam)
+                .then((result) => console.log(result))
+                .catch(console.error)
+        },
+        // updateAgency({
+        //   commit,
+        // }, item) {
+        //   axios
+        //     .put('/api/agency', item)
+        //     .then(result => commit('updateAgency', item))
+        //     .catch(console.error);
+        // },
+        // clearIndividual({
+        //   commit,
+        // }) {
+        //   commit('clearIndividual');
+        // },
+        // clearAgency({
+        //   commit,
+        // }) {
+        //   commit('clearAgency');
+        // },
+        deleteIndividual({ commit }, id) {
+            axios
+                .delete(`/api/individual/${id}`)
+                .then((result) => commit('removeIndividual', id))
+                .catch(console.error)
+        },
+        deleteAgent({ commit }, id) {
+            axios
+                .delete(`/api/agent/${id}`)
+                .then((result) => commit('removeAgent', id))
+                .catch((ex) => console.log(ex.response))
+        },
+        // deleteAgency({
+        //   commit,
+        // }, id) {
+        //   axios
+        //     .delete(`/api/agency/${id}`)
+        //     .then(result => commit('removeAgency', id))
+        //     .catch(console.error);
+        // },
+    },
+}

vue.config.js

@@ -1,16 +1,16 @@
 module.exports = {
-  devServer: {
-    proxy: {
-      "/api": {
-        //target: "http://localhost:57260/",
-        target: "http://training.provision-sa.com:120/",
-        //target: "https://www.pvsl.co.za:86/",
-        changeOrigin: true
-      },
-      "/nph-srep": {
-        target: "http://www.unipoint-consoft.co.za",
-        changeOrigin: true
-      }
-    }
-  }
-};
+    devServer: {
+        proxy: {
+            '/api': {
+                target: 'http://localhost:57260/',
+                //target: "http://training.provision-sa.com:120/",
+                //target: "https://www.pvsl.co.za:86/",
+                changeOrigin: true,
+            },
+            '/nph-srep': {
+                target: 'http://www.unipoint-consoft.co.za',
+                changeOrigin: true,
+            },
+        },
+    },
+}