Check in of navbar change and listview control

babel.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  presets: [
-    '@vue/app',
-  ],
-};

public/index.html

@@ -10,11 +10,11 @@
   <title>Uni-Vate Properties</title>
 
   <link href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700" rel="stylesheet">
-  <link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet">
   <link href="lib/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link href="lib/animate/animate.min.css" rel="stylesheet">
   <link href="lib/ionicons/css/ionicons.min.css" rel="stylesheet">
   <link href="lib/owlcarousel/assets/owl.carousel.min.css" rel="stylesheet">
+  <link href="css/bootstrap.min.css" rel="stylesheet">
   <link href="css/style.css" rel="stylesheet">
   <link rel="stylesheet" href="css/dragndrop.table.columns.css" />
 </head>

src/App.vue

@@ -6,6 +6,7 @@
     <div class="click-closed"></div>
     <SearchTab />
     <NavBar @routerGoTo="routerGoTo" />
+    <div class="pushDown"></div>
     <router-view />
     <FooterSection />
   </div>
@@ -13,16 +14,16 @@
 
 <script>
 // import HomePage from './components/home/homePage.vue';
-import SearchTab from './components/shared/searchTab.vue';
-import NavBar from './components/shared/navBar.vue';
-import FooterSection from './components/shared/footerSection.vue';
+import SearchTab from "./components/shared/searchTab.vue";
+import NavBar from "./components/shared/navBar.vue";
+import FooterSection from "./components/shared/footerSection.vue";
 
 export default {
-  name: 'app',
+  name: "app",
   components: {
     SearchTab,
     NavBar,
-    FooterSection,
+    FooterSection
   },
   // created() {
   //   this.$http.interceptors.response.use(undefined, (err) => {
@@ -37,8 +38,8 @@ export default {
   methods: {
     routerGoTo(goTo) {
       this.$router.push(goTo);
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -55,9 +56,10 @@ a:hover {
   -moz-osx-font-smoothing: grayscale;
   text-align: center;
   color: #2c3e50;
-  margin-top: 60px;
 }
-
+.pushDown {
+  height: 70px;
+}
 .cursor-pointer {
   cursor: pointer;
 }

src/components/shared/basePagination.vue

@@ -11,7 +11,7 @@
         <li class="page-item" v-for="item in paginationItems" :key="item">
           <BasePaginationItem
             :pageNumber="item"
-            :disable="item === currentPage"
+            :isCurrentPage="item === currentPage"
             @loadPage="onLoadPage"
           />
         </li>

src/components/shared/basePaginationItem.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <div v-if="disable">
+  <div :class="isCurrentPage ? 'page-item active' : 'page-item'">
+    <div v-if="isCurrentPage">
       <span class="page-link disabled">{{pageNumber}}</span>
     </div>
     <div v-else @click="onClick">
@@ -15,7 +15,7 @@ export default {
       type: Number,
       required: true,
     },
-    disable: undefined,
+    isCurrentPage: undefined,
   },
   methods: {
     onClick() {
@@ -25,8 +25,7 @@ export default {
 };
 </script>
 <style scoped>
-.disabled {
+.isCurrentPage {
   cursor: arrow;
-  background-color: lightgray;
 }
 </style>

src/components/shared/checkItem.vue

@@ -0,0 +1,25 @@
+<template>
+  <div class="row p-2" @click="checkItem">
+    <div class="custom-control custom-checkbox">
+      <input type="checkbox" class="custom-control-input" :checked="checked" />
+      <label class="custom-control-label">{{title}}</label>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ['title'],
+  data() {
+    return {
+      checked: true,
+    };
+  },
+  methods: {
+    checkItem() {
+      this.checked = !this.checked;
+      this.$emit('checkItem', this.title, this.checked);
+    },
+  },
+};
+</script>

src/components/shared/lightBoxGallery.vue

@@ -45,29 +45,29 @@ export default {
     return {
       bg: false,
       currentImage: 0,
-      count: true,
+      count: true
     };
   },
   props: {
     thumbnails: {
       type: Array,
-      default: () => [],
+      default: () => []
     },
     largeImages: {
       type: Array,
-      default: () => [],
+      default: () => []
     },
     captions: {
       type: Array,
-      default: () => [],
+      default: () => []
     },
     thumbnailsPath: {
       type: String,
-      default: '',
+      default: ""
     },
     largePath: {
       type: String,
-      default: '',
+      default: ""
     },
     caption: true
   },
@@ -91,8 +91,8 @@ export default {
       } else {
         this.currentImage = this.largeImages.length - 1;
       }
-    },
-  },
+    }
+  }
 };
 </script>
 

