Version 1.3.6

Former-commit-id: 28c72f8ee9f7cf548dd5f2c2cc564b31ba13ada8 [formerly cd087b92826cb418d4d17ac26a8cfeb408a54919] [formerly bf241b663bdcfc00737f5bb429ef4a669c1a6c2b [formerly 3e9c3ed912]]
Former-commit-id: 2b74d089de06c4fa5d4933e0c11ff8b1afcd2f46 [formerly 9ac185e1ea76c1beec895f6c51109fd137547e60]
Former-commit-id: a27b4e08dc726769b4731abb5865d2e908387774

Docker.json

@@ -1,7 +1,7 @@
 {
   "port": 80,
   "address": "",
-  "database": "/etc/database.db",
+  "database": "/database.db",
   "scope": "/srv",
   "allowCommands": true,
   "allowEdit": true,

Dockerfile

@@ -7,16 +7,16 @@ RUN apk add --no-cache git
 RUN go get ./...
 
 WORKDIR /go/src/github.com/hacdias/filemanager/cmd/filemanager
-RUN go build -ldflags "-X main.version=$(git tag -l --points-at HEAD)"
+RUN CGO_ENABLED=0 go build -a
 RUN mv filemanager /go/bin/filemanager
 
-FROM alpine:latest
-COPY --from=0 /go/bin/filemanager /usr/local/bin/filemanager
+FROM scratch
+COPY --from=0 /go/bin/filemanager /filemanager
 
 VOLUME /srv
 EXPOSE 80
 
-COPY Docker.json /etc/config.json
+COPY Docker.json /config.json
 
-ENTRYPOINT ["/usr/local/bin/filemanager"]
-CMD ["--config", "/etc/config.json"]
+ENTRYPOINT ["/filemanager"]
+CMD ["--config", "/config.json"]

assets/index.html

@@ -8,6 +8,7 @@
   <meta name="staticgen" content="{{ .StaticGen }}">
   <meta name="noauth" content="{{ .NoAuth }}">
   <meta name="version" content="{{ .Version }}">
+  <meta name="recaptcha" content="{{ .ReCaptchaKey }}">
   <title>File Manager</title>
   <link rel="icon" type="image/png" sizes="32x32" href="{{ .BaseURL }}/static/img/icons/favicon-32x32.png">
   <link rel="icon" type="image/png" sizes="16x16" href="{{ .BaseURL }}/static/img/icons/favicon-16x16.png">
@@ -24,6 +25,13 @@
   <!-- Add to home screen for Windows -->
   <meta name="msapplication-TileImage" content="{{ .BaseURL }}/static/img/icons/msapplication-icon-144x144.png">
   <meta name="msapplication-TileColor" content="#2979ff">
+
+  <script>CSS = "{{ .CSS }}"</script>
+
+  {{ if .ReCaptcha -}}
+    <script src='https://www.google.com/recaptcha/api.js?render=explicit'></script>
+  {{ end }}
+
   <% for (var chunk of webpack.chunks) {
     for (var file of chunk.files) {
       if (file.match(/\.(js|css)$/)) { %>

assets/src/App.vue

@@ -1,18 +1,74 @@
 <template>
-  <router-view></router-view>
+  <router-view :dependencies="loaded" @update:css="updateCSS" @clean:css="cleanCSS"></router-view>
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   name: 'app',
-  mounted: function () {
-    // Remove loading animation.
-    let loading = document.getElementById('loading')
-    loading.classList.add('done')
+  computed: mapState(['recaptcha']),
+  data () {
+    return {
+      loaded: false
+    }
+  },
+  mounted () {
+    if (this.recaptcha.length === 0) {
+      this.unload()
+      return
+    }
 
-    setTimeout(function () {
-      loading.parentNode.removeChild(loading)
-    }, 200)
+    let check = () => {
+      if (typeof window.grecaptcha === 'undefined') {
+        setTimeout(check, 100)
+        return
+      }
+
+      this.unload()
+    }
+
+    check()
+  },
+  methods: {
+    unload () {
+      this.loaded = true
+      // Remove loading animation.
+      let loading = document.getElementById('loading')
+      loading.classList.add('done')
+
+      setTimeout(function () {
+        loading.parentNode.removeChild(loading)
+      }, 200)
+
+      this.updateCSS()
+    },
+    updateCSS (global = false) {
+      let css = this.$store.state.css
+
+      if (typeof this.$store.state.user.css === 'string' && !global) {
+        css += '\n' + this.$store.state.user.css
+      }
+
+      this.removeCSS()
+
+      let style = document.createElement('style')
+      style.title = 'custom-css'
+      style.type = 'text/css'
+      style.appendChild(document.createTextNode(css))
+      document.head.appendChild(style)
+    },
+    removeCSS () {
+      let style = document.querySelector('style[title="custom-css"]')
+      if (style === undefined || style === null) {
+        return
+      }
+
+      style.parentElement.removeChild(style)
+    },
+    cleanCSS () {
+      this.updateCSS(true)
+    }
   }
 }
 </script>

assets/src/components/buttons/SwitchView.vue

@@ -1,32 +1,35 @@
 <template>
   <button @click="change" :aria-label="$t('buttons.switchView')" :title="$t('buttons.switchView')" class="action" id="switch-view-button">
-    <i class="material-icons">{{ icon() }}</i>
+    <i class="material-icons">{{ icon }}</i>
     <span>{{ $t('buttons.switchView') }}</span>
   </button>
 </template>
 
 <script>
+import { mapState, mapMutations } from 'vuex'
+import { updateUser } from '@/utils/api'
+
 export default {
   name: 'switch-button',
+  computed: {
+    ...mapState(['user']),
+    icon: function () {
+      if (this.user.viewMode === 'mosaic') return 'view_list'
+      return 'view_module'
+    }
+  },
   methods: {
+    ...mapMutations(['updateUser']),
     change: function (event) {
       // If we are on mobile we should close the dropdown.
       this.$store.commit('closeHovers')
 
-      let display = 'mosaic'
+      let user = {...this.user}
+      user.viewMode = (this.icon === 'view_list') ? 'list' : 'mosaic'
 
-      if (this.$store.state.req.display === 'mosaic') {
-        display = 'list'
-      }
-
-      this.$store.commit('listingDisplay', display)
-      let path = this.$store.state.baseURL
-      if (path === '') path = '/'
-      document.cookie = `display=${display}; max-age=31536000; path=${path}`
-    },
-    icon: function () {
-      if (this.$store.state.req.display === 'mosaic') return 'view_list'
-      return 'view_module'
+      updateUser(user, 'partial').then(() => {
+        this.updateUser({ viewMode: user.viewMode })
+      }).catch(this.$showError)
     }
   }
 }

assets/src/components/files/Listing.vue

@@ -7,7 +7,7 @@
     <input style="display:none" type="file" id="upload-input" @change="uploadInput($event)" multiple>
   </div>
   <div v-else id="listing"
-    :class="req.display"
+    :class="user.viewMode"
     @dragenter="dragEnter"
     @dragend="dragEnd">
     <div>
@@ -98,7 +98,7 @@ export default {
   name: 'listing',
   components: { Item },
   computed: {
-    ...mapState(['req', 'selected']),
+    ...mapState(['req', 'selected', 'user']),
     nameSorted () {
       return (this.req.sort === 'name')
     },

assets/src/components/files/Preview.vue

@@ -20,8 +20,8 @@
 
     <div class="preview">
       <img v-if="req.type == 'image'" :src="raw()">
-      <audio v-else-if="req.type == 'audio'" :src="raw()" controls></audio>
-      <video v-else-if="req.type == 'video'" :src="raw()" controls>
+      <audio v-else-if="req.type == 'audio'" :src="raw()" autoplay controls></audio>
+      <video v-else-if="req.type == 'video'" :src="raw()" autoplay controls>
         Sorry, your browser doesn't support embedded videos,
         but don't worry, you can <a :href="download()">download it</a>
         and watch it with your favorite video player!

assets/src/components/prompts/Copy.vue

@@ -1,19 +1,23 @@
 <template>
-  <div class="prompt">
-    <h3>{{ $t('prompts.copy') }}</h3>
-    <p>{{ $t('prompts.copyMessage') }}</p>
+  <div class="card floating">
+    <div class="card-title">
+      <h2>{{ $t('prompts.copy') }}</h2>
+    </div>
 
-    <file-list @update:selected="val => dest = val"></file-list>
+    <div class="card-content">
+      <p>{{ $t('prompts.copyMessage') }}</p>
+      <file-list @update:selected="val => dest = val"></file-list>
+    </div>
 
-    <div>
-      <button class="ok"
-        @click="copy"
-        :aria-label="$t('buttons.copy')"
-        :title="$t('buttons.copy')">{{ $t('buttons.copy') }}</button>
-      <button class="cancel"
+    <div class="card-action">
+      <button class="cancel flat"
         @click="$store.commit('closeHovers')"
         :aria-label="$t('buttons.cancel')"
         :title="$t('buttons.cancel')">{{ $t('buttons.cancel') }}</button>
+      <button class="flat"
+        @click="copy"
+        :aria-label="$t('buttons.copy')"
+        :title="$t('buttons.copy')">{{ $t('buttons.copy') }}</button>
     </div>
   </div>
 </template>

assets/src/components/prompts/Delete.vue

@@ -1,16 +1,18 @@
 <template>
-  <div class="prompt">
-    <h3>{{ $t('prompts.deleteTitle') }}</h3>
-    <p v-show="req.kind !== 'listing'">{{ $t('prompts.deleteMessageSingle') }}</p>
-    <p v-show="req.kind === 'listing'">{{ $t('prompts.deleteMessageMultiple', { count: selectedCount}) }}</p>
-    <div>
-      <button @click="submit"
-        :aria-label="$t('buttons.delete')"
-        :title="$t('buttons.delete')">{{ $t('buttons.delete') }}</button>
-      <button class="cancel"
-        @click="$store.commit('closeHovers')"
+  <div class="card floating">
+    <div class="card-content">
+      <p v-if="req.kind !== 'listing'">{{ $t('prompts.deleteMessageSingle') }}</p>
+      <p v-else>{{ $t('prompts.deleteMessageMultiple', { count: selectedCount}) }}</p>
+    </div>
+    <div class="card-action">
+      <button @click="$store.commit('closeHovers')"
+        class="flat cancel"
         :aria-label="$t('buttons.cancel')"
         :title="$t('buttons.cancel')">{{ $t('buttons.cancel') }}</button>
+      <button @click="submit"
+        class="flat"
+        :aria-label="$t('buttons.delete')"
+        :title="$t('buttons.delete')">{{ $t('buttons.delete') }}</button>
     </div>
   </div>
 </template>

assets/src/components/prompts/Download.vue

@@ -1,13 +1,18 @@
 <template>
-  <div class="prompt" id="download">
-    <h3>{{ $t('prompts.download') }}</h3>
-    <p>{{ $t('prompts.downloadMessage') }}</p>
+  <div class="card floating" id="download">
+    <div class="card-title">
+      <h2>{{ $t('prompts.download') }}</h2>
+    </div>
 
-    <button @click="download('zip')" autofocus>zip</button>
-    <button @click="download('tar')" autofocus>tar</button>
-    <button @click="download('targz')" autofocus>tar.gz</button>
-    <button @click="download('tarbz2')" autofocus>tar.bz2</button>
-    <button @click="download('tarxz')" autofocus>tar.xz</button>
+    <div class="card-content">
+      <p>{{ $t('prompts.downloadMessage') }}</p>
+
+      <button class="block cancel" @click="download('zip')" autofocus>zip</button>
+      <button class="block cancel" @click="download('tar')" autofocus>tar</button>
+      <button class="block cancel" @click="download('targz')" autofocus>tar.gz</button>
+      <button class="block cancel" @click="download('tarbz2')" autofocus>tar.bz2</button>
+      <button class="block cancel" @click="download('tarxz')" autofocus>tar.xz</button>
+    </div>
   </div>
 </template>
 

assets/src/components/prompts/Help.vue

@@ -1,23 +1,27 @@
 <template>
-  <div class="prompt help">
-    <h3>{{ $t('help.help') }}</h3>
+  <div class="card floating help">
+    <div class="card-title">
+      <h2>{{ $t('help.help') }}</h2>
+    </div>
 
-    <ul>
-      <li><strong>F1</strong> - {{ $t('help.f1') }}</li>
-      <li><strong>F2</strong> - {{ $t('help.f2') }}</li>
-      <li><strong>DEL</strong> - {{ $t('help.del') }}</li>
-      <li><strong>ESC</strong> - {{ $t('help.esc') }}</li>
-      <li><strong>CTRL + S</strong> - {{ $t('help.ctrl.s') }}</li>
-      <li><strong>CTRL + F</strong> - {{ $t('help.ctrl.f') }}</li>
-      <li><strong>CTRL + Click</strong> - {{ $t('help.ctrl.click') }}</li>
-      <li><strong>Click</strong> - {{ $t('help.click') }}</li>
-      <li><strong>Double click</strong> - {{ $t('help.doubleClick') }}</li>
-    </ul>
+    <div class="card-content">
+      <ul>
+        <li><strong>F1</strong> - {{ $t('help.f1') }}</li>
+        <li><strong>F2</strong> - {{ $t('help.f2') }}</li>
+        <li><strong>DEL</strong> - {{ $t('help.del') }}</li>
+        <li><strong>ESC</strong> - {{ $t('help.esc') }}</li>
+        <li><strong>CTRL + S</strong> - {{ $t('help.ctrl.s') }}</li>
+        <li><strong>CTRL + F</strong> - {{ $t('help.ctrl.f') }}</li>
+        <li><strong>CTRL + Click</strong> - {{ $t('help.ctrl.click') }}</li>
+        <li><strong>Click</strong> - {{ $t('help.click') }}</li>
+        <li><strong>Double click</strong> - {{ $t('help.doubleClick') }}</li>
+      </ul>
+    </div>
 
-    <div>
+    <div class="card-action">
       <button type="submit"
         @click="$store.commit('closeHovers')"
-        class="ok"
+        class="flat"
         :aria-label="$t('buttons.ok')"
         :title="$t('buttons.ok')">{{ $t('buttons.ok') }}</button>
     </div>

assets/src/components/prompts/Info.vue

@@ -1,29 +1,33 @@
 <template>
-  <div class="prompt">
-    <h3>{{ $t('prompts.fileInfo') }}</h3>
+  <div class="card floating">
+    <div class="card-title">
+      <h2>{{ $t('prompts.fileInfo') }}</h2>
+    </div>
 
-    <p v-show="selected.length > 1">{{ $t('prompts.filesSelected', { count: selected.length }) }}</p>
+    <div class="card-content">
+      <p v-if="selected.length > 1">{{ $t('prompts.filesSelected', { count: selected.length }) }}</p>
 
-    <p v-show="selected.length < 2"><strong>{{ $t('prompts.displayName') }}</strong> {{ name() }}</p>
-    <p><strong>{{ $t('prompts.size') }}:</strong> <span id="content_length"></span>{{ humanSize() }}</p>
-    <p v-show="selected.length < 2"><strong>{{ $t('prompts.lastModified') }}:</strong> {{ humanTime() }}</p>
+      <p v-if="selected.length < 2"><strong>{{ $t('prompts.displayName') }}</strong> {{ name() }}</p>
+      <p><strong>{{ $t('prompts.size') }}:</strong> <span id="content_length"></span>{{ humanSize() }}</p>
+      <p v-if="selected.length < 2"><strong>{{ $t('prompts.lastModified') }}:</strong> {{ humanTime() }}</p>
 
-    <section v-show="dir() && selected.length === 0">
-      <p><strong>{{ $t('prompts.numberFiles') }}:</strong> {{ req.numFiles }}</p>
-      <p><strong>{{ $t('prompts.numberDirs') }}:</strong> {{ req.numDirs }}</p>
-    </section>
+      <template v-if="dir() && selected.length === 0">
+        <p><strong>{{ $t('prompts.numberFiles') }}:</strong> {{ req.numFiles }}</p>
+        <p><strong>{{ $t('prompts.numberDirs') }}:</strong> {{ req.numDirs }}</p>
+      </template>
 
-    <section v-show="!dir()">
-      <p><strong>MD5:</strong> <code><a @click="checksum($event, 'md5')">{{ $t('prompts.show') }}</a></code></p>
-      <p><strong>SHA1:</strong> <code><a @click="checksum($event, 'sha1')">{{ $t('prompts.show') }}</a></code></p>
-      <p><strong>SHA256:</strong> <code><a @click="checksum($event, 'sha256')">{{ $t('prompts.show') }}</a></code></p>
-      <p><strong>SHA512:</strong> <code><a @click="checksum($event, 'sha512')">{{ $t('prompts.show') }}</a></code></p>
-    </section>
+      <template v-if="!dir()">
+        <p><strong>MD5:</strong> <code><a @click="checksum($event, 'md5')">{{ $t('prompts.show') }}</a></code></p>
+        <p><strong>SHA1:</strong> <code><a @click="checksum($event, 'sha1')">{{ $t('prompts.show') }}</a></code></p>
+        <p><strong>SHA256:</strong> <code><a @click="checksum($event, 'sha256')">{{ $t('prompts.show') }}</a></code></p>
+        <p><strong>SHA512:</strong> <code><a @click="checksum($event, 'sha512')">{{ $t('prompts.show') }}</a></code></p>
+      </template>
+    </div>
 
-    <div>
+    <div class="card-action">
       <button type="submit"
         @click="$store.commit('closeHovers')"
-        class="ok"
+        class="flat"
         :aria-label="$t('buttons.ok')"
         :title="$t('buttons.ok')">{{ $t('buttons.ok') }}</button>
     </div>

assets/src/components/prompts/Move.vue

@@ -1,19 +1,22 @@
 <template>
-  <div class="prompt">
-    <h3>{{ $t('prompts.move') }}</h3>
-    <p>{{ $t('prompts.moveMessage') }}</p>
+  <div class="card floating">
+    <div class="card-title">
+      <h2>{{ $t('prompts.move') }}</h2>
+    </div>
 
-    <file-list @update:selected="val => dest = val"></file-list>
+    <div class="card-content">
+      <file-list @update:selected="val => dest = val"></file-list>
+    </div>
 
-    <div>
-      <button class="ok"
-        @click="move"
-        :aria-label="$t('buttons.move')"
-        :title="$t('buttons.move')">{{ $t('buttons.move') }}</button>
-      <button class="cancel"
+    <div class="card-action">
+      <button class="flat cancel"
         @click="$store.commit('closeHovers')"
         :aria-label="$t('buttons.cancel')"
         :title="$t('buttons.cancel')">{{ $t('buttons.cancel') }}</button>
+      <button class="flat"
+        @click="move"
+        :aria-label="$t('buttons.move')"
+        :title="$t('buttons.move')">{{ $t('buttons.move') }}</button>
     </div>
   </div>
 </template>

assets/src/components/prompts/NewArchetype.vue

@@ -1,18 +1,24 @@
 <template>
-  <div class="prompt">
-    <h3>{{ $t('prompts.newFile') }}</h3>
-    <p>{{ $t('prompts.newArchetype') }}</p>
-    <input autofocus type="text" @keyup.enter="submit" v-model.trim="name">
-    <input type="text" @keyup.enter="submit" v-model.trim="archetype">
-    <div>
-      <button class="ok"
-        @click="submit"
-        :aria-label="$t('buttons.create')"
-        :title="$t('buttons.create')">{{ $t('buttons.create') }}</button>
-      <button class="cancel"
+  <div class="card floating">
+    <div class="card-title">
+      <h2>{{ $t('prompts.newFile') }}</h2>
+    </div>
+
+    <div class="card-content">
+      <p>{{ $t('prompts.newArchetype') }}</p>
+      <input autofocus type="text" @keyup.enter="submit" v-model.trim="name">
+      <input type="text" @keyup.enter="submit" v-model.trim="archetype">
+    </div>
+
+    <div class="card-action">
+      <button class="flat cancel"
         @click="$store.commit('closeHovers')"
         :aria-label="$t('buttons.cancel')"
         :title="$t('buttons.cancel')">{{ $t('buttons.cancel') }}</button>
+      <button class="flat"
+        @click="submit"
+        :aria-label="$t('buttons.create')"
+        :title="$t('buttons.create')">{{ $t('buttons.create') }}</button>
     </div>
   </div>
 </template>

assets/src/components/prompts/NewDir.vue

@@ -1,17 +1,23 @@
 <template>
-  <div class="prompt">
-    <h3>{{ $t('prompts.newDir') }}</h3>
-    <p>{{ $t('prompts.newDirMessage') }}</p>
-    <input autofocus type="text" @keyup.enter="submit" v-model.trim="name">
-    <div>
-      <button class="ok"
-        :aria-label="$t('buttons.create')"
-        :title="$t('buttons.create')"
-        @click="submit">{{ $t('buttons.create') }}</button>
-      <button class="cancel"
+  <div class="card floating">
+    <div class="card-title">
+      <h2>{{ $t('prompts.newDir') }}</h2>
+    </div>
+
+    <div class="card-content">
+      <p>{{ $t('prompts.newDirMessage') }}</p>
+      <input autofocus type="text" @keyup.enter="submit" v-model.trim="name">
+    </div>
+
+    <div class="card-action">
+      <button class="cancel flat"
         @click="$store.commit('closeHovers')"
         :aria-label="$t('buttons.cancel')"
         :title="$t('buttons.cancel')">{{ $t('buttons.cancel') }}</button>
+      <button class="flat"
+        :aria-label="$t('buttons.create')"
+        :title="$t('buttons.create')"
+        @click="submit">{{ $t('buttons.create') }}</button>
     </div>
   </div>
 </template>

assets/src/components/prompts/NewFile.vue

@@ -1,17 +1,23 @@
 <template>
-  <div class="prompt">
-    <h3>{{ $t('prompts.newFile') }}</h3>
-    <p>{{ $t('prompts.newFileMessage') }}</p>
-    <input autofocus type="text" @keyup.enter="submit" v-model.trim="name">
-    <div>
-      <button class="ok"
-        @click="submit"
-        :aria-label="$t('buttons.create')"
-        :title="$t('buttons.create')">{{ $t('buttons.create') }}</button>
-      <button class="cancel"
+  <div class="card floating">
+    <div class="card-title">
+      <h2>{{ $t('prompts.newFile') }}</h2>
+    </div>
+
+    <div class="card-content">
+      <p>{{ $t('prompts.newFileMessage') }}</p>
+      <input autofocus type="text" @keyup.enter="submit" v-model.trim="name">
+    </div>
+
+    <div class="card-action">
+      <button class="cancel flat"
         @click="$store.commit('closeHovers')"
         :aria-label="$t('buttons.cancel')"
         :title="$t('buttons.cancel')">{{ $t('buttons.cancel') }}</button>
+      <button class="flat"
+        @click="submit"
+        :aria-label="$t('buttons.create')"
+        :title="$t('buttons.create')">{{ $t('buttons.create') }}</button>
     </div>
   </div>
 </template>

assets/src/components/prompts/Rename.vue

@@ -1,18 +1,24 @@
 <template>
-  <div class="prompt">
-    <h3>{{ $t('prompts.rename') }}</h3>
-    <p>{{ $t('prompts.renameMessage') }} <code>{{ oldName() }}</code>:</p>
+  <div class="card floating">
+    <div class="card-title">
+      <h2>{{ $t('prompts.rename') }}</h2>
+    </div>
 
-    <input autofocus type="text" @keyup.enter="submit" v-model.trim="name">
-    <div>
-      <button @click="submit"
-        type="submit"
-        :aria-label="$t('buttons.rename')"
-        :title="$t('buttons.rename')">{{ $t('buttons.rename') }}</button>
-      <button class="cancel"
+    <div class="card-content">
+      <p>{{ $t('prompts.renameMessage') }} <code>{{ oldName() }}</code>:</p>
+      <input autofocus type="text" @keyup.enter="submit" v-model.trim="name">
+    </div>
+
+    <div class="card-action">
+      <button class="cancel flat"
         @click="$store.commit('closeHovers')"
         :aria-label="$t('buttons.cancel')"
         :title="$t('buttons.cancel')">{{ $t('buttons.cancel') }}</button>
+      <button @click="submit"
+        class="flat"
+        type="submit"
+        :aria-label="$t('buttons.rename')"
+        :title="$t('buttons.rename')">{{ $t('buttons.rename') }}</button>
     </div>
   </div>
 </template>

assets/src/components/prompts/Replace.vue

@@ -1,17 +1,22 @@
 <template>
-  <div class="prompt">
-    <h3>{{ $t('prompts.replace') }}</h3>
-    <p>{{ $t('prompts.replaceMessage') }}</p>
+  <div class="card floating">
+    <div class="card-title">
+      <h2>{{ $t('prompts.replace') }}</h2>
+    </div>
 
-    <div>
-      <button class="ok"
-        @click="showConfirm"
-        :aria-label="$t('buttons.replace')"
-        :title="$t('buttons.replace')">{{ $t('buttons.replace') }}</button>
-      <button class="cancel"
+    <div class="card-content">
+      <p>{{ $t('prompts.replaceMessage') }}</p>
+    </div>
+
+    <div class="card-action">
+      <button class="flat cancel"
         @click="$store.commit('closeHovers')"
         :aria-label="$t('buttons.cancel')"
         :title="$t('buttons.cancel')">{{ $t('buttons.cancel') }}</button>
+      <button class="flat"
+        @click="showConfirm"
+        :aria-label="$t('buttons.replace')"
+        :title="$t('buttons.replace')">{{ $t('buttons.replace') }}</button>
     </div>
   </div>
 </template>

assets/src/components/prompts/Schedule.vue

@@ -1,17 +1,23 @@
 <template>
-  <div class="prompt">
-    <h3>{{ $t('prompts.schedule') }}</h3>
-    <p>{{ $t('prompts.scheduleMessage') }}</p>
-    <input autofocus type="datetime-local" v-model="date">
-    <div>
-      <button class="ok"
-        @click="submit"
-        :aria-label="$t('buttons.schedule')"
-        :title="$t('buttons.schedule')">{{ $t('buttons.schedule') }}</button>
-      <button class="cancel"
+  <div class="card floating">
+    <div class="card-title">
+      <h2>{{ $t('prompts.schedule') }}</h2>
+    </div>
+
+    <div class="card-content">
+      <p>{{ $t('prompts.scheduleMessage') }}</p>
+      <input autofocus type="datetime-local" v-model="date">
+    </div>
+
+    <div class="card-action">
+      <button class="cancel flat"
         @click="close"
         :aria-label="$t('buttons.cancel')"
         :title="$t('buttons.cancel')">{{ $t('buttons.cancel') }}</button>
+      <button class="falt"
+        @click="submit"
+        :aria-label="$t('buttons.schedule')"
+        :title="$t('buttons.schedule')">{{ $t('buttons.schedule') }}</button>
     </div>
   </div>
 </template>

assets/src/components/prompts/Share.vue

@@ -1,51 +1,55 @@
 <template>
-  <div class="prompt" id="share">
-    <h3>{{ $t('buttons.share') }}</h3>
-    <p></p>
-    <ul>
-      <li v-if="!hasPermanent">
-        <a @click="getPermalink" :aria-label="$t('buttons.permalink')">{{ $t('buttons.permalink') }}</a>
-      </li>
+  <div class="card floating" id="share">
+    <div class="card-title">
+      <h2>{{ $t('buttons.share') }}</h2>
+    </div>
 
-      <li v-for="link in links" :key="link.hash">
-        <a :href="buildLink(link.hash)" target="_blank">
-          <template v-if="link.expires">{{ humanTime(link.expireDate) }}</template>
-          <template v-else>{{ $t('permanent') }}</template>
-        </a>
+    <div class="card-content">
+      <ul>
+        <li v-if="!hasPermanent">
+          <a @click="getPermalink" :aria-label="$t('buttons.permalink')">{{ $t('buttons.permalink') }}</a>
+        </li>
 
-        <button class="action"
-          @click="deleteLink($event, link)"
-          :aria-label="$t('buttons.delete')"
-          :title="$t('buttons.delete')"><i class="material-icons">delete</i></button>
+        <li v-for="link in links" :key="link.hash">
+          <a :href="buildLink(link.hash)" target="_blank">
+            <template v-if="link.expires">{{ humanTime(link.expireDate) }}</template>
+            <template v-else>{{ $t('permanent') }}</template>
+          </a>
 
-        <button class="action copy-clipboard"
-          :data-clipboard-text="buildLink(link.hash)"
-          :aria-label="$t('buttons.copyToClipboard')"
-          :title="$t('buttons.copyToClipboard')"><i class="material-icons">content_paste</i></button>
-      </li>
+          <button class="action"
+            @click="deleteLink($event, link)"
+            :aria-label="$t('buttons.delete')"
+            :title="$t('buttons.delete')"><i class="material-icons">delete</i></button>
 
-      <li>
-        <input autofocus
-          type="number"
-          max="2147483647"
-          min="0"
-          @keyup.enter="submit"
-          v-model.trim="time">
-        <select v-model="unit" :aria-label="$t('time.unit')">
-          <option value="seconds">{{ $t('time.seconds') }}</option>
-          <option value="minutes">{{ $t('time.minutes') }}</option>
-          <option value="hours">{{ $t('time.hours') }}</option>
-          <option value="days">{{ $t('time.days') }}</option>
-        </select>
-        <button class="action"
-          @click="submit"
-          :aria-label="$t('buttons.create')"
-          :title="$t('buttons.create')"><i class="material-icons">add</i></button>
-      </li>
-    </ul>
+          <button class="action copy-clipboard"
+            :data-clipboard-text="buildLink(link.hash)"
+            :aria-label="$t('buttons.copyToClipboard')"
+            :title="$t('buttons.copyToClipboard')"><i class="material-icons">content_paste</i></button>
+        </li>
 
-    <div>
-      <button class="cancel"
+        <li>
+          <input autofocus
+            type="number"
+            max="2147483647"
+            min="0"
+            @keyup.enter="submit"
+            v-model.trim="time">
+          <select v-model="unit" :aria-label="$t('time.unit')">
+            <option value="seconds">{{ $t('time.seconds') }}</option>
+            <option value="minutes">{{ $t('time.minutes') }}</option>
+            <option value="hours">{{ $t('time.hours') }}</option>
+            <option value="days">{{ $t('time.days') }}</option>
+          </select>
+          <button class="action"
+            @click="submit"
+            :aria-label="$t('buttons.create')"
+            :title="$t('buttons.create')"><i class="material-icons">add</i></button>
+        </li>
+      </ul>
+    </div>
+
+    <div class="card-action">
+      <button class="flat"
         @click="$store.commit('closeHovers')"
         :aria-label="$t('buttons.close')"
         :title="$t('buttons.close')">{{ $t('buttons.close') }}</button>

assets/src/css/base.css

@@ -1,8 +1,8 @@
 body {
   font-family: 'Roboto', sans-serif;
   padding-top: 4em;
-  background-color: #f8f8f8;
-  color: #212121;
+  background-color: #fafafa;
+  color: #333333;
 }
 
 * {
@@ -65,6 +65,53 @@ button:hover {
   background-color: #1E88E5;
 }
 
+input[type="submit"].block,
+button.block {
+  display: block;
+  width: 100%;
+  margin: 0 0 1em;
+}
+
+button.delete {
+  background: #F44336;
+}
+
+button.delete:hover {
+  background: #D32F2F;
+}
+
+button.cancel {
+  background-color: #ECEFF1;
+  color: #37474F;
+}
+
+button.cancel:hover {
+  background-color: #e9eaeb;
+}
+
+button.flat,
+input[type="submit"].flat {
+  color: #1E88E5;
+  background: transparent;
+  box-shadow: 0 0 0;
+  border: 0;
+  margin-left: 0;
+  text-transform: uppercase;
+}
+
+button.flat:hover,
+input[type="submit"].flat:hover {
+  background: rgba(0,0,0,0.05)
+}
+
+button.flat.delete {
+  color: #F44336;
+}
+
+button.flat.cancel {
+  color: #ccc;
+}
+
 .mobile-only {
   display: none !important;
 }

assets/src/css/dashboard.css

@@ -1,64 +1,34 @@
 .dashboard {
   max-width: 600px;
-  box-shadow: rgba(0, 0, 0, 0.06) 0px 1px 3px, rgba(0, 0, 0, 0.12) 0px 1px 2px;
-  border-radius: .5em;
-  background: #fff;
-  padding: 1em;
   margin: 1em 0;
 }
 
-.dashboard a {
+a {
   color: inherit
 }
 
-.dashboard h1 button {
-  font-size: 0.5em;
-  float: right;
-}
-
-.dashboard table {
-  width: 100%;
-}
-
-.dashboard table th {
-  font-weight: 500;
-  color: #757575;
-  text-align: left;
-}
-
-.dashboard table th,
-.dashboard table td {
-  padding: .5em 0;
-}
-
-.dashboard table td:last-child {
-  width: 1em
-}
-
-.dashboard > h1:first-of-type {
-  margin-top: 0;
-}
-
-.dashboard form > p:last-child,
-form.dashboard > p:last-child {
-  text-align: right
-}
-
-.dashboard > *:last-child {
-  margin-bottom: 0;
-}
-
-.dashboard select,
-.dashboard textarea,
-.dashboard input[type="text"],
-.dashboard input[type="password"] {
-  padding: 0;
-  line-height: 1.7;
+select,
+textarea,
+input[type="text"],
+input[type="password"] {
+  padding: 0.5em 0;
+  line-height: 1;
   display: block;
   border: 0;
   border-bottom: 1px solid #dddddd;
   transition: .2s ease border;
   width: 100%;
+  background: transparent;
+}
+
+textarea {
+  line-height: 1.15;
+  padding: .5em;
+  border: 1px solid #ddd;
+  font-family: monospace;
+  min-height: 10em;
+  resize: none;
+  border-radius: 2px;
 }
 
 .dashboard #locale,
@@ -69,49 +39,32 @@ form.dashboard > p:last-child {
 }
 
 .dashboard #locale {
-  border: 1px solid #dddddd;
   margin-top: .5em;
 }
 
-.dashboard textarea:focus,
-.dashboard textarea:hover,
-.dashboard input[type="text"]:focus,
-.dashboard input[type="password"]:focus,
-.dashboard input[type="text"]:hover,
-.dashboard input[type="password"]:hover {
+textarea:focus,
+textarea:hover,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="text"]:hover,
+input[type="password"]:hover {
   border-color: #2979ff;
 }
 
-.dashboard input.red {
+input.red {
   border-color: red;
 }
 
-.dashboard input.green {
+input.green {
   border-color: green;
 }
 
-.dashboard button.delete {
-  background: #F44336;
-}
-
-.dashboard button.delete:hover {
-  background: #D32F2F;
-}
-
-.dashboard textarea {
-  line-height: 1.15;
-  padding: .5em;
-  border: 1px solid #ddd;
-  font-family: monospace;
-  min-height: 10em;
-  resize: vertical;
-}
-
 .dashboard p label {
   margin-bottom: .2em;
   display: block;
   font-size: .8em;
-  font-weight: bold;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.57);
 }
 
 li code,
@@ -141,7 +94,7 @@ p code {
 .dashboard #nav li {
   width: 100%;
   padding: 0 0 1em;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  border-bottom: 2px solid rgba(0, 0, 0, 0.05);
 }
 
 .dashboard #nav li.active {
@@ -152,3 +105,316 @@ p code {
   font-size: 1em;
   vertical-align: middle;
 }
+
+table {
+  border-collapse: collapse;
+  width: 100%;
+}
+
+table tr {
+  border-bottom: 1px solid #ccc;
+}
+
+table tr:last-child {
+  border: 0;
+}
+
+table th {
+  font-weight: 500;
+  color: #757575;
+  text-align: left;
+}
+
+table th,
+table td {
+  padding: .5em 0;
+}
+
+table td.small {
+  width: 1em;
+}
+
+table tr>*:first-child {
+  padding-left: 1em;
+}
+
+table tr>*:last-child {
+  padding-right: 1em;
+}
+
+.card {
+  position: relative;
+  margin: .5rem 0 1rem 0;
+  background-color: #fff;
+  border-radius: 2px;
+  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
+}
+
+.card.floating {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 99999;
+  max-width: 25em;
+  width: 90%;
+  max-height: 95%;
+  z-index: 99999;
+  animation: .1s show forwards;
+}
+
+.card>*>*:first-child {
+  margin-top: 0;
+}
+
+.card>*>*:last-child {
+  margin-bottom: 0;
+}
+
+.card .card-title {
+  padding: 1.5em 1em 1em;
+  display: flex;
+}
+
+.card .card-title>*:first-child {
+  margin-right: auto;
+}
+
+.card>div {
+  padding: 1em 1em;
+}
+
+.card>div:first-child {
+  padding-top: 1.5em;
+}
+
+.card>div:last-child {
+  padding-bottom: 1.5em;
+}
+
+.card .card-title * {
+  margin: 0;
+}
+
+.card .card-action {
+  text-align: right;
+}
+
+.card .card-content.full {
+  padding-bottom: 0;
+}
+
+.card h2 {
+  font-weight: 500;
+}
+
+.card h3 {
+  color: rgba(0, 0, 0, 0.53);
+  font-size: 1em;
+  font-weight: 500;
+  margin: 2em 0 1em;
+}
+
+.card-content table {
+  margin: 0 -1em;
+  width: calc(100% + 2em);
+}
+
+.card code {
+  word-wrap: break-word;
+}
+
+.card#download {
+  max-width: 15em;
+}
+
+.card#share ul {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.card#share ul li {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.card#share ul li a {
+  color: #2196F3;
+  cursor: pointer;
+  margin-right: auto;
+}
+
+.card#share ul li .action i {
+  font-size: 1em;
+}
+
+.card#share ul li input,
+.card#share ul li select {
+  padding: .2em;
+  margin-right: .5em;
+  border: 1px solid #dadada;
+}
+
+.card#share .action.copy-clipboard::after {
+  content: 'Copied!';
+  position: absolute;
+  left: -25%;
+  width: 150%;
+  font-size: .6em;
+  text-align: center;
+  background: #44a6f5;
+  color: #fff;
+  padding: .5em .2em;
+  border-radius: .4em;
+  top: -2em;
+  transition: .1s ease opacity;
+  opacity: 0;
+}
+
+.card#share .action.copy-clipboard.active::after {
+  opacity: 1;
+}
+
+.overlay {
+  background-color: rgba(0, 0, 0, 0.5);
+  position: fixed;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: 100%;
+  z-index: 9999;
+  animation: .1s show forwards;
+}
+
+
+/* * * * * * * * * * * * * * * *
+ *        PROMPT - MOVE        *
+ * * * * * * * * * * * * * * * */
+
+.file-list {
+  max-height: 50vh;
+  overflow: auto;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+}
+
+.file-list li {
+  width: 100%;
+  user-select: none;
+  border-radius: .2em;
+  padding: .3em;
+}
+
+.file-list li[aria-selected=true] {
+  background: #2196f3 !important;
+  color: #fff !important;
+  transition: .1s ease all;
+}
+
+.file-list li:hover {
+  background-color: #e9eaeb;
+  cursor: pointer;
+}
+
+.file-list li:before {
+  content: "folder";
+  color: #6f6f6f;
+  vertical-align: middle;
+  line-height: 1.4;
+  font-family: 'Material Icons';
+  font-size: 1.75em;
+  margin-right: .25em;
+}
+
+.file-list li[aria-selected=true]:before {
+  color: white;
+}
+
+.help {
+  max-width: 24em;
+}
+
+.help ul {
+  padding: 0;
+  margin: 1em 0;
+  list-style: none;
+}
+
+@keyframes show {
+  0% {
+    display: none;
+    opacity: 0;
+  }
+  1% {
+    display: block;
+    opacity: 0;
+  }
+  100% {
+    display: block;
+    opacity: 1;
+  }
+}
+
+.collapsible {
+  border-top: 1px solid rgba(0,0,0,0.1);
+}
+
+.collapsible:last-of-type {
+  border-bottom: 1px solid rgba(0,0,0,0.1);
+}
+
+.collapsible > input {
+  display: none;
+}
+
+.collapsible > label {
+  padding: 1em 0;
+  cursor: pointer;
+  border-right: 0;
+  border-left: 0;
+  display: flex;
+  justify-content: space-between;
+}
+
+.collapsible > label * {
+  margin: 0;
+  color: rgba(0,0,0,0.57);
+}
+
+.collapsible > label i {
+  transition: .2s ease transform;
+  user-select: none;
+}
+
+.collapsible .collapse {
+  max-height: 0;
+  overflow: hidden;
+  transition: .2s ease all;
+}
+
+.collapsible > input:checked ~ .collapse {
+  padding-top: 1em;
+  padding-bottom: 1em;
+  max-height: 20em;
+}
+
+.collapsible > input:checked ~ label i {
+  transform: rotate(180deg)
+}
+
+.card .collapsible {
+  width: calc(100% + 2em);
+  margin: 0 -1em;
+}
+
+.card .collapsible > label {
+  padding: 1em;
+}
+
+.card .collapsible .collapse {
+  padding: 0 1em;
+}

assets/src/css/header.css

@@ -122,8 +122,9 @@ header .search-button {
 #search input {
   width: 100%;
   border: 0;
-  outline: 0;
   background-color: transparent;
+  line-height: 0;
+  padding: 0;
 }
 
 #search #result {

assets/src/css/listing.css

@@ -159,7 +159,7 @@
 
 #listing.list .item.header {
   display: flex !important;
-  background: #f8f8f8;
+  background: #fafafa;
   position: fixed;
   width: calc(100% - 19em);
   top: 7em;

assets/src/css/login.css

@@ -29,6 +29,14 @@
   width: 90%;
 }
 
+#login.recaptcha form {
+  min-width: 304px;
+}
+
+#login #recaptcha {
+  margin: .5em 0 0;
+}
+
 #login input {
   width: 100%;
   width: 100%;

