Merge pull request #338 from TaiBIF/issue/issue-#318

Issue/issue #318
TaiBIF · Oct 29, 2019 · 17ca289 · 17ca289
2 parents 2f54238 + 1b9df5c
commit 17ca289
Show file tree

Hide file tree

Showing 12 changed files with 701 additions and 150 deletions.
diff --git a/src/components/CameraManagement/AddProjectCamera.vue b/src/components/CameraManagement/AddProjectCamera.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="add-project-camera">
-    <div class="camera-filter p-3">
-      <div class="camera-filter-title mb-3">篩選條件</div>
-      <div class="camera-filter-option-type">
-        <div>
+    <div class="filter">
+      <div class="filter-title">篩選條件</div>
+      <div class="filter-option-type">
+        <div class="filter-option-type-header">
           廠牌
           <span class="float-right" v-on:click="clearFilter('manufacturer')"
             >清除 －</span
@@ -17,7 +17,7 @@
           />
           <span
             :id="option"
-            class="camera-filter-option"
+            class="filter-option"
             v-on:click="selectSingleFilter('manufacturer', $event)"
           >
             {{ option }}
@@ -28,8 +28,8 @@
         </div>
       </div>
       <hr />
-      <div class="camera-filter-option-type">
-        <div>
+      <div class="filter-option-type">
+        <div class="filter-option-type-header">
           型號<span class="float-right" v-on:click="clearFilter('model')"
             >清除 －</span
           >
@@ -39,7 +39,7 @@
           <i class="el-icon-check" v-show="selectedFilters.model === option" />
           <span
             :id="option"
-            class="camera-filter-option"
+            class="filter-option"
             v-on:click="selectSingleFilter('model', $event)"
           >
             {{ option }}
@@ -50,8 +50,8 @@
         </div>
       </div>
       <hr />
-      <div class="camera-filter-option-type">
-        <div>
+      <div class="filter-option-type">
+        <div class="filter-option-type-header">
           相機序號<span class="float-right" v-on:click="clearFilter('sn')"
             >清除 －</span
           >
@@ -75,8 +75,8 @@
         </el-checkbox-group>
       </div>
       <hr />
-      <div class="camera-filter-option-type">
-        <div>
+      <div class="filter-option-type">
+        <div class="filter-option-type-header">
           廠商維護編號<span class="float-right" v-on:click="clearFilter('vn')"
             >清除 －</span
           >

diff --git a/src/components/NavHeader/NavHeader.vue b/src/components/NavHeader/NavHeader.vue
@@ -17,40 +17,7 @@
         >
           <span class="navbar-toggler-icon"></span>
         </button>
-        <div
-          v-if="!isLogin"
-          class="collapse navbar-collapse justify-content-end"
-          id="navbarSupportedContent"
-        >
-          <div class="navbar-nav justify-content-md-end subnav">
-            <div class="nav-item dropdown help">
-              <a
-                class="nav-link dropdown-toggle"
-                role="button"
-                data-toggle="dropdown"
-                aria-haspopup="true"
-                aria-expanded="false"
-                >幫助</a
-              >
-              <div class="dropdown-menu dropdown-menu-right">
-                <router-link to="/help/faq" class="dropdown-item"
-                  >常見問題</router-link
-                >
-                <router-link to="/help/contact-us" class="dropdown-item"
-                  >聯絡我們</router-link
-                >
-                <router-link to="/help/privacy" class="dropdown-item"
-                  >隱私權政策</router-link
-                >
-              </div>
-            </div>
-            <div class="divider"></div>
-            <div class="nav-item ml-3">
-              <a @click="loginModalOpen = true" class="btn btn-orange">登入</a>
-            </div>
-          </div>
-        </div>
-        <div class="collapse navbar-collapse" v-if="isLogin">
+        <div class="collapse navbar-collapse">
           <ul class="navbar-nav main-nav">
             <li class="nav-item">
               <router-link
@@ -72,7 +39,7 @@
                 <span class="sr-only" v-if="isDownloadPath">(current)</span>
               </router-link>
             </li>
-            <li class="nav-item">
+            <li class="nav-item" v-if="isLogin">
               <router-link
                 class="nav-link"
                 :class="isHistoryPath ? 'active' : ''"
@@ -105,7 +72,7 @@
             </li>
             <li class="divider"></li>
           </ul>
-          <div class="navbar-nav subnav">
+          <div class="navbar-nav subnav" v-if="isLogin">
             <div class="divider"></div>
             <div
               class="nav-item dropdown notification"
@@ -147,6 +114,39 @@
             </div>
           </div>
         </div>
+        <div
+          v-if="!isLogin"
+          class="collapse navbar-collapse justify-content-end"
+          id="navbarSupportedContent"
+        >
+          <div class="navbar-nav justify-content-md-end subnav">
+            <div class="nav-item dropdown help">
+              <a
+                class="nav-link dropdown-toggle"
+                role="button"
+                data-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+                >幫助</a
+              >
+              <div class="dropdown-menu dropdown-menu-right">
+                <router-link to="/help/faq" class="dropdown-item"
+                  >常見問題</router-link
+                >
+                <router-link to="/help/contact-us" class="dropdown-item"
+                  >聯絡我們</router-link
+                >
+                <router-link to="/help/privacy" class="dropdown-item"
+                  >隱私權政策</router-link
+                >
+              </div>
+            </div>
+            <div class="divider"></div>
+            <div class="nav-item ml-3">
+              <a @click="loginModalOpen = true" class="btn btn-orange">登入</a>
+            </div>
+          </div>
+        </div>
       </nav>
       <login-modal :open="loginModalOpen" @close="loginModalOpen = false" />
     </header>