Provision
/
UnivateProperties
Слідкувати 1
В обрані 0
Форк 0
Код Проблеми 0 Запити на злиття 0 Релізи 0 Вікі Активність
Переглянути джерело

Font Update & Styling On Single View

master
30117125 4 роки тому
джерело
153068cf6b
коміт
7e82815392
26 змінених файлів з 274 додано та 129 видалено
Розділений перегляд Показати статистику Diff
  1. 9
    3
      public/css/newStyle.css
  2. 35
    31
      public/index.html
  3. BIN
      public/webfonts/Muli-Black.woff
  4. BIN
      public/webfonts/Muli-BlackItalic.woff
  5. BIN
      public/webfonts/Muli-Bold.woff
  6. BIN
      public/webfonts/Muli-BoldItalic.woff
  7. BIN
      public/webfonts/Muli-ExtraBold.woff
  8. BIN
      public/webfonts/Muli-ExtraBoldItalic.woff
  9. BIN
      public/webfonts/Muli-ExtraLight.woff
  10. BIN
      public/webfonts/Muli-ExtraLightItalic.woff
  11. BIN
      public/webfonts/Muli-Italic.woff
  12. BIN
      public/webfonts/Muli-Light.woff
  13. BIN
      public/webfonts/Muli-LightItalic.woff
  14. BIN
      public/webfonts/Muli-Regular.woff
  15. BIN
      public/webfonts/Muli-SemiBold.woff
  16. BIN
      public/webfonts/Muli-SemiBoldItalic.woff
  17. 49
    0
      src/components/financial/OrderThankYou.vue
  18. 2
    2
      src/components/financial/paygate/paygateProcess.vue
  19. 48
    26
      src/components/property/commercial/commercialSearchResults.vue
  20. 41
    12
      src/components/property/commercial/singleView/contentSection.vue
  21. 44
    25
      src/components/property/residential/residentialSearchResults.vue
  22. 8
    0
      src/components/property/residential/singleView/contentSection.vue
  23. 16
    22
      src/components/timeshare/resort/unit/carouselSection.vue
  24. 13
    6
      src/components/timeshare/resort/unit/unitPage.vue
  25. 7
    0
      src/router/index.js
  26. 2
    2
      vue.config.js

+ 9
- 3
public/css/newStyle.css Переглянути файл 

@@ -12,7 +12,13 @@
12 12 
   font-style: normal;
13 13 
 }
