Orders - WIP

package-lock.json

@@ -921,6 +921,11 @@
         "@fortawesome/fontawesome-common-types": "^0.2.28"
       }
     },
+    "@fortawesome/vue-fontawesome": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.10.tgz",
+      "integrity": "sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w=="
+    },
     "@hapi/address": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
@@ -987,6 +992,16 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
       "dev": true
     },
+    "@nuxt/opencollective": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nuxt/opencollective/-/opencollective-0.3.0.tgz",
+      "integrity": "sha512-Vf09BxCdj1iT2IRqVwX5snaY2WCTkvM0O4cWWSO1ThCFuc4if0Q/nNwAgCxRU0FeYHJ7DdyMUNSdswCLKlVqeg==",
+      "requires": {
+        "chalk": "^2.4.2",
+        "consola": "^2.10.1",
+        "node-fetch": "^2.6.0"
+      }
+    },
     "@nuxtjs/axios": {
       "version": "5.9.3",
       "resolved": "https://registry.npmjs.org/@nuxtjs/axios/-/axios-5.9.3.tgz",
@@ -2398,6 +2413,23 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
+    "bootstrap": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.2.tgz",
+      "integrity": "sha512-vlGn0bcySYl/iV+BGA544JkkZP5LB3jsmkeKLFQakCOwCM3AOk7VkldBz4jrzSe+Z0Ezn99NVXa1o45cQY4R6A=="
+    },
+    "bootstrap-vue": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.16.0.tgz",
+      "integrity": "sha512-gLETwPmeRHCe5WHmhGxzb5PtTEuKqQPGl0TFvZ2Odbkg/7UuIHdqIexrJRerpnomP4ZzDQ+qYGL91Ls9lcQsJQ==",
+      "requires": {
+        "@nuxt/opencollective": "^0.3.0",
+        "bootstrap": ">=4.5.0 <5.0.0",
+        "popper.js": "^1.16.1",
+        "portal-vue": "^2.1.7",
+        "vue-functional-data-merge": "^3.1.0"
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -2719,7 +2751,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
       "requires": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -4177,12 +4208,8 @@
     },
     "dot-prop": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-      "dev": true,
-      "requires": {
-        "is-obj": "^1.0.0"
-      }
+      "resolved": "",
+      "dev": true
     },
     "dotenv": {
       "version": "7.0.0",
@@ -4253,9 +4280,9 @@
       "dev": true
     },
     "elliptic": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
       "dev": true,
       "requires": {
         "bn.js": "^4.4.0",
@@ -6369,8 +6396,7 @@
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "has-symbols": {
       "version": "1.0.1",
@@ -7120,12 +7146,6 @@
         }
       }
     },
-    "is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-      "dev": true
-    },
     "is-path-cwd": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
@@ -7555,9 +7575,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
     },
     "lodash.clonedeep": {
       "version": "4.5.0",
@@ -8123,6 +8143,11 @@
         "lower-case": "^1.1.1"
       }
     },
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+    },
     "node-forge": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
@@ -13100,6 +13125,16 @@
       "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=="
+    },
     "portfinder": {
       "version": "1.0.26",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
@@ -15314,7 +15349,6 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
       "requires": {
         "has-flag": "^3.0.0"
       }
@@ -16098,6 +16132,11 @@
         "vue": "^2.6.10"
       }
     },
+    "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-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",

package.json

@@ -11,15 +11,18 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.28",
     "@fortawesome/free-solid-svg-icons": "^5.13.0",
+    "@fortawesome/vue-fontawesome": "^0.1.10",
     "@nuxtjs/axios": "^5.9.3",
     "animate.css": "^3.7.2",
     "axios": "^0.19.2",
+    "bootstrap": "^4.5.2",
+    "bootstrap-vue": "^2.16.0",
     "core-js": "^2.6.11",
     "datatables.net": "^1.10.20",
     "font-awesome": "^4.7.0",
     "jquery": "^3.5.1",
     "js-sha256": "^0.9.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.20",
     "material-design-icons-iconfont": "^3.0.3",
     "moment": "^2.24.0",
     "node-sass": "^4.14.1",

src/App.vue