assets/src/css/prompts.css

@@ -1,229 +0,0 @@
-.prompt {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  background: #fff;
-  border: 1px solid rgba(0, 0, 0, 0.075);
-  box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
-  padding: 2em;
-  max-width: 25em;
-  width: 90%;
-  max-height: 95%;
-  z-index: 99999;
-  animation: .1s show forwards;
-}
-
-.overlay {
-  background-color: rgba(0, 0, 0, 0.5);
-  position: fixed;
-  top: 0;
-  left: 0;
-  height: 100%;
-  width: 100%;
-  z-index: 9999;
-  animation: .1s show forwards;
-}
-
-.prompt h3 {
-  margin: 0;
-  font-weight: 500;
-  font-size: 1.5em;
-}
-
-.prompt p {
-  font-size: .9em;
-  color: rgba(0, 0, 0, 0.8);
-  margin: .5em 0 1em;
-}
-
-.prompt input:not([type="submit"]) {
-  width: 100%;
-  border: 1px solid #dadada;
-  line-height: 1;
-  padding: .3em;
-  margin: .3em 0;
-}
-
-.prompt code {
-  word-wrap: break-word;
-}
-
-.prompt div:last-of-type {
-  margin-top: 1em;
-  display: flex;
-  justify-content: flex-start;
-  flex-direction: row-reverse;
-}
-
-.prompt .cancel {
-  background-color: #ECEFF1;
-  color: #37474F;
-}
-
-.prompt .cancel:hover {
-  background-color: #e9eaeb;
-}
-
-.prompt.success i,
-.prompt.error i {
-  color: #F44336;
-  display: block;
-  margin: 0 auto .15em;
-  text-align: center;
-  font-size: 5em;
-}
-
-.prompt.success h3,
-.prompt.error h3 {
-  text-align: center;
-}
-
-.prompt.error button:not(.cancel) {
-  background-color: #F44336
-}
-
-.prompt.success i {
-  color: #8BC34A;
-}
-
-.prompt.success button {
-  background-color: #8BC34A;
-}
-
-
-/* * * * * * * * * * * * * * * *
- *        PROMPT - MOVE        *
- * * * * * * * * * * * * * * * */
-
-.file-list {
-  max-height: 50vh;
-  overflow: auto;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-}
-
-.file-list li {
-  width: 100%;
-  user-select: none;
-  border-radius: .2em;
-  padding: .3em;
-}
-
-.file-list li[aria-selected=true] {
-  background: #2196f3 !important;
-  color: #fff !important;
-  transition: .1s ease all;
-}
-
-.file-list li:hover {
-  background-color: #e9eaeb;
-  cursor: pointer;
-}
-
-.file-list li:before {
-  content: "folder";
-  color: #6f6f6f;
-  vertical-align: middle;
-  line-height: 1.4;
-  font-family: 'Material Icons';
-  font-size: 1.75em;
-  margin-right: .25em;
-}
-
-.file-list li[aria-selected=true]:before {
-  color: white;
-}
-
-.prompt#download {
-  max-width: 15em;
-}
-
-.prompt#download button {
-  width: 100%;
-  display: block;
-  margin: 0 0 1em;
-  background-color: #ECEFF1;
-  color: #37474F;
-}
-
-.prompt#download button:last-of-type {
-  margin-bottom: 0;
-}
-
-.help {
-  max-width: 24em;
-}
-
-.help ul {
-  padding: 0;
-  margin: 1em 0;
-  list-style: none;
-}
-
-@keyframes show {
-  0% {
-    display: none;
-    opacity: 0;
-  }
-  1% {
-    display: block;
-    opacity: 0;
-  }
-  100% {
-    display: block;
-    opacity: 1;
-  }
-}
-
-.prompt#share ul {
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-.prompt#share ul li {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.prompt#share ul li a {
-  color: #2196F3;
-  cursor: pointer;
-  margin-right: auto;
-}
-
-.prompt#share ul li .action i {
-  font-size: 1em;
-}
-
-.prompt#share ul li input,
-.prompt#share ul li select {
-  padding: .2em;
-  margin-right: .5em;
-  border: 1px solid #dadada;
-}
-
-.prompt#share .action.copy-clipboard::after {
-  content: 'Copied!';
-  position: absolute;
-  left: -25%;
-  width: 150%;
-  font-size: .6em;
-  text-align: center;
-  background: #44a6f5;
-  color: #fff;
-  padding: .5em .2em;
-  border-radius: .4em;
-  top: -2em;
-  transition: .1s ease opacity;
-  opacity: 0;
-}
-
-.prompt#share .action.copy-clipboard.active::after {
-  opacity: 1;
-}
-

