Appbar hide Hamburger + bump version

stoufa88 · Jun 10, 2016 · ac42f28 · ac42f28
1 parent d7f848e
commit ac42f28
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 34 deletions.
diff --git a/app/components/App/AppBar.vue b/app/components/App/AppBar.vue
@@ -1,8 +1,6 @@
 <template>
-	<nav :class="{ 'navbar': true, 'navbar-dark bg-inverse': true, 'navbar-fixed-top': true,
-	 							'disable-controls': $route.name == 'showDetails'
-							 }">
-		<button class="navbar-toggler pull-xs-left" type="button" v-on:click="toggleMenu"}>
+	<nav :class="{ 'navbar': true, 'navbar-dark bg-inverse': true, 'navbar-fixed-top': true}">
+		<button class="navbar-toggler pull-xs-left" type="button" v-on:click="toggleMenu"} v-if=" $route.name == 'showList'">
       &#9776;
     </button>
 

diff --git a/app/components/Show/Torrent.vue b/app/components/Show/Torrent.vue
@@ -1,23 +1,32 @@
 <template>
   <li>
-      <span class="torrent-language" v-if="torrent.language">
-        <img class="flag"
-          src="https://lipis.github.io/flag-icon-css/flags/1x1/fr.svg"
-          v-if="torrent.language == 'fr'"
-        />
+			<span v-if="type == 'movies'">
+	      <span class="torrent-language">
+	        <img class="flag"
+	          src="https://lipis.github.io/flag-icon-css/flags/1x1/fr.svg"
+	          v-if="torrent.language == 'fr'"
+	        />
 
-        <img class="flag"
-          src="https://lipis.github.io/flag-icon-css/flags/1x1/gb.svg"
-          v-if="torrent.language == 'en'"
-        />
-      </span>
+	        <img class="flag"
+	          src="https://lipis.github.io/flag-icon-css/flags/1x1/gb.svg"
+	          v-if="torrent.language == 'en'"
+	        />
+	      </span>
 
-      <span>
-        <a class="show-link small"
-          v-link="{ name: 'player', params: { type: type, id: showId, hash: torrent.info_hash }}">
-        {{ `Link ${index + 1}` || movieTorrentLink }}
-        </a>
-      </span>
+	      <span>
+	        <a class="show-link small"
+	          v-link="{ name: 'player', params: { type: type, id: showId, hash: torrent.info_hash }}">
+	        {{ movieTorrentLink }}
+	        </a>
+	      </span>
+			</span>
+
+			<span v-if="type == 'tv'">
+				<a class="show-link small"
+					v-link="{ name: 'player', params: { type: type, id: showId, hash: torrent.info_hash }}">
+				{{ `Link ${index + 1}`  }}
+				</a>
+			</span>
 
   </li>
 </template>

diff --git a/app/stylesheets/main.scss b/app/stylesheets/main.scss
@@ -85,15 +85,6 @@ html {
 
 // -------------------------- App bar ----------------------------------
 
-nav.disable-controls {
-  button {
-    pointer-events: none;
-  }
-  form, .btn-group {
-    display: none;
-  }
-}
-
 .navbar-brand {
 	text-transform: uppercase;
   font-weight: 900;
@@ -240,7 +231,6 @@ nav.disable-controls {
     overflow-x: hidden;
     li {
       list-style-type: none;
-      width: 100%;
       line-height: 34px;
       img {
         width: 15px;
@@ -258,6 +248,7 @@ nav.disable-controls {
     .season-episodes {
       li {
         display: inline-flex;
+				margin-right: 15px;
       }
     }
   }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "lawd",
-  "version": "0.1.0",
-  "description": "Find and instantly watch movies",
+  "version": "0.2.0",
+  "description": "Video streaming desktop application",
   "main": "main.js",
   "scripts": {
     "hot-server": "node server.js",
@@ -26,7 +26,7 @@
     "jquery": "^2.2.2",
     "mime": "^1.3.4",
     "moment": "^2.13.0",
-    "opensubtitles-api": "^3.1.0",
+    "opensubtitles-api": "^3.1.1",
     "parse": "^1.8.5",
     "srt2vtt": "^1.3.1",
     "tether": "^1.2.0",
@@ -50,7 +50,7 @@
     "css-loader": "^0.23.1",
     "del": "^2.2.0",
     "electron-packager": "^7.0.3",
-    "electron-prebuilt": "^1.2.1",
+    "electron-prebuilt": "^1.2.2",
     "electron-rebuild": "^1.1.5",
     "express": "^4.13.4",
     "extract-text-webpack-plugin": "^1.0.1",