瀏覽代碼

Property Ref

master
30117125 4 年之前
父節點
當前提交
b2b6730a74

+ 1
- 1
src/App.vue 查看文件

7
     <SearchTab v-if="!isLandingPage" />
7
     <SearchTab v-if="!isLandingPage" />
8
     <NavBar v-if="!isLandingPage" @routerGoTo="routerGoTo" />
8
     <NavBar v-if="!isLandingPage" @routerGoTo="routerGoTo" />
9
     <div v-if="!isLandingPage"></div>
9
     <div v-if="!isLandingPage"></div>
10
-    <router-view @setLandingPage="setLandingPage" />
10
+    <router-view @setLandingPage="setLandingPage" style="margin-top:190px" />
11
     <FooterSection v-if="!isLandingPage" />
11
     <FooterSection v-if="!isLandingPage" />
12
   </div>
12
   </div>
13
 </template>
13
 </template>

+ 7
- 4
src/components/home/carouselSection.vue 查看文件

267
 /* Extra small devices (phones, 600px and down) */
267
 /* Extra small devices (phones, 600px and down) */
268
 @media only screen and (max-width: 600px) {
268
 @media only screen and (max-width: 600px) {
269
   .introContentAdjust {
269
   .introContentAdjust {
270
-    margin-top: -35px !important;
270
+    margin-top: 140px !important;
271
   }
271
   }
272
 }
272
 }
273
 
273
 
274
 /* Small devices (portrait tablets and large phones, 600px and up) */
274
 /* Small devices (portrait tablets and large phones, 600px and up) */
275
 @media only screen and (min-width: 600px) {
275
 @media only screen and (min-width: 600px) {
276
   .introContentAdjust {
276
   .introContentAdjust {
277
-    margin-top: -15px !important;
277
+    margin-top: 150px !important;
278
   }
278
   }
279
 }
279
 }
280
 
280
 
281
 /* Medium devices (landscape tablets, 768px and up) */
281
 /* Medium devices (landscape tablets, 768px and up) */
282
 @media only screen and (min-width: 768px) {
282
 @media only screen and (min-width: 768px) {
283
+  .introContentAdjust {
284
+    margin-top: 160px !important;
285
+  }
283
 }
286
 }
284
 
287
 
285
 /* Large devices (laptops/desktops, 992px and up) */
288
 /* Large devices (laptops/desktops, 992px and up) */
286
 @media only screen and (min-width: 992px) {
289
 @media only screen and (min-width: 992px) {
287
   .introContentAdjust {
290
   .introContentAdjust {
288
-    margin-top: 25px !important;
291
+    margin-top: 160px !important;
289
   }
292
   }
290
 }
293
 }
291
 
294
 
292
 /* Extra large devices (large laptops and desktops, 1200px and up) */
295
 /* Extra large devices (large laptops and desktops, 1200px and up) */
293
 @media only screen and (min-width: 1200px) {
296
 @media only screen and (min-width: 1200px) {
294
   .introContentAdjust {
297
   .introContentAdjust {
295
-    margin-top: 0px !important;
298
+    margin-top: 120px !important;
296
   }
299
   }
297
 }
300
 }
298
 </style>
301
 </style>

+ 15
- 3
src/components/property/commercial/createProperty/commercialCreate.vue 查看文件

1
 <template>
1
 <template>
2
   <div>
2
   <div>
3
     <carouselSection :salesType="salesType" />
3
     <carouselSection :salesType="salesType" />
4
-
5
     <main id="main" style="margin-top:-20px">
4
     <main id="main" style="margin-top:-20px">
6
       <div class="container pt-5 pb-5">
5
       <div class="container pt-5 pb-5">
7
         <div class="row">
6
         <div class="row">
8
-          <div class="col-md-5">
7
+          <div class="col-md-6">
9
             <div v-if="!property.propertyName">
8
             <div v-if="!property.propertyName">
10
               <label for="propertyName" class="uniSelectLabel">PROPERTY NAME</label>
