Provision
/
UnivateProperties
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Activity
Selaa lähdekoodia

Latest Commit

master
30117125 3 vuotta sitten
vanhempi
2f802b623b
commit
4e6ee94899
18 muutettua tiedostoa jossa 1339 lisäystä ja 1094 poistoa
Yhdistetty näkymä Näytä diff tilastot
  1. 1134
    1033
      package-lock.json
  2. 6
    3
      package.json
  3. 5
    0
      public/index.html
  4. 24
    5
      src/components/admin/misc/carouselSearchProperty.vue
  5. 47
    0
      src/components/marketing/htmlPreview.vue
  6. 4
    6
      src/components/marketing/landingPage.vue
  7. 6
    3
      src/components/marketing/landingPageAddProperty.vue
  8. 28
    14
      src/components/marketing/landingPageProperty.vue
  9. 3
    0
      src/components/shared/navBar.vue
  10. 5
    2
      src/components/timeshare/resort/resortPageNew.vue
  11. 15
    7
      src/components/timeshare/resort/unit/unitPageNew.vue
  12. 2
    0
      src/components/user/loginPage.vue
  13. 36
    16
      src/components/user/registerIndividual.vue
  14. 8
    2
      src/main.js
  15. 10
    0
      src/router/index.js
  16. 1
    0
      src/store/modules/timeshare/resort.js
  17. 3
    1
      src/store/modules/timeshare/timeshare.js
  18. 2
    2
      vue.config.js

+ 1134
- 1033
package-lock.json
File diff suppressed because it is too large
Näytä tiedosto


+ 6
- 3
package.json Näytä tiedosto

12 
     "@nuxtjs/axios": "^5.13.1",
 12 
     "@nuxtjs/axios": "^5.13.1",
13 
     "animate.css": "^3.7.2",
 13 
     "animate.css": "^3.7.2",
14 
     "aos": "^3.0.0-beta.6",
 14 
     "aos": "^3.0.0-beta.6",
15 
-    "axios": "^0.19.2",
15 
+    "axios": "^0.24.0",
16 
     "core-js": "^2.6.12",
 16 
     "core-js": "^2.6.12",
17 
     "crypto-js": "^4.0.0",
 17 
     "crypto-js": "^4.0.0",
18 
-    "datatables.net": "^1.10.23",
18 
+    "datatables.net": "^1.11.3",
19 
     "jquery": "^3.6.0",
 19 
     "jquery": "^3.6.0",
20 
     "js-md5": "^0.7.3",
 20 
     "js-md5": "^0.7.3",
21 
-    "jspdf": "^2.3.0",
21 
+    "jspdf": "^2.4.0",
22 
     "jspdf-autotable": "^3.5.14",
 22 
     "jspdf-autotable": "^3.5.14",
23 
     "lodash": "^4.17.21",
 23 
     "lodash": "^4.17.21",
24 
     "material-design-icons-iconfont": "^3.0.3",
 24 
     "material-design-icons-iconfont": "^3.0.3",
41 
     "vue-json-excel": "^0.2.99",
 41 
     "vue-json-excel": "^0.2.99",
42 
     "vue-loaders": "^4.1.4",
 42 
     "vue-loaders": "^4.1.4",
43 
     "vue-owl-carousel": "^2.0.3",
 43 
     "vue-owl-carousel": "^2.0.3",
44 
+    "vue-quill-editor": "^3.0.6",
44 
     "vue-router": "^3.5.1",
 45 
     "vue-router": "^3.5.1",
46 
+    "vue-sidebar-menu": "^4.8.1",
45 
     "vue-social-sharing": "^3.0.5",
 47 
     "vue-social-sharing": "^3.0.5",
46 
     "vue-trix": "^1.2.0",
 48 
     "vue-trix": "^1.2.0",
47 
     "vue2-editor": "^2.10.2",
 49 
     "vue2-editor": "^2.10.2",
