Version 1.3.0

Former-commit-id: 77f5b5b6d73cf979c074d4390a55b14dd9fb8c39 [formerly 4e77a8d13ec4233f1b38ec9b26e7a42bc6f4a9c5] [formerly 5d9600a5fd5b8044ea0a624570be5881740aa3f0 [formerly a4584e7a55]]
Former-commit-id: b8832f925ca7d7daa162a46b87c03b2fe32f67cf [formerly e109aaf234b60cb046c9c6dea2d96089581066a0]
Former-commit-id: 8916c596e729dc1d887da2135fe7cb7e997b03a5

assets/src/css/dashboard.css

@@ -131,18 +131,21 @@ p code {
   display: flex;
   color: rgb(84, 110, 122);
   font-weight: 500;
-  padding: 0 0 1em;
   margin: 0 0 1em;
   font-size: .8em;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  text-align: center;
+  justify-content: space-between;
+  padding: 0;
 }
 
 .dashboard #nav li {
   width: 100%;
+  padding: 0 0 1em;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 }
 
-.dashboard #nav li:last-child {
-  text-align: right
+.dashboard #nav li.active {
+  border-color: #2196f3
 }
 
 .dashboard #nav i {

assets/src/views/GlobalSettings.vue

@@ -1,16 +1,9 @@
 <template>
   <div class="dashboard">
     <ul id="nav">
-      <li>
-        <router-link to="/settings/profile">
-          <i class="material-icons">keyboard_arrow_left</i> {{ $t('settings.profileSettings') }}
-        </router-link>
-      </li>
-      <li>
-        <router-link to="/users">
-          {{ $t('settings.userManagement') }} <i class="material-icons">keyboard_arrow_right</i>
-        </router-link>
-      </li>
+      <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>
 
     <h1>{{ $t('settings.globalSettings') }}</h1>

assets/src/views/ProfileSettings.vue

@@ -1,11 +1,9 @@
 <template>
   <div class="dashboard">
     <ul id="nav" v-if="user.admin">
-      <li>
-        <router-link to="/settings/global">
-          {{ $t('settings.globalSettings') }} <i class="material-icons">keyboard_arrow_right</i>
-        </router-link>
-      </li>
+      <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>
 
     <h1>{{ $t('settings.profileSettings') }}</h1>

assets/src/views/User.vue

@@ -2,12 +2,9 @@
   <div>
     <form @submit="save" class="dashboard">
       <ul id="nav">
-        <li>
-          <router-link to="/users">
-            <i class="material-icons">keyboard_arrow_left</i> {{ $t('settings.userManagement') }}
-          </router-link>
-        </li>
-        <li></li>
+        <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>
 
       <h1 v-if="id === 0">{{ $t('settings.newUser') }}</h1>

assets/src/views/Users.vue

@@ -1,12 +1,9 @@
 <template>
   <div class="dashboard">
     <ul id="nav">
-      <li>
-        <router-link to="/settings/global">
-          <i class="material-icons">keyboard_arrow_left</i> {{ $t('settings.globalSettings') }}
-        </router-link>
-      </li>
-      <li></li>
+      <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>
@@ -19,7 +16,7 @@
         <th></th>
       </tr>
 
-      <tr v-for="user in users">
+      <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>

cmd/filemanager/main.go