9
               <label for="propertyName" class="uniSelectLabel">PROPERTY NAME</label>
11
             </div>
10
             </div>
16
               v-model="property.propertyName"
15
               v-model="property.propertyName"
17
             />
16
             />
18
           </div>
17
           </div>
19
-          <div class="col-md-5">
18
+          <div class="col-md-6">
19
+            <div v-if="!property.propertyRef">
20
+              <label for="propertyName" class="uniSelectLabel">PROPERTY REFERENCE</label>
21
+            </div>
22
+            <input
23
+              class="form-control uniInput"
24
+              type="text"
25
+              name="propertyRef"
26
+              v-model="property.propertyRef"
27
+            />
28
+          </div>
29
+        </div>
30
+        <div class="row my-5">
31
+          <div class="col-md-6">
20
             <select
32
             <select
21
               class="form-control uniSelect"
33
               class="form-control uniSelect"
22
               name="propertyType"
34
               name="propertyType"

+ 15
- 2
src/components/property/residential/createProperty/residentialCreate.vue 查看文件

5
     <main id="main" style="margin-top:-20px">
5
     <main id="main" style="margin-top:-20px">
6
       <div class="container pt-5 pb-5">
6
       <div class="container pt-5 pb-5">
7
         <div class="row">
7
         <div class="row">
8
-          <div class="col-md-5">
8
+          <div class="col-md-6">
9
             <div v-if="!property.propertyName">
9
             <div v-if="!property.propertyName">
10
               <label for="propertyName" class="uniSelectLabel">PROPERTY NAME</label>
10
               <label for="propertyName" class="uniSelectLabel">PROPERTY NAME</label>
11
             </div>
11
             </div>
16
               v-model="property.propertyName"
16
               v-model="property.propertyName"
17
             />
17
             />
18
           </div>
18
           </div>
19
-          <div class="col-md-5">
19
+          <div class="col-md-6">
20
+            <div v-if="!property.propertyRef">
21
+              <label for="propertyName" class="uniSelectLabel">PROPERTY REFERENCE</label>
22
+            </div>
23
+            <input
24
+              class="form-control uniInput"
25
+              type="text"
26
+              name="propertyRef"
27
+              v-model="property.propertyRef"
28
+            />
29
+          </div>
30
+        </div>
31
+        <div class="row my-5">
32
+          <div class="col-md-6">
20
             <select
33
             <select
21
               class="form-control uniSelect"
34
               class="form-control uniSelect"
22
               name="propertyType"
35
               name="propertyType"

+ 6
- 1
src/components/propertyManagement/rentalManagement/contentSection.vue 查看文件

19
       <div class="row">
19
       <div class="row">
20
         <div class="col-md-6"></div>
20
         <div class="col-md-6"></div>
21
         <div class="col-md-6">
21
         <div class="col-md-6">
22
-          <h4>Contact us for a quote</h4>
22
+          <h4
23
+            style="cursor:pointer"
24
+            @click="$vuetify.goTo('#contactFoot', { duration: 2000, easing: 'easeInOutCubic' })"
25
+          >
26
+            Contact us for a quote
27
+          </h4>
23
         </div>
28
         </div>
24
       </div>
29
       </div>
25
 
30
 

+ 6
- 1
src/components/propertyManagement/sectionalTitle/ourServicesSection.vue 查看文件

18
       <div class="row mt-2">
18
       <div class="row mt-2">
19
         <div class="col-md-6"></div>
19
         <div class="col-md-6"></div>
20
         <div class="col-md-6">
20
         <div class="col-md-6">
21
-          <h4>Contact us for a quote</h4>
21
+          <h4
22
+            style="cursor:pointer"
23
+            @click="$vuetify.goTo('#contactFoot', { duration: 2000, easing: 'easeInOutCubic' })"
24
+          >
25
+            Contact us for a quote
26
+          </h4>
22
         </div>
27
         </div>
23
       </div>
28
       </div>
24
       <div class="row">
29
       <div class="row">

+ 11
- 5
src/components/shared/footerSection.vue 查看文件

