5 Commits

Author SHA1 Message Date
  Bruce Lywood 67386695a7 Merge remote-tracking branch 'origin/master' 5 years ago
  Bruce Lywood 224b1d728f Navbar & Css Color 5 years ago
  Bruce Lywood da1ffc444a Merge remote-tracking branch 'origin/master' 5 years ago
  Bruce Lywood a49f02dbee Merge remote-tracking branch 'origin/master' 5 years ago
  Bruce Lywood e020bd5572 NavBar 5 years ago
3 changed files with 79 additions and 81 deletions
  1. 3
    3
      public/css/style.css
  2. 4
    6
      public/js/main.js
  3. 72
    72
      src/components/shared/navBar.vue

+ 3
- 3
public/css/style.css View File

527
 
527
 
528
 .navbar-default {
528
 .navbar-default {
529
     transition: all .5s ease-in-out;
529
     transition: all .5s ease-in-out;
530
-    background-color: #ffffff;
530
+    background-color: #E5E7E9;
531
     padding-top: 28px;
531
     padding-top: 28px;
532
     padding-bottom: 28px;
532
     padding-bottom: 28px;
533
     -webkit-backface-visibility: hidden;
533
     -webkit-backface-visibility: hidden;
1538
 .section-footer {
1538
 .section-footer {
1539
     padding-top: 60px;
1539
     padding-top: 60px;
1540
     margin-top: 60px;
1540
     margin-top: 60px;
1541
-    background: #f3f3f3;
1541
+    background: #E5E7E9;
1542
 }
1542
 }
1543
 
1543
 
1544
 .section-footer ul {
1544
 .section-footer ul {
1556
 }
1556
 }
1557
 
1557
 
1558
 footer {
1558
 footer {
1559
-    background: #f3f3f3;
1559
+    background: #E5E7E9;
1560
     text-align: center;
1560
     text-align: center;
1561
     padding: 30px 0;
1561
     padding: 30px 0;
1562
 }
1562
 }

+ 4
- 6
public/js/main.js View File

1
 (function ($) {
1
 (function ($) {
2
-  
3
-
4
   // Preloader
2
   // Preloader
5
   $(window).on('load', () => {
3
   $(window).on('load', () => {
6
     if ($('#preloader')) {
4
     if ($('#preloader')) {
54
     $('.intro-content .intro-title').removeClass('zoomIn animated').hide();
52
     $('.intro-content .intro-title').removeClass('zoomIn animated').hide();
55
     $('.intro-content .intro-price').removeClass('fadeInUp animated').hide();
53
     $('.intro-content .intro-price').removeClass('fadeInUp animated').hide();
56
     $('.intro-content .intro-title-top, .intro-content .spacial').removeClass(
54
     $('.intro-content .intro-title-top, .intro-content .spacial').removeClass(
57
-      'fadeIn animated'
58
-)
55
+      'fadeIn animated',
56
+    )
59
       .hide();
57
       .hide();
60
   });
58
   });
61
 
59
 
78
   /* --/ Navbar Menu Reduce /--*/
76
   /* --/ Navbar Menu Reduce /--*/
79
   $(window).trigger('scroll');
77
   $(window).trigger('scroll');
80
   $(window).bind('scroll', () => {
78
   $(window).bind('scroll', () => {
81
-    let pixels = 50;
82
-    let top = 1200;
79
+    const pixels = 50;
80
+    const top = 1200;
83
     if ($(window).scrollTop() > pixels) {
81
     if ($(window).scrollTop() > pixels) {
84
       $('.navbar-default').addClass('navbar-reduce');
82
       $('.navbar-default').addClass('navbar-reduce');
85
       $('.navbar-default').removeClass('navbar-trans');
83
       $('.navbar-default').removeClass('navbar-trans');

+ 72
- 72
src/components/shared/navBar.vue View File

36
       </button>
36
       </button>
37
       <div class="navbar-collapse collapse justify-content-center" id="navbarDefault">
37
       <div class="navbar-collapse collapse justify-content-center" id="navbarDefault">
38
         <ul class="navbar-nav">
38
         <ul class="navbar-nav">
39
-          <li class="nav-item">
39
+          <!-- <li class="nav-item">
40
             <a class="nav-link active" @click="routerGoTo('/')">Home</a>
40
             <a class="nav-link active" @click="routerGoTo('/')">Home</a>
41
-          </li>
42
-          <li class="nav-item dropdown">
43
-            <a
44
-              class="nav-link dropdown-toggle"
45
-              href="#"
46
-              id="navbarDropdown"
47
-              role="button"
48
-              data-toggle="dropdown"
49
-              aria-haspopup="true"
50
-              aria-expanded="false"
51
-            >About</a>
52
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
53
-              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/about/us')">About Us</a>
54
-              <a
55
-                class="dropdown-item cursor-pointer"
56
-                @click="routerGoTo('/about/timeshare')"
57
-              >About Timeshare</a>
58
-            </div>
59
-          </li>
41
+          </li>-->
60
           <li class="nav-item dropdown">
42
           <li class="nav-item dropdown">
61
             <a
43
             <a
62
               class="nav-link dropdown-toggle"
44
               class="nav-link dropdown-toggle"
86
               data-toggle="dropdown"
68
               data-toggle="dropdown"
87
               aria-haspopup="true"
69
               aria-haspopup="true"
88
               aria-expanded="false"
70
               aria-expanded="false"
89
-            >Residential</a>
71
+            >Properties</a>
90
             <div class="dropdown-menu" aria-labelledby="navbarDropdown">
72
             <div class="dropdown-menu" aria-labelledby="navbarDropdown">
73
+              <a
74
+                class="dropdown-item cursor-pointer"
75
+                @click="routerGoTo('/property/Commercial/Search')"
76
+              >
77
+                <u class="color-b">Search</u> Commercial Properties
78
+              </a>
79
+              <a
80
+                class="dropdown-item cursor-pointer"
81
+                @click="routerGoTo('/property/Commercial/Sale')"
82
+              >
83
+                <u class="color-b">To Sell</u> Commercial Properties
84
+              </a>
85
+              <a
86
+                class="dropdown-item cursor-pointer"
87
+                @click="routerGoTo('/property/Commercial/Rental')"
88
+              >
89
+                <u class="color-b">To Rent</u> Commercial Properties
90
+              </a>
91
+              <hr />
92
+
91
               <a
93
               <a
92
                 class="dropdown-item cursor-pointer"
94
                 class="dropdown-item cursor-pointer"
93
                 @click="routerGoTo('/property/Residential/Search')"
95
                 @click="routerGoTo('/property/Residential/Search')"
94
-              >Search</a>
96
+              >
97
+                <u class="color-b">Search</u> Residential Properties
98
+              </a>
99
+              <a
100
+                class="dropdown-item cursor-pointer"
101
+                @click="routerGoTo('/property/Residential/Sale')"
102
+              >
103
+                <u class="color-b">To Sell</u> Residential Properties
104
+              </a>
95
               <a
105
               <a
96
                 class="dropdown-item cursor-pointer"
106
                 class="dropdown-item cursor-pointer"
97
                 @click="routerGoTo('/property/Residential/Rental')"
107
                 @click="routerGoTo('/property/Residential/Rental')"
98
-              >To Rent</a>
99
-              <div
108
+              >
109
+                <u class="color-b">To Rent</u> Residential Properties
110
+              </a>
111
+              <hr />
112
+              <a
100
                 class="dropdown-item cursor-pointer"
113
                 class="dropdown-item cursor-pointer"
101
-                @click="routerGoTo('/property/Residential/Sale')"
102
-              >To Sell</div>
103
-              <div
114
+                @click="routerGoTo('/property/list/Commercial/MyListings')"
115
+              >
116
+                <u class="color-b">My</u> Commercial Properties
117
+              </a>
118
+              <a
104
                 class="dropdown-item cursor-pointer"
119
                 class="dropdown-item cursor-pointer"
105
                 @click="routerGoTo('/property/list/Residential/MyListings')"
120
                 @click="routerGoTo('/property/list/Residential/MyListings')"
106
-              >My Residential Properties</div>
107
-              <div
108
-                class="dropdown-item cursor-pointer"
109
-                @click="routerGoTo('/property/list/Residential/All')"
110
-              >Admin Residential Properties</div>
121
+              >
122
+                <u class="color-b">My</u> Residential Properties
123
+              </a>
111
             </div>
124
             </div>
112
           </li>
125
           </li>
126
+
127
+          <!--  <li class="nav-item">
128
+            <a class="nav-link" @click="routerGoTo('/contactus')">Contact</a>
129
+          </li>-->
113
           <li class="nav-item dropdown">
130
           <li class="nav-item dropdown">
114
             <a
131
             <a
115
               class="nav-link dropdown-toggle"
132
               class="nav-link dropdown-toggle"
119
               data-toggle="dropdown"
136
               data-toggle="dropdown"
120
               aria-haspopup="true"
137
               aria-haspopup="true"
121
               aria-expanded="false"
138
               aria-expanded="false"
122
-            >Commercial</a>
139
+            >About</a>
123
             <div class="dropdown-menu" aria-labelledby="navbarDropdown">
140
             <div class="dropdown-menu" aria-labelledby="navbarDropdown">
141
+              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/about/us')">About Us</a>
124
               <a
142
               <a
125
                 class="dropdown-item cursor-pointer"
143
                 class="dropdown-item cursor-pointer"
126
-                @click="routerGoTo('/property/Commercial/Search')"
127
-              >Search</a>
128
-              <a
129
-                class="dropdown-item cursor-pointer"
130
-                @click="routerGoTo('/property/Commercial/Rental')"
131
-              >To Rent</a>
132
-              <a
133
-                class="dropdown-item cursor-pointer"
134
-                @click="routerGoTo('/property/Commercial/Sale')"
135
-              >To Sell</a>
136
-              <a
137
-                class="dropdown-item cursor-pointer"
138
-                @click="routerGoTo('/property/list/Commercial/MyListings')"
139
-              >My Commercial Properties</a>
144
+                @click="routerGoTo('/about/timeshare')"
145
+              >About Timeshare</a>
146
+            </div>
147
+          </li>
148
+
149
+          <li class="nav-item dropdown">
150
+            <a
151
+              class="nav-link dropdown-toggle"
152
+              href="#"
153
+              id="navbarDropdown"
154
+              role="button"
155
+              data-toggle="dropdown"
156
+              aria-haspopup="true"
157
+              aria-expanded="false"
158
+            >Login</a>
159
+            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
160
+              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/user/login')">Login</a>
161
+              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/user/logout')">Logout</a>
162
+              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/user/register')">Register</a>
140
               <a
163
               <a
141
                 class="dropdown-item cursor-pointer"
164
                 class="dropdown-item cursor-pointer"
142
-                @click="routerGoTo('/property/list/Commercial/All')"
143
-              >Admin Commercial Properties</a>
165
+                @click="routerGoTo('/user/registeragency')"
166
+              >Agency</a>
144
             </div>
167
             </div>
145
           </li>
168
           </li>
146
           <li class="nav-item dropdown">
169
           <li class="nav-item dropdown">
185
               >Property Types</a>
208
               >Property Types</a>
186
             </div>
209
             </div>
187
           </li>
210
           </li>
188
-          <li class="nav-item">
189
-            <a class="nav-link" @click="routerGoTo('/contactus')">Contact</a>
190
-          </li>
191
-          <li class="nav-item dropdown">
192
-            <a
193
-              class="nav-link dropdown-toggle"
194
-              href="#"
195
-              id="navbarDropdown"
196
-              role="button"
197
-              data-toggle="dropdown"
198
-              aria-haspopup="true"
199
-              aria-expanded="false"
200
-            >Login</a>
201
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
202
-              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/user/login')">Login</a>
203
-              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/user/logout')">Logout</a>
204
-              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/user/register')">Register</a>
205
-              <a
206
-                class="dropdown-item cursor-pointer"
207
-                @click="routerGoTo('/user/registeragency')"
208
-              >Agency</a>
209
-            </div>
210
-          </li>
211
         </ul>
211
         </ul>
212
       </div>
212
       </div>
213
       <button
213
       <button

Loading…
Cancel
Save