4 Ревизии

Автор SHA1 Съобщение Дата
  Bruce Lywood 6fba7d5231 Merge remote-tracking branch 'origin/master' преди 5 години
  Bruce Lywood 0ece2f407a Added admin pages, changed navbar and routes преди 5 години
  Bruce Lywood 01b37c3da2 Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivateProperties преди 5 години
  Bruce Lywood 49ff808a2d footer change and css addition преди 5 години

+ 97
- 17
package-lock.json Целия файл

@@ -1978,8 +1978,7 @@
1978 1978
     "atob": {
1979 1979
       "version": "2.1.2",
1980 1980
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
1981
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
1982
-      "dev": true
1981
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
1983 1982
     },
1984 1983
     "autoprefixer": {
1985 1984
       "version": "9.6.0",
@@ -3386,6 +3385,24 @@
3386 3385
         "randomfill": "^1.0.3"
3387 3386
       }
3388 3387
     },
3388
+    "css": {
3389
+      "version": "2.2.4",
3390
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
3391
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
3392
+      "requires": {
3393
+        "inherits": "^2.0.3",
3394
+        "source-map": "^0.6.1",
3395
+        "source-map-resolve": "^0.5.2",
3396
+        "urix": "^0.1.0"
3397
+      },
3398
+      "dependencies": {
3399
+        "source-map": {
3400
+          "version": "0.6.1",
3401
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
3402
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
3403
+        }
3404
+      }
3405
+    },
3389 3406
     "css-color-names": {
3390 3407
       "version": "0.0.4",
3391 3408
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -3441,6 +3458,14 @@
3441 3458
         }
3442 3459
       }
3443 3460
     },
3461
+    "css-parse": {
3462
+      "version": "2.0.0",
3463
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
3464
+      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
3465
+      "requires": {
3466
+        "css": "^2.0.0"
3467
+      }
3468
+    },
3444 3469
     "css-select": {
3445 3470
       "version": "2.0.2",
3446 3471
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
@@ -3670,6 +3695,14 @@
3670 3695
         "assert-plus": "^1.0.0"
3671 3696
       }
3672 3697
     },
3698
+    "datatables.net": {
3699
+      "version": "1.10.19",
3700
+      "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.19.tgz",
3701
+      "integrity": "sha512-+ljXcI6Pj3PTGy5pesp3E5Dr3x3AV45EZe0o1r0gKENN2gafBKXodVnk2ypKwl2tTmivjxbkiqoWnipTefyBTA==",
3702
+      "requires": {
3703
+        "jquery": ">=1.7"
3704
+      }
3705
+    },
3673 3706
     "date-now": {
3674 3707
       "version": "0.1.4",
3675 3708
       "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
@@ -3699,8 +3732,7 @@
3699 3732
     "decode-uri-component": {
3700 3733
       "version": "0.2.0",
3701 3734
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
3702
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
3703
-      "dev": true
3735
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
3704 3736
     },
3705 3737
     "deep-equal": {
3706 3738
       "version": "1.0.1",
@@ -4664,10 +4696,13 @@
4664 4696
       }
4665 4697
     },
4666 4698
     "eslint-utils": {
4667
-      "version": "1.3.1",
4668
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
4669
-      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
4670
-      "dev": true
4699
+      "version": "1.4.2",
4700
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
4701
+      "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
4702
+      "dev": true,
4703
+      "requires": {
4704
+        "eslint-visitor-keys": "^1.0.0"
4705
+      }
4671 4706
     },
4672 4707
     "eslint-visitor-keys": {
4673 4708
       "version": "1.0.0",
@@ -7027,6 +7062,11 @@
7027 7062
       "integrity": "sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=",
7028 7063
       "dev": true
7029 7064
     },
7065
+    "jquery": {
7066
+      "version": "3.4.1",
7067
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
7068
+      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
7069
+    },
7030 7070
     "js-base64": {
7031 7071
       "version": "2.5.1",
7032 7072
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
@@ -8221,6 +8261,11 @@
8221 8261
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
8222 8262
       "dev": true
8223 8263
     },
