5 коммитов

Автор SHA1 Сообщение Дата
  Bruce Lywood 7dfb31f1d8 Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivateProperties 5 лет назад
  Bruce Lywood 1b8f6c857c Merge remote-tracking branch 'origin/master' 5 лет назад
  Bruce Lywood 90a33115d9 Merge remote-tracking branch 'origin/master' 5 лет назад
  Bruce Lywood ec29e308a5 Navbar and Login Page changes 5 лет назад
  Bruce Lywood c442886912 Logout menu 5 лет назад

+ 2
- 14
src/components/shared/navBar.vue Просмотреть файл

@@ -152,26 +152,14 @@
152 152
 
153 153
             <li class="nav-item dropdown">
154 154
               <a
155
-                class="nav-link dropdown-toggle"
156
-                href="#"
155
+                class="nav-link"
156
+                @click="routerGoTo('/user/login')"
157 157
                 id="navbarDropdown"
158 158
                 role="button"
159 159
                 data-toggle="dropdown"
160 160
                 aria-haspopup="true"
161 161
                 aria-expanded="false"
162 162
               >Login</a>
163
-              <div class="dropdown-menu" aria-labelledby="navbarDropdown">
164
-                <a class="dropdown-item cursor-pointer" @click="routerGoTo('/user/login')">Login</a>
165
-                <a class="dropdown-item cursor-pointer" @click="routerGoTo('/user/logout')">Logout</a>
166
-                <a
167
-                  class="dropdown-item cursor-pointer"
168
-                  @click="routerGoTo('/user/register')"
169
-                >Register</a>
170
-                <a
171
-                  class="dropdown-item cursor-pointer"
172
-                  @click="routerGoTo('/user/registeragency')"
173
-                >Agency</a>
174
-              </div>
175 163
             </li>
176 164
             <li class="nav-item dropdown">
177 165
               <a

+ 13
- 0
src/components/timeshare/sell/sellPage.vue Просмотреть файл

@@ -18,6 +18,19 @@
18 18
         </div>
19 19
         <br />
20 20
         <div>
21
+          <div class="container col-md-10">
22
+            <div class="myWell">
23
+              <h4>Week Information</h4>
24
+            </div>
25
+            <div style="float: right;" class="btn btn-link color-b">
26
+              <!-- <router-link to="LinkToBeSelected">
27
+                Bulk Weeks Upload
28
+                <span class="ion-ios-arrow-forward" style="color:#60CBEB"></span>
29
+              </router-link>-->
30
+            </div>
31
+          </div>
32
+          <br />
33
+          <br />
21 34
           <p>* You need to be logged in to submit your listing. Please register and log in if you have not done so already.</p>
22 35
           <hr />
23 36
           <div class="form-group row">

+ 17
- 0
src/components/user/loginPage.vue Просмотреть файл

@@ -57,8 +57,21 @@
57 57
           <div class="form-group row"></div>
58 58
           <button @click="Login()" class="btn btn-b-n" type="submit">Sign In</button>
59 59
           <p v-if="user !== null">{{ user }}</p>
60
+          <hr />
61
+          <button
62
+            @click="routerGoTo('/user/register')"
63
+            class="btn"
64
+            style="margin:2px"
65
+            type="button"
66
+          >Registration</button>
67
+          <button
68
+            @click="routerGoTo('/user/registeragency')"
69
+            class="btn"
70
+            style="margin:2px"
71
+          >Agency Registration</button>
60 72
         </div>
61 73
       </form>
74
+
62 75
       <form id="forgot">
63 76
         <div class="form">
64 77
           <h5>Trouble signing in?</h5>
@@ -124,6 +137,10 @@ export default {
124 137
       this.isPasswordShown = 'password';
125 138
     },
126 139
     SendMail() {},
140
+    routerGoTo(goTo) {
141
+      console.log(goTo);
142
+      this.$router.push(goTo);
143
+    },
127 144
   },
128 145
 };
129 146
 </script>

Загрузка…
Отмена
Сохранить