src/components/shared/listView.vue

@@ -3,53 +3,47 @@
 <template>
   <div>
     <div class="container">
-      <div class="row">
-        <div class="col-md-12">
-          <input
-            v-model="searchItem"
-            class="form-control"
-            placeholder="Filter users by name or age"
-          />
-          <table id="table" class="table table-bordered table-hover">
-            <thead>
-              <tr class="dnd-moved">
-                <th v-for="(column, c) in Columns" :key="c">
-                  <div @click="sortBy(column)">{{ column }}</div>
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr v-for="(item, i) in DisplayItems" :key="i" class="text-left dnd-moved">
-                <td v-for="(column, c) in Columns" :key="c">{{ item[column] }}</td>
-              </tr>
-            </tbody>
-          </table>
-          <div class="d-flex justify-content-between">
-            <div class="p-1">{{ currentPage + ' / ' + PageCount }}</div>
-            <div class="p-1">
-              <BasePagination
-                :currentPage="currentPage"
-                :pageCount="PageCount"
-                @nextPage="pageChangeHandle('next')"
-                @previousPage="pageChangeHandle('previous')"
-                @loadPage="pageChangeHandle"
-              />
-            </div>
-            <div class="p-2">
-              <div class="d-flex flex-row">
-                <div>
-                  <select
-                    class="form-control"
-                    id="agent"
-                    name="agent"
-                    v-model="visibleItemsPerPageCount"
-                    @change="onChangeItemsPerPage()"
-                  >
-                    <option v-for="(item, i) in itemsPerPageList" :key="i">{{ item }}</option>
-                  </select>
-                </div>
-              </div>
-            </div>
+      <div class="d-flex justify-content-between">
+        <div class="p-2">
+          <input v-model="searchItem" class="form-control" placeholder="Search ..." />
+        </div>
+      </div>
+    </div>
+    <table id="table" class="table table-bordered table-hover">
+      <thead>
+        <tr class="dnd-moved">
+          <th v-for="(column, c) in Columns" :key="c">
+            <div @click="sortBy(column)">{{ column }}</div>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr v-for="(item, i) in DisplayItems" :key="i" class="text-left dnd-moved">
+          <td v-for="(column, c) in Columns" :key="c">{{ item[column] }}</td>
+        </tr>
+      </tbody>
+    </table>
+    <div class="d-flex justify-content-between">
+      <div class="p-1">{{ currentPage + ' / ' + PageCount }}</div>
+      <div class="p-1">
+        <BasePagination
+          :currentPage="currentPage"
+          :pageCount="PageCount"
+          @nextPage="pageChangeHandle('next')"
+          @previousPage="pageChangeHandle('previous')"
+          @loadPage="pageChangeHandle"
+        />
+      </div>
+      <div class="p-2">
+        <div class="d-flex flex-row">
+          <div>
+            <select
+              class="form-control"
+              v-model="visibleItemsPerPageCount"
+              @change="onChangeItemsPerPage()"
+            >
+              <option v-for="(item, i) in itemsPerPageList" :key="i">{{ item }}</option>
+            </select>
           </div>
         </div>
       </div>
@@ -58,13 +52,13 @@
 </template>
 
 <script>