8264
+    "object-path": {
8265
+      "version": "0.11.4",
8266
+      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
8267
+      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk="
8268
+    },
8224 8269
     "object-visit": {
8225 8270
       "version": "1.0.1",
8226 8271
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -9884,8 +9929,7 @@
9884 9929
     "resolve-url": {
9885 9930
       "version": "0.2.1",
9886 9931
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
9887
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
9888
-      "dev": true
9932
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
9889 9933
     },
9890 9934
     "restore-cursor": {
9891 9935
       "version": "2.0.0",
@@ -10245,8 +10289,7 @@
10245 10289
     "sax": {
10246 10290
       "version": "1.2.4",
10247 10291
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
10248
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
10249
-      "dev": true
10292
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
10250 10293
     },
10251 10294
     "schema-utils": {
10252 10295
       "version": "0.4.7",
@@ -10731,7 +10774,6 @@
10731 10774
       "version": "0.5.2",
10732 10775
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
10733 10776
       "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
10734
-      "dev": true,
10735 10777
       "requires": {
10736 10778
         "atob": "^2.1.1",
10737 10779
         "decode-uri-component": "^0.2.0",
@@ -10761,8 +10803,7 @@
10761 10803
     "source-map-url": {
10762 10804
       "version": "0.4.0",
10763 10805
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
10764
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
10765
-      "dev": true
10806
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
10766 10807
     },
10767 10808
     "spdx-correct": {
10768 10809
       "version": "3.1.0",
@@ -11081,6 +11122,46 @@
11081 11122
         }
11082 11123
       }
11083 11124
     },
11125
+    "stylus": {
11126
+      "version": "0.54.7",
11127
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz",
11128
+      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
11129
+      "requires": {
11130
+        "css-parse": "~2.0.0",
11131
+        "debug": "~3.1.0",
11132
+        "glob": "^7.1.3",
11133
+        "mkdirp": "~0.5.x",
11134
+        "safer-buffer": "^2.1.2",
11135
+        "sax": "~1.2.4",
11136
+        "semver": "^6.0.0",
11137
+        "source-map": "^0.7.3"
11138
+      },
11139
+      "dependencies": {
11140
+        "debug": {
11141
+          "version": "3.1.0",
11142
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
11143
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
11144
+          "requires": {
11145
+            "ms": "2.0.0"
11146
+          }
11147
+        },
11148
+        "ms": {
11149
+          "version": "2.0.0",
11150
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
11151
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
11152
+        },
11153
+        "semver": {
11154
+          "version": "6.3.0",
11155
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
11156
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
11157
+        },
11158
+        "source-map": {
11159
+          "version": "0.7.3",
11160
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
11161
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
11162
+        }
11163
+      }
11164
+    },
11084 11165
     "stylus-loader": {
11085 11166
       "version": "3.0.2",
11086 11167
       "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
@@ -11675,8 +11756,7 @@
11675 11756
     "urix": {
11676 11757
       "version": "0.1.0",
11677 11758
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
11678
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
11679
-      "dev": true
11759
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
11680 11760
     },
11681 11761
     "url": {
11682 11762
       "version": "0.11.0",

+ 1
- 0
package.json Целия файл

@@ -12,6 +12,7 @@
12 12
     "animate.css": "^3.7.2",
13 13
     "axios": "^0.19.0",
14 14
     "core-js": "^2.6.5",
15
+    "datatables.net": "^1.10.19",
15 16
     "lodash": "^4.17.15",
16 17
     "material-design-icons-iconfont": "^3.0.3",
17 18
     "node-sass": "^4.12.0",

+ 5
- 2
public/css/style.css Целия файл

@@ -1570,6 +1570,9 @@ footer .credits {
1570 1570
     font-size: 14px;
1571 1571
 }
1572 1572
 
1573
+.pt-3-half {
1574
+    padding-top: 1.4rem;
1575
+}
1573 1576
 
1574 1577
 /*======================================
1575 1578
 //--//-->   FORM INPUT
@@ -1589,7 +1592,7 @@ footer .credits {
1589 1592
 .form {
1590 1593
     position: relative;
1591 1594
     z-index: 1;
1592
-    background: rgb(236, 233, 233);
1595
+    background: #F8F9F9;
1593 1596
     max-width: 360px;
1594 1597
     margin: 0 auto 100px;
1595 1598
     padding: 45px;
@@ -1600,7 +1603,7 @@ footer .credits {
1600 1603
 .regform {
1601 1604
     position: relative;
1602 1605
     z-index: 1;
1603
-    background: rgb(236, 233, 233);
1606
+    background: #F8F9F9;
1604 1607
     max-width: 600px;
1605 1608
     margin: 0 auto 100px;
1606 1609
     padding: 45px;

+ 36
- 0
src/components/admin/status/changeLogPage.vue Целия файл

@@ -0,0 +1,36 @@
1
+<template>
2
+  <section class="intro-single">
3
+    <div class="container">
4
+      <div class="row">
5
+        <div class="col-md-12 col-lg-8">
6
+          <div class="title-single-box">
7
+            <h1 class="title-single" style="text-align:left;">Change Log</h1>
8
+          </div>
9
+        </div>
10
+      </div>
11
+    </div>
12
+    <div id="table" class="col-xs-12 table-responsive">
13
+      <datatable :columns="columns" :data="rows"></datatable>
14
+    </div>
15
+  </section>
16
+</template>
17
+<script>
18
+import { mapState, mapActions } from 'vuex';
19
+
20
+export default {
21
+  name: 'changeLogPage',
22
+  created() {
23
+    this.getchangeLogPage();
24
+  },
25
+  computed: {
26
+    ...mapState('status', ['changeLogPage']),
27
+  },
28
+  methods: {
29
+    ...mapActions('status', ['getchangeLogPage']),
30
+  },
31
+};
32
+</script>
33
+
34
+
35
+<style>
36
+</style>

+ 36
- 0
src/components/admin/status/tenderWeekAdminPage.vue Целия файл

@@ -0,0 +1,36 @@
1
+<template>
2
+  <section class="intro-single">
3
+    <div class="container">
4
+      <div class="row">
5
+        <div class="col-md-12 col-lg-8">
6
+          <div class="title-single-box">
7
+            <h1 class="title-single" style="text-align:left;">Tender Week Admin</h1>
8
+          </div>
9
+        </div>
10
+      </div>
11
+    </div>
12
+    <div id="table" class="col-xs-12 table-responsive">
13
+      <datatable :columns="columns" :data="rows"></datatable>
14
+    </div>
15
+  </section>
16
+</template>
17
+<script>
18
+import { mapState, mapActions } from 'vuex';
19
+
20
+export default {
21
+  name: 'TenderWeekAdmin',
22
+  created() {
23
+    this.gettenderWeekdmin();
24
+  },
25
+  computed: {
26
+    ...mapState('status', ['tenderWeekAdmin']),
27
+  },
28
+  methods: {
29
+    ...mapActions('status', ['gettenderWeekAdmin']),
30
+  },
31
+};
32
+</script>
33
+
34
+
35
+<style>
36
+</style>

+ 36
- 0
src/components/admin/status/timeshareAdminPage.vue Целия файл

@@ -0,0 +1,36 @@
1
+<template>
2
+  <section class="intro-single">
3
+    <div class="container">
4
+      <div class="row">
5
+        <div class="col-md-12 col-lg-8">
6
+          <div class="title-single-box">
7
+            <h1 class="title-single" style="text-align:left;">Timeshare Admin</h1>
8
+          </div>
9
+        </div>
10
+      </div>
11
+    </div>
12
+    <div id="table" class="col-xs-12 table-responsive">
13
+      <datatable :columns="columns" :data="rows"></datatable>
14
+    </div>
15
+  </section>
16
+</template>
17
+<script>
18
+import { mapState, mapActions } from 'vuex';
19
+
20
+export default {
21
+  name: 'TimeshareAdmin',
22
+  created() {
23
+    this.gettimeshareAdmin();
24
+  },
25
+  computed: {
26
+    ...mapState('status', ['timeshareAdmin']),
27
+  },
28
+  methods: {
29
+    ...mapActions('status', ['gettimeshareAdmin']),
30
+  },
31
+};
32
+</script>
33
+
34
+
35
+<style>
36
+</style>

+ 36
- 0
src/components/admin/status/userManagementPage.vue Целия файл

@@ -0,0 +1,36 @@
1
+<template>
2
+  <section class="intro-single">
3
+    <div class="container">
4
+      <div class="row">
5
+        <div class="col-md-12 col-lg-8">
6
+          <div class="title-single-box">
7
+            <h1 class="title-single" style="text-align:left;">User Management</h1>
8
+          </div>
9
+        </div>
10
+      </div>
11
+    </div>
12
+    <div id="table" class="col-xs-12 table-responsive">
13
+      <datatable :columns="columns" :data="rows"></datatable>
14
+    </div>
15
+  </section>
16
+</template>
17
+<script>
18
+import { mapState, mapActions } from 'vuex';
19
+
20
+export default {
21
+  name: 'userManagementPage',
22
+  created() {
23
+    this.getuserManagementPage();
24
+  },
25
+  computed: {
26
+    ...mapState('status', ['userManagementPage']),
27
+  },
28
+  methods: {
29
+    ...mapActions('status', ['getuserManagementPage']),
30
+  },
31
+};
32
+</script>
33
+
34
+
35
+<style>
36
+</style>

+ 10
- 4
src/components/misc/contactUs.vue Целия файл

@@ -1,10 +1,16 @@
1 1
 <template>
2 2
   <div class="container">
3
-    <div class="row">
4
-      <div class="col-md-12">
5
-        <h1 class="my-4">Contact Us</h1>
3
+    <section class="intro-single">
4
+      <div class="container">
5
+        <div class="row">
6
+          <div class="col-md-12 col-lg-8">
7
+            <div class="title-single-box">
8
+              <h1 class="title-single" style="text-align:left;">Contact Us</h1>
9
+            </div>
10
+          </div>
11
+        </div>
6 12
       </div>
7
-    </div>
13
+    </section>
8 14
     <div class="map-wrapper">
9 15
       <div class="map-canvas" id="map-canvas"></div>
10 16
       <a

+ 7
- 7
src/components/shared/footerSection.vue Целия файл

@@ -74,7 +74,7 @@
74 74
               </div>
75 75
               <div class="w-body-a">
76 76
                 <ul class="list-unstyled">
77
-                  <li class="item-list-a">
77
+                  <li class="item-list-a" style="margin-bottom: 1em">
78 78
                     <a href="https:\\www.daelive.com">
79 79
                       <img
80 80
                         class="img-fluid"
@@ -84,8 +84,8 @@
84 84
                       />
85 85
                     </a>
86 86
                   </li>
87
-                  <br />
88
-                  <li class="item-list-a">
87
+
88
+                  <li class="item-list-a" style="margin-bottom: 1em">
89 89
                     <a href="https:\\www.gomelo.co.za">
90 90
                       <img
91 91
                         class="img-fluid"
@@ -95,8 +95,8 @@
95 95
                       />
96 96
                     </a>
97 97
                   </li>
98
-                  <br />
99
-                  <li class="item-list-a">
98
+
99
+                  <li class="item-list-a" style="margin-bottom: 1em">
100 100
                     <a href="https:\\www.rci.co.za">
101 101
                       <img
102 102
                         class="img-fluid"
@@ -106,8 +106,8 @@
106 106
                       />
107 107
                     </a>
108 108
                   </li>
109
-                  <br />
110
-                  <li class="item-list-a">
109
+
110
+                  <li class="item-list-a" style="margin-bottom: 1em">
111 111
                     <a href="https:\\www.voasa.co.za">
112 112
                       <img
113 113
                         class="img-fluid"

+ 9
- 13
src/components/shared/navBar.vue Целия файл

@@ -151,28 +151,24 @@
151 151
               <a class="dropdown-item cursor-pointer" @click="routerGoTo('/status/list')">Status</a>
152 152
               <a
153 153
                 class="dropdown-item cursor-pointer"
154
-                @click="routerGoTo('/status/list')"
154
+                @click="routerGoTo('/status/timeshareAdmin')"
155 155
               >Timeshare Week Admin</a>
156 156
               <a
157 157
                 class="dropdown-item cursor-pointer"
158
-                @click="routerGoTo('/status/list')"
159
-              >Changes Logs</a>
160
-              <a
161
-                class="dropdown-item cursor-pointer"
162
-                @click="routerGoTo('/status/list')"
163
-              >User Management & Access</a>
158
+                @click="routerGoTo('/status/tenderWeekAdmin')"
159
+              >Tender Week Management</a>
164 160
               <a
165 161
                 class="dropdown-item cursor-pointer"
166
-                @click="routerGoTo('/status/list')"
167
-              >Tender Week Management</a>
162
+                @click="routerGoTo('/unitConfiguration/list')"
163
+              >Unit Configuration</a>
168 164
               <a
169 165
                 class="dropdown-item cursor-pointer"
170
-                @click="routerGoTo('/status/list')"
171
-              >Timeshare Week Approval</a>
166
+                @click="routerGoTo('/status/userManagementPage')"
167
+              >User Management & Access</a>
172 168
               <a
173 169
                 class="dropdown-item cursor-pointer"
174
-                @click="routerGoTo('/unitConfiguration/list')"
175
-              >Unit Configuration</a>
170
+                @click="routerGoTo('/status/changeLogPage')"
171
+              >Changes Logs</a>
176 172
             </div>
177 173
           </li>
178 174
           <li class="nav-item">

+ 59
- 52
src/components/user/loginPage.vue Целия файл

@@ -1,65 +1,72 @@
1 1
 <template>
2
-  <!-- eslint-disable max-len -->
3
-  <div class="login-page">
4
-    <form id="signIn">
5
-      <div class="form">
6
-        <div>
7
-          <h4>Login</h4>
8
-        </div>
9
-        <div class="row">
10
-          <div>
11
-            <eva-icon name="lock-outline" fill="#60CBEB"></eva-icon>
12
-          </div>
13
-          <div class="col-md-11">
14
-            <input
15
-              class="form-control"
16
-              v-model="username"
17
-              placeholder="Username"
18
-              type="text"
19
-              name="username"
20
-              value
21
-            />
22
-          </div>
2
+  <div class="container">
3
+    <!-- eslint-disable max-len -->
4
+    <div class="login-page">
5
+      <form id="signIn">
6
+        <div class="form">
23 7
           <div>
24
-            <eva-icon v-if="!showPassword" name="eye-off" fill="#60CBEB" @click="togglePassword()"></eva-icon>
25
-            <eva-icon v-else name="eye" fill="#60CBEB" @click="passwordToggled()"></eva-icon>
8
+            <h4>Login</h4>
26 9
           </div>
27
-          <div class="col-md-11">
28
-            <input
29
-              class="form-control"
30
-              :type="isPasswordShown"
31
-              v-model="password"
32
-              id="password"
33
-              placeholder="Password"
34
-              name="password"
35
-              value
36
-            />
10
+          <div class="row">
11
+            <div>
12
+              <eva-icon name="lock-outline" fill="#60CBEB"></eva-icon>
13
+            </div>
14
+            <div class="col-md-11">
15
+              <input
16
+                class="form-control"
17
+                v-model="username"
18
+                placeholder="Username"
19
+                type="text"
20
+                name="username"
21
+                value
22
+              />
23
+            </div>
24
+            <div>
25
+              <eva-icon
26
+                v-if="!showPassword"
27
+                name="eye-off"
28
+                fill="#60CBEB"
29
+                @click="togglePassword()"
30
+              ></eva-icon>
31
+              <eva-icon v-else name="eye" fill="#60CBEB" @click="passwordToggled()"></eva-icon>
32
+            </div>
33
+            <div class="col-md-11">
34
+              <input
35
+                class="form-control"
36
+                :type="isPasswordShown"
37
+                v-model="password"
38
+                id="password"
39
+                placeholder="Password"
40
+                name="password"
41
+                value
42
+              />
43
+            </div>
37 44
           </div>
45
+          <div class="form-group row"></div>
46
+          <button @click="Login" class="btn btn-b-n" type="submit">Sign In</button>
47
+          <p v-if="user !== null">{{ user }}</p>
38 48
         </div>
39
-        <div class="form-group row"></div>
40
-        <button @click="Login" class="btn btn-b-n" type="submit">Sign In</button>
41
-        <p v-if="user !== null">{{ user }}</p>
42
-      </div>
43
-    </form>
49
+      </form>
44 50
 
45
-    <form id="forgot">
46
-      <div class="form">
47
-        <h5>Trouble signing in?</h5>
48
-        <div>
49
-          <div class="row">
50
-            <eva-icon name="email" fill="#60CBEB"></eva-icon>
51
+      <form id="forgot">
52
+        <div class="form">
53
+          <h5>Trouble signing in?</h5>
54
+          <div>
55
+            <div class="row">
56
+              <eva-icon name="email" fill="#60CBEB"></eva-icon>
51 57
 
52
-            <div class="col-md-11">
53
-              <input class="form-control" placeholder="Your Email" type="text" name="email" value />
58
+              <div class="col-md-11">
59
+                <input class="form-control" placeholder="Your Email" type="text" name="email" value />
60
+              </div>
54 61
             </div>
55 62
           </div>
63
+          <div class="form-group row"></div>
64
+          <div class="offset-md-3 col-md-5">
65
+            <button class="btn btn-b-n" type="submit">Get Help</button>
66
+          </div>
56 67
         </div>
57
-        <div class="form-group row"></div>
58
-        <div class="offset-md-3 col-md-5">
59
-          <button class="btn btn-b-n" type="submit">Get Help</button>
60
-        </div>
61
-      </div>
62
-    </form>
68
+      </form>
69
+    </div>
63 70
   </div>
64 71
 </template>
65 72
 

+ 25
- 0
src/router/index.js Целия файл

@@ -19,6 +19,10 @@ import AboutUs from '../components/about/aboutUsPage.vue';
19 19
 import AboutTimeshare from '../components/about/aboutTimeshare.vue';
20 20
 
21 21
 import Status from '../components/admin/status/statusPage.vue';
22
+import timeshareAdminPage from '../components/admin/status/timeshareAdminPage.vue';
23
+import tenderWeekAdminPage from '../components/admin/status/tenderWeekAdminPage.vue';
24
+import userManagementPage from '../components/admin/status/userManagementPage.vue';
25
+import changeLogPage from '../components/admin/status/changeLogPage.vue';
22 26
 import UnitConfiguration from '../components/admin/unitConfiguration/unitConfigurationPage.vue';
23 27
 
24 28
 import ResortPage from '../components/timeshare/resort/resortPage.vue';
@@ -26,6 +30,7 @@ import UnitPage from '../components/timeshare/resort/unitPage.vue';
26 30
 
27 31
 import ContactUs from '../components/misc/contactUs.vue';
28 32
 
33
+
29 34
 Vue.use(Router);
30 35
 
31 36
 export default new Router({
@@ -99,6 +104,26 @@ export default new Router({
99 104
     name: 'StatusList',
100 105
     component: Status,
101 106
   },
107
+  {
108
+    path: '/status/timeshareAdmin',
109
+    name: 'TimeshareAdmin',
110
+    component: timeshareAdminPage,
111
+  },
112
+  {
113
+    path: '/status/tenderWeekAdmin',
114
+    name: 'TenderWeekAdmin',
115
+    component: tenderWeekAdminPage,
116
+  },
117
+  {
118
+    path: '/status/userManagementPage',
119
+    name: 'userManagementPage',
120
+    component: userManagementPage,
121
+  },
122
+  {
123
+    path: '/status/changeLogPage',
124
+    name: 'changeLogPage',
125
+    component: changeLogPage,
126
+  },
102 127
   {
103 128
     path: '/unitConfiguration/list',
104 129
     name: 'UnitConfiguration',

Loading…
Отказ
Запис