18
               <a href="commercial.php">Rent Commercial Property</a><br />
18
               <a href="commercial.php">Rent Commercial Property</a><br />
19
               <a href="residential.php">Buy Residential Property</a><br />
19
               <a href="residential.php">Buy Residential Property</a><br />
20
               <a href="residential.php">Rent Residential Property</a><br /> -->
20
               <a href="residential.php">Rent Residential Property</a><br /> -->
21
-              <router-link class="footerText" v-if="isLoggedIn" to="/properties"
21
+              <router-link v-if="isLoggedIn" class="footerText" to="/properties"
22
                 >Property Management</router-link
22
                 >Property Management</router-link
23
-              ><br />
23
+              ><br v-if="isLoggedIn" />
24
+              <router-link to="/property/residential">Residential Property</router-link><br />
25
+              <router-link to="/property/commercial">Commercial Property</router-link><br />
24
               <router-link class="footerText" to="/privacyPolicy">Privacy Policy</router-link><br />
26
               <router-link class="footerText" to="/privacyPolicy">Privacy Policy</router-link><br />
25
               <router-link class="footerText" to="/websiteDisclaimer"
27
               <router-link class="footerText" to="/websiteDisclaimer"
26
                 >Website Disclaimer</router-link
28
                 >Website Disclaimer</router-link
27
               ><br />
29
               ><br />
28
             </p>
30
             </p>
29
           </div>
31
           </div>
30
-          <div class="col-lg-9 section-header">
32
+          <div class="col-lg-9 section-header" id="contactFoot">
31
             <h2 align="left">Contact Us</h2>
33
             <h2 align="left">Contact Us</h2>
32
             <div class="row">
34
             <div class="row">
33
               <div class="col-md-4">
35
               <div class="col-md-4">
88
           <div class="col-md-12">
90
           <div class="col-md-12">
89
             <div class="copyright-footer">
91
             <div class="copyright-footer">
90
               <p class="copyright color-text-a">
92
               <p class="copyright color-text-a">
91
-                &copy; Copyright
93
+                Copyright © {{ currentYear }} Copyright
92
                 <span class="color-a">
94
                 <span class="color-a">
93
-                  <b>Univate Properties</b>
95
+                  <b>Uni-Vate Properties.</b>
94
                 </span>
96
                 </span>
95
                 All Rights Reserved.
97
                 All Rights Reserved.
96
               </p>
98
               </p>
138
     // eslint-disable-next-line vue/return-in-computed-property
140
     // eslint-disable-next-line vue/return-in-computed-property
139
     Logout() {
141
     Logout() {
140
       return this.logout();
142
       return this.logout();
143
+    },
144
+    currentYear() {
145
+      var d = new Date();
146
+      return d.getFullYear();
141
     }
147
     }
142
   }
148
   }
143
 };
149
 };

+ 50
- 41
src/components/shared/navBar.vue 查看文件

4
       <i class="fa fa-bars"></i>
4
       <i class="fa fa-bars"></i>
5
     </button> -->
5
     </button> -->
6
     <div>
6
     <div>
7
-      <header
8
-        id="header"
9
-        style="width: 100%; position: fixed; top:0px; z-index: 50;min-height:120px"
10
-      >
7
+      <header id="header" style="width: 100%; position: fixed; top:0px; z-index: 50;">
11
         <div class="container">
8
         <div class="container">
12
           <div class="row">
9
           <div class="row">
13
             <div id="logo" class="col-md-3 col-xs-4 pull-left">
10
             <div id="logo" class="col-md-3 col-xs-4 pull-left">
43
               </div>
40
               </div>
44
               <nav id="nav-menu-container">
41
               <nav id="nav-menu-container">
45
                 <ul class="nav-menu sf-js-enabled sf-arrows">
42
                 <ul class="nav-menu sf-js-enabled sf-arrows">