51 
   },
 53 
   },
52 
   "devDependencies": {
 54 
   "devDependencies": {
53 
     "@fortawesome/fontawesome-free": "^5.15.2",
 55 
     "@fortawesome/fontawesome-free": "^5.15.2",
56 
+    "@types/uuid": "^8.3.4",
54 
     "@vue/cli-plugin-babel": "^3.12.1",
 57 
     "@vue/cli-plugin-babel": "^3.12.1",
55 
     "@vue/cli-plugin-eslint": "^3.12.1",
 58 
     "@vue/cli-plugin-eslint": "^3.12.1",
56 
     "@vue/cli-service": "^3.12.1",
 59 
     "@vue/cli-service": "^3.12.1",

+ 5
- 0
public/index.html Näytä tiedosto

21 
     <link href="css/bootstrap.min.css" rel="stylesheet">
 21 
     <link href="css/bootstrap.min.css" rel="stylesheet">
22 
     <link href="css/style.css" rel="stylesheet">
 22 
     <link href="css/style.css" rel="stylesheet">
23 
     <link rel="stylesheet" href="css/dragndrop.table.columns.css" />
 23 
     <link rel="stylesheet" href="css/dragndrop.table.columns.css" />
24 
+    <link rel="stylesheet" href="owlcarousel/owl.carousel.min.css">
25 
+<link rel="stylesheet" href="owlcarousel/owl.theme.default.min.css">
24 
   </head>
 26 
   </head>
25
27
26 
   <body>
 28 
   <body>
38 
   <script src="lib/owlcarousel/owl.carousel.min.js"></script>
 40 
   <script src="lib/owlcarousel/owl.carousel.min.js"></script>
39 
   <script src="lib/scrollreveal/scrollreveal.min.js"></script>
 41 
   <script src="lib/scrollreveal/scrollreveal.min.js"></script>
40 
   <script src="js/main.js"></script>
 42 
   <script src="js/main.js"></script>
43 
+  <script src="https://kit.fontawesome.com/your-code-number.js"></script>
44 
+  <script src="jquery.min.js"></script>
45 
+<script src="owlcarousel/owl.carousel.min.js"></script>
41
46
42
47
43 
 </html>
 48 
 </html>

+ 24
- 5
src/components/admin/misc/carouselSearchProperty.vue Näytä tiedosto

4 
       <div class="row">
 4 
       <div class="row">
5 
         <div class="col">
 5 
         <div class="col">
6 
           <div class="section-header">
 6 
           <div class="section-header">
7 
-            <h2>Search</h2>
7 
+            <h2>Search {{ propertyType === "res" ? "Residential" : "Commercial" }}</h2>
8 
           </div>
 8 
           </div>
9 
         </div>
 9 
         </div>
10 
       </div>
 10 
       </div>
12 
       <div class="row">
 12 
       <div class="row">
13 
         <div class="container">
 13 
         <div class="container">
14 
           <ListView
 14 
           <ListView
15 
-            :items="properties"
15 
+            :items="filteredProperties"
16 
             :showNew="false"
 16 
             :showNew="false"
17 
             :showColumnChooser="false"
 17 
             :showColumnChooser="false"
18 
             @onRowClick="onRowClick"
 18 
             @onRowClick="onRowClick"
40 
 export default {
 40 
 export default {
41 
   name: "CarouselSearch",
 41 
   name: "CarouselSearch",
42 
   props: {
 42 
   props: {
43 
-    name: String
43 
+    name: String,
44 
+    selectProperty: String
44 
   },
 45 
   },
45 
   components: {
 46 
   components: {
46 
     ListView
 47 
     ListView
48 
   data() {
 49 
   data() {
49 
     return {
 50 
     return {
50 
       loaded: false,
 51 
       loaded: false,
51 
-      user: Log.getUser()
52 
+      user: Log.getUser(),
53 
+      propertyType: ""
52 
     };
 54 
     };
53 
   },
 55 
   },
54 
   mounted() {
 56 
   mounted() {
55 
     this.loadData().then(() => {
 57 
     this.loadData().then(() => {
56 
       setTimeout(() => {
 58 
       setTimeout(() => {
57 
         this.loaded = true;
 59 
         this.loaded = true;
60 
+        this.propertyType = this.selectProperty;
61 
+        console.log(this.properties);
58 
       }, 100);
 62 
       }, 100);
59 
     });
 63 
     });
60 
   },
 64 
   },
61 
   computed: {
 65 
   computed: {
62 
-    ...mapState("propertyList", ["properties"])
66 
+    ...mapState("propertyList", ["properties"]),
67 
+    filteredProperties() {
68 
+      var propertyList = [];
69 
+      this.properties.forEach(property => {
70 
+        if (this.propertyType === "comm") {
71 
+          if (property.type === "Commercial") {
72 
+            propertyList.push(property);
73 
+          }
74 
+        } else {
75 
+          if (property.type === "Residential") {
76 
+            propertyList.push(property);
77 
+          }
78 
+        }
79 
+      });
80 
+      return propertyList;
81 
+    }
63 
   },
 82 
   },
64 
   methods: {
 83 
   methods: {
65 
     ...mapActions("propertyList", ["getAdminProperties"]),
 84 
     ...mapActions("propertyList", ["getAdminProperties"]),

+ 47
- 0
src/components/marketing/htmlPreview.vue Näytä tiedosto

1 
+<template>
2 
+  <div class="container-fluid">
3 
+    <div class="row">
4 
+      <div class="col">
5 
+        <div class="section-header">
6 
+          <h2>Landing Page</h2>
7 
+        </div>
8 
+      </div>
9 
+    </div>
10 
+    <div class="row">
11 
+      <div class="col-md-12">
12 
+        <textarea
13 
+          class="form-control"
14 
+          type="text"
15 
+          rows="10"
16 
+          step="any"
17 
+          name="levy"
18 
+          v-model="someCode"
19 
+        />
20 
+      </div>
21 
+    </div>
22 
+    <div class="row">
23 
+      <div class="col-md-12" style="border:1px solid black; border-radius:15px;">
24 
+        <div class="no-style" v-html="someCode"></div>
25 
+      </div>
26 
+    </div>
27 
+  </div>
28 
+</template>
29 
+
30 
+<script>
31 
+/* eslint-disable */
32 
+
33 
+export default {
34 
+  data() {
35 
+    return {
36 
+      htmlCode: "",
37 
+      someCode: ""
38 
+    };
39 
+  },
40 
+  async mounted() {
41 
+    this.htmlCode = localStorage.getItem("htmlPreview");
42 
+    console.log(this.$route.params.html);
43 
+  }
44 
+};
45 
+</script>
46 
+
47 
+<style lang="scss" scoped></style>

+ 4
- 6
src/components/marketing/landingPage.vue Näytä tiedosto

102 
                 </label>
 102 
                 </label>
103 
               </div>
 103 
               </div>
104 
               <div class="input-group mb-3">
 104 
               <div class="input-group mb-3">
105 
-                <!-- <div class="input-group-prepend">
106 
-                    <span class="input-group-text" style="color: #60CBEB">
107 
-                      <b>B</b>
108 
-                    </span>
109 
-                  </div>-->
110 
                 <textarea
 105 
                 <textarea
111 
                   class="form-control"
 106 
                   class="form-control"
112 
                   type="text"
 107 
                   type="text"
328 
       weekColumns: ["image", "weekUni"],
 323 
       weekColumns: ["image", "weekUni"],
329 
       weekFormats: ["image", ""],
 324 
       weekFormats: ["image", ""],
330 
       placeHolderColumns: ["name", "boundTo", "format"],
 325 
       placeHolderColumns: ["name", "boundTo", "format"],
331 
-      defaultPlaceholderClass: this.CheckType
326 
+      defaultPlaceholderClass: this.CheckType,
327 
+      editorOption: {
328 
+        // Some Quill options...
329 
+      }
332 
     };
 330 
     };
333 
   },
 331 
   },
334 
   props: {
 332 
   props: {

+ 6
- 3
src/components/marketing/landingPageAddProperty.vue Näytä tiedosto

13 
               FIND PROPERTY
 13 
               FIND PROPERTY
14 
             </button>
 14 
             </button>
15 
             <modal name="propSearch" :width="700" :height="900">
 15 
             <modal name="propSearch" :width="700" :height="900">
16 
-              <Search @onSelected="onSelected" />
16 
+              <Search :selectProperty="PropertyType" @onSelected="onSelected" />
17 
             </modal>
 17 
             </modal>
18 
           </div>
 18 
           </div>
19 
           <div class="col-md-2 mt-3">
 19 
           <div class="col-md-2 mt-3">
136 
     Alert,
 136 
     Alert,
137 
     ListView
 137 
     ListView
138 
   },
 138 
   },
139 
+  props: {
140 
+    PropertyType: {}
141 
+  },
139 
   data() {
 142 
   data() {
140 
     return {
 143 
     return {
141 
       loaded: false,
 144 
       loaded: false,
147 
       placeHolders: [],
 150 
       placeHolders: [],
148 
       showPlaceholder: false,
 151 
       showPlaceholder: false,
149 
       placeHolder: undefined,
 152 
       placeHolder: undefined,
150 
-      value: undefined
153 
+      value: undefined,
154 
+      selectedProperty: ""
151 
     };
 155 
     };
152 
   },
 156 
   },
153 
   methods: {
 157 
   methods: {
157 
     },
 161 
     },
158 
     onSelected(item) {
 162 
     onSelected(item) {
159 
       this.propertyObj = item;
 163 
       this.propertyObj = item;
160 
-      console.log(this.propertyObj);
161 
       this.$modal.hide("propSearch");
 164 
       this.$modal.hide("propSearch");
162 
     },
 165 
     },
163 
     checkImage(item) {
 166 
     checkImage(item) {

+ 28
- 14
src/components/marketing/landingPageProperty.vue Näytä tiedosto

232 
       </div>
 232 
       </div>
233 
       <br />
 233 
       <br />
234 
       <div class="col-md-12">
 234 
       <div class="col-md-12">
235 
-        <label>
236 
-          <b>Properties</b>
237 
-        </label>
238 
-        <div class="d-flex">
239 
-          <div class="p-2">
240 
-            <div class="btn-solid-blue" @click="addWeekClose()" v-if="CanEditWeeks">
241 
-              {{ btnCaptionWeek }}
235 
+        <div class="row">
236 
+          <div class="col-md-12">
237 
+            <label>
238 
+              <b>Properties</b>
239 
+            </label>
240 
+          </div>
241 
+        </div>
242 
+        <div class="row">
243 
+          <div class="col-md-6">
244 
+            <select
245 
+              v-model="selectedPropertyType"
246 
+              name="PropertySelector"
247 
+              class="form-control uniSelect"
248 
+            >
249 
+              <option value="res">Residential</option>
250 
+              <option value="comm">Commercial</option>
251 
+            </select>
252 
+          </div>
253 
+        </div>
254 
+        <div class="row">
255 
+          <div class="d-flex">
256 
+            <div class="p-2">
257 
+              <div class="btn-solid-blue" @click="addWeekClose()" v-if="CanEditWeeks">
258 
+                {{ btnCaptionWeek }}
259 
+              </div>
242 
             </div>
 260 
             </div>
243 
           </div>
 261 
           </div>
244 
         </div>
 262 
         </div>
245 
       </div>
 263 
       </div>
264 
+
246 
       <div class="col-md-12" v-if="showNewWeek">
 265 
       <div class="col-md-12" v-if="showNewWeek">
247 
-        <WeekAdd @onWeekItemAdd="AddNewProperty" />
266 
+        <WeekAdd :PropertyType="selectedPropertyType" @onWeekItemAdd="AddNewProperty" />
248 
       </div>
 267 
       </div>
249 
       <div class="col-md-12">
 268 
       <div class="col-md-12">
250 
         <hr />
 269 
         <hr />
315 
   data() {
 334 
   data() {
316 
     return {
 335 
     return {
317 
       loaded: false,
 336 
       loaded: false,
337 
+      selectedPropertyType: "res",
318 
       wait: false,
 338 
       wait: false,
319 
       isNew: true,
 339 
       isNew: true,
320 
       showNew: false,
 340 
       showNew: false,
412 
       this.campaign.placeHolders = _.remove(this.campaign.placeHolders, x => x !== item);
 432 
       this.campaign.placeHolders = _.remove(this.campaign.placeHolders, x => x !== item);
413 
       this.placeHolders = this.campaign.placeHolders;
 433 
       this.placeHolders = this.campaign.placeHolders;
414 
     },
 434 
     },
415 
-    // AddWeek(item) {
416 
-    //   // const myList = this.campaign.items ? this.campaign.items : [];
417 
-    //   // myList.push(item);
418 
-    //   // this.campaign.items = myList;
419 
-    //   //this.showNewWeek = false;
420 
-    // },
421 
     AddNewProperty(property) {
 435 
     AddNewProperty(property) {
422 
       var item = {
 436 
       var item = {
423 
         image: property.image,
 437 
         image: property.image,

+ 3
- 0
src/components/shared/navBar.vue Näytä tiedosto

320 
                       <li v-if="ROLE === 'Super Admin'">
 320 
                       <li v-if="ROLE === 'Super Admin'">
321 
                         <router-link to="/campaignUpload">Landing Pages / Campaignes</router-link>
 321 
                         <router-link to="/campaignUpload">Landing Pages / Campaignes</router-link>
322 
                       </li>
 322 
                       </li>
323 
+                      <li v-if="ROLE === 'Super Admin'">
324 
+                        <router-link to="/landingPages">Landing Pages * / Campaignes</router-link>
325 
+                      </li>
323 
                       <li v-if="ROLE === 'Designer'">
 326 
                       <li v-if="ROLE === 'Designer'">
324 
                         <router-link to="/campaignUpload">Landing Pages / Campaignes</router-link>
 327 
                         <router-link to="/campaignUpload">Landing Pages / Campaignes</router-link>
325 
                       </li>
 328 
                       </li>

+ 5
- 2
src/components/timeshare/resort/resortPageNew.vue Näytä tiedosto

67 
   },
 67 
   },
68 
   data() {
 68 
   data() {
69 
     return {
 69 
     return {
70 
-      wait: true
70 
+      wait: true,
71 
+      rCode: ""
71 
     };
 72 
     };
72 
   },
 73 
   },
73 
   props: {
 74 
   props: {
83 
     ...mapState("resort", ["resort", "images"])
 84 
     ...mapState("resort", ["resort", "images"])
84 
   },
 85 
   },
85 
   created() {
 86 
   created() {
86 
-    this.getResortData(this.resortCode).then(() => (this.wait = false));
87 
+    this.getResortData(this.resortCode.includes("SILV") ? "SILV1" : this.resortCode).then(
88 
+      () => (this.wait = false)
89 
+    );
87 
   }
 90 
   }
88 
 };
 91 
 };
89 
 </script>
 92 
 </script>

+ 15
- 7
src/components/timeshare/resort/unit/unitPageNew.vue Näytä tiedosto

7 
         <div class="col">
 7 
         <div class="col">
8 
           <tabSection
 8 
           <tabSection
9 
             style="margin-bottom:100px"
 9 
             style="margin-bottom:100px"
10 
-            :resortCode="resortCode"
10 
+            :resortCode="calculatedCode"
11 
             :resortCoords="resort.prPostAdd1"
 11 
             :resortCoords="resort.prPostAdd1"
12 
             :layoutImages="layouts"
 12 
             :layoutImages="layouts"
13 
             :resortName="resort.prName"
 13 
             :resortName="resort.prName"
55 
     //   this.boolLoaded = true;
 55 
     //   this.boolLoaded = true;
56 
     // }, 500);
 56 
     // }, 500);
57 
     this.wait = true;
 57 
     this.wait = true;
58 
-    this.getResortData(this.resortCode).then(fulfilled => {
59 
-      this.applyResortFilter(this.resortCode);
60 
-      this.getWeeks();
61 
-      this.wait = false;
62 
-    });
58 
+    this.getResortData(this.resortCode.includes("SILV") ? "SILV1" : this.resortCode).then(
59 
+      fulfilled => {
60 
+        this.applyResortFilter(this.resortCode.includes("SILV") ? "SILV1" : this.resortCode);
61 
+        this.getWeeks();
62 
+        this.wait = false;
63 
+      }
64 
+    );
63 
   },
 65 
   },
64 
   computed: {
 66 
   computed: {
65 
     ...mapState("resort", ["resort"]),
 67 
     ...mapState("resort", ["resort"]),
68 
       weekById: "weekList/weekById"
 70 
       weekById: "weekList/weekById"
69 
     }),
 71 
     }),
70 
     week() {
 72 
     week() {
71 
-      return this.weekById(this.resortCode, this.unitNumber);
73 
+      return this.weekById(
74 
+        this.resortCode.includes("SILV") ? "SILV1" : this.resortCode,
75 
+        this.unitNumber
76 
+      );
72 
     },
 77 
     },
73 
     layouts() {
 78 
     layouts() {
74 
       var layouts = [];
 79 
       var layouts = [];
75 
       layouts.push(this.resort.layout);
 80 
       layouts.push(this.resort.layout);
76 
       return layouts;
 81 
       return layouts;
82 
+    },
83 
+    calculatedCode() {
84 
+      return this.resortCode.includes("SILV") ? "SILV1" : this.resortCode;
77 
     }
 85 
     }
78 
     // ...mapState('week', ['currentWeek']),
 86 
     // ...mapState('week', ['currentWeek']),
79 
   },
 87 
   },

+ 2
- 0
src/components/user/loginPage.vue Näytä tiedosto

81 
 <script>
 81 
 <script>
82 
 /* eslint-disable */
 82 
 /* eslint-disable */
83 
 import { mapActions, mapState } from "vuex";
 83 
 import { mapActions, mapState } from "vuex";
84 
+import uuid from "uuid";
84 
 import alert from "../shared/alert.vue";
 85 
 import alert from "../shared/alert.vue";
85 
 import Log from "../../assets/Log";
 86 
 import Log from "../../assets/Log";
86 
 import carousel from "vue-owl-carousel";
 87 
 import carousel from "vue-owl-carousel";
125 
       } else this.troubleToggle = true;
 126 
       } else this.troubleToggle = true;