@@ -41,7 +41,6 @@ var (
 	allowNew      bool
 	allowPublish  bool
 	showVer       bool
-	version       = "master"
 )
 
 func init() {
@@ -102,15 +101,7 @@ func setupViper() {
 }
 
 func printVersion() {
-	version = strings.TrimSpace(version)
-
-	if version == "" {
-		fmt.Println("filemanager is at an untracked version")
-	} else {
-		version = strings.TrimPrefix(version, "v")
-		fmt.Println("filemanager version", version)
-	}
-
+	fmt.Println("filemanager version", filemanager.Version)
 	os.Exit(0)
 }
 

filemanager.go

@@ -20,6 +20,9 @@ import (
 	"github.com/robfig/cron"
 )
 
+// Version is the current File Manager version.
+const Version = "1.3.0"
+
 var (
 	ErrExist              = errors.New("the resource already exists")
 	ErrNotExist           = errors.New("the resource does not exist")

http/http.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -53,11 +54,7 @@ func serve(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error) {
 	// Check if this request is made to the service worker. If so,
 	// pass it through a template to add the needed variables.
 	if r.URL.Path == "/sw.js" {
-		return renderFile(
-			c, w,
-			c.Assets.MustString("sw.js"),
-			"application/javascript",
-		)
+		return renderFile(c, w, "sw.js")
 	}
 
 	// Checks if this request is made to the static assets folder. If so, and
@@ -95,11 +92,7 @@ func serve(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error) {
 	w.Header().Set("x-content-type", "nosniff")
 	w.Header().Set("x-xss-protection", "1; mode=block")
 
-	return renderFile(
-		c, w,
-		c.Assets.MustString("index.html"),
-		"text/html",
-	)
+	return renderFile(c, w, "index.html")
 }
 
 // staticHandler handles the static assets path.
@@ -109,11 +102,7 @@ func staticHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int,
 		return 0, nil
 	}
 
-	return renderFile(
-		c, w,
-		c.Assets.MustString("static/manifest.json"),
-		"application/json",
-	)
+	return renderFile(c, w, "static/manifest.json")
 }
 
 // apiHandler is the main entry point for the /api endpoint.
@@ -219,8 +208,21 @@ func splitURL(path string) (string, string) {
 }
 
 // renderFile renders a file using a template with some needed variables.
-func renderFile(c *fm.Context, w http.ResponseWriter, file string, contentType string) (int, error) {
-	tpl := template.Must(template.New("file").Parse(file))
+func renderFile(c *fm.Context, w http.ResponseWriter, file string) (int, error) {
+	tpl := template.Must(template.New("file").Parse(c.Assets.MustString(file)))
+
+	var contentType string
+	switch filepath.Ext(file) {
+	case ".html":
+		contentType = "text/html"
+	case ".js":
+		contentType = "application/javascript"
+	case ".json":
+		contentType = "application/json"
+	default:
+		contentType = "text"
+	}
+
 	w.Header().Set("Content-Type", contentType+"; charset=utf-8")
 
 	data := map[string]interface{}{
@@ -245,11 +247,8 @@ func renderFile(c *fm.Context, w http.ResponseWriter, file string, contentType s
 func sharePage(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error) {
 	s, err := c.Store.Share.Get(r.URL.Path)
 	if err == fm.ErrNotExist {
-		return renderFile(
-			c, w,
-			c.Assets.MustString("static/share/404.html"),
-			"text/html",
-		)
+		w.WriteHeader(http.StatusNotFound)
+		return renderFile(c, w, "static/share/404.html")
 	}
 
 	if err != nil {
@@ -258,11 +257,8 @@ func sharePage(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, erro
 
 	if s.Expires && s.ExpireDate.Before(time.Now()) {
 		c.Store.Share.Delete(s.Hash)
-		return renderFile(
-			c, w,
-			c.Assets.MustString("static/share/404.html"),
-			"text/html",
-		)
+		w.WriteHeader(http.StatusNotFound)
+		return renderFile(c, w, "static/share/404.html")
 	}
 
 	r.URL.Path = s.Path

http/share.go

@@ -44,6 +44,10 @@ func shareGetHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
 		}
 	}
 
+	if len(s) == 0 {
+		return http.StatusNotFound, nil
+	}
+
 	return renderJSON(w, s)
 }
 

publish.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+echo "Releasing version $1"
+sed -i "s|(untracked version)|$1|g" filemanager.go
+
+echo "Building assets"
+./build.sh
+
+echo "Commiting..."
+git add -A
+git commit -m "Version $1"
+git push
+
+echo "Creating the tag..."
+git tag "v$1"
+git push --tags
+
+echo "Commiting untracked version notice..."
+sed -i "s|$1|(untracked version)|g" filemanager.go
+git add -A
+git commit -m "untracked version `date`"
+git push
+
+echo "Done!"

rice-box.go.REMOVED.git-id

@@ -1 +1 @@
-3b621522d90af10b96208b839db22160799540b3
+ff1dc93e7042a5be07b719f0a1b7d1aca3f13b08