46
-                  <li class="menu-has-children">
47
-                    <div
48
-                      @mouseover="timeShareClass = 'ts-display'"
49
-                      @mouseleave="timeShareClass = 'no-display'"
50
-                    ></div>
51
-                    <a href="#" class="sf-with-ul">
52
-                      Timeshare
53
-                    </a>
54
-                    <ul style="margin-top:-10px;text-align:left" :class="timeShareClass">
55
-                      <li>
56
-                        <router-link to="/timeshare/buy">To Buy</router-link>
57
-                      </li>
58
-                      <li>
59
-                        <router-link to="/timeshare/sell">To Sell</router-link>
60
-                      </li>
61
-                      <li>
62
-                        <router-link to="/timeshare/faq">FAQ</router-link>
63
-                      </li>
64
-                      <li v-if="isLoggedIn">
65
-                        <hr />
66
-                        <router-link to="/timeshare/myWeeks">My Timeshare Weeks</router-link>
67
-                      </li>
68
-                    </ul>
69
-                  </li>
70
-                  <li class="menu-has-children">
43
+                  <li class="menu-has-children" style="margin-left:-20px">
71
                     <div
44
                     <div
72
                       @mouseover="commercialClass = 'ts-display'"
45
                       @mouseover="commercialClass = 'ts-display'"
73
                       @mouseleave="commercialClass = 'no-display'"
46
                       @mouseleave="commercialClass = 'no-display'"
88
                       </li>
61
                       </li>
89
                     </ul>
62
                     </ul>
90
                   </li>
63
                   </li>
91
-                  <li class="menu-has-children">
64
+                  <li class="menu-has-children mx-1">
92
                     <div
65
                     <div
93
                       @mouseover="residentialClass = 'ts-display'"
66
                       @mouseover="residentialClass = 'ts-display'"
94
                       @mouseleave="residentialClass = 'no-display'"
67
                       @mouseleave="residentialClass = 'no-display'"
109
                       </li>
82
                       </li>
110
                     </ul>
83
                     </ul>
111
                   </li>
84
                   </li>
85
+                  <li class="menu-has-children mx-1">
86
+                    <div
87
+                      @mouseover="timeShareClass = 'ts-display'"
88
+                      @mouseleave="timeShareClass = 'no-display'"
89
+                    ></div>
90
+                    <a href="#" class="sf-with-ul">
91
+                      Timeshare
92
+                    </a>
93
+                    <ul style="margin-top:-10px;text-align:left" :class="timeShareClass">
94
+                      <li>
95
+                        <router-link to="/timeshare/buy">To Buy</router-link>
96
+                      </li>
97
+                      <li>
98
+                        <router-link to="/timeshare/sell">To Sell</router-link>
99
+                      </li>
100
+                      <li>
101
+                        <router-link to="/timeshare/faq">FAQ</router-link>
102
+                      </li>
103
+                      <li v-if="isLoggedIn">
104
+                        <hr />
105
+                        <router-link to="/timeshare/myWeeks">My Timeshare Weeks</router-link>
106
+                      </li>
107
+                    </ul>
108
+                  </li>
112
                   <!-- <li class="menu-has-children">
109
                   <!-- <li class="menu-has-children">
113
                     <div
110
                     <div
114
                       @mouseover="propertiesClass = 'ts-display'"
111
                       @mouseover="propertiesClass = 'ts-display'"
133
                       </li>
130
                       </li>
134
                     </ul>
131
                     </ul>
135
                   </li> -->
132
                   </li> -->
136
-                  <li class="menu-has-children">
133
+                  <li class="menu-has-children mx-1">
137
                     <div
134
                     <div
138
                       @mouseover="propManClass = 'ts-display'"
135
                       @mouseover="propManClass = 'ts-display'"
139
                       @mouseleave="propManClass = 'no-display'"
136
                       @mouseleave="propManClass = 'no-display'"
154
                       </li>
151
                       </li>
155
                     </ul>
152
                     </ul>
156
                   </li>
153
                   </li>
157
-                  <li class="menu-has-children">
154
+                  <li class="menu-has-children mx-1">
158
                     <div
155
                     <div
159
                       @mouseover="aboutClass = 'ts-display'"