14 14
15 
-@import url("https://fonts.googleapis.com/css?family=Muli&display=swap");
15 
+@font-face {
16 
+  font-family: "Muli";
17 
+  src: url("../webfonts//Muli-Regular.woff") format("woff");
18 
+  font-weight: 500;
19 
+}
20 
+
21 
+/* @import url("https://fonts.googleapis.com/css?family=Muli&display=swap"); */
16 22
17 23 
 .uniSelect {
18 24 
   border-color: rgb(27, 117, 187);
 
@@ -27,8 +33,8 @@
27 33
28 34 
 .uniSelect option {
29 35 
   color: rgb(118, 118, 118);
30 
-  font-family: "Muli";
31 
-  text-transform: uppercase;
36 
+  font-family: inherit;
37 
+  text-transform: inherit;
32 38 
 }
33 39
34 40 
 .uniSelectLabel {

+ 35
- 31
public/index.html Переглянути файл 

@@ -1,39 +1,43 @@
1 1 
 <!DOCTYPE html>
2 2 
 <html lang="en">
3 3
4 
-<head>
5 
-  <meta charset="utf-8">
6 
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
7 
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
8 
-  <link rel="icon" href="<%= BASE_URL %>favicon.png">
9 
-  <link href="img/univate.PNG" rel="apple-touch-icon">
10 
-  <title>Uni-Vate Properties</title>
4 
+  <head>
5 
+    <meta charset="utf-8">
6 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
7 
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
8 
+    <link rel="icon" href="<%= BASE_URL %>favicon.png">
9 
+    <link href="img/univate.PNG" rel="apple-touch-icon">
10 
+    <title>Uni-Vate Properties</title>
11 11
12 
-  <link href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700" rel="stylesheet">
13 
-  <link href="lib/font-awesome/css/font-awesome.min.css" rel="stylesheet">
14 
-  <link href="lib/animate/animate.min.css" rel="stylesheet">
15 
-  <link href="lib/ionicons/css/ionicons.min.css" rel="stylesheet">
16 
-  <link href="lib/owlcarousel/assets/owl.carousel.min.css" rel="stylesheet">
17 
-  <link href="css/bootstrap.min.css" rel="stylesheet">
18 
-  <link href="css/style.css" rel="stylesheet">
19 
-  <link rel="stylesheet" href="css/dragndrop.table.columns.css" />
20 
-</head>
12 
+    <link
13 
+      href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700"
14 
+      rel="stylesheet">
15 
+    <link href="https://fonts.googleapis.com/css?family=Muli&display=swap"
16 
+      rel="stylesheet">
17 
+    <link href="lib/font-awesome/css/font-awesome.min.css" rel="stylesheet">
18 
+    <link href="lib/animate/animate.min.css" rel="stylesheet">
19 
+    <link href="lib/ionicons/css/ionicons.min.css" rel="stylesheet">
20 
+    <link href="lib/owlcarousel/assets/owl.carousel.min.css" rel="stylesheet">
21 
+    <link href="css/bootstrap.min.css" rel="stylesheet">
22 
+    <link href="css/style.css" rel="stylesheet">
23 
+    <link rel="stylesheet" href="css/dragndrop.table.columns.css" />
24 
+  </head>
21 25
22 
-<body>
23 
-  <noscript>
24 
-    <strong>We're sorry but bootvue doesn't work properly without JavaScript
25 
-      enabled. Please enable it to continue.</strong>
26 
-  </noscript>
27 
-  <div id="app"></div>
28 
-</body>
29 
-<script src="lib/jquery/jquery.min.js"></script>
30 
-<script src="lib/jquery/jquery-migrate.min.js"></script>
31 
-<script src="lib/popper/popper.min.js"></script>
32 
-<script src="lib/bootstrap/js/bootstrap.min.js"></script>
33 
-<script src="lib/easing/easing.min.js"></script>
34 
-<script src="lib/owlcarousel/owl.carousel.min.js"></script>
35 
-<script src="lib/scrollreveal/scrollreveal.min.js"></script>
36 
-<script src="js/main.js"></script>
26 
+  <body>
27 
+    <noscript>
28 
+      <strong>We're sorry but bootvue doesn't work properly without JavaScript
29 
+        enabled. Please enable it to continue.</strong>
30 
+    </noscript>
31 
+    <div id="app"></div>
32 
+  </body>
33 
+  <script src="lib/jquery/jquery.min.js"></script>
34 
+  <script src="lib/jquery/jquery-migrate.min.js"></script>
35 
+  <script src="lib/popper/popper.min.js"></script>
36 
+  <script src="lib/bootstrap/js/bootstrap.min.js"></script>
37 
+  <script src="lib/easing/easing.min.js"></script>
38 
+  <script src="lib/owlcarousel/owl.carousel.min.js"></script>
39 
+  <script src="lib/scrollreveal/scrollreveal.min.js"></script>
40 
+  <script src="js/main.js"></script>
37 41
38 42
39 43 
 </html>

BIN
public/webfonts/Muli-Black.woff Переглянути файл


BIN
public/webfonts/Muli-BlackItalic.woff Переглянути файл


BIN
public/webfonts/Muli-Bold.woff Переглянути файл


BIN
public/webfonts/Muli-BoldItalic.woff Переглянути файл


BIN
public/webfonts/Muli-ExtraBold.woff Переглянути файл


BIN
public/webfonts/Muli-ExtraBoldItalic.woff Переглянути файл


BIN
public/webfonts/Muli-ExtraLight.woff Переглянути файл


BIN
public/webfonts/Muli-ExtraLightItalic.woff Переглянути файл


BIN
public/webfonts/Muli-Italic.woff Переглянути файл


BIN
public/webfonts/Muli-Light.woff Переглянути файл


BIN
public/webfonts/Muli-LightItalic.woff Переглянути файл


BIN
public/webfonts/Muli-Regular.woff Переглянути файл


BIN
public/webfonts/Muli-SemiBold.woff Переглянути файл


BIN
public/webfonts/Muli-SemiBoldItalic.woff Переглянути файл


+ 49
- 0
src/components/financial/OrderThankYou.vue Переглянути файл 

@@ -0,0 +1,49 @@
1 
+<template>
2 
+  <section id="intro">
3 
+    <div class="container">
4 
+      <div class="row">
5 
+        <div class="col-md-6">
6 
+          <div class="intro-content box text-center">
7 
+            <h2>Thank you!</h2>
8 
+            <p>Your payment has been received and your propery will be listed</p>
9 
+          </div>
10 
+        </div>
11 
+      </div>
12 
+    </div>
13 
+
14 
+    <carousel
15 
+      :nav="false"
16 
+      :dots="false"
17 
+      :items="1"
18 
+      :autoplay="true"
19 
+      :loop="true"
20 
+      :autoHeight="true"
21 
+      id="intro-carousel"
22 
+      style="margin-top:-50px;"
23 
+      :responsive="{ 0: { items: 1, nav: false }, 600: { items: 1, nav: false } }"
24 
+    >
25 
+      <img class="item" src="/img/intro-carousel/home-1.jpg" alt="" />
26 
+      <img class="item" src="/img/intro-carousel/16.jpg" alt="" />
27 
+      <img class="item" src="/img/intro-carousel/comm-1.jpg" alt="" />
28 
+      <img class="item" src="/img/intro-carousel/comm-4.jpg" alt="" />
29 
+      <img class="item" src="/img/intro-carousel/3.jpg" alt="" />
30 
+      <img class="item" src="/img/intro-carousel/home-5.jpg" alt="" />
31 
+    </carousel>
32 
+  </section>
33 
+</template>
34 
+
35 
+<script>
36 
+import carousel from "vue-owl-carousel";
37 
+export default {
38 
+  components: {
39 
+    carousel
40 
+  },
41 
+  data() {
42 
+    return {
43 
+      boolLoaded: false
44 
+    };
45 
+  }
46 
+};
47 
+</script>
48 
+
49 
+<style lang="scss" scoped></style>

+ 2
- 2
src/components/financial/paygate/paygateProcess.vue Переглянути файл 

@@ -1,5 +1,5 @@
1 1 
 <template>
2 
-  <div class="container mt-3 headerAdjustment">
2 
+  <div class="container" style="margin-bottom:30px">
3 3 
     <div class="row" v-if="loaded">
4 4 
       <div class="col"></div>
5 5 
       <div class="col-sm-6" sm="6">
 
@@ -23,7 +23,7 @@
23 23 
               ></iframe>
24 24 
               <form
25 25 
                 ref="form"
26 
-                target="payment_frame"
26 
+                target="_parent"
27 27 
                 action="https://secure.paygate.co.za/payweb3/process.trans"
28 28 
                 method="POST"
29 29 
               >

+ 48
- 26
src/components/property/commercial/commercialSearchResults.vue Переглянути файл 

@@ -1,12 +1,13 @@
1 1 
 <template>
2 2 
   <main id="main" style="margin-top:-20px; padding-bottom:50px">
3 
-    <section>
3 
+    <div v-if="wait" id="preloader"></div>
4 
+    <section v-if="properties.length > 0">
4 5 
       <div class="container">
5 6 
         <div class="row pt-5 justify-content-md-center">
6 7 
           <h3 v-if="propertySearch.salesType === 'Sale'">COMMERCIAL PROPERTIES FOR SALE</h3>
7 8 
           <h3 v-else-if="propertySearch.salesType === 'Rent'">COMMERCIAL PROPERTIES FOR RENT</h3>
8 9 
         </div>
9 
-        <div v-if="properties.length > 0" class="row justify-content-md-center">
10 
+        <div class="row justify-content-md-center">
10 11 
           <div
11 12 
             class="col-lg-3 col-md-6 col-sm-6"
12 13 
             v-for="currentProperty in properties"
 
@@ -15,30 +16,52 @@
15 16 
             <div>
16 17 
               <div class="portfolio-item">
17 18 
                 <img style="width:255px; height:255px" :src="currentProperty.displayImage" alt />
18 
-
19 
-                <h4 class="mt-3">{{ currentProperty.suburb }}</h4>
20 
-                <p>{{currentProperty.shortDescription }}</p>
19 
+                <h4>{{ currentProperty.displayPrice }}</h4>
20 
+                <p>Address | 00m</p>
21 
+                <p>{{ currentProperty.shortDescription }}</p>
21 22 
                 <br />
22 23
23 24 
                 <!-- <a href="commercialproperty-page.php" class="btn-white-border">VIEW</a> -->
24 25 
                 <router-link
25 26 
                   class="btn-white-border"
26 27 
                   :to="`/property/commercial/property/${currentProperty.id}`"
27 
-                >VIEW</router-link>
28 
+                  >VIEW</router-link
29 
+                >
28 30 
               </div>
29 31 
             </div>
30 32 
           </div>
31 33 
         </div>
32 
-        <div v-else class="row">
33 
-          <div align="center" class="col-md-12">
34 
-            <img src="img/no-homes.png" />
35 
-            <br />
36 
-            <br />
37 
-            <p>Sorry no listings where found matching your search</p>
34 
+      </div>
35 
+    </section>
36 
+    <section v-else id="intro" style="margin-bottom:-50px">
37 
+      <div class="container">
38 
+        <div class="row d-flex justify-content-center">
39 
+          <div class="col-md-8">
40 
+            <div class="intro-content box text-center">
41 
+              <h2>Sorry no listing where found matching your search</h2>
42 
+              <a class="btn-white-border" href="javascript:history.back()">BACK TO SEARCH</a>
43 
+            </div>
38 44 
           </div>
39 45 
         </div>
40 
-        <div v-if="wait" id="preloader"></div>
41 46 
       </div>
47 
+
48 
+      <carousel
49 
+        :nav="false"
50 
+        :dots="false"
51 
+        :items="1"
52 
+        :autoplay="true"
53 
+        :loop="true"
54 
+        id="intro-carousel"
55 
+        style="margin-top:-50px"
56 
+        :responsive="{ 0: { items: 1, nav: false }, 600: { items: 1, nav: false } }"
57 
+      >
58 
+        <img class="item" src="img/intro-carousel/comm-1.jpg" alt />
59 
+        <img class="item" src="img/intro-carousel/comm-2.jpg" alt />
60 
+        <img class="item" src="img/intro-carousel/comm-3.jpg" alt />
61 
+        <img class="item" src="img/intro-carousel/comm-4.jpg" alt />
62 
+        <img class="item" src="img/intro-carousel/comm-5.jpg" alt />
63 
+        <img class="item" src="img/intro-carousel/comm-6.jpg" alt />
64 
+      </carousel>
42 65 
     </section>
43 66 
   </main>
44 67 
 </template>
 
@@ -47,15 +70,17 @@
47 70 
 /* eslint-disable */
48 71 
 import { mapState, mapActions } from "vuex";
49 72 
 import propertyCard from "../propertyCard";
73 
+import carousel from "vue-owl-carousel";
50 74
51 75 
 export default {
52 76 
   name: "propertysearch",
53 77 
   components: {
54 78 
     propertyCard,
79 
+    carousel
55 80 
   },
56 81 
   data() {
57 82 
     return {
58 
-      wait: true,
83 
+      wait: true
59 84 
     };
60 85 
   },
61 86 
   mounted() {
 
@@ -69,15 +94,16 @@ export default {
69 94 
       this.propertySearch.userName = this.user.username;
70 95 
     }
71 96
72 
-    this.searchProperties(this.propertySearch).then((fulfilled) => {
97 
+    this.searchProperties(this.propertySearch).then(fulfilled => {
73 98 
       this.wait = false;
74 99 
     });
100 
+    console.log(this.properties);
75 101 
   },
76 102 
   methods: {
77 103 
     ...mapActions("propertySearch", [
78 104 
       "searchProperties",
79 105 
       "clearProperties",
80 
-      "updateResultsShowing",
106 
+      "updateResultsShowing"
81 107 
     ]),
82 108 
     SetType(item) {
83 109 
       this.propertySearch.propertyUsageType = item;
 
@@ -85,14 +111,10 @@ export default {
85 111 
     SearchPage() {
86 112 
       this.clearProperties();
87 113 
       this.$router.push("/property/search");
88 
-    },
114 
+    }
89 115 
   },
90 116 
   computed: {
91 
-    ...mapState("propertySearch", [
92 
-      "properties",
93 
-      "propertySearch",
94 
-      "resultsShowing",
95 
-    ]),
117 
+    ...mapState("propertySearch", ["properties", "propertySearch", "resultsShowing"]),
96 118 
     ...mapState("authentication", ["user"]),
97 119 
     ParamsChanged() {
98 120 
       console.log(JSON.stringify(this.propertySearch));
 
@@ -100,17 +122,17 @@ export default {
100 122 
         // eslint-disable-next-line vue/no-side-effects-in-computed-properties
101 123 
         this.propertySearch.propertyUsageType = "Residential";
102 124 
       }
103 
-      this.searchProperties(this.propertySearch).then((fulfilled) => {
125 
+      this.searchProperties(this.propertySearch).then(fulfilled => {
104 126 
         this.wait = false;
105 127 
       });
106 128 
       return null;
107 
-    },
129 
+    }
108 130 
   },
109 131 
   watch: {
110 132 
     ParamsChanged() {
111 133 
       return null;
112 
-    },
113 
-  },
134 
+    }
135 
+  }
114 136 
 };
115 137 
 </script>
116 138

+ 41
- 12
src/components/property/commercial/singleView/contentSection.vue Переглянути файл 

@@ -4,9 +4,21 @@
4 4 
       <div class="row" id="resort-profile">
5 5 
         <div class="col-md-4">
6 6 
           <div class="resPortfolioSection" style="margin-top:-5px">
7 
+            <iframe
8 
+              width="100%"
9 
+              src="https://www.youtube.com/embed/watch_popup?v=qKgHJYzWtVA"
10 
+              frameborder="0"
11 
+              allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
12 
+              allowfullscreen
13 
+              style="margin-bottom:-6px"
14 
+            ></iframe>
7 15 
             <div v-for="(image, i) in propertyImages" @click="index = i" :key="i">
8 16 
               <div v-if="i < 3">
9 
-                <img v-if="i === 0" style="width:100%; height:201px;object-fit: cover" :src="image" />
17 
+                <img
18 
+                  v-if="i === 0"
19 
+                  style="width:100%; height:201px;object-fit: cover"
20 
+                  :src="image"
21 
+                />
10 22 
                 <div v-else-if="i !== 0">
11 23 
                   <img
12 24 
                     v-if="i % 2 === 0"
 
@@ -21,21 +33,38 @@
21 33 
             <gallery :images="propertyImages" :index="index" @close="index = null"></gallery>
22 34 
           </div>
23 35
24 
-          <div class="panel-left p-5" style="margin-top:140px; margin-bottom:50px">
36 
+          <div class="panel-left p-5" style="margin-top:140px;">
25 37 
             <h2>Property Detial</h2>
26 38 
             <p v-if="property.showAddress">{{ property.streetNumber }} {{ property.streetName }}</p>
27 39 
             <p>{{ property.suburb }}, {{ property.city }}</p>
28 40 
             <p>{{ property.shortDescription }}</p>
29 41 
             <p>{{ property.price | toCurrency }}</p>
30 
-            <div class="btn-white-border">
31 
-              <i class="fa fa-search"></i>BOOK A VIEWING
32 
-            </div>
42 
+            <div class="btn-white-border"><i class="fa fa-search"></i>BOOK A VIEWING</div>
43 
+          </div>
44 
+          <div class="panel-left px-5 pb-5 text-center">
45 
+            <h4 class="text-white">Share this Property</h4>
46 
+            <a
47 
+              href="http://www.facebook.com/sharer.php?u=https://www.univateproperties.co.za/"
48 
+              target="_blank"
49 
+              ><img src="img/icon-facebook.svg" alt="Share on Facebook" class="col-3 p-1 mx-1"
50 
+            /></a>
51 
+            <a
52 
+              href="mailto:?Subject=Simple Share Buttons&amp;Body=I%20saw%20this%20and%20thought%20of%20you!%20 https://www.univateproperties.co.za/"
53 
+              ><img src="/img/icon-email.svg" alt="Share on email" class="col-3 p-1 mx-1"
54 
+            /></a>
55 
+            <a
56 
+              href="whatsapp://send?text=Have a look at this property: https://www.univateproperties.co.za"
57 
+              data-action="share/whatsapp/share"
58 
+              target="_blank"
59 
+            >
60 
+              <img src="img/icon-whatsapp.svg" alt="Share on whatsapp" class="col-3 p-1 mx-1"
61 
+            /></a>
33 62 
           </div>
34 63 
         </div>
35 64 
         <div class="col-md-8 p-5 resort-profile">
36 
-          <h2
37 
-            v-if="property.showAddress"
38 
-          >{{ property.propertyName }} / {{ property.streetNumber }} {{ property.streetName }}</h2>
65 
+          <h2 v-if="property.showAddress">
66 
+            {{ property.propertyName }} / {{ property.streetNumber }} {{ property.streetName }}
67 
+          </h2>
39 68 
           <h2>{{ property.propertyName }}</h2>
40 69 
           <div>
41 70 
             <table class="table table-striped">
 
@@ -94,11 +123,11 @@
94 123 
 import gallery from "../../../shared/gallerySlideShow";
95 124 
 export default {
96 125 
   components: {
97 
-    gallery,
126 
+    gallery
98 127 
   },
99 128 
   props: {
100 129 
     property: {},
101 
-    propertyImages: {},
130 
+    propertyImages: {}
102 131 
   },
103 132 
   mounted() {
104 133 
     console.log(this.property);
 
@@ -106,9 +135,9 @@ export default {
106 135 
   data() {
107 136 
     return {
108 137 
       index: null,
109 
-      date: new Date(),
138 
+      date: new Date()
110 139 
     };
111 
-  },
140 
+  }
112 141 
 };
113 142 
 </script>
114 143

+ 44
- 25
src/components/property/residential/residentialSearchResults.vue Переглянути файл 

@@ -1,12 +1,13 @@
1 1 
 <template>
2 2 
   <main id="main" style="margin-top:-20px; padding-bottom:50px">
3 
-    <section>
3 
+    <div v-if="wait" id="preloader"></div>
4 
+    <section v-if="properties.length > 0">
4 5 
       <div class="container">
5 6 
         <div class="row pt-5 justify-content-md-center">
6 7 
           <h3 v-if="propertySearch.salesType === 'Sale'">RESIDENTIAL PROPERTIES FOR SALE</h3>
7 8 
           <h3 v-else-if="propertySearch.salesType === 'Rent'">RESIDENTIAL PROPERTIES FOR RENT</h3>
8 9 
         </div>
9 
-        <div v-if="properties.length > 0" class="row justify-content-md-center">
10 
+        <div class="row justify-content-md-center">
10 11 
           <div
11 12 
             class="col-lg-3 col-md-6 col-sm-6"
12 13 
             v-for="currentProperty in properties"
 
@@ -17,28 +18,50 @@
17 18 
                 <img style="width:255px; height:255px" :src="currentProperty.displayImage" alt />
18 19
19 20 
                 <h4 class="mt-3">{{ currentProperty.suburb }}</h4>
20 
-                <p>{{currentProperty.shortDescription }}</p>
21 
+                <p>{{ currentProperty.shortDescription }}</p>
21 22 
                 <br />
22 23
23 24 
                 <!-- <a href="commercialproperty-page.php" class="btn-white-border">VIEW</a> -->
24 25 
                 <router-link
25 26 
                   class="btn-white-border"
26 27 
                   :to="`/property/residential/property/${currentProperty.id}`"
27 
-                >VIEW</router-link>
28 
+                  >VIEW</router-link
29 
+                >
28 30 
               </div>
29 31 
             </div>
30 32 
           </div>
31 33 
         </div>
32 
-        <div v-else class="row">
33 
-          <div align="center" class="col-md-12">
34 
-            <img src="img/no-homes.png" />
35 
-            <br />
36 
-            <br />
37 
-            <p>Sorry no listings where found matching your search</p>
34 
+      </div>
35 
+    </section>
36 
+    <section v-else id="intro" style="margin-bottom:-50px">
37 
+      <div class="container">
38 
+        <div class="row d-flex justify-content-center">
39 
+          <div class="col-md-8">
40 
+            <div class="intro-content box text-center">
41 
+              <h2>Sorry no listing where found matching your search</h2>
42 
+              <a class="btn-white-border" href="javascript:history.back()">BACK TO SEARCH</a>
43 
+            </div>
38 44 
           </div>
39 45 
         </div>
40 
-        <div v-if="wait" id="preloader"></div>
41 46 
       </div>
47 
+
48 
+      <carousel
49 
+        :nav="false"
50 
+        :dots="false"
51 
+        :items="1"
52 
+        :autoplay="true"
53 
+        :loop="true"
54 
+        id="intro-carousel"
55 
+        style="margin-top:-50px"
56 
+        :responsive="{ 0: { items: 1, nav: false }, 600: { items: 1, nav: false } }"
57 
+      >
58 
+        <img class="item" src="img/intro-carousel/comm-1.jpg" alt />
59 
+        <img class="item" src="img/intro-carousel/comm-2.jpg" alt />
60 
+        <img class="item" src="img/intro-carousel/comm-3.jpg" alt />
61 
+        <img class="item" src="img/intro-carousel/comm-4.jpg" alt />
62 
+        <img class="item" src="img/intro-carousel/comm-5.jpg" alt />
63 
+        <img class="item" src="img/intro-carousel/comm-6.jpg" alt />
64 
+      </carousel>
42 65 
     </section>
43 66 
   </main>
44 67 
 </template>
 
@@ -51,11 +74,11 @@ import propertyCard from "../propertyCard";
51 74 
 export default {
52 75 
   name: "propertysearch",
53 76 
   components: {
54 
-    propertyCard,
77 
+    propertyCard
55 78 
   },
56 79 
   data() {
57 80 
     return {
58 
-      wait: true,
81 
+      wait: true
59 82 
     };
60 83 
   },
61 84 
   mounted() {
 
@@ -69,7 +92,7 @@ export default {
69 92 
       this.propertySearch.userName = this.user.username;
70 93 
     }
71 94
72 
-    this.searchProperties(this.propertySearch).then((fulfilled) => {
95 
+    this.searchProperties(this.propertySearch).then(fulfilled => {
73 96 
       this.wait = false;
74 97 
     });
75 98 
   },
 
@@ -77,7 +100,7 @@ export default {
77 100 
     ...mapActions("propertySearch", [
78 101 
       "searchProperties",
79 102 
       "clearProperties",
80 
-      "updateResultsShowing",
103 
+      "updateResultsShowing"
81 104 
     ]),
82 105 
     SetType(item) {
83 106 
       this.propertySearch.propertyUsageType = item;
 
@@ -85,14 +108,10 @@ export default {
85 108 
     SearchPage() {
86 109 
       this.clearProperties();
87 110 
       this.$router.push("/property/search");
88 
-    },
111 
+    }
89 112 
   },
90 113 
   computed: {
91 
-    ...mapState("propertySearch", [
92 
-      "properties",
93 
-      "propertySearch",
94 
-      "resultsShowing",
95 
-    ]),
114 
+    ...mapState("propertySearch", ["properties", "propertySearch", "resultsShowing"]),
96 115 
     ...mapState("authentication", ["user"]),
97 116 
     ParamsChanged() {
98 117 
       console.log(JSON.stringify(this.propertySearch));
 
@@ -100,17 +119,17 @@ export default {
100 119 
         // eslint-disable-next-line vue/no-side-effects-in-computed-properties
101 120 
         this.propertySearch.propertyUsageType = "Residential";
102 121 
       }
103 
-      this.searchProperties(this.propertySearch).then((fulfilled) => {
122 
+      this.searchProperties(this.propertySearch).then(fulfilled => {
104 123 
         this.wait = false;
105 124 
       });
106 125 
       return null;
107 
-    },
126 
+    }
108 127 
   },
109 128 
   watch: {
110 129 
     ParamsChanged() {
111 130 
       return null;
112 
-    },
113 
-  },
131 
+    }
132 
+  }
114 133 
 };
115 134 
 </script>
116 135

+ 8
- 0
src/components/property/residential/singleView/contentSection.vue Переглянути файл 

@@ -4,6 +4,14 @@
4 4 
       <div class="row" id="resort-profile">
5 5 
         <div class="col-md-4">
6 6 
           <div class="resPortfolioSection">
7 
+            <iframe
8 
+              width="100%"
9 
+              src="https://www.youtube.com/embed/watch_popup?v=qKgHJYzWtVA"
10 
+              frameborder="0"
11 
+              allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
12 
+              allowfullscreen
13 
+              style="margin-bottom:-6px"
14 
+            ></iframe>
7 15 
             <div v-for="(image, i) in propertyImages" @click="index = i" :key="i">
8 16 
               <div v-if="i < 3">
9 17 
                 <img v-if="i === 0" style="width:100%" :src="image" />

+ 16
- 22
src/components/timeshare/resort/unit/carouselSection.vue Переглянути файл 

@@ -1,22 +1,20 @@
1 1 
 <template>
2 2 
   <section id="intro">
3 
-    <div v-if="loaded">
4 
-      <carousel
5 
-        :nav="false"
6 
-        :dots="false"
7 
-        :items="10"
8 
-        :autoplay="true"
9 
-        :loop="true"
10 
-        :autoHeight="true"
11 
-        id="intro-carousel"
12 
-        style="margin-top:-50px;"
13 
-        :responsive="{ 0: { items: 1, nav: false }, 600: { items: 1, nav: false } }"
14 
-      >
15 
-        <div v-for="(image, i) in resortImages" :key="i">
16 
-          <img class="item" style="object-fit:cover" :src="image" :key="i" />
17 
-        </div>
18 
-      </carousel>
19 
-    </div>
3 
+    <carousel
4 
+      :nav="false"
5 
+      :dots="false"
6 
+      :items="10"
7 
+      :autoplay="true"
8 
+      :loop="true"
9 
+      :autoHeight="true"
10 
+      id="intro-carousel"
11 
+      style="margin-top:-50px;"
12 
+      :responsive="{ 0: { items: 1, nav: false }, 600: { items: 1, nav: false } }"
13 
+    >
14 
+      <div v-for="(image, i) in resortImages" :key="i">
15 
+        <img class="item" style="object-fit:cover" :src="image" :key="i" />
16 
+      </div>
17 
+    </carousel>
20 18 
   </section>
21 19 
 </template>
22 20 
 
@@ -32,15 +30,11 @@ export default {
32 30 
   },
33 31 
   data() {
34 32 
     return {
35 
-      images: [],
36 
-      loaded: false
33 
+      images: []
37 34 
     };
38 35 
   },
39 36 
   async created() {
40 37 
     this.images = await this.resortImages;
41 
-    setTimeout(() => {
42 
-      this.loaded = true;
43 
-    }, 500);
44 38 
   }
45 39 
 };
46 40 
 </script>

+ 13
- 6
src/components/timeshare/resort/unit/unitPage.vue Переглянути файл 

@@ -1,6 +1,6 @@
1 1 
 <template>
2 2 
   <main id="main" style="padding-bottom:50px">
3 
-    <carouselSection :resortImages="images" />
3 
+    <carouselSection v-if="boolLoaded" :resortImages="images" />
4 4 
     <summarySection :resortCode="resortCode" :unitNumber="unitNumber" />
5 5 
     <div class="container">
6 6 
       <div class="row mt-5">
 
@@ -38,14 +38,21 @@ export default {
38 38 
     resortCode: {},
39 39 
     unitNumber: {}
40 40 
   },
41 
-  mounted() {
42 
-    this.initResort(this.resortCode);
41 
+  data() {
42 
+    return {
43 
+      boolLoaded: false
44 
+    };
45 
+  },
46 
+  async mounted() {
47 
+    await this.initResort(this.resortCode);
43 48 
     if (this.resortCode) {
44 49 
       this.applyResortFilter(this.resortCode);
45 50 
     }
46 
-    this.layouts.push(this.layout);
47 
-    this.getWeeks();
48 
-    console.log(this.resort);
51 
+    await this.layouts.push(this.layout);
52 
+    await this.getWeeks();
53 
+    setTimeout(() => {
54 
+      this.boolLoaded = true;
55 
+    }, 500);
49 56 
   },
50 57 
   computed: {
51 58 
     ...mapState("resort", ["resort", "description", "images", "layout"]),

+ 7
- 0
src/router/index.js Переглянути файл 

@@ -72,6 +72,8 @@ import ResidentialSearchResults from "../components/property/residential/residen
72 72
73 73 
 import PaymentGateway from "../components/financial/paygate/paygateProcess.vue";
74 74 
 import Payments from "../components/financial/payments.vue";
75 
+import PaymentSuccess from "../components/financial/OrderThankYou.vue";
76 
+
75 77 
 import LandingPages from "../components/marketing/landingPages.vue";
76 78 
 import LandingPage from "../components/marketing/landingPage.vue";
77 79 
 import LandingPageWeek from "../components/marketing/landingPageWeek.vue";
 
@@ -386,6 +388,11 @@ export default new Router({
386 388 
       }),
387 389 
       component: PaymentGateway
388 390 
     },
391 
+    {
392 
+      path: "/payments/success",
393 
+      name: "PaymentSuccess",
394 
+      component: PaymentSuccess
395 
+    },
389 396 
     {
390 397 
       path: "/payments",
391 398 
       name: "Payments",

+ 2
- 2
vue.config.js Переглянути файл 

@@ -2,8 +2,8 @@ module.exports = {
2 2 
   devServer: {
3 3 
     proxy: {
4 4 
       "/api": {
5 
-        //target: "http://localhost:57260/",
6 
-        target: "http://training.provision-sa.com:82",
5 
+        target: "http://localhost:57260/",
6 
+        //target: "http://training.provision-sa.com:82",
7 7 
         changeOrigin: true
8 8 
       },
9 9 
       "/nph-srep": {

Писати Попередній перегляд
Завантаження…
Відмінити
Зберегти