@@ -19,13 +19,13 @@ export default {
   name: "app",
   components: {
     NavBar,
-    FooterSection,
+    FooterSection
   },
   methods: {
     routerGoTo(goTo) {
       this.$router.push(goTo);
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -34,11 +34,11 @@ button:hover {
   cursor: pointer;
 }
 hr {
-  background-color: #24aae1;
+  background-color: #6c757d;
 }
 .my-btn {
   margin: 2px;
-  color: #24aae1;
+  color: #6c757d;
 }
 .title-img {
   width: 800px;
@@ -51,12 +51,12 @@ hr {
   border-radius: 15px;
 }
 .myBackground {
-  border-color: #24aae1;
-  background-color: #24aae1;
+  border-color: #6c757d;
+  background-color: #6c757d;
 }
 .myFill {
-  fill: #24aae1;
-  color: #24aae1;
+  fill: #6c757d;
+  color: #6c757d;
 }
 .mySuccess {
   border-color: rgba(2, 184, 117, 0.5);
@@ -78,7 +78,7 @@ a {
   cursor: pointer;
 }
 a:hover {
-  color: #24aae1;
+  color: #6c757d;
 }
 #app {
   font-family: "Avenir", Helvetica, Arial, sans-serif;
@@ -99,7 +99,7 @@ html {
   margin: 0;
 }
 .isSelected {
-  border-color: white white #24aae1 white;
+  border-color: white white #6c757d white;
 }
 .isUnSelected {
   border-color: white white white white;
@@ -118,7 +118,7 @@ html {
   color: white;
 }
 .normalText {
-  background-color: #24aae1;
+  background-color: #6c757d;
 }
 .pendingOffer {
   background-color: #ff8344;

src/components/accounts/login.vue

@@ -12,7 +12,7 @@
           <div class="input-group mb-3">
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -26,7 +26,7 @@
           <div class="input-group mb-3">
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="lock-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="lock-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -38,8 +38,8 @@
               />
               <div class="input-group-append">
                 <span class="input-group-text" @click="togglePassword()">
-                  <eva-icon v-if="showPassword" name="eye-off-outline" fill="#24aae1"></eva-icon>
-                  <eva-icon v-else name="eye-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon v-if="showPassword" name="eye-off-outline" fill="#6c757d"></eva-icon>
+                  <eva-icon v-else name="eye-outline" fill="#6c757d"></eva-icon>
                 </span>
               </div>
             </div>
@@ -69,10 +69,7 @@ export default {
     };
   },
   methods: {
-    ...mapActions("authentiaction", [
-      "getAuthentication",
-      "checkAuthentication"
-    ]),
+    ...mapActions("authentiaction", ["getAuthentication", "checkAuthentication"]),
     Login() {
       this.checkAuthentication(this.auth).then(() => {
         //console.log(JSON.stringify(this.$store.state.authentiaction.result));

src/components/accounts/register.vue

@@ -14,9 +14,14 @@
             <label>Name</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
               </span>
-              <input class="form-control" type="text" name="name" v-model="userContainer.firstName" />
+              <input
+                class="form-control"
+                type="text"
+                name="name"
+                v-model="userContainer.firstName"
+              />
             </div>
           </div>
         </div>
@@ -25,7 +30,7 @@
             <label>Surname</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="book-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="book-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -41,7 +46,7 @@
             <label>Email Address</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="email-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="email-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -57,7 +62,7 @@
             <label>Cellphone</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="phone-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="phone-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -73,7 +78,7 @@
             <label>Password</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="lock-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="lock-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -91,7 +96,7 @@
             <label>Confirm Password</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="lock-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="lock-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -107,10 +112,15 @@
                     <eva-icon
                       v-if="showPassword"
                       name="eye-off-outline"
-                      fill="#24aae1"
+                      fill="#6c757d"
+                      @click="togglePassword()"
+                    ></eva-icon>
+                    <eva-icon
+                      v-else
+                      name="eye-outline"
+                      fill="#6c757d"
                       @click="togglePassword()"
                     ></eva-icon>
-                    <eva-icon v-else name="eye-outline" fill="#24aae1" @click="togglePassword()"></eva-icon>
                   </span>
                 </div>
               </div>
@@ -120,15 +130,14 @@
         <div class="form-group row"></div>
         <div class="row offset-md-4">
           <div class="col-md-2">
-            <button
-              @click="RegisterData()"
-              class="btn btn-b-n"
-              type="submit"
-              data-dismiss="modal"
-            >Submit</button>
+            <button @click="RegisterData()" class="btn btn-b-n" type="submit" data-dismiss="modal">
+              Submit
+            </button>
           </div>
           <div class="col-md-2 offset-md-1">
-            <button @click="Close()" class="btn btn-b-n" type="button" data-dismiss="modal">Cancel</button>
+            <button @click="Close()" class="btn btn-b-n" type="button" data-dismiss="modal">
+              Cancel
+            </button>
           </div>
         </div>
       </div>

src/components/accounts/restaurantRegistration.vue

@@ -19,7 +19,7 @@
             <label>Name</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="edit-2-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -61,7 +61,7 @@
             <label>Delivery Fee</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="credit-card-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -77,7 +77,7 @@
             <label>Delivery Radius (KM)</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="pin-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="pin-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -93,7 +93,7 @@
             <label>Delivery Time (Minutes)</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="clock-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="clock-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -130,7 +130,7 @@
             <label>Shopping Centre</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="shopping-cart-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="shopping-cart-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -146,7 +146,7 @@
             <label>Shop Number</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="hash-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="hash-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -207,7 +207,7 @@
             <label>First Name</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -221,7 +221,7 @@
             <label>Surname</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="book-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="book-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -235,7 +235,7 @@
             <label>Email Address</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="email-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="email-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -251,7 +251,7 @@
             <label>Password</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="lock-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="lock-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -267,7 +267,7 @@
             <label>Confirm Password</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="lock-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="lock-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -283,10 +283,15 @@
                     <eva-icon
                       v-if="showPassword"
                       name="eye-off-outline"
-                      fill="#24aae1"
+                      fill="#6c757d"
+                      @click="togglePassword()"
+                    ></eva-icon>
+                    <eva-icon
+                      v-else
+                      name="eye-outline"
+                      fill="#6c757d"
                       @click="togglePassword()"
                     ></eva-icon>
-                    <eva-icon v-else name="eye-outline" fill="#24aae1" @click="togglePassword()"></eva-icon>
                   </span>
                 </div>
               </div>
@@ -296,15 +301,14 @@
         <div class="form-group row"></div>
         <div class="row offset-md-4">
           <div class="col-md-2">
-            <button
-              @click="SubmitData()"
-              class="btn btn-b-n"
-              type="button"
-              data-dismiss="modal"
-            >Submit</button>
+            <button @click="SubmitData()" class="btn btn-b-n" type="button" data-dismiss="modal">
+              Submit
+            </button>
           </div>
           <div class="col-md-2 offset-md-1">
-            <button @click="Close()" class="btn btn-b-n" type="button" data-dismiss="modal">Cancel</button>
+            <button @click="Close()" class="btn btn-b-n" type="button" data-dismiss="modal">
+              Cancel
+            </button>
           </div>
         </div>
         <div class="row" style="text-align:left">
@@ -416,8 +420,7 @@ export default {
 
       this.restaurantContainer.categories = cats;
       this.restaurantContainer.methodsOfPayment = mops;
-      this.restaurantContainer.deliveryTime =
-        this.deliverfrom + " - " + this.deliverTo + " Min";
+      this.restaurantContainer.deliveryTime = this.deliverfrom + " - " + this.deliverTo + " Min";
 
       if (this.restaurantContainer.userPassword !== this.confirmpassword) {
         this.hasError = true;

src/components/accounts/tradingHours.vue

@@ -17,7 +17,7 @@
       <div class="col-md-12" style="margin-bottom: 1em">
         <label>Description</label>
         <div class="input-group-prepend">
-          <span class="input-group-text" style="color: #24aae1">
+          <span class="input-group-text" style="color: #6c757d">
             <b>D</b>
           </span>
           <input class="form-control" type="text" v-model="tradingData.description" />
@@ -28,7 +28,7 @@
       <div class="col-md-6" style="margin-bottom: 1em">
         <label>From</label>
         <div class="input-group-prepend">
-          <span class="input-group-text" style="color: #24aae1">
+          <span class="input-group-text" style="color: #6c757d">
             <b>F</b>
           </span>
           <VueTimepicker v-model="tradingData.from" :disabled="EnableTime"></VueTimepicker>
@@ -37,7 +37,7 @@
       <div class="col-md-6" style="margin-bottom: 1em">
         <label>To</label>
         <div class="input-group-prepend">
-          <span class="input-group-text" style="color: #24aae1">
+          <span class="input-group-text" style="color: #6c757d">
             <b>T</b>
           </span>
           <VueTimepicker v-model="tradingData.to" :disabled="EnableTime"></VueTimepicker>
@@ -57,11 +57,9 @@
             @change="selectionChangedHours"
             :disabled="tradingData.closed"
           />
-          <label
-            class="custom-control-label"
-            for="th24HSwitch"
-            style="margin-left: 40px"
-          >{{tradingData.open24 ? 'Yes' : 'No'}}</label>
+          <label class="custom-control-label" for="th24HSwitch" style="margin-left: 40px">{{
+            tradingData.open24 ? "Yes" : "No"
+          }}</label>
         </div>
       </div>
     </div>
@@ -78,11 +76,9 @@
             @change="selectionChanged"
             :disabled="tradingData.open24"
           />
-          <label
-            class="custom-control-label"
-            for="thCloseSwitch"
-            style="margin-left: 40px"
-          >{{tradingData.closed ? 'Yes' : 'No'}}</label>
+          <label class="custom-control-label" for="thCloseSwitch" style="margin-left: 40px">{{
+            tradingData.closed ? "Yes" : "No"
+          }}</label>
         </div>
       </div>
     </div>

src/components/customer/customerDetails.vue

@@ -16,7 +16,7 @@
             <label>Name</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
               </span>
               <input class="form-control" type="text" name="FirstName" v-model="user.firstName" />
             </div>
@@ -25,7 +25,7 @@
             <label>Surname</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
               </span>
               <input class="form-control" type="text" name="Surname" v-model="user.surname" />
             </div>
@@ -36,7 +36,7 @@
             <label>Eamil Addres</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -50,7 +50,7 @@
             <label>Cellphone</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
               </span>
               <input class="form-control" type="text" name="cellphone" v-model="user.cellphone" />
             </div>
@@ -76,22 +76,17 @@
                 :checked="userAddress.isComplex"
                 @change="selectionChanged"
               />
-              <label
-                class="custom-control-label"
-                for="thCloseSwitch"
-                style="margin-left: 40px"
-              >{{userAddress.isComplex ? 'Yes' : 'No'}}</label>
+              <label class="custom-control-label" for="thCloseSwitch" style="margin-left: 40px">
+                {{
+                userAddress.isComplex ? "Yes" : "No"
+                }}
+              </label>
             </div>
           </div>
         </div>
         <div class="row" style="text-align:left">
           <div class="col-md-4" style="margin-bottom: 1em">
-            <button
-              @click="ShowMap()"
-              class="btn btn-b-n"
-              type="button"
-              data-dismiss="modal"
-            >Update Address</button>
+            <b-button class="mt-2" @click="ShowMap()">Update Address</b-button>
           </div>
         </div>
         <div v-if="userAddress.isComplex" class="row" style="text-align:left">
@@ -99,7 +94,7 @@
             <label>Complex Name</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -113,7 +108,7 @@
             <label>Unit Number</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -131,7 +126,7 @@
                 <label>Street Number</label>
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                    <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -148,7 +143,7 @@
                 <label>Street Name</label>
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                    <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -165,7 +160,7 @@
                 <label>Suburb</label>
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                    <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -182,7 +177,7 @@
                 <label>City</label>
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                    <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -199,7 +194,7 @@
                 <label>Province</label>
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                    <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -216,7 +211,7 @@
                 <label>Postal Code</label>
                 <div class="input-group-prepend">
                   <span class="input-group-text">
-                    <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                    <eva-icon name="person-outline" fill="#6c757d"></eva-icon>
                   </span>
                   <input
                     class="form-control"
@@ -235,10 +230,10 @@
         </div>
         <div class="row offset-md-5">
           <div class="col-md-2">
-            <button @click="Save()" class="btn btn-b-n" type="button" data-dismiss="modal">Save</button>
+            <b-button class="mt-2" @click="Save()">Save</b-button>
           </div>
           <div class="col-md-2">
-            <button @click="Close()" class="btn btn-b-n" type="button" data-dismiss="modal">Close</button>
+            <b-button class="mt-2" @click="Close()">Close</b-button>
           </div>
         </div>
       </div>
@@ -250,7 +245,7 @@
         <Map :showLocationLabel="false" @GoogleAddress="UpdateAddress" />
         <div class="row" style="text-align:left">
           <div class="col-md-4" style="margin-bottom: 1em">
-            <button @click="HideMap()" class="btn btn-b-n" type="button" data-dismiss="modal">Close</button>
+            <b-button class="mt-2" @click="HideMap()">Close</b-button>
           </div>
         </div>
       </div>
@@ -321,4 +316,4 @@ export default {
     this.getUserAddress(Log.userId());
   },
 };
-</script>
+</script>

src/components/customer/customerOrder.vue

@@ -0,0 +1,170 @@
+<template>
+  <b-container fluid class="mt-5 ml-5 mr-5 md">
+    <div class="row">
+      <div class="col-md-12 col-lg-8">
+        <div class="title-box-d">
+          <br />
+          <h1 class="title-d" style="text-align:left; font-size: 250%">Order Details</h1>
+        </div>
+      </div>
+    </div>
+    <b-row>
+      <b-card class="col-md-11 itemCard" style="text-align:left; cursor: pointer;">
+        <b-card-title>
+          <b>Order #{{ order.id }}</b>
+          | {{ order.restaurantName }}
+          | {{ order.date | toDate }}
+        </b-card-title>
+        <b-card-title>
+          <b-row>
+            <b-col cols="6">{{order.status}}</b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col>
+              <b-button v-if="order.status === 'Awaiting Payment'" class="mt-5">Make Payment</b-button>
+            </b-col>
+          </b-row>
+        </b-card-title>
+        <hr />
+        <b-card-body>
+          <b-row>
+            <b-col cols="6">
+              <b>Address</b>
+            </b-col>
+            <b-col>
+              <b>Method Of Payment</b>
+            </b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col>
+              <b>Order Summary</b>
+            </b-col>
+            <b-col></b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="6">{{ order.customerName }}</b-col>
+            <b-col>{{ order.methodOfPayment }}</b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col>Items: {{ order.totalItems }}</b-col>
+            <b-col style="text-align:right;">{{ order.subTotal | toCurrency }}</b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="6">{{ order.complexLine }}</b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col>Delivery Fee:</b-col>
+            <b-col style="text-align:right;">{{ order.deliveryFee | toCurrency }}</b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="6">{{ order.streetLine }}</b-col>
+            <b-col>
+              <b>Delivery Method</b>
+            </b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="6">{{ order.suburb }}</b-col>
+            <b-col>{{ order.deliveryMethod }}</b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col>Order Total:</b-col>
+            <b-col style="text-align:right;">
+              <b>{{ order.subTotal + order.deliveryFee | toCurrency }}</b>
+            </b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="6">{{ order.city }}</b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+          </b-row>
+          <b-row>
+            <b-col cols="6">{{ order.postalCode }}</b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+            <b-col></b-col>
+          </b-row>
+        </b-card-body>
+        <h4>Items</h4>
+        <b-card-body>
+          <div v-for="item in order.lines" :key="item.id">
+            <b-card no-body class="overflow-hidden" style="cursor: pointer;">
+              <b-row no-gutters>
+                <b-col cols="1">
+                  <b-card-img
+                    :src="item.image"
+                    alt="Image"
+                    style="max-height: 100px; max-width:100px"
+                    class="rounded-0 mt-2 ml-2"
+                  ></b-card-img>
+                </b-col>
+                <b-col>
+                  <b-card-body>
+                    <b-row>
+                      <b-col cols="6">
+                        <h5>{{ item.name }}</h5>
+                      </b-col>
+                      <b-col>
+                        <strong>Price:</strong>
+                      </b-col>
+                      <b-col>
+                        <strong>Quantity:</strong>
+                      </b-col>
+                      <b-col>
+                        <strong>Line Total:</strong>
+                      </b-col>
+                      <b-col></b-col>
+                      <b-col></b-col>
+                    </b-row>
+                    <b-row class="mt-2">
+                      <b-col cols="6">{{ item.description }}</b-col>
+                      <b-col>{{ item.price }}</b-col>
+                      <b-col>{{ item.qty }}</b-col>
+                      <b-col>{{ item.subTotal }}</b-col>
+                      <b-col></b-col>
+                      <b-col></b-col>
+                    </b-row>
+                  </b-card-body>
+                </b-col>
+              </b-row>
+            </b-card>
+          </div>
+        </b-card-body>
+      </b-card>
+    </b-row>
+    <b-row>
+      <b-button fluid class="mt-5 ml-5 mr-5 md" @click="Back">Back</b-button>
+    </b-row>
+  </b-container>
+</template>
+
+<script>
+import { mapState, mapActions } from "vuex";
+import Log from "../../assets/Log";
+
+export default {
+  name: "OrderDetail",
+  methods: {
+    ...mapActions("order", ["getUserOrder"]),
+    Back() {
+      this.$router.push("/MyOrders");
+    },
+  },
+  computed: {
+    ...mapState("order", ["order"]),
+  },
+  mounted() {
+    this.getUserOrder(this.$route.params.id);
+  },
+};
+</script>

src/components/customer/customerOrders.vue

@@ -1,33 +1,69 @@
 <template>
-  <div>
-    <div class="conainer">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12 col-lg-8">
-            <div class="title-box-d">
-              <br />
-              <h1 class="title-d" style="text-align:left; font-size: 250%">My Orders</h1>
-            </div>
-          </div>
-        </div>
-        <div class="row"></div>
-        <div class="row">
-          <div class="col-md-12">
-            <listView />
-          </div>
+  <b-container fluid class="mt-5 ml-5 mr-5 md">
+    <div class="row">
+      <div class="col-md-12 col-lg-8">
+        <div class="title-box-d">
+          <br />
+          <h1 class="title-d" style="text-align:left; font-size: 250%">My Orders</h1>
         </div>
       </div>
     </div>
-  </div>
+    <b-row v-for="order in orders" :key="order.id">
+      <b-card
+        class="col-md-11 itemCard"
+        style="text-align:left; cursor: pointer;"
+        @click="ShowDetails(order.id)"
+      >
+        <b-card-title>
+          <b>Date:</b>
+          {{ order.date | toDate }}
+          <!-- <b-button style="text-align:right">Details</b-button> -->
+        </b-card-title>
+        <b-card-sub-title>
+          <b>Time:</b>
+          {{ order.date | toTime }}
+          <br />
+          <b>Status:</b>
+          {{ order.status }}
+        </b-card-sub-title>
+        <hr />
+
+        <b-card-img
+          v-for="(image, i) in order.images"
+          :key="i"
+          :src="image"
+          img-alt="Card image"
+          img-left
+          class="mb-3"
+          style="max-height: 96px; max-width:96px; margin-left: 10px;"
+        />
+
+        <b-card-footer>
+          <b>Total:</b>
+          {{ order.total | toCurrency }}
+        </b-card-footer>
+      </b-card>
+    </b-row>
+  </b-container>
 </template>
 
 <script>
-import listView from "../shared/listView";
+import { mapState, mapActions } from "vuex";
+import Log from "../../assets/Log";
 
 export default {
   name: "CustomerOrders",
-  components: {
-    listView
-  }
+  methods: {
+    ...mapActions("order", ["getUserOrders"]),
+    ShowDetails(id) {
+      this.$router.push(`/OrderDetails/${id}`);
+    },
+  },
+  computed: {
+    ...mapState("order", ["orders"]),
+  },
+  mounted() {
+    this.getUserOrders(Log.userId());
+  },
 };
 </script>

src/components/orders/cart.vue

@@ -1,89 +1,155 @@
 <template>
-  <div class="container">
-    <div class="container">
-      <div class="row">
-        <div class="col-md-12 col-lg-8">
-          <div class="title-box-d">
-            <br />
-            <h1 class="title-d" style="text-align:left; font-size: 250%">My Cart</h1>
-          </div>
-        </div>
-      </div>
-      <!-- ListView -->
-      <ListView
-        :items="cartItems"
-        :displayColumns="columns"
-        :displayFormats="formats"
-        :editable="true"
-        :deleteable="true"
-        @onEdit="Edit"
-        @onDelete="Delete"
-      />
-      <div class="row">
-        <div class="col-md-12" style="margin-bottomL 1em">
-          <!-- RestaurantFeeDel -->
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-2 offset-md-8" style="margin-bottomL 1em">
-          <label style="margin-top: 0.5em">
-            <b>Delivery Fee:</b>
-          </label>
-        </div>
-        <div class="col-md-2" style="margin-bottomL 1em">
-          <label style="margin-top: 0.5em">
-            <b>{{deliveryFee | toCurrency}}</b>
-          </label>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-2 offset-md-8" style="margin-bottomL 1em">
-          <label style="margin-top: 0.5em">
-            <b>Order Total:</b>
-          </label>
-        </div>
-        <div class="col-md-2" style="margin-bottomL 1em">
-          <label style="margin-top: 0.5em">
-            <b>{{OrderTotal | toCurrency}}</b>
-          </label>
-        </div>
-      </div>
-      <modal name="menu" :width="800" :height="600">
-        <Cart :showItem="CurrentItem" @Close="CloseItem" />
-      </modal>
-      <br />
-      <div class="row">
-        <div class="col-md-12" style="margin-bottomL 1em">
-          <div class="row offset-md-4">
-            <div class="col-md-3">
-              <button
-                @click="CheckOut()"
-                class="btn btn-b-n"
-                type="button"
-                data-dismiss="modal"
-                :disabled="cartItems.length == 0"
-              >Check Out</button>
-            </div>
-            <div class="col-md-3">
-              <button
-                @click="ClearCart()"
-                class="btn btn-b-n"
-                type="button"
-                data-dismiss="modal"
-                :disabled="cartItems.length == 0"
-              >Clear Cart</button>
-            </div>
-          </div>
+  <!-- <div class="container"> -->
+  <b-container fluid class="mt-5 ml-5 mr-5 md">
+    <div class="row">
+      <div class="col-md-12 col-lg-8">
+        <div class="title-box-d">
+          <br />
+          <h1 class="title-d" style="text-align:left; font-size: 250%">My Cart</h1>
         </div>
       </div>
     </div>
-  </div>
+    <b-row v-if="cartItems.length > 0">
+      <b-col cols="8">
+        <div v-for="item in cartItems" :key="item.id">
+          <b-card
+            no-body
+            class="overflow-hidden itemCard mt-2"
+            @click="Edit(item)"
+            style="cursor: pointer;"
+          >
+            <b-row no-gutters>
+              <b-col cols="1">
+                <b-card-img
+                  :src="item.image"
+                  alt="Image"
+                  style="max-height: 150px; max-width:150px"
+                  class="rounded-0 mt-2 ml-2"
+                ></b-card-img>
+              </b-col>
+              <b-col>
+                <b-card-body>
+                  <b-row>
+                    <b-col cols="6">
+                      <h5>{{ item.name }}</h5>
+                    </b-col>
+                    <b-col>
+                      <strong>Price:</strong>
+                    </b-col>
+                    <b-col>
+                      <strong>Quantity:</strong>
+                    </b-col>
+                    <b-col>
+                      <strong>Line Total:</strong>
+                    </b-col>
+                    <b-col></b-col>
+                  </b-row>
+                  <b-row class="mt-2">
+                    <b-col cols="6">{{ item.description }}</b-col>
+                    <b-col>{{ item.price | toCurrency }}</b-col>
+                    <b-col class="mr-5">{{ item.qty }}</b-col>
+                    <b-col>{{ item.subTotal | toCurrency }}</b-col>
+                    <b-col>
+                      <b-button @click="Delete(item)" variant="danger">
+                        <strong>
+                          <font-awesome-icon icon="trash"></font-awesome-icon>
+                        </strong>
+                      </b-button>
+                    </b-col>
+                  </b-row>
+                </b-card-body>
+              </b-col>
+            </b-row>
+          </b-card>
+        </div>
+      </b-col>
+      <b-col style="margin-right: 200px;">
+        <!-- <b-container class="shoppingDetail mb-2">
+          <b-row>
+            <b-col>
+              <ProfileShipCart class="mb-3" />
+            </b-col>
+          </b-row>
+        </b-container>-->
+        <b-container class="shoppingDetail">
+          <b-row class="mt-3">
+            <b-col align="right">
+              <b-row>
+                <b-col>
+                  <h6>Total Cart Items</h6>
+                </b-col>
+                <b-col cols="3">
+                  <h6>{{ OrderQty }}</h6>
+                </b-col>
+              </b-row>
+              <hr />
+              <b-row>
+                <b-col>
+                  <h5>Subtotal</h5>
+                </b-col>
+                <b-col cols="3">
+                  <h5>{{ OrderSubTotal | toCurrency }}</h5>
+                </b-col>
+              </b-row>
+              <b-row>
+                <b-col>
+                  <h5>Delivery Fee</h5>
+                </b-col>
+                <b-col cols="3">
+                  <h5>{{ deliveryFee | toCurrency }}</h5>
+                </b-col>
+              </b-row>
+              <hr />
+              <b-row>
+                <b-col>
+                  <h4>Grand Total</h4>
+                </b-col>
+                <b-col cols="3">
+                  <h4>{{ OrderTotal | toCurrency }}</h4>
+                </b-col>
+              </b-row>
+              <hr />
+
+              <b-row class="mt-2 mb-2">
+                <b-col>
+                  <b-button @click="CheckOut">Checkout</b-button>
+                </b-col>
+              </b-row>
+            </b-col>
+          </b-row>
+        </b-container>
+      </b-col>
+    </b-row>
+    <b-container v-if="cartItems.length > 0">
+      <b-row>
+        <b-col></b-col>
+        <b-col>
+          <b-row class="mt-3">
+            <b-col class="ml-5" align="right">
+              <b-button class="mt-2" variant="danger" v-on:click="ClearCart">Clear Cart</b-button>
+            </b-col>
+            <b-col></b-col>
+          </b-row>
+        </b-col>
+      </b-row>
+    </b-container>
+    <b-container v-else>
+      <p>Your cart is empty</p>
+      <b-button class="mt-2" v-on:click="GoHome">Continue Shopping</b-button>
+    </b-container>
+    <modal name="menu" :width="800" :height="600">
+      <Cart :showItem="CurrentItem" @Close="CloseItem" />
+    </modal>
+  </b-container>
+  <!-- </div> -->
 </template>
 
 <script>
 import { mapState, mapActions } from "vuex";
 import ListView from "../shared/listView";
 import Cart from "./cartItem";
+import Log from "../../assets/Log";
+import orderOptionSelectionVue from "./orderOptionSelection.vue";
 
 export default {
   name: "MyCart",
@@ -101,6 +167,7 @@ export default {
   },
   methods: {
     ...mapActions("cart", ["getDeliveryFee"]),
+    ...mapActions("order", ["saveOrder"]),
     New() {},
     Edit(item) {
       this.item = item;
@@ -115,15 +182,47 @@ export default {
       }
     },
     CheckOut() {
-      this.$router.push("/ConfirmOrder");
+      let orderObject = {};
+      orderObject.deliveryAddress = { userid: Log.userId() };
+      orderObject.items = [];
+
+      for (let i = 0; i < this.cartItems.length; i++) {
+        let item = {
+          id: this.cartItems[i].id,
+          description: this.cartItems[i].description,
+          name: this.cartItems[i].name,
+          subTotal: this.cartItems[i].subTotal,
+          qty: this.cartItems[i].qty,
+          selection: this.cartItems[i].selection,
+          price: this.cartItems[i].price,
+          restaurantId: this.cartItems[i].restaurantId,
+        };
+
+        orderObject.items.push(item);
+      }
+
+      this.saveOrder(orderObject)
+        .then((fulfilled) => {
+          this.cartItems.splice(0, this.cartItems.length);
+          this.$router.push(`/ConfirmOrder/${this.order.orderId}`);
+        })
+        .catch((error) => {
+          alert(error.message);
+        });
+
+      //this.$router.push("/ConfirmOrder");
     },
     ClearCart() {
       this.deliveryFee = 0;
       this.cartItems.splice(0, this.cartItems.length);
     },
+    GoHome() {
+      this.$router.push("/");
+    },
   },
   computed: {
     ...mapState("cart", ["cartItems", "deliveryFee"]),
+    ...mapState("order", ["order"]),
     CurrentItem() {
       return this.item;
     },
@@ -134,6 +233,20 @@ export default {
       }
       return tot + this.deliveryFee;
     },
+    OrderSubTotal() {
+      var tot = 0;
+      for (let i = 0; i < this.cartItems.length; i++) {
+        tot = tot + this.cartItems[i].subTotal;
+      }
+      return tot;
+    },
+    OrderQty() {
+      var tot = 0;
+      for (let i = 0; i < this.cartItems.length; i++) {
+        tot = tot + this.cartItems[i].qty;
+      }
+      return tot;
+    },
   },
   mounted() {
     if (this.cartItems.length > 0) {

src/components/orders/cartCard.vue

@@ -0,0 +1,29 @@
+<template>
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12 col-lg-8">
+        <div class="title-box-d">
+          <br />
+          <h1 class="title-d" style="text-align:left; font-size: 250%">My Cart</h1>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+
+
+<style lang="scss" scoped>
+.shipHeader {
+  color: black;
+}
+.itemCard {
+  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.12);
+}
+.shoppingDetail {
+  background-color: #f5f5f5;
+  border-style: solid;
+  border-color: rgb(185, 185, 185);
+  border-width: thin;
+}
+</style>

src/components/orders/confirmOrder.vue

@@ -30,6 +30,9 @@ import StepOne from "./orderConf/confAddress";
 import StepTwo from "./orderConf/makePayment";
 import StepThree from "./orderConf/orderPlaced";
 
+import { mapState, mapActions } from "vuex";
+import Log from "../../assets/Log";
+
 export default {
   components: {
     HorizontalStepper,
@@ -65,6 +68,7 @@ export default {
     };
   },
   methods: {
+    ...mapActions("order", ["updateOrder", "getCartOrder"]),
     // Executed when @completed-step event is triggered
     completeStep(payload) {
       this.demoSteps.forEach((step) => {
@@ -88,5 +92,8 @@ export default {
       alert("end");
     },
   },
+  computed: {
+    ...mapState("order", ["order"]),
+  },
 };
 </script>

src/components/orders/orderConf/confAddress.vue

@@ -12,11 +12,11 @@
             :checked="userAddress.isComplex"
             @change="selectionChanged"
           />
-          <label class="custom-control-label" for="thCloseSwitch" style="margin-left: 40px">
-            {{
-            isComplex ? "Yes" : "No"
-            }}
-          </label>
+          <label
+            class="custom-control-label"
+            for="thCloseSwitch"
+            style="margin-left: 40px"
+          >{{ isComplex ? "Yes" : "No" }}</label>
         </div>
       </div>
     </div>
@@ -43,7 +43,7 @@
         <label>Complex Name</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <input
             class="form-control"
@@ -57,7 +57,7 @@
         <label>Unit Number</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="text" name="Surname" v-model="userAddress.unitNumber" />
         </div>
@@ -70,7 +70,7 @@
             <label>Street Number</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -87,7 +87,7 @@
             <label>Street Name</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -104,7 +104,7 @@
             <label>Suburb</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -121,7 +121,7 @@
             <label>City</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -138,7 +138,7 @@
             <label>Province</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -155,7 +155,7 @@
             <label>Postal Code</label>
             <div class="input-group-prepend">
               <span class="input-group-text">
-                <eva-icon name="person-outline" fill="#24aae1"></eva-icon>
+                <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
               </span>
               <input
                 class="form-control"
@@ -210,6 +210,7 @@ export default {
   },
   methods: {
     ...mapActions("user", ["getUserAddress"]),
+    ...mapActions("order", ["updateAddress"]),
     selectionChanged() {
       this.userAddress.isComplex = !this.userAddress.isComplex;
     },
@@ -229,9 +230,7 @@ export default {
       });
     },
     Continue() {
-      this.order.deliveryAddress = this.userAddress;
-      this.order.items = this.cartItems;
-      this.$emit("can-continue", { value: true });
+      this.UpdateAddressContinue();
     },
     UpdateAddress(address) {
       this.userAddress.streetNumber = address.streetNumber;
@@ -244,7 +243,13 @@ export default {
       this.userAddress.googleMapUrl = address.url;
       this.userAddress.latitude = address.coordinates.lat;
       this.userAddress.longitude = address.coordinates.lng;
-      this.$emit("can-continue", { value: true });
+      this.order.deliveryAddress = this.userAddress;
+      this.UpdateAddressContinue();
+    },
+    UpdateAddressContinue() {
+      let obj = this.userAddress;
+      obj.orderId = this.order.orderId;
+      this.updateAddress(obj).then(this.$emit("can-continue", { value: true }));
     },
   },
   computed: {

src/components/restaurants/restaurantCategory.vue

@@ -10,7 +10,7 @@
         <label>Description</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="credit-card-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="text" name="description" v-model="category.description" />
         </div>
@@ -47,7 +47,7 @@
         <img :src="category.image" style="height:200px; width:200px; object-fit: cover;" />
         <br />
         <span class="input-group-text" align="center" style="width:150px" @click="removeImage()">
-          <eva-icon name="trash-2-outline" fill="#24aae1"></eva-icon>Delete
+          <eva-icon name="trash-2-outline" fill="#6c757d"></eva-icon>Delete
         </span>
       </div>
     </div>
@@ -55,7 +55,8 @@
     <div class="row">
       <div class="col-md-12" style="margin-bottom: 1em">
         <div class="input-group-prepend">
-          <b-button class="btn btn-b-n" @click="Ok">Ok</b-button>
+          <!-- <b-button class="btn btn-b-n" @click="Ok">Ok</b-button> -->
+          <b-button class="mt-2" @click="Ok">Ok</b-button>
         </div>
       </div>
     </div>
@@ -68,10 +69,10 @@ import ImageUploader from "vue-image-upload-resize";
 export default {
   name: "Category",
   props: {
-    editCategory: { default: {} }
+    editCategory: { default: {} },
   },
   components: {
-    ImageUploader
+    ImageUploader,
   },
   data() {
     return {
@@ -79,12 +80,12 @@ export default {
       category: {
         id: 0,
         image: null,
-        description: ""
-      }
+        description: "",
+      },
     };
   },
   methods: {
-    setImage: function(output) {
+    setImage: function (output) {
       this.hasImage = true;
       this.category.image = output.dataUrl;
     },
@@ -93,7 +94,7 @@ export default {
     },
     removeImage() {
       this.category.image = null;
-    }
+    },
   },
   watch: {
     editCategory: {
@@ -102,8 +103,8 @@ export default {
         if (val) {
           this.category = val;
         }
-      }
-    }
-  }
+      },
+    },
+  },
 };
-</script>
+</script>

src/components/restaurants/restaurantDetails.vue

@@ -24,7 +24,7 @@
               <label>Update Logo</label>
               <div class="input-group-prepend">
                 <span class="input-group-text" style="cursor: pointer;" @click="UpdateLogo">
-                  <eva-icon @click="UpdateLogo" name="image-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon @click="UpdateLogo" name="image-outline" fill="#6c757d"></eva-icon>
                 </span>
               </div>
             </div>
@@ -39,7 +39,7 @@
               <label>Name</label>
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="edit-2-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
                 </span>
                 <input class="form-control" type="text" name="rname" v-model="restaurant.name" />
               </div>
@@ -63,7 +63,7 @@
               <label>Delivery Fee</label>
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon name="credit-card-outline" fill="#6c757d"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -79,7 +79,7 @@
               <label>Delivery Radius (KM)</label>
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="pin-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon name="pin-outline" fill="#6c757d"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -95,7 +95,7 @@
               <label>Delivery Time (Minutes)</label>
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="clock-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon name="clock-outline" fill="#6c757d"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -164,7 +164,7 @@
               <label>Shopping Centre</label>
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="shopping-cart-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon name="shopping-cart-outline" fill="#6c757d"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -180,7 +180,7 @@
               <label>Shop Number</label>
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="hash-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon name="hash-outline" fill="#6c757d"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -196,7 +196,7 @@
               <label>Street Number</label>
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="navigation-2-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -213,7 +213,7 @@
               <label>Street Name</label>
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="navigation-2-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -230,7 +230,7 @@
               <label>Suburb</label>
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="navigation-2-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -247,7 +247,7 @@
               <label>City</label>
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="navigation-2-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -264,7 +264,7 @@
               <label>Province</label>
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="navigation-2-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -281,7 +281,7 @@
               <label>Postal Code</label>
               <div class="input-group-prepend">
                 <span class="input-group-text">
-                  <eva-icon name="navigation-2-outline" fill="#24aae1"></eva-icon>
+                  <eva-icon name="navigation-2-outline" fill="#6c757d"></eva-icon>
                 </span>
                 <input
                   class="form-control"
@@ -298,12 +298,7 @@
         <div class="col-md-6" style="margin-bottomL 1em">
           <div class="row" style="text-align:left">
             <div class="col-md-4" style="margin-bottom: 1em">
-              <button
-                @click="ShowMap()"
-                class="btn btn-b-n"
-                type="button"
-                data-dismiss="modal"
-              >Update Address</button>
+              <b-button class="mt-2" @click="ShowMap()">Update Address</b-button>
             </div>
           </div>
           <Map :showAutoComplete="false" :showLocationLabel="false" :setLocation="mapCoords" />
@@ -311,10 +306,10 @@
       </div>
       <div class="row offset-md-5">
         <div class="col-md-2">
-          <button @click="Save()" class="btn btn-b-n" type="button" data-dismiss="modal">Save</button>
+          <b-button class="mt-2" @click="Save()">Save</b-button>
         </div>
         <div class="col-md-2">
-          <button @click="Close()" class="btn btn-b-n" type="button" data-dismiss="modal">Close</button>
+          <b-button class="mt-2" @click="Close()">Close</b-button>
         </div>
       </div>
     </div>
@@ -387,7 +382,7 @@ export default {
     ListView,
     Categories,
     TradingHours,
-    ImageUploader
+    ImageUploader,
   },
   data() {
     return {
@@ -396,19 +391,19 @@ export default {
         "openingTime",
         "closingTime",
         "closed",
-        "opened24H"
+        "opened24H",
       ],
       wait: false,
       selectedMops: [],
       hasImage: false,
-      restaurantId: Log.restaurantId()
+      restaurantId: Log.restaurantId(),
     };
   },
   methods: {
     ...mapActions("restaurant", [
       "getRestaurant",
       "updateRestaurant",
-      "removeTradingHours"
+      "removeTradingHours",
     ]),
     Save() {
       this.wait = true;
@@ -428,10 +423,10 @@ export default {
       this.restaurant.methodsOfPayment = mops;
 
       this.updateRestaurant(this.restaurant)
-        .then(fulfilled => {
+        .then((fulfilled) => {
           this.$router.push("/");
         })
-        .catch(error => {
+        .catch((error) => {
           console.log(error.message);
         });
     },
@@ -481,10 +476,10 @@ export default {
     UpdateLogo() {
       this.$modal.show("loadImage");
     },
-    setImage: function(output) {
+    setImage: function (output) {
       this.$modal.hide("loadImage");
       this.restaurant.logo = output.dataUrl;
-    }
+    },
   },
   computed: {
     ...mapState("restaurant", ["restaurant"]),
@@ -492,7 +487,7 @@ export default {
     mapCoords() {
       var coords = {
         lat: this.restaurant.latitude,
-        lng: this.restaurant.longitude
+        lng: this.restaurant.longitude,
       };
       return coords;
     },
@@ -504,7 +499,7 @@ export default {
     },
     SavedMops() {
       this.selectedMops = this.restaurant.selectedMethodsOfPayments;
-    }
+    },
   },
   mounted() {
     this.wait = false;
@@ -513,7 +508,7 @@ export default {
   watch: {
     SavedMops() {
       alert("bla");
-    }
-  }
+    },
+  },
 };
-</script>
+</script>

src/components/restaurants/restaurantMenuCateory.vue

@@ -10,7 +10,7 @@
         <label>Description</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="text" name="description" v-model="category.description" />
         </div>
@@ -20,7 +20,7 @@
     <div class="row">
       <div class="col-md-12" style="margin-bottom: 1em">
         <div class="input-group-prepend">
-          <b-button class="btn btn-b-n" @click="Ok">Ok</b-button>
+          <b-button class="mt-2" @click="Ok">Ok</b-button>
         </div>
       </div>
     </div>
@@ -31,20 +31,20 @@
 export default {
   name: "Category",
   props: {
-    editCategory: { default: {} }
+    editCategory: { default: {} },
   },
   data() {
     return {
       category: {
         id: 0,
-        description: ""
-      }
+        description: "",
+      },
     };
   },
   methods: {
     Ok() {
       this.$emit("CategoryUpdate", this.category);
-    }
+    },
   },
   watch: {
     editCategory: {
@@ -53,8 +53,8 @@ export default {
         if (val) {
           this.category = val;
         }
-      }
-    }
-  }
+      },
+    },
+  },
 };
-</script>
+</script>

src/components/restaurants/restaurantMenuItem.vue

@@ -18,14 +18,10 @@
           <label>Category</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
-              <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+              <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
             </span>
             <select class="form-control" v-model="menuItem.category">
-              <option v-for="(cat, i) in categories" :key="i">
-                {{
-                cat.description
-                }}
-              </option>
+              <option v-for="(cat, i) in categories" :key="i">{{ cat.description }}</option>
             </select>
           </div>
         </div>
@@ -35,7 +31,7 @@
           <label>Name</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
-              <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+              <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
             </span>
             <input class="form-control" type="text" v-model="menuItem.name" />
           </div>
@@ -46,7 +42,7 @@
           <label>Description</label>
           <div class="input-group-prepend">
             <span class="input-group-text">
-              <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+              <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
             </span>
             <input class="form-control" type="text" v-model="menuItem.description" />
           </div>
@@ -56,8 +52,8 @@
         <div class="col-md-6" style="margin-bottom: 1em">
           <label>Price</label>
           <div class="input-group-prepend">
-            <span class="input-group-text">
-              <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <span class="input-group-text" style="color:#6c757d">
+              <b>R</b>
             </span>
             <input class="form-control" type="number" v-model="menuItem.price" />
           </div>
@@ -94,7 +90,7 @@
           <img :src="menuItem.image" style="height:100px; width:100px; object-fit: cover;" />
           <br />
           <span class="input-group-text" align="center" style="width:100px" @click="removeImage()">
-            <eva-icon name="trash-2-outline" fill="#24aae1"></eva-icon>Delete
+            <eva-icon name="trash-2-outline" fill="#6c757d"></eva-icon>Delete
           </span>
         </div>
       </div>
@@ -110,11 +106,13 @@
               :checked="menuItem.overrideOptions"
               @change="selectionChanged"
             />
-            <label
-              class="custom-control-label"
-              for="thCloseSwitch"
-              style="margin-left: 40px"
-            >{{menuItem.overrideOptions ? 'Yes - This will override any menu options set on the category' : 'No - This will append category options to the below options'}}</label>
+            <label class="custom-control-label" for="thCloseSwitch" style="margin-left: 40px">
+              {{
+              menuItem.overrideOptions
+              ? "Yes - This will override any menu options set on the category"
+              : "No - This will append category options to the below options"
+              }}
+            </label>
           </div>
         </div>
       </div>
@@ -134,10 +132,10 @@
         <div class="col-md-12" style="margin-bottomL 1em">
           <div class="row offset-md-5">
             <div class="col-md-2">
-              <button @click="Save()" class="btn btn-b-n" type="button" data-dismiss="modal">Save</button>
+              <b-button class="mt-2" @click="Save()">Save</b-button>
             </div>
             <div class="col-md-2">
-              <button @click="Close()" class="btn btn-b-n" type="button" data-dismiss="modal">Close</button>
+              <b-button class="mt-2" @click="Close()">Close</b-button>
             </div>
           </div>
         </div>
@@ -162,7 +160,7 @@ export default {
   components: {
     ImageUploader,
     ListView,
-    ItemOption
+    ItemOption,
   },
   data() {
     return {
@@ -170,7 +168,7 @@ export default {
       hasImage: false,
       restaurantId: Log.restaurantId(),
       showOption: false,
-      menuOption: {}
+      menuOption: {},
     };
   },
   methods: {
@@ -181,20 +179,20 @@ export default {
       this.menuItem.restaurantId = this.restaurantId;
       if (this.menuItem.category !== "") {
         var category = this.categories.find(
-          c => c.description === this.menuItem.category
+          (c) => c.description === this.menuItem.category
         );
         this.menuItem.categoryId = category.id;
       }
       console.log(JSON.stringify(this.menuItem));
 
-      this.insertMenuItem(this.menuItem).then(fulfilled => {
+      this.insertMenuItem(this.menuItem).then((fulfilled) => {
         this.$router.push("/RestaurantMenu");
       });
     },
     Close() {
       this.$router.push("/RestaurantMenu");
     },
-    setImage: function(output) {
+    setImage: function (output) {
       this.hasImage = true;
       this.menuItem.image = output.dataUrl;
     },
@@ -221,20 +219,20 @@ export default {
       if (item) {
         this.showOption = false;
       }
-    }
+    },
   },
   computed: {
     ...mapState("menuCategories", ["categories"]),
     ...mapState("menu", ["menuItem"]),
     CurrentOption() {
       return this.menuOption;
-    }
+    },
   },
   mounted() {
     this.wait = true;
     this.getCategories(this.restaurantId);
     this.getMenuItem(this.$route.params.itemid);
     this.wait = false;
-  }
+  },
 };
-</script>
+</script>

src/components/restaurants/restaurantMenuItemOptions.vue

@@ -10,7 +10,7 @@
         <label>Description</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="credit-card-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="text" v-model="menuOption.description" />
         </div>
@@ -21,10 +21,14 @@
         <label>Option Type</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="credit-card-outline" fill="#6c757d"></eva-icon>
           </span>
           <select class="form-control" v-model="menuOption.optionType">
-            <option v-for="item in optionTypes" :value="item.id" :key="item.id">{{item.description}}</option>
+            <option v-for="item in optionTypes" :value="item.id" :key="item.id">
+              {{
+              item.description
+              }}
+            </option>
           </select>
         </div>
       </div>
@@ -32,7 +36,7 @@
         <label>Option Limit</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="credit-card-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="number" v-model="menuOption.optionLimit" />
         </div>
@@ -50,11 +54,11 @@
             :checked="menuOption.isBasePrice"
             @change="selectionChanged"
           />
-          <label
-            class="custom-control-label"
-            for="thCloseSwitch"
-            style="margin-left: 40px"
-          >{{menuOption.isBasePrice ? 'Yes' : 'No'}}</label>
+          <label class="custom-control-label" for="thCloseSwitch" style="margin-left: 40px">
+            {{
+            menuOption.isBasePrice ? "Yes" : "No"
+            }}
+          </label>
         </div>
       </div>
     </div>
@@ -63,7 +67,7 @@
         <label>Rank</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="credit-card-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="number" v-model="menuOption.rank" />
         </div>
@@ -92,10 +96,10 @@
       <div class="col-md-12" style="margin-bottomL 1em">
         <div class="row offset-md-5">
           <div class="col-md-2">
-            <button @click="Save()" class="btn btn-b-n" type="button" data-dismiss="modal">Save</button>
+            <b-button class="mt-2" @click="Save()">Save</b-button>
           </div>
           <div class="col-md-2">
-            <button @click="Close()" class="btn btn-b-n" type="button" data-dismiss="modal">Close</button>
+            <b-button class="mt-2" @click="Close()">Close</b-button>
           </div>
         </div>
       </div>
@@ -114,10 +118,10 @@ export default {
   name: "MenuOption",
   components: {
     ListView,
-    OptionItem
+    OptionItem,
   },
   props: {
-    menuOption: { default: {} }
+    menuOption: { default: {} },
   },
   data() {
     return {
@@ -127,7 +131,7 @@ export default {
       columns: ["description", "price", "rank"],
       wait: false,
       restaurantId: Log.restaurantId(),
-      menuItemId: 0
+      menuItemId: 0,
     };
   },
   methods: {
@@ -180,10 +184,10 @@ export default {
 
       this.$modal.hide("OptionItem");
       this.isEdit = false;
-    }
+    },
   },
   computed: {
-    ...mapState("menuOptions", ["optionTypes"])
+    ...mapState("menuOptions", ["optionTypes"]),
   },
   mounted() {
     this.wait = false;
@@ -196,8 +200,8 @@ export default {
         if (val) {
           this.menuOption = val;
         }
-      }
-    }
-  }
+      },
+    },
+  },
 };
-</script>
+</script>

src/components/restaurants/restaurantMenuOption.vue

@@ -10,15 +10,11 @@
         <label>Menu Category</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <select class="form-control" v-model="menuOption.categoryDescription">
             <option>All</option>
-            <option v-for="(cat, i) in categories" :key="i">
-              {{
-              cat.description
-              }}
-            </option>
+            <option v-for="(cat, i) in categories" :key="i">{{ cat.description }}</option>
           </select>
         </div>
       </div>
@@ -28,7 +24,7 @@
         <label>Description</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="text" v-model="menuOption.description" />
         </div>
@@ -39,10 +35,14 @@
         <label>Option Type</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <select class="form-control" v-model="menuOption.optionType">
-            <option v-for="item in optionTypes" :value="item.id" :key="item.id">{{item.description}}</option>
+            <option v-for="item in optionTypes" :value="item.id" :key="item.id">
+              {{
+              item.description
+              }}
+            </option>
           </select>
         </div>
       </div>
@@ -50,7 +50,7 @@
         <label>Option Limit</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="number" v-model="menuOption.optionLimit" />
         </div>
@@ -68,11 +68,11 @@
             :checked="menuOption.isBasePrice"
             @change="selectionChanged"
           />
-          <label
-            class="custom-control-label"
-            for="thCloseSwitch"
-            style="margin-left: 40px"
-          >{{menuOption.isBasePrice ? 'Yes' : 'No'}}</label>
+          <label class="custom-control-label" for="thCloseSwitch" style="margin-left: 40px">
+            {{
+            menuOption.isBasePrice ? "Yes" : "No"
+            }}
+          </label>
         </div>
       </div>
     </div>
@@ -81,7 +81,7 @@
         <label>Rank</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="number" v-model="menuOption.rank" />
         </div>
@@ -110,22 +110,10 @@
       <div class="col-md-12" style="margin-bottomL 1em">
         <div class="row offset-md-5">
           <div class="col-md-2">
-            <button
-              @click="Save()"
-              class="btn btn-b-n"
-              type="button"
-              data-dismiss="modal"
-              name="SaveButton"
-            >Save</button>
+            <b-button class="mt-2" @click="Save()">Save</b-button>
           </div>
           <div class="col-md-2">
-            <button
-              @click="Close()"
-              class="btn btn-b-n"
-              type="button"
-              data-dismiss="modal"
-              name="CloseButton"
-            >Close</button>
+            <b-button class="mt-2" @click="Close()">Close</b-button>
           </div>
         </div>
       </div>
@@ -144,7 +132,7 @@ export default {
   name: "MenuOption",
   components: {
     ListView,
-    OptionItem
+    OptionItem,
   },
   data() {
     return {
@@ -154,7 +142,7 @@ export default {
       columns: ["description", "price", "rank"],
       wait: false,
       restaurantId: Log.restaurantId(),
-      menuItemId: 0
+      menuItemId: 0,
     };
   },
   methods: {
@@ -163,7 +151,7 @@ export default {
       "deleteMenuOptionItem",
       "addMenuOption",
       "updateMenuOption",
-      "getOptionTypes"
+      "getOptionTypes",
     ]),
     ...mapActions("menuCategories", ["getCategories"]),
     selectionChanged() {
@@ -177,7 +165,7 @@ export default {
       this.menuOption.restaurantId = this.restaurantId;
       if (this.menuOption.categoryDescription !== "All") {
         var category = this.categories.find(
-          c => c.description === this.menuOption.categoryDescription
+          (c) => c.description === this.menuOption.categoryDescription
         );
         this.menuOption.categoryId = category.id;
       } else {
@@ -185,7 +173,7 @@ export default {
       }
       alert(JSON.stringify(this.menuOption));
       if (this.menuOption.id === 0) {
-        this.addMenuOption(this.menuOption).then(result => {
+        this.addMenuOption(this.menuOption).then((result) => {
           this.$router.push("/MenuOptions");
         });
       } else {
@@ -213,11 +201,11 @@ export default {
 
       this.$modal.hide("OptionItem");
       this.isEdit = false;
-    }
+    },
   },
   computed: {
     ...mapState("menuOptions", ["menuOption", "optionTypes"]),
-    ...mapState("menuCategories", ["categories"])
+    ...mapState("menuCategories", ["categories"]),
   },
   mounted() {
     this.wait = false;
@@ -225,6 +213,6 @@ export default {
     this.getMenuOption(this.$route.params.optionid);
     this.menuItemId = this.$route.params.menuItemId;
     this.getOptionTypes();
-  }
+  },
 };
-</script>
+</script>

src/components/restaurants/restaurantMenuOptionItem.vue

@@ -10,7 +10,7 @@
         <label>Description</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <input
             class="form-control"
@@ -26,7 +26,7 @@
         <label>Price</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <input
             class="form-control"
@@ -42,7 +42,7 @@
         <label>Rank</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <input
             class="form-control"
@@ -57,7 +57,7 @@
     <div class="row">
       <div class="col-md-12" style="margin-bottom: 1em">
         <div class="input-group-prepend">
-          <b-button class="btn btn-b-n" @click="Ok">Ok</b-button>
+          <b-button class="mt-2" @click="Ok">Ok</b-button>
         </div>
       </div>
     </div>
@@ -70,10 +70,10 @@ import ImageUploader from "vue-image-upload-resize";
 export default {
   name: "MenuOptionItem",
   props: {
-    editMenuOptionItem: { default: {} }
+    editMenuOptionItem: { default: {} },
   },
   components: {
-    ImageUploader
+    ImageUploader,
   },
   data() {
     return {
@@ -83,14 +83,14 @@ export default {
         description: "",
         price: 0,
         rank: 0,
-        menuOptionId: 0
-      }
+        menuOptionId: 0,
+      },
     };
   },
   methods: {
     Ok() {
       this.$emit("MenuItemUpdated", this.menuOptionItem);
-    }
+    },
   },
   watch: {
     editMenuOptionItem: {
@@ -99,8 +99,8 @@ export default {
         if (val) {
           this.menuOptionItem = val;
         }
-      }
-    }
-  }
+      },
+    },
+  },
 };
-</script>
+</script>

src/components/restaurants/restaurantRole.vue

@@ -10,7 +10,7 @@
         <label>Role Name</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="text" name="description" v-model="role.roleName" />
         </div>
@@ -95,10 +95,10 @@
       <div class="col-md-12" style="margin-bottomL 1em">
         <div class="row offset-md-5">
           <div class="col-md-2">
-            <button @click="Save()" class="btn btn-b-n" type="button" data-dismiss="modal">Save</button>
+            <b-button class="mt-2" @click="Save()">Save</b-button>
           </div>
           <div class="col-md-2">
-            <button @click="Close()" class="btn btn-b-n" type="button" data-dismiss="modal">Close</button>
+            <b-button class="mt-2" @click="Close()">Close</b-button>
           </div>
         </div>
       </div>
@@ -213,4 +213,4 @@ export default {
     this.getRole(this.$route.params.id);
   },
 };
-</script>
+</script>

src/components/restaurants/restaurantUser.vue

@@ -10,7 +10,7 @@
         <label>Email</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="email-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="text" name="description" v-model="user.emailAddress" />
         </div>
@@ -21,7 +21,7 @@
         <label>First Name</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="text" name="description" v-model="user.firstName" />
         </div>
@@ -32,7 +32,7 @@
         <label>Surname</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="text" name="description" v-model="user.surname" />
         </div>
@@ -43,7 +43,7 @@
         <label>Cellphone</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="phone-call-outline" fill="#6c757d"></eva-icon>
           </span>
           <input class="form-control" type="text" name="description" v-model="user.cellphone" />
         </div>
@@ -53,7 +53,7 @@
     <div class="row">
       <div class="col-md-12" style="margin-bottom: 1em">
         <div class="input-group-prepend">
-          <b-button class="btn btn-b-n" @click="Ok">Ok</b-button>
+          <b-button class="mt-2" @click="Ok()">Ok</b-button>
         </div>
       </div>
     </div>
@@ -64,18 +64,18 @@
 export default {
   name: "RestaurantUser",
   props: {
-    editUser: { default: {} }
+    editUser: { default: {} },
   },
   data() {
     return {
       hasImage: false,
-      user: {}
+      user: {},
     };
   },
   methods: {
     Ok() {
       this.$emit("UpdateUser", this.user);
-    }
+    },
   },
   watch: {
     editUser: {
@@ -84,8 +84,8 @@ export default {
         if (val) {
           this.user = val;
         }
-      }
-    }
-  }
+      },
+    },
+  },
 };
-</script>
+</script>

src/components/restaurants/rolePremission.vue

@@ -10,7 +10,7 @@
         <label>Target</label>
         <div class="input-group-prepend">
           <span class="input-group-text">
-            <eva-icon name="credit-card-outline" fill="#24aae1"></eva-icon>
+            <eva-icon name="edit-2-outline" fill="#6c757d"></eva-icon>
           </span>
           <select class="form-control" v-model="role.target">
             <option value="Select"></option>
@@ -29,7 +29,7 @@
       <div class="col-md-2" style="margin-bottom: 1em">
         <label>Navigation</label>
         <div class="input-group-prepend">
-          <input style="margin-left: 1px" type="checkbox" v-model="role.navigate" />
+          <input style="margin-left: 1px;" type="checkbox" v-model="role.navigate" />
         </div>
       </div>
       <div class="col-md-2" style="margin-bottom: 1em">
@@ -62,7 +62,7 @@
     <div class="row">
       <div class="col-md-12" style="margin-bottom: 1em">
         <div class="input-group-prepend">
-          <b-button class="btn btn-b-n" @click="Ok">Ok</b-button>
+          <b-button class="mt-2" @click="Ok">Ok</b-button>
         </div>
       </div>
     </div>
@@ -74,20 +74,20 @@ import ListView from "../shared/listView";
 export default {
   name: "Role",
   props: {
-    role: { default: {} }
+    role: { default: {} },
   },
   components: {
-    ListView
+    ListView,
   },
   data() {
     return {
-      wait: false
+      wait: false,
     };
   },
   methods: {
     Ok() {
       this.$emit("UpdatePrems", this.role);
-    }
+    },
   },
   watch: {
     role: {
@@ -96,8 +96,8 @@ export default {
         if (val) {
           this.role = val;
         }
-      }
-    }
-  }
+      },
+    },
+  },
 };
