From 8c8a57433e875ae1b5ad4b03d0211a0c432c3460 Mon Sep 17 00:00:00 2001
From: Justin Hawkins <justin@hawkins.id.au>
Date: Sun, 5 Jun 2022 12:04:47 +0930
Subject: [PATCH] Show if a new version is available in the menu bar

---
 version/version.go         |  9 ++++++++-
 web/templates/_layout.html | 11 +++++++++--
 web/web.go                 |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/version/version.go b/version/version.go
index c237056..18c4e58 100644
--- a/version/version.go
+++ b/version/version.go
@@ -8,7 +8,7 @@ import (
 	"golang.org/x/mod/semver"
 )
 
-const Tag = "v0.0.17"
+const Tag = "v0.0.18"
 
 var versionInfo struct {
 	Local struct {
@@ -40,7 +40,14 @@ func UpgradeAvailable() (bool, string) {
 		return true, versionInfo.Remote.Tag
 	}
 	return false, ""
+}
 
+func UpgradeAvailableString() string {
+	upgrade, ver := UpgradeAvailable()
+	if upgrade {
+		return ver
+	}
+	return ""
 }
 
 func UpdateVersionInfo() {
diff --git a/web/templates/_layout.html b/web/templates/_layout.html
index 2c554f3..63b0cab 100644
--- a/web/templates/_layout.html
+++ b/web/templates/_layout.html
@@ -34,10 +34,17 @@
     </div>
     <div class="top-bar-right">
       <ul class="menu">
+        {{ if newVersion }}
+        <li>
+          <div><a href="https://github.com/tardisx/linkwallet/releases/tag/{{ newVersion }}">{{ newVersion }} available</a></div>
+        </li>
+        {{ end }}
+        <li class="menu-text">
+          {{ version }}
+        </li>
         <li>
           <a href="https://github.com/tardisx/linkwallet">
-            {{ version }}
-            <img src="/assets/image/GitHub-Mark-32px.png" />
+            <img src="/assets/image/GitHub-Mark-32px.png" width="16px" height="16px"/>
           </a>
         </li>
         <!-- <li><input type="search" placeholder="Search"></li>
diff --git a/web/web.go b/web/web.go
index e91e6c3..a82c69d 100644
--- a/web/web.go
+++ b/web/web.go
@@ -51,7 +51,7 @@ func Create(bmm *db.BookmarkManager, cmm *db.ConfigManager) *Server {
 	}
 
 	// templ := template.Must(template.New("").Funcs(template.FuncMap{"dict": dictHelper}).ParseFS(templateFiles, "templates/*.html"))
-	templ := template.Must(template.New("").Funcs(template.FuncMap{"nicetime": niceTime, "niceURL": niceURL, "join": strings.Join, "version": version.Is}).ParseFS(templateFiles, "templates/*.html"))
+	templ := template.Must(template.New("").Funcs(template.FuncMap{"nicetime": niceTime, "niceURL": niceURL, "join": strings.Join, "version": version.Is, "newVersion": version.UpgradeAvailableString}).ParseFS(templateFiles, "templates/*.html"))
 
 	config, err := cmm.LoadConfig()
 	if err != nil {