Search log screens - properties only

package-lock.json

@@ -7793,6 +7793,11 @@
         }
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",

package.json

@@ -17,6 +17,7 @@
     "jquery": "^3.4.1",
     "lodash": "^4.17.15",
     "material-design-icons-iconfont": "^3.0.3",
+    "moment": "^2.24.0",
     "node-sass": "^4.12.0",
     "roboto-fontface": "*",
     "sass-loader": "^7.3.1",

src/components/admin/logs/SearchLogs.vue

@@ -0,0 +1,87 @@
+<template>
+  <!-- eslint-disable max-len -->
+  <div>
+    <div class="container">
+      <!-- <section class="intro-single"> -->
+      <div class="container">
+        <br />
+        <br />
+        <br />
+        <br />
+        <div class="row">
+          <div class="col-md-12 col-lg-8">
+            <div class="title-box-d">
+              <h1 class="title-d" style="text-align:left; font-size: 250%">Search Log</h1>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- </section> -->
+    </div>
+    <div class="container">
+      <table class="table table-bordered">
+        <thead>
+          <tr>
+            <th>Date</th>
+            <th>Time</th>
+            <th>User</th>
+            <th>Keyword</th>
+            <th>Sales Type</th>
+            <th>Property Usage Type</th>
+            <th>Property Type</th>
+            <th>Province</th>
+            <th>City</th>
+            <th>Suburb</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(item, i) in propertySearch" :key="i">
+            <td>{{ formatDate(item.date) }}</td>
+            <td>{{ formatTime(item.date) }}</td>
+            <td v-if="item.user">{{ item.user }}</td>
+            <td v-else>No User</td>
+            <td>{{ item.keyword === 'All' ? '' : item.keyword }}</td>
+            <td>{{ item.salesType === 'All' ? '' : item.salesType }}</td>
+            <td>{{ item.propertyUsageType === 'All' ? '' : item.propertyUsageType }}</td>
+            <td>{{ item.propertyType === 'All' ? '' : item.propertyType }}</td>
+            <td>{{ item.province === 'All' ? '' : item.province }}</td>
+            <td>{{ item.city === 'All' ? '' : item.city }}</td>
+            <td>{{ item.suburb === 'All' ? '' : item.suburb }}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <br />
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions } from 'vuex';
+import moment from 'moment';
+import Vue from 'vue';
+import excel from 'vue-excel-export';
+
+Vue.use(excel);
+
+export default {
+  name: 'searchLog',
+  data() {
+    return {};
+  },
+  methods: {
+    ...mapActions('searchLog', ['getPropertySearchLogs']),
+    formatDate(value) {
+      return moment(String(value)).format('YYYY/MM/DD');
+    },
+    formatTime(value) {
+      return moment(String(value)).format('hh:mm');
+    },
+  },
+  mounted() {
+    this.getPropertySearchLogs();
+  },
+  computed: {
+    ...mapState('searchLog', ['propertySearch']),
+  },
+};
+</script>

src/components/property/propertyList.vue

@@ -49,7 +49,8 @@
             <td v-html="item.size" />
             <td>{{ item.price }}</td>
             <td>{{ item.type }}</td>
-            <td>{{ item.publish }}</td>
+            <!-- <td>{{ item.publish }}</td> -->
+            <td></td>
             <td>{{ item.status }}</td>
             <td>
               <button
@@ -57,10 +58,16 @@
                 @click="Edit(item)"
                 class="btn btn-b-n"
                 style="width: 85px; height:40px;"
+                disabled
               >Edit</button>
             </td>
             <td>
-              <button type="button" class="btn btn-b-n" style="width: 85px; height:40px;">Delete</button>
+              <button
+                type="button"
+                class="btn btn-b-n"
+                style="width: 85px; height:40px;"
+                disabled
+              >Delete</button>
             </td>
           </tr>
         </tbody>

src/components/shared/navBar.vue

@@ -174,6 +174,11 @@
                   class="dropdown-item cursor-pointer"
                   @click="routerGoTo('/propertyTypes/list')"
                 >Property Types</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/searchLog')"
+                >Search Logs</a>
+                <a class="dropdown-item cursor-pointer" @click="routerGoTo('/Offers')">Offers</a>
               </div>
             </li>
             <li class="nav-item dropdown">

src/router/index.js

@@ -40,6 +40,7 @@ import PrivacyPolicy from '../components/misc/privacyPolicyPage.vue';
 
 import MakeOffer from '../components/processFlow/makeOffer.vue';
 import Offer from '../components/processFlow/offers.vue';
+import searchLog from '../components/admin/logs/SearchLogs.vue';
 // import store from '../store';
 
 Vue.use(Router);
@@ -221,5 +222,10 @@ export default new Router({
       name: 'TimeshareSearch',
       component: TimeshareSearch,
     },
+    {
+      path: '/searchLog',
+      name: 'SearchLog',
+      component: searchLog,
+    },
   ],
 });

src/store/index.js

@@ -18,6 +18,7 @@ import WeekList from './modules/timeshare/weekList';
 import Bid from './modules/processFlow/bid';
 import Authentication from './modules/user/authentication';
 import PropertySearch from './modules/property/propertySearch';
+import SearchLog from './modules/logs/searchLog';
 
 Vue.use(Vuex);
 /* eslint no-param-reassign: ["error", { "props": false }] */
@@ -41,5 +42,6 @@ export default new Vuex.Store({
     bid: Bid,
     authentication: Authentication,
     propertySearch: PropertySearch,
+    searchLog: SearchLog,
   },
 });

src/store/modules/logs/searchLog.js

@@ -0,0 +1,24 @@
+// api/searchLog/property
+import axios from 'axios';
+
+export default {
+  namespaced: true,
+  state: {
+    propertySearch: {},
+  },
+  mutations: {
+    updateSearch(state, data) {
+      state.propertySearch = [];
+      state.propertySearch = data;
+    },
+  },
+  getters: {},
+  actions: {
+    getPropertySearchLogs({ commit }) {
+      axios
+        .get('/api/searchLog/property')
+        .then(result => commit('updateSearch', result.data))
+        .catch(console.error);
+    },
+  },
+};

src/store/modules/property/propertyLists.js

@@ -14,7 +14,7 @@ export default {
   actions: {
     getProperties({ commit }, item) {
       axios
-        .get(`/api/property/${item.propertyType}/${item.user}`)
+        .get(`/api/property/${item.propertyType}/All`) // .get(`/api/property/${item.propertyType}/${item.user}`)
         .then(result => commit('setProperties', result.data))
         .catch(console.error);
     },