-</script>
+</script>

src/components/shared/autoComplete.vue

@@ -7,7 +7,9 @@
         :key="i"
         class="autocomplete-result"
         @click="setResult(result)"
-      >{{ result }}</li>
+      >
+        {{ result }}
+      </li>
     </ul>
   </div>
 </template>
@@ -73,7 +75,7 @@ export default {
 }
 
 .autocomplete-result:hover {
-  background-color: #24aae1;
+  background-color: #6c757d;
   color: white;
 }
 </style>

src/components/shared/basePaginationItem.vue

@@ -13,15 +13,15 @@ export default {
   props: {
     pageNumber: {
       type: Number,
-      required: true
+      required: true,
     },
-    isCurrentPage: undefined
+    isCurrentPage: undefined,
   },
   methods: {
     onClick() {
       this.$emit("loadPage", this.pageNumber);
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

src/components/shared/checkItem.vue

@@ -17,7 +17,7 @@ export default {
   },
   methods: {
     checkItem() {
-      this.$emit('checkItem', this.title, !this.show);
+      this.$emit("checkItem", this.title, !this.show);
     },
   },
   computed: {

src/components/shared/fieldEditor.vue

@@ -6,9 +6,9 @@
         v-if="mayEdit"
         @click="EditClick()"
         class="input-group-text spanCursor"
-        style="color: #24aae1"
+        style="color: #6c757d"
       >
-        <eva-icon name="edit-outline" fill="#24aae1"></eva-icon>
+        <eva-icon name="edit-outline" fill="#6c757d"></eva-icon>
       </span>
     </div>
     <div v-if="edit" class="input-group-prepend">
@@ -21,7 +21,8 @@
           v-for="option in selectOptions"
           :value="option[selectValue]"
           :key="option[selectValue]"
-        >{{ option[selectText] }}</option>
+          >{{ option[selectText] }}</option
+        >
       </select>
       <select v-if="type === 'selectlist'" class="form-control" v-model="value">
         <option v-for="item in selectOptions" :value="item" :key="item">{{ item }}</option>
@@ -31,12 +32,12 @@
         v-if="edit"
         @click="UpdateValue()"
         class="input-group-text spanCursor"
-        style="color: #24aae1"
+        style="color: #6c757d"
       >
-        <eva-icon name="checkmark-outline" fill="#24aae1"></eva-icon>
+        <eva-icon name="checkmark-outline" fill="#6c757d"></eva-icon>
       </span>
-      <span v-if="edit" @click="Close()" class="input-group-text spanCursor" style="color: #24aae1">
-        <eva-icon name="close-outline" fill="#24aae1"></eva-icon>
+      <span v-if="edit" @click="Close()" class="input-group-text spanCursor" style="color: #6c757d">
+        <eva-icon name="close-outline" fill="#6c757d"></eva-icon>
       </span>
     </div>
   </div>
@@ -44,15 +45,7 @@
 
 <script>
 export default {
-  props: [
-    "value",
-    "type",
-    "mayEdit",
-    "selectOptions",
-    "selectValue",
-    "selectText",
-    "display"
-  ],
+  props: ["value", "type", "mayEdit", "selectOptions", "selectValue", "selectText", "display"],
   data() {
     return {
       edit: false,
@@ -76,19 +69,13 @@ export default {
     selectionClick(item) {
       if (item.target.options.selectedIndex > 0) {
         if (!this.value) {
-          this.myDisplay = this.selectOptions[
-            item.target.options.selectedIndex - 1
-          ][this.selectText];
+          this.myDisplay = this.selectOptions[item.target.options.selectedIndex - 1][
+            this.selectText
+          ];
         }
         if (this.selectOptions[item.target.options.selectedIndex - 1]) {
-          this.$emit(
-            "input",
-            this.selectOptions[item.target.options.selectedIndex - 1]
-          );
-          this.$emit(
-            "change",
-            this.selectOptions[item.target.options.selectedIndex - 1]
-          );
+          this.$emit("input", this.selectOptions[item.target.options.selectedIndex - 1]);
+          this.$emit("change", this.selectOptions[item.target.options.selectedIndex - 1]);
         }
       }
     }

src/components/shared/home.vue

@@ -2,6 +2,14 @@
   <div class="container">
     <div class="form-group row">
       <div class="col-md-10 offset-md-1">
+        <!-- <b-tabs class="nav nav-pills-a nav-pills mb-3 section-t3">
+          <b-tab title="Restaurants" active
+            ><b-card-text><Cards /></b-card-text
+          ></b-tab>
+          <b-tab title="Categories" lazy
+            ><b-card-text><Categories /></b-card-text
+          ></b-tab>
+        </b-tabs> -->
         <ul class="nav nav-pills-a nav-pills mb-3 section-t3" id="pills-tab" role="tablist">
           <li class="nav-item">
             <a
@@ -12,7 +20,8 @@
               role="tab"
               aria-controls="pills-video"
               aria-selected="true"
-            >Restaurants</a>
+              >Restaurants</a
+            >
           </li>
           <li class="nav-item">
             <a
@@ -23,7 +32,8 @@
               role="tab"
               aria-controls="pills-plans"
               aria-selected="false"
-            >Categories</a>
+              >Categories</a
+            >
           </li>
         </ul>
         <div class="tab-content" id="pills-tabContent">

src/components/shared/imageLoader.vue

@@ -21,7 +21,7 @@
         <img :src="img" style="height:200px; width:150px; object-fit: cover;" />
         <br />
         <span class="input-group-text" align="center" style="width:150px" @click="removeImage(key)">
-          <eva-icon name="trash-2-outline" fill="#24aae1"></eva-icon>Delete
+          <eva-icon name="trash-2-outline" fill="#6c757d"></eva-icon>Delete
         </span>
       </div>
       <br />

src/components/shared/listView.vue

@@ -11,11 +11,8 @@
       <div class="p-2">
         <div class="d-flex flex-row">
           <div class="p2" v-if="showColumnChooser">
-            <div
-              class="btn btn-primary myBackground btn-width cursor-pointer"
-              data-toggle="modal"
-              data-target="#myModal"
-            >Column Chooser</div>
+            <!-- <div class="mt-2" data-toggle="modal" data-target="#myModal">Column Chooser</div> -->
+            <b-button class="mt-2" data-toggle="modal" data-target="#myModal">Column Chooser</b-button>
             <div class="col-md-12">
               <div id="myModal" class="modal fade" role="dialog">
                 <div class="modal-dialog modal-lg">
@@ -23,7 +20,8 @@
                   <div class="modal-content">
                     <div class="modal-header">
                       <h5>Column Chooser</h5>
-                      <button type="button" class="close" data-dismiss="modal">&times;</button>
+                      <!-- <button type="button" class="close" data-dismiss="modal">&times;</button> -->
+                      <b-button class="mt-2" data-dismiss="modal">&times;</b-button>
                     </div>
                     <div style="margin-left:50px; margin-right:50px;margin-bottom:50px;">
                       <ListViewControl :items="allColumn" @checkItem="checkItem" />
@@ -34,13 +32,10 @@
             </div>
           </div>
           <div class="p2" v-if="selectedItems.length > 0">
-            <div
-              class="btn btn-primary myBackground btn-width cursor-pointer"
-              @click="onClearSelected()"
-            >Clear Selected</div>
+            <b-button class="mt-2" @click="onClearSelected()">Clear Selected</b-button>
           </div>
           <div class="p2" v-if="showNew">
-            <div class="btn btn-primary myBackground btn-width cursor-pointer" @click="onNew()">New</div>
+            <b-button class="mt-2" @click="onNew()">New</b-button>
           </div>
         </div>
       </div>
@@ -179,7 +174,7 @@ export default {
   components: {
     BasePagination,
     Alert,
-    ListViewControl
+    ListViewControl,
   },
   mounted() {
     if (this.itemsPerPageList && this.itemsPerPageList.length > 0) {
@@ -190,75 +185,75 @@ export default {
   },
   props: {
     compact: {
-      default: true
+      default: true,
     },
     allowSelect: {
-      default: true
+      default: true,
     },
     allowMultipleSelect: {
-      default: false
+      default: false,
     },
     hideSearch: {
-      default: false
+      default: false,
     },
     showNew: {
-      default: true
+      default: true,
     },
     items: undefined,
     editable: {
-      default: false
+      default: false,
     },
     deleteable: {
-      default: false
+      default: false,
     },
     columnCount: {
-      default: 6
+      default: 6,
     },
     showPager: {
-      default: true
+      default: true,
     },
     title: {
-      default: undefined
+      default: undefined,
     },
     sortKey: {
-      default: "id"
+      default: "id",
     },
     hideItemCount: {
-      default: false
+      default: false,
     },
     currentPage: {
-      default: 1
+      default: 1,
     },
     bordered: {
-      default: true
+      default: true,
     },
     striped: {
-      default: true
+      default: true,
     },
     showColumnChooser: {
-      default: true
+      default: true,
     },
     displayColumns: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     displayFormats: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     displayHeaders: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     showCustomAction: {
-      default: false
+      default: false,
     },
     CustomActionHeading: {
-      default: ""
+      default: "",
     },
     CustomActionCondition: {
-      default: ""
-    }
+      default: "",
+    },
   },
   data() {
     return {
@@ -270,7 +265,7 @@ export default {
       visibleItemsPerPageCount: 20,
       itemsPerPageList: ItemsPerPageList,
       visibleColumn: [],
-      allColumn: []
+      allColumn: [],
     };
   },
   methods: {
@@ -296,10 +291,11 @@ export default {
               !Array.isArray(Object.values(item)[o])
             ) {
               const columnName = Object.keys(item)[o];
-              if (!listAll.some(x => x.column === columnName)) {
+              if (!listAll.some((x) => x.column === columnName)) {
                 listAll.push({
                   column: columnName,
-                  show: _.filter(listAll, x => x.show).length < this.columnCount
+                  show:
+                    _.filter(listAll, (x) => x.show).length < this.columnCount,
                 });
               }
             }
@@ -314,7 +310,7 @@ export default {
     },
     isSelected(i) {
       const ind = this.getActualIndex(i);
-      return _.some(this.selectedItems, x => x === ind);
+      return _.some(this.selectedItems, (x) => x === ind);
     },
     onNew() {
       this.$emit("onNew");
@@ -350,8 +346,8 @@ export default {
     },
     onRowClick(item, i) {
       const ind = this.getActualIndex(i);
-      if (_.some(this.selectedItems, x => x === ind)) {
-        this.selectedItems = this.selectedItems.filter(x => x !== ind);
+      if (_.some(this.selectedItems, (x) => x === ind)) {
+        this.selectedItems = this.selectedItems.filter((x) => x !== ind);
       } else {
         if (!this.allowMultipleSelect) {
           this.selectedItems = [];
@@ -404,7 +400,7 @@ export default {
         if (array[i] === value) return true;
       }
       return false;
-    }
+    },
   },
   computed: {
     ListWidth() {
@@ -431,7 +427,7 @@ export default {
           listColumns.push(this.displayColumns[i]);
         }
       } else {
-        const list = _.filter(this.allColumn, x => x.show);
+        const list = _.filter(this.allColumn, (x) => x.show);
         for (const i in list) {
           const item = list[i];
           if (item) {
@@ -446,9 +442,9 @@ export default {
       return list;
     },
     FilteredItems() {
-      const list = _.filter(this.items, item =>
+      const list = _.filter(this.items, (item) =>
         Object.values(item).some(
-          i =>
+          (i) =>
             JSON.stringify(i)
               .toLowerCase()
               .indexOf(this.searchItem.toLowerCase()) > -1
@@ -464,9 +460,9 @@ export default {
         endSlice = list.length;
       }
       return list.slice(startSlice, endSlice);
-    }
+    },
     //GetAllColumn() {}
-  }
+  },
 };
 </script>
 <style scoped>
@@ -502,29 +498,29 @@ th[draggable] a {
   opacity: 0.25;
 }
 .over {
-  background-color: rgba(0, 0, 255, 0.35);
+  background-color: rgba(87, 87, 92, 0.35);
 }
 .my-border {
   border: solid 3px silver;
 }
 .selected {
-  background-color: rgba(96, 203, 235, 0.5);
+  background-color: rgba(174, 180, 182, 0.5);
   border: white 2px double;
 }
 .selected:hover {
-  background-color: rgba(96, 203, 235, 0.85);
+  background-color: rgba(166, 181, 185, 0.85);
 }
 .btn-width {
   width: 125px;
 }
 .table-title {
   padding: 5px;
-  border: rgba(200, 200, 200, 0.66) double 2px;
+  border: rgba(56, 58, 59, 0.66) double 2px;
   border-radius: 5px;
-  background-color: rgba(96, 203, 235, 0.25);
+  background-color: rgba(176, 188, 192, 0.25);
 }
 .table-title:hover {
-  background-color: rgba(96, 203, 235, 0.4);
+  background-color: rgba(64, 64, 65, 0.4);
 }
 .table-header {
   background-color: rgba(200, 200, 200, 0.66);

src/components/shared/mapSetLocation.vue

@@ -3,7 +3,7 @@
     <label v-if="showLocationLabel">Location</label>
     <div v-if="showAutoComplete" class="input-group-prepend">
       <span class="input-group-text">
-        <eva-icon name="map" fill="#24aae1"></eva-icon>
+        <eva-icon name="map" fill="#6c757d"></eva-icon>
       </span>
       <gmap-autocomplete class="form-control" @place_changed="setPlace"></gmap-autocomplete>
       <button class="btn btn-primary btn-l" @click="addMarker">Add</button>

src/components/shared/navBar.vue

@@ -38,7 +38,7 @@
         <div class="input-group-prepend">
           <input type="text" placeholder="search" />
           <span class="input-group-text" @click="Search">
-            <i class="fa fa-search" style="color:#24aae1"></i>
+            <i class="fa fa-search" style="color:#6c757d"></i>
           </span>
         </div>
       </div>
@@ -175,7 +175,7 @@ export default {
     isLoggedIn() {
       // console.log(Log.isLoggedIn());
       // return Log.isLoggedIn();
-      return false;
+      return true;
     },
     NAME() {
       //return Log.getPerson().name;
@@ -184,7 +184,6 @@ export default {
     SystemRole() {
       return "Customer";
       //return "SuperAdmin";
-
       //return "RestaurantAdmin";
     },
     // eslint-disable-next-line vue/return-in-computed-property

src/main.js

@@ -10,7 +10,17 @@ import VModal from "vue-js-modal";
 import "font-awesome/css/font-awesome.min.css";
 import VueGeolocation from "vue-browser-geolocation";
 import * as VueGoogleMaps from "vue2-google-maps";
+import { BootstrapVue, IconsPlugin } from "bootstrap-vue";
+import "bootstrap/dist/css/bootstrap.css";
+import "bootstrap-vue/dist/bootstrap-vue.css";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { fas } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 
+library.add(fas);
+Vue.component("font-awesome-icon", FontAwesomeIcon);
+Vue.use(BootstrapVue);
+Vue.use(IconsPlugin);
 Vue.use(VueGeolocation);
 Vue.use(VueGoogleMaps, {
   load: {

src/router/index.js

@@ -27,6 +27,7 @@ import RestaurantUsers from "../components/restaurants/restaurantUsers.vue";
 import RestaurantRoles from "../components/restaurants/restaurantRoles.vue";
 import RestaurantRole from "../components/restaurants/restaurantRole.vue";
 import OrderConfirmation from "../components/orders/confirmOrder.vue";
+import CustomerOrder from "../components/customer/customerOrder.vue";
 
 Vue.use(Router);
 
@@ -155,9 +156,14 @@ export default new Router({
       component: RestaurantRole
     },
     {
-      path: "/ConfirmOrder",
+      path: "/ConfirmOrder/:id",
       name: "OrderConfirmation",
       component: OrderConfirmation
+    },
+    {
+      path: "/OrderDetails/:id",
+      name: "CustomerOrder",
+      component: CustomerOrder
     }
   ]
 });

src/store/modules/orders/order.js

@@ -1,4 +1,6 @@
 import axios from "axios";
+import { result } from "lodash";
+import { resolve, reject } from "core-js/fn/promise";
 
 export default {
   namespaced: true,
@@ -16,6 +18,9 @@ export default {
     },
     setOrderItems(state, items) {
       state.orderItems = items;
+    },
+    updateAddress(state, address) {
+      state.order.deliveryAddress = address;
     }
   },
   getters: {},
@@ -28,6 +33,11 @@ export default {
         .get(`/api/order/GetUserOrders/${userId}`)
         .then(result => commit("setOrders", result.data));
     },
+    getUserOrder({ commit }, userId) {
+      axios
+        .get(`/api/order/GetUserOrder/${userId}`)
+        .then(result => commit("setOrder", result.data));
+    },
     getRestaurantOrders({ commit }, restaurantId) {
       axios
         .get(`/api/order/GetRestaurantOrders/${restaurantId}`)
@@ -38,8 +48,33 @@ export default {
         .get(`/api/order/GetOrderItems/${orderId}`)
         .then(result => commit("setOrderItems", result.data));
     },
+    getCartOrder({ commit }, id) {
+      axios.get(`/api/order/GetCartOrder/${id}`).then(result => commit("setOrder", result.data));
+    },
     saveOrder({ commit }, order) {
-      axios.post("/api/order", order).then(result => commit("setOrders", result.data));
+      return new Promise((resolve, reject) => {
+        axios
+          .post("/api/order", order)
+          .then(result => {
+            commit("setOrder", result.data);
+            resolve();
+          })
+          .catch(error => reject(new Error(error.message)));
+      });
+    },
+    updateOrder({ commit }, order) {
+      axios.put("/api/order", order).then(result => commit("setOrder", result.data));
+    },
+    updateAddress({ commit }, address) {
+      return new Promise((resolve, reject) => {
+        axios
+          .put("/api/order/UpdateAddress", address)
+          .then(result => {
+            commit("updateAddress", result.data);
+            resolve();
+          })
+          .catch(error => reject(new Error(error.message)));
+      });
     }
   }
 };