126 
     },
 127 
     },
127 
     Login() {
 128 
     Login() {
129 
+      console.log(this.username + " " + this.password);
128 
       this.login({ username: this.username, password: this.password })
 130 
       this.login({ username: this.username, password: this.password })
129 
         .then(() => {
 131 
         .then(() => {
130 
           // console.log(Log.getUser());
 132 
           // console.log(Log.getUser());

+ 36
- 16
src/components/user/registerIndividual.vue Näytä tiedosto

11 
           <alert :text="'This username is already in use'" :type="'ERROR'" />
 11 
           <alert :text="'This username is already in use'" :type="'ERROR'" />
12 
         </div>
 12 
         </div>
13 
       </div>
 13 
       </div>
14 
+      <div v-if="boolValidationError" class="row">
15 
+        <div class="col">
16 
+          <alert :text="validationErrorMessage" :type="'ERROR'" />
17 
+        </div>
18 
+      </div>
14 
       <div class="row">
 19 
       <div class="row">
15 
         <div class="col-sm-12 col-md-6 ">
 20 
         <div class="col-sm-12 col-md-6 ">
16 
           <input
 21 
           <input
161 
       boolMessage: false,
 166 
       boolMessage: false,
162 
       terms: false,
 167 
       terms: false,
163 
       indivUser: {},
 168 
       indivUser: {},
164 
-      boolUserExists: false
169 
+      boolUserExists: false,
170 
+      boolValidationError: false,
171 
+      validationErrorMessage: ""
165 
     };
 172 
     };
166 
   },
 173 
   },
167 
   computed: {
 174 
   computed: {
195 
     },
 202 
     },
196 
     SubmitData() {
 203 
     SubmitData() {
197 
       this.indivUser.acceptedTerms = this.terms;
 204 
       this.indivUser.acceptedTerms = this.terms;
198 
-      this.saveIndividual(this.indivUser)
199 
-        .then(res => {
200 
-          this.boolMessage = true;
201 
-          setTimeout(() => {
202 
-            if (Log.getUser().role !== "Super Admin") {
203 
-              this.$router.push("/user/login");
204 
-            } else {
205 
-              this.$refs.dataToggle.click();
206 
-              this.$router.go();
207 
-            }
208 
-          }, 500);
209 
-        })
210 
-        .catch(err => {
211 
-          this.boolUserExists = true;
212 
-        });
205 
+      console.log(this.indivUser.email);
206 
+      if (this.indivUser.email) {
207 
+        console.log(this.indivUser.username);
208 
+        if (this.indivUser.username) {
209 
+          this.saveIndividual(this.indivUser)
210 
+            .then(res => {
211 
+              this.boolMessage = true;
212 
+              setTimeout(() => {
213 
+                if (Log.getUser().role !== "Super Admin") {
214 
+                  this.$router.push("/user/login");
215 
+                } else {
216 
+                  this.$refs.dataToggle.click();
217 
+                  this.$router.go();
218 
+                }
219 
+              }, 500);
220 
+            })
221 
+            .catch(err => {
222 
+              console.log(err.message);
223 
+              this.boolUserExists = true;
224 
+            });
225 
+        } else {
226 
+          this.validationErrorMessage = "Username Required";
227 
+          this.boolValidationError = true;
228 
+        }
229 
+      } else {
230 
+        this.validationErrorMessage = "Email Required";
231 
+        this.boolValidationError = true;
232 
+      }
213 
     },
 233 
     },
214 
     Close() {
 234 
     Close() {
215 
       this.$router.push("/user/login");
 235 
       this.$router.push("/user/login");

+ 8
- 2
src/main.js Näytä tiedosto

18 
 import vueFloatLabel from "vue-float-label";
 18 
 import vueFloatLabel from "vue-float-label";
19 
 import 'vue-loaders/dist/vue-loaders.css';
 19 
 import 'vue-loaders/dist/vue-loaders.css';
20 
 import VueLoaders from 'vue-loaders';
 20 
 import VueLoaders from 'vue-loaders';
21 
+import VueQuillEditor from 'vue-quill-editor'
21
22
23 
+import 'quill/dist/quill.core.css' // import styles
24 
+import 'quill/dist/quill.snow.css' // for snow theme
25 
+import 'quill/dist/quill.bubble.css' // for bubble theme
26 
+
27 
+Vue.use(VueQuillEditor, /* { default global options } */)
22 
 Vue.use(VueLoaders);
 28 
 Vue.use(VueLoaders);
23 
 Vue.use(VueSocialSharing);
 29 
 Vue.use(VueSocialSharing);
24 
 Vue.use(EvaIcons);
 30 
 Vue.use(EvaIcons);
47
53
48 
 Vue.config.productionTip = false;
 54 
 Vue.config.productionTip = false;
49 
 //axios.defaults.baseURL = "http://localhost:57260";
 55 
 //axios.defaults.baseURL = "http://localhost:57260";
50 
-axios.defaults.baseURL = "https://www.pvsl.co.za:86/";
51 
-//axios.defaults.baseURL = "http://training.provision-sa.com:82/";
56 
+//axios.defaults.baseURL = "https://www.pvsl.co.za:86/";
57 
+axios.defaults.baseURL = "http://training.provision-sa.com:120/";
52 
 //axios.defaults.baseURL = "http://localhost:8080/"
 58 
 //axios.defaults.baseURL = "http://localhost:8080/"
53
59
54 
 Vue.prototype.$axios = axios;
 60 
 Vue.prototype.$axios = axios;

+ 10
- 0
src/router/index.js Näytä tiedosto

111
111
112 
 import UserRoles from "../components/user/Roles/userRoles.vue";
 112 
 import UserRoles from "../components/user/Roles/userRoles.vue";
113
113
114 
+import htmlPreview from '../components/marketing/htmlPreview.vue'
115 
+
114 
 Vue.use(VueHead);
 116 
 Vue.use(VueHead);
115 
 Vue.use(Router);
 117 
 Vue.use(Router);
116
118
529 
       }),
 531 
       }),