156
                       @mouseover="aboutClass = 'ts-display'"
160
                       @mouseleave="aboutClass = 'no-display'"
157
                       @mouseleave="aboutClass = 'no-display'"
171
                       </li>
168
                       </li>
172
                     </ul>
169
                     </ul>
173
                   </li>
170
                   </li>
174
-                  <li>
171
+                  <li class="mx-1">
175
                     <router-link to="/share/contact">Contact Us</router-link>
172
                     <router-link to="/share/contact">Contact Us</router-link>
176
                   </li>
173
                   </li>
177
-                  <li v-if="isLoggedIn" class="menu-has-children">
174
+                  <li v-if="isLoggedIn" class="menu-has-children mx-1">
178
                     <div
175
                     <div
179
                       @mouseover="userClass = 'ts-display'"
176
                       @mouseover="userClass = 'ts-display'"
180
                       @mouseleave="userClass = 'no-display'"
177
                       @mouseleave="userClass = 'no-display'"
237
                         <router-link to="/landingPages">Landing Pages / Campaignes</router-link>
234
                         <router-link to="/landingPages">Landing Pages / Campaignes</router-link>
238
                       </li>
235
                       </li>
239
                       <li>
236
                       <li>
240
-                        <a class="btn-white-border p-2" @click="logout(routerGoTo('/user/login'))"
241
-                          >Logout</a
237
+                        <router-link class="btn-white-border p-2" to="/user/login"
238
+                          >Logout</router-link
242
                         >
239
                         >
243
                       </li>
240
                       </li>
244
                     </ul>
241
                     </ul>
245
                   </li>
242
                   </li>
243
+
246
                   <li v-if="!isLoggedIn">
244
                   <li v-if="!isLoggedIn">
247
-                    <router-link class="btn-white-border p-2" to="/user/login">Login</router-link>
245
+                    <router-link class="btn-white-border p-2 ml-1 mr-1" to="/user/login"
246
+                      >Login</router-link
247
+                    >
248
                   </li>
248
                   </li>
249
 
249
 
250
                   <li v-if="!isLoggedIn" class="menu-has-children">
250
                   <li v-if="!isLoggedIn" class="menu-has-children">
252
                       @mouseover="registerClass = 'ts-display'"
252
                       @mouseover="registerClass = 'ts-display'"
253
                       @mouseleave="registerClass = 'no-display'"
253
                       @mouseleave="registerClass = 'no-display'"
254
                     ></div>
254
                     ></div>
255
-                    <a href="#" class="sf-with-ul btn-solid-blue pt-2 pb-1" style="height:39px">
255
+                    <a href="#" class="sf-with-ul btn-solid-blue pt-2 pb-1" style="height:39px;">
256
                       Register
256
                       Register
257
                     </a>
257
                     </a>
258
-                    <ul style="margin-top:-10px;text-align:left" :class="registerClass">
258
+                    <ul style="margin-top:-10px;" :class="registerClass">
259
                       <li>
259
                       <li>
260
                         <router-link to="/user/register">Register</router-link>
260
                         <router-link to="/user/register">Register</router-link>
261
                       </li>
261
                       </li>
345
     },
345
     },
346
     // eslint-disable-next-line vue/return-in-computed-property
346
     // eslint-disable-next-line vue/return-in-computed-property
347
     Logout() {
347
     Logout() {
348
-      return this.logout();
348
+      this.logout().then(res => {
349
+        console.log("something");
350
+      });
351
+      //return this.logout();
349
     }
352
     }
350
   }
353
   }
351
 };
354
 };
393
 /* Medium devices (landscape tablets, 768px and up) */
396
 /* Medium devices (landscape tablets, 768px and up) */
394
 @media only screen and (min-width: 768px) {
397
 @media only screen and (min-width: 768px) {
395
   #header {
398
   #header {
396
-    min-height: 120px;
399
+    height: 170px;
397
   }
400
   }
398
 }
401
 }
399
 
402
 
400
 /* Large devices (laptops/desktops, 992px and up) */