assets/src/css/styles.css

@@ -3,7 +3,6 @@
 @import "./fonts.css";
 @import "./base.css";
 @import "./header.css";
-@import "./prompts.css";
 @import "./listing.css";
 @import "./editor.css";
 @import "./dashboard.css";

assets/src/i18n/en.yaml

@@ -117,7 +117,7 @@ settings:
   commandsHelp: >
     Here you can set commands that are executed in the named events. You
     write one command per line. If the event is related to files, such as before and
-    after saving, the environment variable "file" will be available with the path
+    after saving, the environment variable "FILE" will be available with the path
     of the file.
   commandsUpdated: Commands updated!
   customStylesheet: Custom Stylesheet
@@ -168,7 +168,6 @@ sidebar:
   myFiles: My files
   newFile: New file
   newFolder: New folder
-  servedWith: Served with
   settings: Settings
   siteSettings: Site Settings
   hugoNew: Hugo New

assets/src/i18n/fr.yaml

@@ -115,7 +115,7 @@ settings:
   commandsHelp: >
     Ici vous pouvez définir des commandes qui seront exécutées lors de l'évènement correspondant.
     Vous devez indiquer une commande par ligne. Si l'évènement est en rapport avec des fichiers,
-    par exemple avant et après enregistrement, la variable d'environement "file" sera disponible
+    par exemple avant et après enregistrement, la variable d'environement "FILE" sera disponible
     et contiendra le chemin d'accès vers le fichier.
   commandsUpdated: Commandes mises à jour !
   customStylesheet: Feuille de style personnalisée