530 
       component: MyWeeksEdit
 532 
       component: MyWeeksEdit
531 
     },
 533 
     },
534 
+    {
535 
+      path: "/htmlPreview",
536 
+      name: "HtmlPreview",
537 
+      props: route => ({
538 
+        ...route.params
539 
+      }),
540 
+      component: htmlPreview
541 
+    },
532 
     {
 542 
     {
533 
       path: "/user/forgotPassword",
 543 
       path: "/user/forgotPassword",
534 
       name: "forgotPassword",
 544 
       name: "forgotPassword",

+ 1
- 0
src/store/modules/timeshare/resort.js Näytä tiedosto

1 
 /* eslint-disable no-restricted-syntax */
 1 
 /* eslint-disable no-restricted-syntax */
2 
 /* eslint-disable guard-for-in */
 2 
 /* eslint-disable guard-for-in */
3 
+/* eslint-disable */
3 
 import axios from "axios";
 4 
 import axios from "axios";
4 
 import { reject } from "core-js/fn/promise";
 5 
 import { reject } from "core-js/fn/promise";
5
6

+ 3
- 1
src/store/modules/timeshare/timeshare.js Näytä tiedosto

191 
     getResorts({ commit }) {
 191 
     getResorts({ commit }) {
192 
       axios
 192 
       axios
193 
         .get("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/list/")
 193 
         .get("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/list/")
194 
-        .then(result => commit("addResort", result.data))
194 
+        .then(result => {commit("addResort", result.data)
195 
+        console.log(result.data);
196 
+      })
195 
         .catch(console.error);
 197 
         .catch(console.error);
196 
     },
 198 
     },
197 
     getRegions({ dispatch, commit }) {
 199 
     getRegions({ dispatch, commit }) {

+ 2
- 2
vue.config.js Näytä tiedosto

3 
     proxy: {
 3 
     proxy: {
4 
       "/api": {
 4 
       "/api": {
5 
         //target: "http://localhost:57260/",
 5 
         //target: "http://localhost:57260/",
6 
-        //target: "http://training.provision-sa.com:82/",
7 
-        target: "https://www.pvsl.co.za:86/",
6 
+        target: "http://training.provision-sa.com:120/",
7 
+        //target: "https://www.pvsl.co.za:86/",
8 
         changeOrigin: true
 8 
         changeOrigin: true
9 
       },
 9 
       },
10 
       "/nph-srep": {
 10 
       "/nph-srep": {

Write Preview
Loading…
Peruuta
Tallenna