403
 /* Large devices (laptops/desktops, 992px and up) */
401
 @media only screen and (min-width: 992px) {
404
 @media only screen and (min-width: 992px) {
405
+  #header {
406
+    height: 165px;
407
+  }
402
 }
408
 }
403
 
409
 
404
 /* Extra large devices (large laptops and desktops, 1200px and up) */
410
 /* Extra large devices (large laptops and desktops, 1200px and up) */
405
 @media only screen and (min-width: 1200px) {
411
 @media only screen and (min-width: 1200px) {
412
+  #header {
413
+    height: 120px;
414
+  }
406
 }
415
 }
407
 </style>
416
 </style>

+ 0
- 23
src/components/shared/navBarNew.vue 查看文件

1
-<template>
2
-  <div id="header-sticky-wrapper" class="sticky-wrapper is-sticky" style="min-height: 120px;">
3
-    <div class="container">
4
-      <div class="row">
5
-        <div id="logo" class="col-md-3 col-xs-4 pull-left">
6
-          <a href="/">
7
-            <img
8
-              class="img-fluid"
9
-              src="/img/logos/UVProp.png"
10
-              alt="UVProp logo"
11
-              style="height:100px;"
12
-          /></a>
13
-        </div>
14
-      </div>
15
-    </div>
16
-  </div>
17
-</template>
18
-
19
-<script>
20
-export default {};
21
-</script>
22
-
23
-<style lang="scss" scoped></style>

+ 11
- 1
src/components/user/loginPage.vue 查看文件

79
 /* eslint-disable */
79
 /* eslint-disable */
80
 import { mapActions, mapState } from "vuex";
80
 import { mapActions, mapState } from "vuex";
81
 import alert from "../shared/alert.vue";
81
 import alert from "../shared/alert.vue";
82
+import Log from "../../assets/Log";
82
 import carousel from "vue-owl-carousel";
83
 import carousel from "vue-owl-carousel";
83
 export default {
84
 export default {
84
   name: "Login",
85
   name: "Login",
105
   computed: {
106
   computed: {
106
     ...mapState("authentication", ["token", "status"])
107
     ...mapState("authentication", ["token", "status"])
107
   },
108
   },
109
+  mounted() {
110
+    this.checkUserStatus();
111
+  },
108
   methods: {
112
   methods: {
109
-    ...mapActions("authentication", ["login", "init"]),
113
+    ...mapActions("authentication", ["login", "init", "logout"]),
110
     ToggleTrouble() {
114
     ToggleTrouble() {
111
       if (this.troubleToggle) {
115
       if (this.troubleToggle) {
112
         this.troubleToggle = false;
116
         this.troubleToggle = false;
121
           this.error = true;
125
           this.error = true;
122
         });
126
         });
123
     },
127
     },
128
+    checkUserStatus() {
129
+      if (Log.isLoggedIn()) {
130
+        this.logout();
131
+        this.$router.go();
132
+      }
133
+    },
124
     togglePassword() {
134
     togglePassword() {
125
       this.showPassword = true;
135
       this.showPassword = true;
126
       this.isPasswordShown = "text";
136
       this.isPasswordShown = "text";

+ 2
- 0
src/main.js 查看文件

7
 import router from "./router";
7
 import router from "./router";
8
 import store from "./store";
8
 import store from "./store";
9
 import * as VueGoogleMaps from "vue2-google-maps";
9
 import * as VueGoogleMaps from "vue2-google-maps";
10
+import Vuetify from "vuetify";
10
 
11
 
11
 Vue.use(EvaIcons);
12
 Vue.use(EvaIcons);
13
+Vue.use(Vuetify);
12
 Vue.use(VueGoogleMaps, {
14
 Vue.use(VueGoogleMaps, {
13
   load: {
15
   load: {
14
     key: "AIzaSyD8k_Kwml_C8IDfs-gX8JFV8acli3L9cAE",
16
     key: "AIzaSyD8k_Kwml_C8IDfs-gX8JFV8acli3L9cAE",

Loading…
取消
儲存