@@ -161,7 +161,6 @@ sidebar:
   myFiles: Mes fichiers
   newFile: Nouveau fichier
   newFolder: Nouveau dossier
-  servedWith: Géré avec
   settings: Paramètres
   siteSettings: Paramètres du site
   hugoNew: Nouveau Hugo

assets/src/i18n/index.js

@@ -9,8 +9,39 @@ import zhTW from './zh-tw.yaml'
 
 Vue.use(VueI18n)
 
+export function detectLocale () {
+  let locale = (navigator.language || navigator.browserLangugae).toLowerCase()
+  switch (true) {
+    case /^en.*/i.test(locale):
+      locale = 'en'
+      break
+    case /^fr.*/i.test(locale):
+      locale = 'fr'
+      break
+    case /^pt.*/i.test(locale):
+      locale = 'pt'
+      break
+    case /^ja.*/i.test(locale):
+      locale = 'ja'
+      break
+    case /^zh-CN/i.test(locale):
+      locale = 'zh-cn'
+      break
+    case /^zh-TW/i.test(locale):
+      locale = 'zh-tw'
+      break
+    case /^zh.*/i.test(locale):
+      locale = 'zh-cn'
+      break
+    default:
+      locale = 'en'
+  }
+
+  return locale
+}
+
 const i18n = new VueI18n({
-  locale: 'en',
+  locale: detectLocale(),
   fallbackLocale: 'en',
   messages: {
     'en': en,

assets/src/i18n/ja.yaml

@@ -118,13 +118,13 @@ settings:
     ここで、名前付きイベントに実行するコマンドを設定することができます。\
     一行にコマンド一つを入力してください。\
     イベントはファイルに関連する場合、例えばファイル保存の前にまたは後で、\
-    環境変数 file はファイルのパスに割り当てられます。"
+    環境変数 FILE はファイルのパスに割り当てられます。"
   commandsUpdated: コマンドは更新されました！
   customStylesheet: カスタムスタイルシ ート
   examples: 例
   globalSettings: グローバル設定
   language: 言語
-  lockPassowrd: 新しいパスワードを変更に禁止
+  lockPassword: 新しいパスワードを変更に禁止
   newPassword: 新しいパスワード
   newPasswordConfirm: 新しいパスワードを確認します
   newUser: 新しいユーザー
@@ -168,7 +168,6 @@ sidebar:
   myFiles: 私のファイル
   newFile: 新しいファイルを作成
   newFolder: 新しいフォルダを作成
-  servedWith: サービス提供者
   settings: 設定
   siteSettings: サイト設定
   hugoNew: Hugo New

assets/src/i18n/pt.yaml

@@ -139,7 +139,7 @@ settings:
     Pode definir um conjunto de comandos a executar em determiandos eventos.
     Deve escrever um comando por linha. Se o evento estiver relacionado com ficheiros,
     como antes e depois de guardar, irá existir uma variável de ambiente denominada
-    "file" com o caminho do ficheiro.
+    "FILE" com o caminho do ficheiro.
   commandsUpdated: Comandos atualizados!
   customStylesheet: Estilos Personalizados
   examples: Exemplos
@@ -193,7 +193,6 @@ sidebar:
   newFile: Novo ficheiro
   newFolder: Nova pasta
   preview: Pré-visualizar
-  servedWith: Servido com
   settings: Configurações
   siteSettings: Configurações do Site
 time:

assets/src/i18n/zh-cn.yaml

@@ -117,13 +117,13 @@ settings:
   commandsHelp: "\
     在这里，您可以设置在指定事件下执行的命令，一行一条。\
     若事件与文件相关，如“在保存文件前”，\
-    则文件的路径会被赋值给环境变量 \"file\"。"
+    则文件的路径会被赋值给环境变量 \"FILE\"。"
   commandsUpdated: 命令已更新！
   customStylesheet: 自定义样式表
   examples: 例子
   globalSettings: 全局设置
   language: 语言
-  lockPassowrd: 禁止用户修改密码
+  lockPassword: 禁止用户修改密码
   newPassword: 您的新密码
   newPasswordConfirm: 重输一遍新密码
   newUser: 新建用户
@@ -166,7 +166,6 @@ sidebar:
   myFiles: 我的文件
   newFile: 新建文件
   newFolder: 新建文件夹
-  servedWith: '服务提供者:'
   settings: 设置
   siteSettings: 网站设置
   hugoNew: Hugo New

assets/src/i18n/zh-tw.yaml

@@ -4,7 +4,7 @@ buttons:
   close: 關閉
   copy: 複製
   copyFile: 複製檔案
-  copyToClipboard: 複製到剪貼板
+  copyToClipboard: 複製到剪貼簿
   create: 建立
   delete: 刪除
   download: 下載
@@ -34,7 +34,7 @@ buttons:
 success:
   linkCopied: 連結已複製！
 errors:
-  forbidden: 你被禁止訪問。
+  forbidden: 你被禁止存取。
   internal: 內部出現麻煩了。
   notFound: 找不到檔案。
 files:
@@ -47,7 +47,7 @@ files:
   lastModified: 最後修改
   loading: 讀取中...
   lonely: 這裡沒有任何檔案...
-  metadata: 中繼資料
+  metadata: 詮釋資料
   multipleSelectionEnabled: 多選模式已開啟
   name: 名稱
   size: 大小
@@ -102,71 +102,70 @@ prompts:
   show: 顯示
   size: 大小
   schedule: 計畫
-  scheduleMessage: 請選擇發佈這篇帖子的日期。
-  newArchetype: 建立一個基於原型的新帖子。您的檔案將會建立在內容資料夾中。
+  scheduleMessage: 請選擇發佈這篇貼文的日期。
+  newArchetype: 建立一個基於原型的新貼文。您的檔案將會建立在內容資料夾中。
 settings:
   admin: 管理員
   administrator: 管理員
   allowCommands: 執行命令
   allowEdit: 編輯、重命名或刪除檔案/目錄
   allowNew: 創建新檔案和目錄
-  allowPublish: 發佈新的帖子與頁面
+  allowPublish: 發佈新的貼文與頁面
   avoidChanges: '(留空以避免更改)'
   changePassword: 更改密碼
   commands: 命令
   commandsHelp: "\
     在這裡，您可以設定在指定事件下執行的命令，一行一條。\
     若事件與檔案相關，如“在保存檔案前”，\
-    則檔案的路徑會被賦值給環境變數 \"file\"。"
+    則檔案的路徑會被賦值給環境變數 \"FILE\"。"
   commandsUpdated: 命令已更新！
   customStylesheet: 自定義樣式表
-  examples: 例子
+  examples: 範例
   globalSettings: 全域設定
   language: 語言
-  lockPassword: 禁止用戶修改密碼
+  lockPassword: 禁止使用者修改密碼
   newPassword: 您的新密碼
   newPasswordConfirm: 重輸一遍新密碼
-  newUser: 建立用戶
+  newUser: 建立使用者
   password: 密碼
   passwordUpdated: 密碼已更新！
   permissions: 權限
   permissionsHelp: "\
-    您可以將該用戶設置為管理員，也可以單獨選擇各項權限。\
+    您可以將該使用者設置為管理員，也可以單獨選擇各項權限。\
     如果選擇了“管理員”，則其他的選項會被自動勾上，\
-    同時該用戶可以管理其他用戶。"
+    同時該使用者可以管理其他使用者。"
   profileSettings: 設定檔設定
   ruleExample1: "\
-    封鎖用戶訪問所有資料夾下任何以 . 開頭的檔案\
+    封鎖使用者存取所有資料夾下任何以 . 開頭的檔案\
     (隱藏文件, 例如: .git, .gitignore)。"
-  ruleExample2: 封鎖用戶訪問其目錄範圍的根目錄下名為 Caddyfile 的檔案。
+  ruleExample2: 封鎖使用者存取其目錄範圍的根目錄下名為 Caddyfile 的檔案。
   rules: 規則
   rulesHelp1: "\
-    您可以為該用戶製定一組黑名單或白名單式的規則，\
-    被屏蔽的檔案將不會顯示在清單中，用戶也無權限訪問,\
+    您可以為該使用者製定一組黑名單或白名單式的規則，\
+    被屏蔽的檔案將不會顯示在清單中，使用者也無權限存取,\
     支持相對於目錄範圍的路徑。"
   rulesHelp2: "\
     每行一條規則，且必須以關鍵字 {0} 或 {1} 開頭。\
     如要使用規則運算式，請在加上 {2} 之後再附上運算式或路徑。"
   scope: 目錄範圍
   settingsUpdated: 設定已更新！
-  user: 用戶
-  userCommands: 用戶命令
+  user: 使用者
+  userCommands: 使用者命令
   userCommandsHelp: "\
-    指定該用戶可以執行的命令，用空格分隔。\
+    指定該使用者可以執行的命令，用空格分隔。\
     例如："
-  userCreated: 用戶已建立！
-  userDeleted: 用戶已刪除！
-  userManagement: 用戶管理
-  username: 用戶名
-  users: 用戶
-  userUpdated: 用戶已更新！
+  userCreated: 使用者已建立！
+  userDeleted: 使用者已刪除！
+  userManagement: 使用者管理
+  username: 使用者名稱
+  users: 使用者
+  userUpdated: 使用者已更新！
 sidebar:
   help: 幫助
   logout: 登出
   myFiles: 我的檔案
   newFile: 建立檔案
   newFolder: 建立資料夾
-  servedWith: '服務提供者:'
   settings: 設定
   siteSettings: 網站設定
   hugoNew: Hugo New
@@ -190,9 +189,10 @@ languages:
   pt: Português
   ja: 日本語
   zhCN: 中文 (简体)
+  zhTW: 中文 (繁體)
 time:
   unit: 時間單位
   seconds: 秒
   minutes: 分鐘
   hours: 小時
-  days: 天
+  days: 天

assets/src/main.js

@@ -26,13 +26,12 @@ Vue.prototype.$showSuccess = function (message) {
 }
 
 Vue.prototype.$showError = function (error) {
-  // TODO: add btns: close and report issue
   let n = new Noty(Object.assign({}, notyDefault, {
     text: error,
     type: 'error',
     timeout: null,
     buttons: [
-      Noty.button(i18n.t('buttons.reportIssue'), 'cancel', function () {
+      Noty.button(i18n.t('buttons.reportIssue'), '', function () {
         window.open('https://github.com/hacdias/filemanager/issues/new')
       }),
       Noty.button(i18n.t('buttons.close'), '', function () {

assets/src/router/index.js

@@ -3,10 +3,11 @@ import Router from 'vue-router'
 import Login from '@/views/Login'
 import Layout from '@/views/Layout'
 import Files from '@/views/Files'
-import Users from '@/views/Users'
-import User from '@/views/User'
-import GlobalSettings from '@/views/GlobalSettings'
-import ProfileSettings from '@/views/ProfileSettings'
+import Users from '@/views/Settings/Users'
+import User from '@/views/Settings/User'
+import Settings from '@/views/Settings'
+import GlobalSettings from '@/views/settings/Global'
+import ProfileSettings from '@/views/settings/Profile'
 import Error403 from '@/views/errors/403'
 import Error404 from '@/views/errors/404'
 import Error500 from '@/views/errors/500'
@@ -49,22 +50,44 @@ const router = new Router({
         {
           path: '/settings',
           name: 'Settings',
+          component: Settings,
           redirect: {
             path: '/settings/profile'
-          }
-        },
-        {
-          path: '/settings/profile',
-          name: 'Profile Settings',
-          component: ProfileSettings
-        },
-        {
-          path: '/settings/global',
-          name: 'Global Settings',
-          component: GlobalSettings,
+          },
           meta: {
-            requiresAdmin: true
-          }
+            disableOnNoAuth: true
+          },
+          children: [
+            {
+              path: '/settings/profile',
+              name: 'Profile Settings',
+              component: ProfileSettings
+            },
+            {
+              path: '/settings/global',
+              name: 'Global Settings',
+              component: GlobalSettings,
+              meta: {
+                requiresAdmin: true
+              }
+            },
+            {
+              path: '/settings/users',
+              name: 'Users',
+              component: Users,
+              meta: {
+                requiresAdmin: true
+              }
+            },
+            {
+              path: '/settings/users/*',
+              name: 'User',
+              component: User,
+              meta: {
+                requiresAdmin: true
+              }
+            }
+          ]
         },
         {
           path: '/403',
@@ -81,22 +104,6 @@ const router = new Router({
           name: 'Internal Server Error',
           component: Error500
         },
-        {
-          path: '/users',
-          name: 'Users',
-          component: Users,
-          meta: {
-            requiresAdmin: true
-          }
-        },
-        {
-          path: '/users/*',
-          name: 'User',
-          component: User,
-          meta: {
-            requiresAdmin: true
-          }
-        },
         {
           path: '/files',
           redirect: {
@@ -123,16 +130,17 @@ router.beforeEach((to, from, next) => {
     auth.loggedIn()
       .then(() => {
         if (to.matched.some(record => record.meta.requiresAdmin)) {
-          if (store.state.user.admin) {
-            next()
+          if (!store.state.user.admin) {
+            next({ path: '/403' })
             return
           }
+        }
 
-          next({
-            path: '/403'
-          })
-
-          return
+        if (to.matched.some(record => record.meta.disableOnNoAuth)) {
+          if (store.state.noAuth) {
+            next({ path: '/403' })
+            return
+          }
         }
 
         next()

assets/src/store/index.js

@@ -12,6 +12,12 @@ const state = {
     key: '',
     items: []
   },
+  css: (() => {
+    let css = window.CSS
+    window.CSS = null
+    return css
+  })(),
+  recaptcha: document.querySelector('meta[name="recaptcha"]').getAttribute('content'),
   staticGen: document.querySelector('meta[name="staticgen"]').getAttribute('content'),
   baseURL: document.querySelector('meta[name="base"]').getAttribute('content'),
   noAuth: (document.querySelector('meta[name="noauth"]').getAttribute('content') === 'true'),

assets/src/store/mutations.js

@@ -1,4 +1,4 @@
-import i18n from '@/i18n'
+import * as i18n from '@/i18n'
 import moment from 'moment'
 
 const mutations = {
@@ -27,10 +27,17 @@ const mutations = {
   setLoading: (state, value) => { state.loading = value },
   setReload: (state, value) => { state.reload = value },
   setUser: (state, value) => {
-    moment.locale(value.locale)
-    i18n.locale = value.locale
+    let locale = value.locale
+
+    if (locale === '') {
+      locale = i18n.detectLocale()
+    }
+
+    moment.locale(locale)
+    i18n.default.locale = locale
     state.user = value
   },
+  setCSS: (state, value) => (state.css = value),
   setJWT: (state, value) => (state.jwt = value),
   multiple: (state, value) => (state.multiple = value),
   addSelected: (state, value) => (state.selected.push(value)),
@@ -45,8 +52,12 @@ const mutations = {
   resetSelected: (state) => {
     state.selected = []
   },
-  listingDisplay: (state, value) => {
-    state.req.display = value
+  updateUser: (state, value) => {
+    if (typeof value !== 'object') return
+
+    for (let field in value) {
+      state.user[field] = value[field]
+    }
   },
   updateRequest: (state, value) => {
     state.req = value

assets/src/utils/auth.js

@@ -31,8 +31,8 @@ function loggedIn () {
   })
 }
 
-function login (user, password) {
-  let data = {username: user, password: password}
+function login (user, password, captcha) {
+  let data = {username: user, password: password, recaptcha: captcha}
   return new Promise((resolve, reject) => {
     let request = new window.XMLHttpRequest()
     request.open('POST', `${store.state.baseURL}/api/auth/get`, true)

assets/src/views/Layout.vue

@@ -6,7 +6,7 @@
     <site-header></site-header>
     <sidebar></sidebar>
     <main>
-      <router-view v-on:css-updated="updateCSS"></router-view>
+      <router-view @css="$emit('update:css')"></router-view>
     </main>
     <prompts></prompts>
   </div>
@@ -34,23 +34,10 @@ export default {
     }
   },
   mounted () {
-    this.updateCSS()
+    this.$emit('update:css')
   },
-  methods: {
-    updateCSS () {
-      let css = this.$store.state.user.css
-
-      let style = document.querySelector('style[title="user-css"]')
-      if (style !== undefined && style !== null) {
-        style.parentElement.removeChild(style)
-      }
-
-      style = document.createElement('style')
-      style.title = 'user-css'
-      style.type = 'text/css'
-      style.appendChild(document.createTextNode(css))
-      document.head.appendChild(style)
-    }
+  beforeDestroy () {
+    this.$emit('clean:css')
   }
 }
 </script>

assets/src/views/Login.vue

@@ -1,11 +1,12 @@
 <template>
-  <div id="login">
+  <div id="login" :class="{ recaptcha: recaptcha.length > 0 }">
     <form @submit="submit">
       <img src="../assets/logo.svg" alt="File Manager">
       <h1>File Manager</h1>
       <div v-if="wrong" class="wrong">{{ $t("login.wrongCredentials") }}</div>
       <input type="text" v-model="username" :placeholder="$t('login.username')">
       <input type="password" v-model="password" :placeholder="$t('login.password')">
+      <div v-if="recaptcha.length" id="recaptcha"></div>
       <input type="submit" :value="$t('login.submit')">
     </form>
   </div>
@@ -13,9 +14,12 @@
 
 <script>
 import auth from '@/utils/auth'
+import { mapState } from 'vuex'
 
 export default {
   name: 'login',
+  props: ['dependencies'],
+  computed: mapState(['recaptcha']),
   data: function () {
     return {
       wrong: false,
@@ -23,8 +27,23 @@ export default {
       password: ''
     }
   },
+  mounted () {
+    if (this.dependencies) this.setup()
+  },
+  watch: {
+    dependencies: function (val) {
+      if (val) this.setup()
+    }
+  },
   methods: {
-    submit: function (event) {
+    setup () {
+      if (this.recaptcha.length === 0) return
+
+      window.grecaptcha.render('recaptcha', {
+        sitekey: this.recaptcha
+      })
+    },
+    submit (event) {
       event.preventDefault()
       event.stopPropagation()
 
@@ -33,7 +52,17 @@ export default {
         redirect = '/files/'
       }
 
-      auth.login(this.username, this.password)
+      let captcha = ''
+      if (this.recaptcha.length > 0) {
+        captcha = window.grecaptcha.getResponse()
+
+        if (captcha === '') {
+          this.wrong = true
+          return
+        }
+      }
+
+      auth.login(this.username, this.password, captcha)
         .then(() => { this.$router.push({ path: redirect }) })
         .catch(() => { this.wrong = true })
     }

assets/src/views/Settings.vue

@@ -0,0 +1,20 @@
+<template>
+  <div class="dashboard">
+    <ul id="nav" v-if="user.admin">
+      <li :class="{ active: $route.path === '/settings/profile' }"><router-link to="/settings/profile">{{ $t('settings.profileSettings') }}</router-link></li>
+      <li :class="{ active: $route.path === '/settings/global' }"><router-link to="/settings/global">{{ $t('settings.globalSettings') }}</router-link></li>
+      <li :class="{ active: $route.path === '/settings/users' }"><router-link to="/settings/users">{{ $t('settings.userManagement') }}</router-link></li>
+    </ul>
+
+    <router-view @css="$emit('css')"></router-view>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'settings',
+  computed: mapState([ 'user' ])
+}
+</script>

assets/src/views/Users.vue

@@ -1,48 +0,0 @@
-<template>
-  <div class="dashboard">
-    <ul id="nav">
-      <li><router-link to="/settings/profile">{{ $t('settings.profileSettings') }}</router-link></li>
-      <li><router-link to="/settings/global">{{ $t('settings.globalSettings') }}</router-link></li>
-      <li class="active"><router-link to="/users">{{ $t('settings.userManagement') }}</router-link></li>
-    </ul>
-
-    <h1>{{ $t('settings.users') }} <router-link to="/users/new"><button>{{ $t('buttons.new') }}</button></router-link></h1>
-
-    <table>
-      <tr>
-        <th>{{ $t('settings.username') }}</th>
-        <th>{{ $t('settings.admin') }}</th>
-        <th>{{ $t('settings.scope') }}</th>
-        <th></th>
-      </tr>
-
-      <tr v-for="user in users" :key="user.id">
-        <td>{{ user.username }}</td>
-        <td><i v-if="user.admin" class="material-icons">done</i><i v-else class="material-icons">close</i></td>
-        <td>{{ user.filesystem }}</td>
-        <td><router-link :to="'/users/' + user.ID"><i class="material-icons">mode_edit</i></router-link></td>
-      </tr>
-
-    </table>
-  </div>
-</template>
-
-<script>
-import * as api from '@/utils/api'
-
-export default {
-  name: 'users',
-  data: function () {
-    return {
-      users: []
-    }
-  },
-  created () {
-    api.getUsers().then(users => {
-      this.users = users
-    }).catch(error => {
-      this.$showError(error)
-    })
-  }
-}
-</script>

assets/src/views/settings/Global.vue

@@ -1,37 +1,61 @@
 <template>
   <div class="dashboard">
-    <ul id="nav">
-      <li><router-link to="/settings/profile">{{ $t('settings.profileSettings') }}</router-link></li>
-      <li class="active"><router-link to="/settings/global">{{ $t('settings.globalSettings') }}</router-link></li>
-      <li><router-link to="/users">{{ $t('settings.userManagement') }}</router-link></li>
-    </ul>
+    <form class="card" v-if="staticGen.length" @submit.prevent="saveStaticGen">
+      <div class="card-title">
+        <h2>{{ capitalize($store.state.staticGen) }}</h2>
+      </div>
 
-    <h1>{{ $t('settings.globalSettings') }}</h1>
+      <div class="card-content">
+        <p v-for="field in staticGen" :key="field.variable">
+          <label v-if="field.type !== 'checkbox'">{{ field.name }}</label>
+          <input v-if="field.type === 'text'" type="text" v-model.trim="field.value">
+          <input v-else-if="field.type === 'checkbox'" type="checkbox" v-model.trim="field.value">
+          <template v-if="field.type === 'checkbox'">{{ capitalize(field.name, 'caps') }}</template>
+        </p>
+      </div>
 
-    <form @submit="saveStaticGen" v-if="$store.state.staticGen.length > 0">
-      <h2>{{ capitalize($store.state.staticGen) }}</h2>
-
-      <p v-for="field in staticGen" :key="field.variable">
-        <label v-if="field.type !== 'checkbox'">{{ field.name }}</label>
-        <input v-if="field.type === 'text'" type="text" v-model.trim="field.value">
-        <input v-else-if="field.type === 'checkbox'" type="checkbox" v-model.trim="field.value">
-        <template v-if="field.type === 'checkbox'">{{ capitalize(field.name, 'caps') }}</template>
-      </p>
-
-      <p><input type="submit" value="Save"></p>
+      <div class="card-action">
+        <input class="flat" type="submit" :value="$t('buttons.update')">
+      </div>
     </form>
 
-    <form @submit="saveCommands">
-      <h2>{{ $t('settings.commands') }}</h2>
+    <form class="card" @submit.prevent="saveCSS">
+      <div class="card-title">
+        <h2>{{ $t('settings.customStylesheet') }}</h2>
+      </div>
 
-      <p class="small">{{ $t('settings.commandsHelp') }}</p>
+      <div class="card-content">
+        <textarea v-model="css"></textarea>
+      </div>
 
-      <template v-for="command in commands">
-        <h3>{{ capitalize(command.name) }}</h3>
-        <textarea v-model.trim="command.value"></textarea>
-      </template>
+      <div class="card-action">
+        <input class="flat" type="submit" :value="$t('buttons.update')">
+      </div>
+    </form>
 
-      <p><input type="submit" value="Save"></p>
+    <form class="card" @submit.prevent="saveCommands">
+      <div class="card-title">
+        <h2>{{ $t('settings.commands') }}</h2>
+      </div>
+
+      <div class="card-content">
+        <p class="small">{{ $t('settings.commandsHelp') }}</p>
+
+        <div v-for="command in commands" :key="command.name" class="collapsible">
+          <input :id="command.name" type="checkbox">
+          <label :for="command.name">
+            <p>{{ capitalize(command.name) }}</p>
+            <i class="material-icons">arrow_drop_down</i>
+          </label>
+          <div class="collapse">
+            <textarea v-model.trim="command.value"></textarea>
+          </div>
+        </div>
+      </div>
+
+      <div class="card-action">
+        <input class="flat" type="submit" :value="$t('buttons.update')">
+      </div>
     </form>
 
   </div>
@@ -46,7 +70,8 @@ export default {
   data: function () {
     return {
       commands: [],
-      staticGen: []
+      staticGen: [],
+      css: ''
     }
   },
   computed: {
@@ -65,8 +90,10 @@ export default {
             value: settings.commands[key].join('\n')
           })
         }
+
+        this.css = settings.css
       })
-      .catch(error => { this.$showError(error) })
+      .catch(this.$showError)
   },
   methods: {
     capitalize (name, where = '_') {
@@ -81,8 +108,6 @@ export default {
       return name.slice(0, -1)
     },
     saveCommands (event) {
-      event.preventDefault()
-
       let commands = {}
 
       for (let command of this.commands) {
@@ -96,10 +121,18 @@ export default {
 
       updateSettings(commands, 'commands')
         .then(() => { this.$showSuccess(this.$t('settings.commandsUpdated')) })
-        .catch(error => { this.$showError(error) })
+        .catch(this.$showError)
+    },
+    saveCSS (event) {
+      updateSettings(this.css, 'css')
+        .then(() => {
+          this.$showSuccess(this.$t('settings.settingsUpdated'))
+          this.$store.commit('setCSS', this.css)
+          this.$emit('css')
+        })
+        .catch(this.$showError)
     },
     saveStaticGen (event) {
-      event.preventDefault()
       let staticGen = {}
 
       for (let field of this.staticGen) {
@@ -117,7 +150,7 @@ export default {
 
       updateSettings(staticGen, 'staticGen')
         .then(() => { this.$showSuccess(this.$t('settings.settingsUpdated')) })
-        .catch(error => { this.$showError(error) })
+        .catch(this.$showError)
     },
     parseStaticGen (staticgen) {
       for (let option of staticgen) {

assets/src/views/settings/Profile.vue

@@ -1,26 +1,35 @@
 <template>
   <div class="dashboard">
-    <ul id="nav" v-if="user.admin">
-      <li class="active"><router-link to="/settings/profile">{{ $t('settings.profileSettings') }}</router-link></li>
-      <li><router-link to="/settings/global">{{ $t('settings.globalSettings') }}</router-link></li>
-      <li><router-link to="/users">{{ $t('settings.userManagement') }}</router-link></li>
-    </ul>
+     <form class="card" @submit="updateSettings">
+      <div class="card-title">
+        <h2>{{ $t('settings.profileSettings') }}</h2>
+      </div>
 
-    <h1>{{ $t('settings.profileSettings') }}</h1>
+      <div class="card-content">
+        <h3>{{ $t('settings.language') }}</h3>
+        <p><languages id="locale" :selected.sync="locale"></languages></p>
+        <h3>{{ $t('settings.customStylesheet') }}</h3>
+        <textarea v-model="css" name="css"></textarea>
+      </div>
 
-    <form @submit="updateSettings">
-      <h3>{{ $t('settings.language') }}</h3>
-      <p><languages id="locale" :selected.sync="locale"></languages></p>
-      <h3>{{ $t('settings.customStylesheet') }}</h3>
-      <textarea v-model="css" name="css"></textarea>
-      <p><input type="submit" :value="$t('buttons.update')"></p>
+      <div class="card-action">
+        <input class="flat" type="submit" :value="$t('buttons.update')">
+      </div>
     </form>
 
-    <form v-if="!user.lockPassword" @submit="updatePassword">
-      <h3>{{ $t('settings.changePassword') }}</h3>
-      <p><input :class="passwordClass" type="password" :placeholder="$t('settings.newPassword')" v-model="password" name="password"></p>
-      <p><input :class="passwordClass" type="password" :placeholder="$t('settings.newPasswordConfirm')" v-model="passwordConf" name="password"></p>
-      <p><input type="submit" :value="$t('buttons.update')"></p>
+    <form class="card" v-if="!user.lockPassword" @submit="updatePassword">
+      <div class="card-title">
+        <h2>{{ $t('settings.changePassword') }}</h2>
+      </div>
+
+      <div class="card-content">
+        <p><input :class="passwordClass" type="password" :placeholder="$t('settings.newPassword')" v-model="password" name="password"></p>
+        <p><input :class="passwordClass" type="password" :placeholder="$t('settings.newPasswordConfirm')" v-model="passwordConf" name="password"></p>
+      </div>
+
+      <div class="card-action">
+        <input class="flat" type="submit" :value="$t('buttons.update')">
+      </div>
     </form>
   </div>
 </template>
@@ -89,7 +98,7 @@ export default {
 
       updateUser(user, 'partial').then(location => {
         this.$store.commit('setUser', user)
-        this.$emit('css-updated')
+        this.$emit('css')
         this.$showSuccess(this.$t('settings.settingsUpdated'))
       }).catch(e => {
         this.$showError(e)

assets/src/views/settings/User.vue

@@ -1,76 +1,81 @@
 <template>
   <div>
-    <form @submit="save" class="dashboard">
-      <ul id="nav">
-        <li><router-link to="/settings/profile">{{ $t('settings.profileSettings') }}</router-link></li>
-        <li><router-link to="/settings/global">{{ $t('settings.globalSettings') }}</router-link></li>
-        <li><router-link to="/users">{{ $t('settings.userManagement') }}</router-link></li>
-      </ul>
+    <form @submit="save" class="card">
+      <div class="card-title">
+        <h2 v-if="id === 0">{{ $t('settings.newUser') }}</h2>
+        <h2 v-else>{{ $t('settings.user') }} {{ username }}</h2>
+      </div>
 
-      <h1 v-if="id === 0">{{ $t('settings.newUser') }}</h1>
-      <h1 v-else>{{ $t('settings.user') }} {{ username }}</h1>
+      <div class="card-content">
 
-      <p><label for="username">{{ $t('settings.username') }}</label><input type="text" v-model="username" id="username"></p>
-      <p><label for="password">{{ $t('settings.password') }}</label><input type="password" :placeholder="passwordPlaceholder" v-model="password" id="password"></p>
-      <p><label for="scope">{{ $t('settings.scope') }}</label><input type="text" v-model="filesystem" id="scope"></p>
-      <p>
-        <label for="locale">{{ $t('settings.language') }}</label>
-        <languages id="locale" :selected.sync="locale"></languages>
-      </p>
+        <p><label for="username">{{ $t('settings.username') }}</label><input type="text" v-model="username" id="username"></p>
+        <p><label for="password">{{ $t('settings.password') }}</label><input type="password" :placeholder="passwordPlaceholder" v-model="password" id="password"></p>
+        <p><label for="scope">{{ $t('settings.scope') }}</label><input type="text" v-model="filesystem" id="scope"></p>
+        <p>
+          <label for="locale">{{ $t('settings.language') }}</label>
+          <languages id="locale" :selected.sync="locale"></languages>
+        </p>
 
-      <p><input type="checkbox" :disabled="admin" v-model="lockPassword"> {{ $t('settings.lockPassword') }}</p>
+        <p><input type="checkbox" :disabled="admin" v-model="lockPassword"> {{ $t('settings.lockPassword') }}</p>
 
-      <h2>{{ $t('settings.permissions') }}</h2>
-      <p class="small">{{ $t('settings.permissionsHelp') }}</p>
+        <h3>{{ $t('settings.permissions') }}</h3>
+        <p class="small">{{ $t('settings.permissionsHelp') }}</p>
 
-      <p><input type="checkbox" v-model="admin"> {{ $t('settings.administrator') }}</p>
-      <p><input type="checkbox" :disabled="admin" v-model="allowNew"> {{ $t('settings.allowNew') }}</p>
-      <p><input type="checkbox" :disabled="admin" v-model="allowEdit"> {{ $t('settings.allowEdit') }}</p>
-      <p><input type="checkbox" :disabled="admin" v-model="allowCommands"> {{ $t('settings.allowCommands') }}</p>
-      <p v-show="$store.state.staticGen.length"><input type="checkbox" :disabled="admin" v-model="allowPublish"> {{ $t('settings.allowPublish') }}</p>
+        <p><input type="checkbox" v-model="admin"> {{ $t('settings.administrator') }}</p>
+        <p><input type="checkbox" :disabled="admin" v-model="allowNew"> {{ $t('settings.allowNew') }}</p>
+        <p><input type="checkbox" :disabled="admin" v-model="allowEdit"> {{ $t('settings.allowEdit') }}</p>
+        <p><input type="checkbox" :disabled="admin" v-model="allowCommands"> {{ $t('settings.allowCommands') }}</p>
+        <p v-show="$store.state.staticGen.length"><input type="checkbox" :disabled="admin" v-model="allowPublish"> {{ $t('settings.allowPublish') }}</p>
 
-      <h3>{{ $t('settings.userCommands') }}</h3>
-      <p class="small">{{ $t('settings.userCommandsHelp') }} <i>git svn hg</i>.</p>
-      <input type="text" v-model.trim="commands">
+        <h3>{{ $t('settings.userCommands') }}</h3>
+        <p class="small">{{ $t('settings.userCommandsHelp') }} <i>git svn hg</i>.</p>
+        <input type="text" v-model.trim="commands">
 
-      <h2>{{ $t('settings.rules') }}</h2>
+        <h3>{{ $t('settings.rules') }}</h3>
 
-      <p class="small">{{ $t('settings.rulesHelp1') }}</p>
+        <p class="small">{{ $t('settings.rulesHelp1') }}</p>
 
-      <i18n path="settings.rulesHelp2" tag="p" class="small">
-        <code>allow</code><code>disallow</code><code>regex</code>
-      </i18n>
+        <i18n path="settings.rulesHelp2" tag="p" class="small">
+          <code>allow</code><code>disallow</code><code>regex</code>
+        </i18n>
 
-      <p class="small"><strong>{{ $t('settings.examples') }}</strong></p>
+        <p class="small"><strong>{{ $t('settings.examples') }}</strong></p>
 
-      <ul class="small">
-        <li><code>disallow regex \\/\\..+</code> - {{ $t('settings.ruleExample1') }}</li>
-        <li><code>disallow /Caddyfile</code> - {{ $t('settings.ruleExample2') }}</li>
-      </ul>
+        <ul class="small">
+          <li><code>disallow regex \\/\\..+</code> - {{ $t('settings.ruleExample1') }}</li>
+          <li><code>disallow /Caddyfile</code> - {{ $t('settings.ruleExample2') }}</li>
+        </ul>
 
-      <textarea v-model.trim="rules"></textarea>
+        <textarea v-model.trim="rules"></textarea>
 
-      <h2>{{ $t('settings.customStylesheet') }}</h2>
+        <h3>{{ $t('settings.customStylesheet') }}</h3>
 
-      <textarea name="css"></textarea>
+        <textarea name="css"></textarea>
+      </div>
 
-      <p>
-        <button v-if="id !== 0" @click.prevent="deletePrompt" type="button" class="delete" :aria-label="$t('buttons.delete')" :title="$t('buttons.delete')">{{ $t('buttons.delete') }}</button>
-        <input type="submit" :value="$t('buttons.save')">
-      </p>
+      <div class="card-action">
+        <button v-if="id !== 0" @click.prevent="deletePrompt" type="button" class="flat delete" :aria-label="$t('buttons.delete')" :title="$t('buttons.delete')">{{ $t('buttons.delete') }}</button>
+        <input class="flat" type="submit" :value="$t('buttons.save')">
+      </div>
     </form>
 
-    <div v-if="$store.state.show === 'deleteUser'" class="prompt">
-      <h3>Delete User</h3>
-      <p>Are you sure you want to delete this user?</p>
-      <div>
-        <button @click="deleteUser" autofocus>{{ $t('buttons.delete') }}</button>
-        <button class="cancel"
+    <div v-if="$store.state.show === 'deleteUser'" class="card floating">
+      <div class="card-content">
+        <p>Are you sure you want to delete this user?</p>
+      </div>
+
+      <div class="card-action">
+        <button class="cancel flat"
           @click="closeHovers"
+          autofocus
           :aria-label="$t('buttons.cancel')"
           :title="$t('buttons.cancel')">
           {{ $t('buttons.cancel') }}
         </button>
+        <button class="flat"
+          @click="deleteUser">
+          {{ $t('buttons.delete') }}
+        </button>
       </div>
     </div>
   </div>
@@ -105,7 +110,7 @@ export default {
   },
   computed: {
     passwordPlaceholder () {
-      if (this.$route.path === '/users/new') return ''
+      if (this.$route.path === '/settings/users/new') return ''
       return this.$t('settings.avoidChanges')
     }
   },
@@ -131,7 +136,7 @@ export default {
     fetchData () {
       let user = this.$route.params[0]
 
-      if (this.$route.path === '/users/new') {
+      if (this.$route.path === '/settings/users/new') {
         user = 'base'
       }
 
@@ -168,7 +173,7 @@ export default {
 
         this.rules = this.rules.trim()
       }).catch(() => {
-        this.$router.push({ path: '/users/new' })
+        this.$router.push({ path: '/settings/users/new' })
       })
     },
     capitalize (name) {
@@ -205,7 +210,7 @@ export default {
       event.preventDefault()
 
       deleteUser(this.id).then(location => {
-        this.$router.push({ path: '/users' })
+        this.$router.push({ path: '/settings/users' })
         this.$showSuccess(this.$t('settings.userDeleted'))
       }).catch(e => {
         this.$showError(e)
@@ -215,7 +220,7 @@ export default {
       event.preventDefault()
       let user = this.parseForm()
 
-      if (this.$route.path === '/users/new') {
+      if (this.$route.path === '/settings/users/new') {
         newUser(user).then(location => {
           this.$router.push({ path: location })
           this.$showSuccess(this.$t('settings.userCreated'))

assets/src/views/settings/Users.vue

@@ -0,0 +1,48 @@
+<template>
+  <div class="card">
+    <div class="card-title">
+      <h2>{{ $t('settings.users') }}</h2>
+      <router-link to="/settings/users/new"><button class="flat">{{ $t('buttons.new') }}</button></router-link>
+    </div>
+
+    <div class="card-content full">
+      <table>
+        <tr>
+          <th>{{ $t('settings.username') }}</th>
+          <th>{{ $t('settings.admin') }}</th>
+          <th>{{ $t('settings.scope') }}</th>
+          <th></th>
+        </tr>
+
+        <tr v-for="user in users" :key="user.id">
+          <td>{{ user.username }}</td>
+          <td><i v-if="user.admin" class="material-icons">done</i><i v-else class="material-icons">close</i></td>
+          <td>{{ user.filesystem }}</td>
+          <td class="small">
+            <router-link :to="'/settings/users/' + user.ID"><i class="material-icons">mode_edit</i></router-link>
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as api from '@/utils/api'
+
+export default {
+  name: 'users',
+  data: function () {
+    return {
+      users: []
+    }
+  },
+  created () {
+    api.getUsers().then(users => {
+      this.users = users
+    }).catch(error => {
+      this.$showError(error)
+    })
+  }
+}
+</script>

caddy/parser/parser.go

@@ -48,6 +48,8 @@ func Parse(c *caddy.Controller, plugin string) ([]*filemanager.FileManager, erro
 		scope := "."
 		database := ""
 		noAuth := false
+		reCaptchaKey := ""
+		reCaptchaSecret := ""
 
 		if plugin != "" {
 			baseURL = "/admin"
@@ -146,6 +148,27 @@ func Parse(c *caddy.Controller, plugin string) ([]*filemanager.FileManager, erro
 				}
 
 				u.CSS = string(css)
+			case "view_mode":
+				if !c.NextArg() {
+					return nil, c.ArgErr()
+				}
+
+				u.ViewMode = c.Val()
+				if u.ViewMode != filemanager.MosaicViewMode && u.ViewMode != filemanager.ListViewMode {
+					return nil, c.ArgErr()
+				}
+			case "recaptcha_key":
+				if !c.NextArg() {
+					return nil, c.ArgErr()
+				}
+
+				reCaptchaKey = c.Val()
+			case "recaptcha_secret":
+				if !c.NextArg() {
+					return nil, c.ArgErr()
+				}
+
+				reCaptchaSecret = c.Val()
 			case "no_auth":
 				if !c.NextArg() {
 					noAuth = true
@@ -184,7 +207,7 @@ func Parse(c *caddy.Controller, plugin string) ([]*filemanager.FileManager, erro
 			sha := hex.EncodeToString(hasher.Sum(nil))
 			database = filepath.Join(path, sha+".db")
 
-			fmt.Println("[WARNING] A database is going to be created for your File Manager instace at " + database +
+			fmt.Println("[WARNING] A database is going to be created for your File Manager instance at " + database +
 				". It is highly recommended that you set the 'database' option to '" + sha + ".db'\n")
 		}
 
@@ -204,10 +227,12 @@ func Parse(c *caddy.Controller, plugin string) ([]*filemanager.FileManager, erro
 		}
 
 		m := &filemanager.FileManager{
-			NoAuth:      noAuth,
-			BaseURL:     "",
-			PrefixURL:   "",
-			DefaultUser: u,
+			NoAuth:          noAuth,
+			BaseURL:         "",
+			PrefixURL:       "",
+			ReCaptchaKey:    reCaptchaKey,
+			ReCaptchaSecret: reCaptchaSecret,
+			DefaultUser:     u,
 			Store: &filemanager.Store{
 				Config: bolt.ConfigStore{DB: db},
 				Users:  bolt.UsersStore{DB: db},

cmd/filemanager/main.go

@@ -24,23 +24,26 @@ import (
 )
 
 var (
-	addr          string
-	config        string
-	database      string
-	scope         string
-	commands      string
-	logfile       string
-	staticg       string
-	locale        string
-	baseurl       string
-	prefixurl     string
-	port          int
-	noAuth        bool
-	allowCommands bool
-	allowEdit     bool
-	allowNew      bool
-	allowPublish  bool
-	showVer       bool
+	addr            string
+	config          string
+	database        string
+	scope           string
+	commands        string
+	logfile         string
+	staticg         string
+	locale          string
+	baseurl         string
+	prefixurl       string
+	viewMode        string
+	recaptchakey    string
+	recaptchasecret string
+	port            int
+	noAuth          bool
+	allowCommands   bool
+	allowEdit       bool
+	allowNew        bool
+	allowPublish    bool
+	showVer         bool
 )
 
 func init() {
@@ -53,12 +56,15 @@ func init() {
 	flag.StringVarP(&baseurl, "baseurl", "b", "", "Base URL")
 	flag.StringVar(&commands, "commands", "git svn hg", "Default commands option for new users")
 	flag.StringVar(&prefixurl, "prefixurl", "", "Prefix URL")
+	flag.StringVar(&viewMode, "view-mode", "mosaic", "Default view mode for new users")
+	flag.StringVar(&recaptchakey, "recaptcha-key", "", "ReCaptcha site key")
+	flag.StringVar(&recaptchasecret, "recaptcha-secret", "", "ReCaptcha secret")
 	flag.BoolVar(&allowCommands, "allow-commands", true, "Default allow commands option for new users")
 	flag.BoolVar(&allowEdit, "allow-edit", true, "Default allow edit option for new users")
 	flag.BoolVar(&allowPublish, "allow-publish", true, "Default allow publish option for new users")
 	flag.BoolVar(&allowNew, "allow-new", true, "Default allow new option for new users")
 	flag.BoolVar(&noAuth, "no-auth", false, "Disables authentication")
-	flag.StringVar(&locale, "locale", "en", "Default locale for new users")
+	flag.StringVar(&locale, "locale", "", "Default locale for new users, set it empty to enable auto detect from browser")
 	flag.StringVar(&staticg, "staticgen", "", "Static Generator you want to enable")
 	flag.BoolVarP(&showVer, "version", "v", false, "Show version")
 }
@@ -75,10 +81,13 @@ func setupViper() {
 	viper.SetDefault("AllowNew", true)
 	viper.SetDefault("AllowPublish", true)
 	viper.SetDefault("StaticGen", "")
-	viper.SetDefault("Locale", "en")
+	viper.SetDefault("Locale", "")
 	viper.SetDefault("NoAuth", false)
 	viper.SetDefault("BaseURL", "")
 	viper.SetDefault("PrefixURL", "")
+	viper.SetDefault("ViewMode", filemanager.MosaicViewMode)
+	viper.SetDefault("ReCaptchaKey", "")
+	viper.SetDefault("ReCaptchaSecret", "")
 
 	viper.BindPFlag("Port", flag.Lookup("port"))
 	viper.BindPFlag("Address", flag.Lookup("address"))
@@ -95,6 +104,9 @@ func setupViper() {
 	viper.BindPFlag("NoAuth", flag.Lookup("no-auth"))
 	viper.BindPFlag("BaseURL", flag.Lookup("baseurl"))
 	viper.BindPFlag("PrefixURL", flag.Lookup("prefixurl"))
+	viper.BindPFlag("ViewMode", flag.Lookup("view-mode"))
+	viper.BindPFlag("ReCaptchaKey", flag.Lookup("recaptcha-key"))
+	viper.BindPFlag("ReCaptchaSecret", flag.Lookup("recaptcha-secret"))
 
 	viper.SetConfigName("filemanager")
 	viper.AddConfigPath(".")
@@ -175,9 +187,11 @@ func handler() http.Handler {
 	}
 
 	fm := &filemanager.FileManager{
-		NoAuth:    viper.GetBool("NoAuth"),
-		BaseURL:   viper.GetString("BaseURL"),
-		PrefixURL: viper.GetString("PrefixURL"),
+		NoAuth:          viper.GetBool("NoAuth"),
+		BaseURL:         viper.GetString("BaseURL"),
+		PrefixURL:       viper.GetString("PrefixURL"),
+		ReCaptchaKey:    viper.GetString("ReCaptchaKey"),
+		ReCaptchaSecret: viper.GetString("ReCaptchaSecret"),
 		DefaultUser: &filemanager.User{
 			AllowCommands: viper.GetBool("AllowCommands"),
 			AllowEdit:     viper.GetBool("AllowEdit"),
@@ -189,6 +203,7 @@ func handler() http.Handler {
 			CSS:           "",
 			Scope:         viper.GetString("Scope"),
 			FileSystem:    fileutils.Dir(viper.GetString("Scope")),
+			ViewMode:      viper.GetString("ViewMode"),
 		},
 		Store: &filemanager.Store{
 			Config: bolt.ConfigStore{DB: db},

file.go

@@ -67,8 +67,6 @@ type Listing struct {
 	Sort string `json:"sort"`
 	// And which order.
 	Order string `json:"order"`
-	// Displays in mosaic or list.
-	Display string `json:"display"`
 }
 
 // GetInfo gets the file information and, in case of error, returns the

filemanager.go

@@ -3,6 +3,7 @@ package filemanager
 import (
 	"crypto/rand"
 	"errors"
+	"fmt"
 	"log"
 	"net/http"
 	"os"
@@ -21,7 +22,13 @@ import (
 )
 
 // Version is the current File Manager version.
-const Version = "1.3.1"
+const (
+	// Version is the current File Manager version.
+	Version = "1.3.6"
+
+	ListViewMode   = "list"
+	MosaicViewMode = "mosaic"
+)
 
 var (
 	ErrExist              = errors.New("the resource already exists")
@@ -65,6 +72,10 @@ type FileManager struct {
 	// there will only exist one user, called "admin".
 	NoAuth bool
 
+	// ReCaptcha Site key and secret.
+	ReCaptchaKey    string
+	ReCaptchaSecret string
+
 	// StaticGen is the static websit generator handler.
 	StaticGen StaticGen
 
@@ -74,10 +85,28 @@ type FileManager struct {
 	// A map of events to a slice of commands.
 	Commands map[string][]string
 
+	// Global stylesheet.
+	CSS string
+
 	// NewFS should build a new file system for a given path.
 	NewFS FSBuilder
 }
 
+var commandEvents = []string{
+	"before_save",
+	"after_save",
+	"before_publish",
+	"after_publish",
+	"before_copy",
+	"after_copy",
+	"before_rename",
+	"after_rename",
+	"before_upload",
+	"after_upload",
+	"before_delete",
+	"after_delete",
+}
+
 // Command is a command function.
 type Command func(r *http.Request, m *FileManager, u *User) error
 
@@ -111,16 +140,39 @@ func (m *FileManager) Setup() error {
 		return err
 	}
 
+	// Get the global CSS.
+	err = m.Store.Config.Get("css", &m.CSS)
+	if err != nil && err == ErrNotExist {
+		err = m.Store.Config.Save("css", "")
+	}
+
+	if err != nil {
+		return err
+	}
+
 	// Tries to get the event commands from the database.
 	// If they don't exist, initialize them.
 	err = m.Store.Config.Get("commands", &m.Commands)
-	if err != nil && err == ErrNotExist {
-		m.Commands = map[string][]string{
-			"before_save":    {},
-			"after_save":     {},
-			"before_publish": {},
-			"after_publish":  {},
+
+	if err == nil {
+		// Add hypothetically new command handlers.
+		for _, command := range commandEvents {
+			if _, ok := m.Commands[command]; ok {
+				continue
+			}
+
+			m.Commands[command] = []string{}
 		}
+	}
+
+	if err != nil && err == ErrNotExist {
+		m.Commands = map[string][]string{}
+
+		// Initialize the command handlers.
+		for _, command := range commandEvents {
+			m.Commands[command] = []string{}
+		}
+
 		err = m.Store.Config.Save("commands", m.Commands)
 	}
 
@@ -159,6 +211,14 @@ func (m *FileManager) Setup() error {
 		}
 	}
 
+	// TODO: remove this after 1.5
+	for _, user := range users {
+		if user.ViewMode != ListViewMode && user.ViewMode != MosaicViewMode {
+			user.ViewMode = ListViewMode
+			m.Store.Users.Update(user, "ViewMode")
+		}
+	}
+
 	m.DefaultUser.Username = ""
 	m.DefaultUser.Password = ""
 
@@ -235,7 +295,7 @@ func (m FileManager) ShareCleaner() {
 }
 
 // Runner runs the commands for a certain event type.
-func (m FileManager) Runner(event string, path string) error {
+func (m FileManager) Runner(event string, path string, destination string, user *User) error {
 	commands := []string{}
 
 	// Get the commands from the File Manager instance itself.
@@ -260,7 +320,15 @@ func (m FileManager) Runner(event string, path string) error {
 		}
 
 		cmd := exec.Command(command, args...)
-		cmd.Env = append(os.Environ(), "file="+path)
+		cmd.Env = append(os.Environ(), fmt.Sprintf("FILE=%s", path))
+		cmd.Env = append(cmd.Env, fmt.Sprintf("ROOT=%s", string(user.Scope)))
+		cmd.Env = append(cmd.Env, fmt.Sprintf("TRIGGER=%s", event))
+		cmd.Env = append(cmd.Env, fmt.Sprintf("USERNAME=%s", user.Username))
+
+		if destination != "" {
+			cmd.Env = append(cmd.Env, fmt.Sprintf("DESTINATION=%s", destination))
+		}
+
 		cmd.Stdin = os.Stdin
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
@@ -294,9 +362,10 @@ var DefaultUser = User{
 	Rules:         []*Rule{},
 	CSS:           "",
 	Admin:         true,
-	Locale:        "en",
+	Locale:        "",
 	Scope:         ".",
 	FileSystem:    fileutils.Dir("."),
+	ViewMode:      "mosaic",
 }
 
 // User contains the configuration for each user.
@@ -340,6 +409,9 @@ type User struct {
 
 	// Commands is the list of commands the user can execute.
 	Commands []string `json:"commands"`
+
+	// User view mode for files and folders.
+	ViewMode string `json:"viewMode"`
 }
 
 // Allowed checks if the user has permission to access a directory/file.

http/auth.go

@@ -1,8 +1,11 @@
 package http
 
 import (
+	"bytes"
 	"encoding/json"
+	"fmt"
 	"net/http"
+	"net/url"
 	"strings"
 	"time"
 
@@ -11,6 +14,45 @@ import (
 	fm "github.com/hacdias/filemanager"
 )
 
+type cred struct {
+	Password  string `json:"password"`
+	Username  string `json:"username"`
+	Recaptcha string `json:"recaptcha"`
+}
+
+// recaptcha checks the recaptcha code.
+func recaptcha(secret string, response string) (bool, error) {
+	api := "https://www.google.com/recaptcha/api/siteverify"
+
+	body := url.Values{}
+	body.Set("secret", secret)
+	body.Add("response", response)
+
+	client := &http.Client{}
+	resp, err := client.Post(api, "application/x-www-form-urlencoded", bytes.NewBufferString(body.Encode()))
+	if err != nil {
+		return false, err
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return false, nil
+	}
+
+	var data struct {
+		Success     bool        `json:"success"`
+		ChallengeTS time.Time   `json:"challenge_ts"`
+		Hostname    string      `json:"hostname"`
+		ErrorCodes  interface{} `json:"error-codes"`
+	}
+
+	err = json.NewDecoder(resp.Body).Decode(&data)
+	if err != nil {
+		return false, err
+	}
+
+	return data.Success, nil
+}
+
 // authHandler proccesses the authentication for the user.
 func authHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error) {
 	// NoAuth instances shouldn't call this method.
@@ -19,7 +61,7 @@ func authHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, er
 	}
 
 	// Receive the credentials from the request and unmarshal them.
-	var cred fm.User
+	var cred cred
 	if r.Body == nil {
 		return http.StatusForbidden, nil
 	}
@@ -29,6 +71,19 @@ func authHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, er
 		return http.StatusForbidden, nil
 	}
 
+	// If ReCaptcha is enabled, check the code.
+	if len(c.ReCaptchaSecret) > 0 {
+		ok, err := recaptcha(c.ReCaptchaSecret, cred.Recaptcha)
+		if err != nil {
+			fmt.Println(err)
+			return http.StatusForbidden, err
+		}
+
+		if !ok {
+			return http.StatusForbidden, nil
+		}
+	}
+
 	// Checks if the user exists.
 	u, err := c.Store.Users.GetByUsername(cred.Username, c.NewFS)
 	if err != nil {

http/download.go

@@ -25,7 +25,7 @@ func downloadHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
 		if r.URL.Query().Get("inline") == "true" {
 			w.Header().Set("Content-Disposition", "inline")
 		} else {
-			w.Header().Set("Content-Disposition", "attachment; filename="+c.File.Name)
+			w.Header().Set("Content-Disposition", "attachment; filename=\""+c.File.Name+"\"")
 		}
 
 		http.ServeFile(w, r, c.File.Path)
@@ -107,7 +107,7 @@ func downloadHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
 	}
 	defer file.Close()
 
-	w.Header().Set("Content-Disposition", "attachment; filename="+name)
+	w.Header().Set("Content-Disposition", "attachment; filename=\""+name+"\"")
 	_, err = io.Copy(w, file)
 	return 0, err
 }

http/http.go

@@ -25,16 +25,13 @@ func Handler(m *fm.FileManager) http.Handler {
 		if code >= 400 {
 			w.WriteHeader(code)
 
-			if err == nil {
-				txt := http.StatusText(code)
-				log.Printf("%v: %v %v\n", r.URL.Path, code, txt)
-				w.Write([]byte(txt))
-			}
+			txt := http.StatusText(code)
+			log.Printf("%v: %v %v\n", r.URL.Path, code, txt)
+			w.Write([]byte(txt + "\n"))
 		}
 
 		if err != nil {
 			log.Print(err)
-			w.Write([]byte(err.Error()))
 		}
 	})
 }
@@ -226,9 +223,13 @@ func renderFile(c *fm.Context, w http.ResponseWriter, file string) (int, error)
 	w.Header().Set("Content-Type", contentType+"; charset=utf-8")
 
 	data := map[string]interface{}{
-		"BaseURL": c.RootURL(),
-		"NoAuth":  c.NoAuth,
-		"Version": fm.Version,
+		"BaseURL":         c.RootURL(),
+		"NoAuth":          c.NoAuth,
+		"Version":         fm.Version,
+		"CSS":             template.CSS(c.CSS),
+		"ReCaptcha":       c.ReCaptchaKey != "" && c.ReCaptchaSecret != "",
+		"ReCaptchaKey":    c.ReCaptchaKey,
+		"ReCaptchaSecret": c.ReCaptchaSecret,
 	}
 
 	if c.StaticGen != nil {
@@ -266,6 +267,7 @@ func sharePage(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, erro
 
 	info, err := os.Stat(s.Path)
 	if err != nil {
+		c.Store.Share.Delete(s.Hash)
 		return ErrorToHTTP(err, false), err
 	}
 

http/resource.go

@@ -38,7 +38,7 @@ func resourceHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
 	case http.MethodPut:
 		// Before save command handler.
 		path := filepath.Join(c.User.Scope, r.URL.Path)
-		if err := c.Runner("before_save", path); err != nil {
+		if err := c.Runner("before_save", path, "", c.User); err != nil {
 			return http.StatusInternalServerError, err
 		}
 
@@ -48,7 +48,7 @@ func resourceHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
 		}
 
 		// After save command handler.
-		if err := c.Runner("after_save", path); err != nil {
+		if err := c.Runner("after_save", path, "", c.User); err != nil {
 			return http.StatusInternalServerError, err
 		}
 
@@ -130,8 +130,6 @@ func listingHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int,
 	}
 
 	listing.ApplySort()
-	listing.Display = displayMode(w, r, cookieScope)
-
 	return renderJSON(w, f)
 }
 
@@ -141,12 +139,22 @@ func resourceDeleteHandler(c *fm.Context, w http.ResponseWriter, r *http.Request
 		return http.StatusForbidden, nil
 	}
 
+	// Fire the before trigger.
+	if err := c.Runner("before_delete", r.URL.Path, "", c.User); err != nil {
+		return http.StatusInternalServerError, err
+	}
+
 	// Remove the file or folder.
 	err := c.User.FileSystem.RemoveAll(r.URL.Path)
 	if err != nil {
 		return ErrorToHTTP(err, true), err
 	}
 
+	// Fire the after trigger.
+	if err := c.Runner("after_delete", r.URL.Path, "", c.User); err != nil {
+		return http.StatusInternalServerError, err
+	}
+
 	return http.StatusOK, nil
 }
 
@@ -187,6 +195,11 @@ func resourcePostPutHandler(c *fm.Context, w http.ResponseWriter, r *http.Reques
 		}
 	}
 
+	// Fire the before trigger.
+	if err := c.Runner("before_upload", r.URL.Path, "", c.User); err != nil {
+		return http.StatusInternalServerError, err
+	}
+
 	// Create/Open the file.
 	f, err := c.User.FileSystem.OpenFile(r.URL.Path, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0776)
 	if err != nil {
@@ -218,6 +231,12 @@ func resourcePostPutHandler(c *fm.Context, w http.ResponseWriter, r *http.Reques
 	// Writes the ETag Header.
 	etag := fmt.Sprintf(`"%x%x"`, fi.ModTime().UnixNano(), fi.Size())
 	w.Header().Set("ETag", etag)
+
+	// Fire the after trigger.
+	if err := c.Runner("after_upload", r.URL.Path, "", c.User); err != nil {
+		return http.StatusInternalServerError, err
+	}
+
 	return http.StatusOK, nil
 }
 
@@ -256,7 +275,7 @@ func resourcePublish(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
 	path := filepath.Join(c.User.Scope, r.URL.Path)
 
 	// Before save command handler.
-	if err := c.Runner("before_publish", path); err != nil {
+	if err := c.Runner("before_publish", path, "", c.User); err != nil {
 		return http.StatusInternalServerError, err
 	}
 
@@ -266,7 +285,7 @@ func resourcePublish(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
 	}
 
 	// Executed the before publish command.
-	if err := c.Runner("before_publish", path); err != nil {
+	if err := c.Runner("before_publish", path, "", c.User); err != nil {
 		return http.StatusInternalServerError, err
 	}
 
@@ -293,40 +312,36 @@ func resourcePatchHandler(c *fm.Context, w http.ResponseWriter, r *http.Request)
 	}
 
 	if action == "copy" {
+		// Fire the after trigger.
+		if err := c.Runner("before_copy", src, dst, c.User); err != nil {
+			return http.StatusInternalServerError, err
+		}
+
+		// Copy the file.
 		err = c.User.FileSystem.Copy(src, dst)
+
+		// Fire the after trigger.
+		if err := c.Runner("after_copy", src, dst, c.User); err != nil {
+			return http.StatusInternalServerError, err
+		}
 	} else {
+		// Fire the after trigger.
+		if err := c.Runner("before_rename", src, dst, c.User); err != nil {
+			return http.StatusInternalServerError, err
+		}
+
+		// Rename the file.
 		err = c.User.FileSystem.Rename(src, dst)
+
+		// Fire the after trigger.
+		if err := c.Runner("after_rename", src, dst, c.User); err != nil {
+			return http.StatusInternalServerError, err
+		}
 	}
 
 	return ErrorToHTTP(err, true), err
 }
 
-// displayMode obtains the display mode from the Cookie.
-func displayMode(w http.ResponseWriter, r *http.Request, scope string) string {
-	var displayMode string
-
-	// Checks the cookie.
-	if displayCookie, err := r.Cookie("display"); err == nil {
-		displayMode = displayCookie.Value
-	}
-
-	// If it's invalid, set it to mosaic, which is the default.
-	if displayMode == "" || (displayMode != "mosaic" && displayMode != "list") {
-		displayMode = "mosaic"
-	}
-
-	// Set the cookie.
-	http.SetCookie(w, &http.Cookie{
-		Name:   "display",
-		Value:  displayMode,
-		MaxAge: 31536000,
-		Path:   scope,
-		Secure: r.TLS != nil,
-	})
-
-	return displayMode
-}
-
 // handleSortOrder gets and stores for a Listing the 'sort' and 'order',
 // and reads 'limit' if given. The latter is 0 if not given. Sets cookies.
 func handleSortOrder(w http.ResponseWriter, r *http.Request, scope string) (sort string, order string, err error) {

http/settings.go

@@ -13,6 +13,7 @@ import (
 type modifySettingsRequest struct {
 	*modifyRequest
 	Data struct {
+		CSS       string                 `json:"css"`
 		Commands  map[string][]string    `json:"commands"`
 		StaticGen map[string]interface{} `json:"staticGen"`
 	} `json:"data"`
@@ -61,6 +62,7 @@ func settingsHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
 }
 
 type settingsGetRequest struct {
+	CSS       string              `json:"css"`
 	Commands  map[string][]string `json:"commands"`
 	StaticGen []option            `json:"staticGen"`
 }
@@ -73,6 +75,7 @@ func settingsGetHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (
 	result := &settingsGetRequest{
 		Commands:  c.Commands,
 		StaticGen: []option{},
+		CSS:       c.CSS,
 	}
 
 	if c.StaticGen != nil {
@@ -114,6 +117,16 @@ func settingsPutHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (
 		return http.StatusOK, nil
 	}
 
+	// Update the global CSS.
+	if mod.Which == "css" {
+		if err := c.Store.Config.Save("css", mod.Data.CSS); err != nil {
+			return http.StatusInternalServerError, err
+		}
+
+		c.CSS = mod.Data.CSS
+		return http.StatusOK, nil
+	}
+
 	// Update the static generator options.
 	if mod.Which == "staticGen" {
 		err = mapstructure.Decode(mod.Data.StaticGen, c.StaticGen)

http/users.go

@@ -182,6 +182,7 @@ func usersPostHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (in
 	}
 
 	u.Password = pw
+	u.ViewMode = fm.MosaicViewMode
 
 	// Saves the user to the database.
 	err = c.Store.Users.Save(u)
@@ -194,7 +195,7 @@ func usersPostHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (in
 	}
 
 	// Set the Location header and return.
-	w.Header().Set("Location", "/users/"+strconv.Itoa(u.ID))
+	w.Header().Set("Location", "/settings/users/"+strconv.Itoa(u.ID))
 	w.WriteHeader(http.StatusCreated)
 	return 0, nil
 }
@@ -268,12 +269,20 @@ func usersPutHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
 		return http.StatusBadRequest, err
 	}
 
+	// If we're updating the default user. Only for NoAuth
+	// implementations. Used to change the viewMode.
+	if id == 0 && c.NoAuth {
+		c.DefaultUser.ViewMode = u.ViewMode
+		return http.StatusOK, nil
+	}
+
 	// Updates the CSS and locale.
 	if which == "partial" {
 		c.User.CSS = u.CSS
 		c.User.Locale = u.Locale
+		c.User.ViewMode = u.ViewMode
 
-		err = c.Store.Users.Update(c.User, "CSS", "Locale")
+		err = c.Store.Users.Update(c.User, "CSS", "Locale", "ViewMode")
 		if err != nil {
 			return http.StatusInternalServerError, err
 		}

publish.sh

@@ -18,7 +18,7 @@ git push --tags
 echo "Commiting untracked version notice..."
 sed -i "s|$1|(untracked)|g" filemanager.go
 git add -A
-git commit -m "untracked version `date`"
+git commit -m "[ci skip] auto: setting untracked version"
 git push
 
 echo "Done!"

rice-box.go.REMOVED.git-id

@@ -1 +1 @@
-5361edece00958caab3c3fcff99e50f5dff981f5
+d7bb20a2a9de9e40331b2688b8f2b0f63deef097