From 7f5a361bc148088046ad7b501381d5d9b2db2b87 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Wed, 28 Jun 2017 19:26:07 +0100
Subject: [PATCH] pretty updates :)

Former-commit-id: 693423b34a05c66aeb1fac8832a7cfbe8a440a8c [formerly db4998875d0347b455cd77e34d68cfe3e7db355b] [formerly 48da880c8e3e5b7a0f32d36e4a728b899acb7986 [formerly 7aa6a549f986d3673cf7f0c2669e39b083add791]]
Former-commit-id: d7c550899bf1a84e5e0831ed6e3573ccf798f7a4 [formerly 3c951aaf0f638ac5e7637841e835f3a354c33192]
Former-commit-id: b5839c3e783af0182ca7ffc037161914d4a2a503
---
 .gitignore                            |   2 +-
 _assets/_old/templates/actions.tmpl   |   5 +-
 _assets/build/check-versions.js       |   2 +-
 _assets/src/App.vue                   |  19 ++---
 _assets/src/components/InfoButton.vue |  15 ++++
 _assets/src/components/Search.vue     |   6 +-
 _assets/src/css/header.css            | 100 ++++++++++----------------
 _assets/src/css/styles.css            |   2 +-
 8 files changed, 71 insertions(+), 80 deletions(-)
 create mode 100644 _assets/src/components/InfoButton.vue

diff --git a/.gitignore b/.gitignore
index 6bfef784..ae35a22a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 .DS_Store
 node_modules/
-dist_dev/*
+_assets/dist_dev/*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
diff --git a/_assets/_old/templates/actions.tmpl b/_assets/_old/templates/actions.tmpl
index c8444175..d307c171 100644
--- a/_assets/_old/templates/actions.tmpl
+++ b/_assets/_old/templates/actions.tmpl
@@ -1,8 +1,5 @@
 {{ define "info-button" }}
-<button title="Info" aria-label="Info" class="action" id="info">
-    <i class="material-icons">info</i>
-    <span>Info</span>
-</button>
+
 {{ end }}
 
 {{ define "delete-button" }}
diff --git a/_assets/build/check-versions.js b/_assets/build/check-versions.js
index 100f3a0f..b3e7e17e 100644
--- a/_assets/build/check-versions.js
+++ b/_assets/build/check-versions.js
@@ -11,7 +11,7 @@ var versionRequirements = [
     name: 'node',
     currentVersion: semver.clean(process.version),
     versionRequirement: packageConfig.engines.node
-  },
+  }
 ]
 
 if (shell.which('npm')) {
diff --git a/_assets/src/App.vue b/_assets/src/App.vue
index 362b02fe..137eb2da 100644
--- a/_assets/src/App.vue
+++ b/_assets/src/App.vue
@@ -1,14 +1,14 @@
 <template>
   <div id="app">
     <header>
-      <div id="top-bar">
-            <img src="./assets/logo.svg" alt="File Manager">
-            <search></search>
-        </div>
-        <div id="bottom-bar">
-    
-        </div>
-        <div id="click-overlay"></div>
+      <div id="first-bar">
+        <img src="./assets/logo.svg" alt="File Manager">
+        <search></search>
+      </div>
+      <div id="second-bar">
+        <info-button></info-button>
+      </div>
+      <!-- <div id="click-overlay"></div> -->
     </header>
     <nav id="sidebar">
       <a class="action" :href="baseURL + '/'">
@@ -50,6 +50,7 @@
 import Search from './components/Search'
 import Preview from './components/Preview'
 import Listing from './components/Listing'
+import InfoButton from './components/InfoButton'
 import css from './css.js'
 
 function updateColumnSizes () {
@@ -61,7 +62,7 @@ function updateColumnSizes () {
 
 export default {
   name: 'app',
-  components: { Search, Preview, Listing },
+  components: { Search, Preview, Listing, InfoButton },
   mounted: function () {
     updateColumnSizes()
     window.addEventListener('resize', updateColumnSizes)
diff --git a/_assets/src/components/InfoButton.vue b/_assets/src/components/InfoButton.vue
new file mode 100644
index 00000000..9ea8a7e4
--- /dev/null
+++ b/_assets/src/components/InfoButton.vue
@@ -0,0 +1,15 @@
+<template>
+    <button title="Info" aria-label="Info" class="action" id="info">
+        <i class="material-icons">info</i>
+        <span>Info</span>
+    </button>
+</template>
+
+<script>
+export default {
+  name: 'info-button',
+  data: function () {
+    return window.info.page.data
+  }
+}
+</script>
diff --git a/_assets/src/components/Search.vue b/_assets/src/components/Search.vue
index ba349939..399d7113 100644
--- a/_assets/src/components/Search.vue
+++ b/_assets/src/components/Search.vue
@@ -16,6 +16,8 @@
 </template>
 
 <script>
+import page from '../page'
+
 // Remove the last directory of an url
 var removeLastDirectoryPartOf = function (url) {
   var arr = url.split('/')
@@ -109,8 +111,7 @@ export default {
 
         conn.onclose = (event) => {
           this.$el.classList.remove('ongoing')
-          // TODO: if is listing!
-          // listing.reload()
+          page.reload()
         }
 
         return
@@ -132,6 +133,7 @@ export default {
 
       conn.onclose = () => {
         this.$el.classList.remove('ongoing')
+        page.reload()
       }
     }
   }
diff --git a/_assets/src/css/header.css b/_assets/src/css/header.css
index e7e61f5b..c24f871e 100644
--- a/_assets/src/css/header.css
+++ b/_assets/src/css/header.css
@@ -8,6 +8,7 @@ header {
     left: 0;
     width: 100%;
     padding: 0;
+    display: flex;
 }
 
 header a,
@@ -35,16 +36,51 @@ header>div div {
  *            TOP BAR          *
  * * * * * * * * * * * * * * * */
 