-import _ from "lodash";
-import ItemsPerPageList from "../../assets/staticData/itemsPerPage";
-import BasePagination from "../shared/basePagination.vue";
+import _ from 'lodash';
+import ItemsPerPageList from '../../assets/staticData/itemsPerPage';
+import BasePagination from './basePagination.vue';
 
 export default {
   components: {
-    BasePagination
+    BasePagination,
   },
   mounted() {
     try {
@@ -78,19 +72,33 @@ export default {
     }
   },
   props: {
-    items: undefined
+    items: undefined,
   },
   data() {
     return {
-      sortKey: "",
+      showControl: false,
+      sortKey: '',
       reverse: false,
-      searchItem: "",
+      searchItem: '',
       itemsPerPageList: ItemsPerPageList,
       visibleItemsPerPageCount: 0,
-      currentPage: 1
+      currentPage: 1,
     };
   },
   methods: {
+    changeColumn(title, checked) {
+      if (checked) {
+        this.myColumns.push(title);
+      } else {
+        const ind = this.myColumns.indexOf(title);
+        if (ind > -1) {
+          this.myColumns.splice(ind, 1);
+        }
+      }
+    },
+    onControlVisibilityChange() {
+      this.showControl = !this.showControl;
+    },
     sortBy(sortKey) {
       this.reverse = this.sortKey === sortKey ? !this.reverse : false;
       this.sortKey = sortKey;
@@ -98,10 +106,10 @@ export default {
     async pageChangeHandle(value) {
       console.log(value);
       switch (value) {
-        case "next":
+        case 'next':
           this.currentPage += 1;
           break;
-        case "previous":
+        case 'previous':
           this.currentPage -= 1;
           break;
         default:
@@ -112,11 +120,17 @@ export default {
       if (this.currentPage !== 1) {
         this.currentPage = 1;
       }
-    }
+    },
   },
   computed: {
+    ListWidth() {
+      if (this.showControl) {
+        return 'col-md-9';
+      }
+      return 'col-md-12';
+    },
     SortDirection() {
-      return this.reverse ? "desc" : "asc";
+      return this.reverse ? 'desc' : 'asc';
     },
     PageCount() {
       return this.visibleItemsPerPageCount !== 0
@@ -130,8 +144,8 @@ export default {
           const item = this.items[i];
           for (const o in Object.keys(item)) {
             if (
-              !list.includes(Object.keys(item)[o]) &&
-              !Array.isArray(Object.values(item)[o])
+              !list.includes(Object.keys(item)[o])
+              && !Array.isArray(Object.values(item)[o])
             ) {
               list.push(Object.keys(item)[o]);
             }
@@ -141,14 +155,11 @@ export default {
       return list;
     },
     FilteredItems() {
-      const list = _.filter(this.items, item =>
-        Object.values(item).some(
-          i =>
-            JSON.stringify(i)
+      const list = _.filter(this.items, item => Object.values(item).some(
+          i => JSON.stringify(i)
               .toLowerCase()
-              .indexOf(this.searchItem) > -1
-        )
-      );
+              .indexOf(this.searchItem) > -1,
+        ),);
       return _.orderBy(list, this.sortKey, this.SortDirection);
     },
     DisplayItems() {
@@ -159,8 +170,8 @@ export default {
         endSlice = list.length;
       }
       return list.slice(startSlice, endSlice);
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

src/components/shared/listViewControl.vue

@@ -0,0 +1,24 @@
+<template>
+  <div>
+    <div v-for="item in items" :key="item">
+      <CheckItem :title="item" @checkItem="changeColumn" />
+    </div>
+  </div>
+</template>
+<script>
+import CheckItem from './checkItem.vue';
+
+export default {
+  components: {
+    CheckItem,
+  },
+  props: {
+    items: undefined,
+  },
+  methods: {
+    changeColumn(title, checked) {
+      this.$emit('changeColumn', title, checked);
+    },
+  },
+};
+</script>

src/components/shared/navBar.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- eslint-disable max-len -->
-  <nav class="navbar navbar-default navbar-trans navbar-expand-lg fixed-top">
+
+  <nav class="navbar navbar-light bg-light navbar-expand-lg fixed-top" style="font-size:18px;">
     <div class="container-fluid">
       <div class="col-md-2">
         <button
@@ -43,7 +44,7 @@
             <!-- <li class="nav-item">
             <a class="nav-link active" @click="routerGoTo('/')">Home</a>
             </li>-->
-            <li class="nav-item dropdown">
+            <li class="nav-item dropdowsn">
               <a
                 class="nav-link dropdown-toggle"
                 href="#"
@@ -227,7 +228,7 @@
 </template>
 
 <script>
-import { mapGetters, mapActions } from "vuex";
+import { mapGetters, mapActions } from 'vuex';
 
 export default {
   data() {
@@ -235,23 +236,23 @@ export default {
   },
   computed: {
     showLogout() {
-      return this.$store.state.authentication.status === "success";
+      return this.$store.state.authentication.status === 'success';
     },
     hideLogin() {
-      return this.$store.state.authentication.status !== "success";
+      return this.$store.state.authentication.status !== 'success';
     },
     Logout() {
       return this.$store.state.authentication.methods.logout;
-    }
+    },
   },
 
   methods: {
-    ...mapGetters("authentication", ["isLoggedIn"]),
-    ...mapActions("authentication", ["logout"]),
+    ...mapGetters('authentication', ['isLoggedIn']),
+    ...mapActions('authentication', ['logout']),
 
     routerGoTo(goTo) {
-      this.$emit("routerGoTo", goTo);
-    }
-  }
+      this.$emit('routerGoTo', goTo);
+    },
+  },
 };
 </script>

src/components/timeshare/sell/sellPage.vue

@@ -26,27 +26,21 @@
           <hr />
           <div class="form-group row">
             <div class="col-md-4">
-              <label>Were you referred by an agent?</label>
-              <br />
-              <div class="form-check form-check-inline">
-                <input
-                  class="form-check-input radiogroup"
-                  type="radio"
-                  value="true"
-                  :checked="refAgent"
-                  @change="changeRef"
-                />
-                <label class="form-check-label" for="referedBy">Yes</label>
-              </div>
-              <div class="form-check form-check-inline">
-                <input
-                  class="form-check-input radiogroup"
-                  type="radio"
-                  value="false"
-                  :checked="!refAgent"
-                  @change="changeRef"
-                />
-                <label class="form-check-label" for="referedBy">No</label>
+              <div class="form-group">
+                <label>Were you referred by an agent?</label>
+                <div class="custom-control custom-switch">
+                  <input
+                    type="checkbox"
+                    class="custom-control-input"
+                    id="customSwitch1"
+                    :checked="refAgent"
+                    @change="changeRef"
+                  />
+                  <label
+                    class="custom-control-label"
+                    for="customSwitch1"
+                  >{{refAgent ? 'Yes' : 'No'}}</label>
+                </div>
               </div>
             </div>
             <div class="col-md-4" v-if="refAgent">
@@ -539,34 +533,34 @@
   </div>
 </template>
 <script>
-import { mapState, mapActions } from 'vuex';
-import DetailIndividual from '../../user/timeshareIndividual.vue';
-import BankDetails from '../../shared/bankAccount.vue';
-import Address from '../../misc/address.vue';
+import { mapState, mapActions } from "vuex";
+import DetailIndividual from "../../user/timeshareIndividual.vue";
+import BankDetails from "../../shared/bankAccount.vue";
+import Address from "../../misc/address.vue";
 
 export default {
-  name: 'TimeshareToSell',
+  name: "TimeshareToSell",
   components: { DetailIndividual, BankDetails, Address },
   created() {
     this.initTimeshare();
   },
   computed: {
-    ...mapState('timeshare', [
-      'resorts',
-      'regions',
-      'detailedRegion',
-      'seasons',
-      'result',
-      'resortBedrooms',
-      'maxSleep',
-      'bankedEntities',
-      'sellItem',
-      'agencies',
-      'agents',
+    ...mapState("timeshare", [
+      "resorts",
+      "regions",
+      "detailedRegion",
+      "seasons",
+      "result",
+      "resortBedrooms",
+      "maxSleep",
+      "bankedEntities",
+      "sellItem",
+      "agencies",
+      "agents"
     ]),
     refAgent() {
       return this.sellItem && this.sellItem.referedByAgent;
-    },
+    }
   },
   methods: {
     submitSale() {
@@ -593,10 +587,10 @@ export default {
     resortChange() {
       this.onResortChange({
         resortName: this.sellItem.resort.resortName,
-        resortCode: this.sellItem.resort.resortCode,
+        resortCode: this.sellItem.resort.resortCode
       });
 
-      if (this.sellItem && this.sellItem.resort === 'Other') {
+      if (this.sellItem && this.sellItem.resort === "Other") {
         this.sellItem.otherResortName = undefined;
         this.sellItem.otherResort = true;
       } else {
@@ -609,8 +603,8 @@ export default {
         ? this.sellItem.region.id
         : 1;
     },
-    ...mapActions('timeshare', ['initTimeshare', 'onResortChange', 'saveWeek']),
-  },
+    ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek"])
+  }
 };
 </script>
 <style>