Show version in login page

internal/cmd/version.go

@@ -17,6 +17,6 @@ func newVersionCommand() *cobra.Command {
 
 func newVersionCommandHandler() func(cmd *cobra.Command, args []string) {
 	return func(cmd *cobra.Command, args []string) {
-		cmd.Printf("Shiori version %s (build %s) at %s\n", model.Version, model.Commit, model.Date)
+		cmd.Printf("Shiori version %s (build %s) at %s\n", model.BuildVersion, model.BuildCommit, model.BuildDate)
 	}
 }

internal/http/routes/frontend.go

@@ -10,6 +10,7 @@ import (
 	"github.com/gin-contrib/static"
 	"github.com/gin-gonic/gin"
 	"github.com/go-shiori/shiori/internal/config"
+	"github.com/go-shiori/shiori/internal/model"
 	views "github.com/go-shiori/shiori/internal/view"
 	"github.com/sirupsen/logrus"
 )
@@ -65,11 +66,13 @@ func (r *FrontendRoutes) Setup(e *gin.Engine) {
 	group.GET("/login", func(ctx *gin.Context) {
 		ctx.HTML(http.StatusOK, "login.html", gin.H{
 			"RootPath": r.cfg.Http.RootPath,
+			"Version":  model.BuildVersion,
 		})
 	})
 	group.GET("/", func(ctx *gin.Context) {
 		ctx.HTML(http.StatusOK, "index.html", gin.H{
 			"RootPath": r.cfg.Http.RootPath,
+			"Version":  model.BuildVersion,
 		})
 	})
 	e.StaticFS("/assets", newAssetsFS(r.logger, views.Assets))

internal/http/routes/system.go

@@ -22,9 +22,9 @@ func (r *SystemRoutes) livenessHandler(c *gin.Context) {
 		Commit  string `json:"commit"`
 		Date    string `json:"date"`
 	}{
-		Version: model.Version,
+		Version: model.BuildVersion,
-		Commit:  model.Commit,
+		Commit:  model.BuildCommit,
-		Date:    model.Date,
+		Date:    model.BuildDate,
 	})
 }
 

internal/model/main.go

@@ -2,7 +2,7 @@ package model
 
 // Variables set my the main package coming from ldflags
 var (
-	Version = "dev"
+	BuildVersion = "dev"
-	Commit  = "none"
+	BuildCommit  = "none"
-	Date    = "unknown"
+	BuildDate    = "unknown"
 )

internal/view/login.html

@@ -15,7 +15,7 @@
 	<link rel="icon" type="image/x-icon" href="assets/res/favicon.ico">
 
 	<link href="assets/css/source-sans-pro.min.css" rel="stylesheet">
-	<link href="assets/css/fontawesome.min.css" rel="stylesheet">w
+	<link href="assets/css/fontawesome.min.css" rel="stylesheet">
 	<link href="assets/css/stylesheet.css" rel="stylesheet">
 
 	<script src="assets/js/vue.min.js"></script>
@@ -50,6 +50,9 @@
 				</div>
 			</form>
 		</div>
+		<div>
+			<p>$$.Version$$</p>
+		</div>
 	</div>
 
 	<script type="module">

main.go

@@ -24,9 +24,9 @@ var (
 
 func init() {
 	// Set globally
-	model.Version = version
+	model.BuildVersion = version
-	model.Commit = commit
+	model.BuildCommit = commit
-	model.Date = date
+	model.BuildDate = date
 }
 
 func main() {