-#top-bar {
+#first-bar {
     height: 4em;
 }
 
-#top-bar img {
+#first-bar img {
     height: 2.5em;
     margin-right: 1em;
     vertical-align: middle;
 }
 
+/* * * * * * * * * * * * * * * *
+ *          BOTTOM BAR         *
+ * * * * * * * * * * * * * * * */
+
+#second-bar {
+    justify-content: flex-end;
+}
+
+#more {
+    display: none;
+}
+
+#file-only {
+    display: inline-block;
+    border-right: 1px solid rgba(0, 0, 0, 0.075);
+    padding-right: .3em;
+    margin-right: .3em;
+    transition: .2s ease opacity, visibility;
+    visibility: visible;
+}
+
+#file-only.disabled {
+    opacity: 0;
+    visibility: hidden;
+}
+
+#download ul.active {
+    top: 0;
+    right: 0;
+}
+
+#more ul.active {
+    right: .5em;
+    top: 4.5em;
+}
 
 /* * * * * * * * * * * * * * * *
  *          SEARCH BAR         *
@@ -173,64 +209,4 @@ header>div div {
 
 #search:-ms-input-placeholder {
     color: rgba(255, 255, 255, .5);
-}
-
-
-/* * * * * * * * * * * * * * * *
- *          BOTTOM BAR         *
- * * * * * * * * * * * * * * * */
-
-#bottom-bar {
-    border-top: 1px solid rgba(0, 0, 0, 0.075);
-    height: 3.8em;
-}
-
-#bottom-bar>div:first-child>* {
-    display: inline-block;
-    vertical-align: middle;
-}
-
-#bottom-bar>div:first-child>i {
-    margin-right: .3em;
-}
-
-#bottom-bar>*:first-child {
-    margin-right: auto;
-    max-width: calc(100% - 25em);
-    width: 100%;
-}
-
-#bottom-bar p {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    width: calc(100% - 3em);
-    white-space: nowrap;
-}
-
-#more {
-    display: none;
-}
-
-#file-only {
-    display: inline-block;
-    border-right: 1px solid rgba(0, 0, 0, 0.075);
-    padding-right: .3em;
-    margin-right: .3em;
-    transition: .2s ease opacity, visibility;
-    visibility: visible;
-}
-
-#file-only.disabled {
-    opacity: 0;
-    visibility: hidden;
-}
-
-#download ul.active {
-    top: 0;
-    right: 0;
-}
-
-#more ul.active {
-    right: .5em;
-    top: 4.5em;
 }
\ No newline at end of file
diff --git a/_assets/src/css/styles.css b/_assets/src/css/styles.css
index f31893e7..0f2f86e4 100644
--- a/_assets/src/css/styles.css
+++ b/_assets/src/css/styles.css
@@ -4,7 +4,7 @@
 
 body {
     font-family: 'Roboto', sans-serif;
-    padding-top: 7.8em;
+    padding-top: 4em;
     background-color: #f8f8f8;
 }