From c79f86137e96ef4049d3bf54579897327752d255 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Mon, 7 Dec 2020 22:46:17 +0000 Subject: [PATCH] separate head into template, add description meta tag --- data/templates/404.html | 24 ++---------------------- data/templates/admin.html | 26 ++------------------------ data/templates/form-base.html | 4 ++-- data/templates/form.html | 27 +++------------------------ data/templates/header.html | 23 +++++++++++++++++++++++ data/templates/invalidCode.html | 16 ++-------------- data/templates/setup.html | 2 +- go.mod | 5 ++--- go.sum | 6 ++++++ views.go | 8 +++----- 10 files changed, 46 insertions(+), 95 deletions(-) create mode 100644 data/templates/header.html diff --git a/data/templates/404.html b/data/templates/404.html index e27c2ea..22593ad 100644 --- a/data/templates/404.html +++ b/data/templates/404.html @@ -1,29 +1,9 @@ - - - - - - - - - - - - 404 + 404 - jfa-go - {{ if not .bs5 }} - - {{ end }} - - {{ if .bs5 }} - - {{ else }} - - {{ end }} - + {{ template "header.html" . }} - Setup - Jellyfin Accounts + Setup - jfa-go
diff --git a/go.mod b/go.mod index 60d119d..d9eae46 100644 --- a/go.mod +++ b/go.mod @@ -19,8 +19,8 @@ require ( github.com/gin-gonic/gin v1.6.3 github.com/go-chi/chi v4.1.2+incompatible // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/spec v0.19.13 // indirect github.com/go-playground/validator/v10 v10.4.1 // indirect + github.com/gofrs/uuid v3.3.0+incompatible // indirect github.com/golang/protobuf v1.4.3 github.com/google/uuid v1.1.2 // indirect github.com/hrfee/jfa-go/common v0.0.0-20201112212552-b6f3cd7c1f71 @@ -41,14 +41,13 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14 github.com/swaggo/gin-swagger v1.3.0 - github.com/swaggo/swag v1.6.9 // indirect + github.com/swaggo/swag v1.7.0 // indirect github.com/ugorji/go v1.2.0 // indirect github.com/urfave/cli/v2 v2.3.0 // indirect golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 // indirect golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect golang.org/x/sys v0.0.0-20201113233024-12cec1faf1ba // indirect golang.org/x/text v0.3.4 // indirect - golang.org/x/tools v0.0.0-20201114224030-61ea331ec02b // indirect google.golang.org/protobuf v1.25.0 // indirect gopkg.in/ini.v1 v1.62.0 gopkg.in/yaml.v2 v2.3.0 // indirect diff --git a/go.sum b/go.sum index 32e459c..421c4c0 100644 --- a/go.sum +++ b/go.sum @@ -77,6 +77,8 @@ github.com/go-openapi/spec v0.19.12 h1:OO9WrvhDwtiMY/Opr1j1iFZzirI3JW4/bxNFRcntA github.com/go-openapi/spec v0.19.12/go.mod h1:gwrgJS15eCUgjLpMjBJmbZezCsw88LmgeEip0M63doA= github.com/go-openapi/spec v0.19.13 h1:AcZVcWsrfW7LqyHKVbTZYpFF7jQcMxmAsWrw2p/b9ew= github.com/go-openapi/spec v0.19.13/go.mod h1:gwrgJS15eCUgjLpMjBJmbZezCsw88LmgeEip0M63doA= +github.com/go-openapi/spec v0.19.14 h1:r4fbYFo6N4ZelmSX8G6p+cv/hZRXzcuqQIADGT1iNKM= +github.com/go-openapi/spec v0.19.14/go.mod h1:gwrgJS15eCUgjLpMjBJmbZezCsw88LmgeEip0M63doA= github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= @@ -234,6 +236,8 @@ github.com/swaggo/swag v1.6.8 h1:z3ZNcpJs/NLMpZcKqXUsBELmmY2Ocy09JXKx5gu3L4M= github.com/swaggo/swag v1.6.8/go.mod h1:a0IpNeMfGidNOcm2TsqODUh9JHdHu3kxDA0UlGbBKjI= github.com/swaggo/swag v1.6.9 h1:BukKRwZjnEcUxQt7Xgfrt9fpav0hiWw9YimdNO9wssw= github.com/swaggo/swag v1.6.9/go.mod h1:a0IpNeMfGidNOcm2TsqODUh9JHdHu3kxDA0UlGbBKjI= +github.com/swaggo/swag v1.7.0 h1:5bCA/MTLQoIqDXXyHfOpMeDvL9j68OY/udlK4pQoo4E= +github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.5-pre/go.mod h1:FwP/aQVg39TXzItUBMwnWp9T9gPQnXw4Poh4/oBQZ/0= github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= @@ -376,6 +380,8 @@ golang.org/x/tools v0.0.0-20201113202037-1643af1435f3 h1:7R7+wzd5VuLvCNyHZ/MG511 golang.org/x/tools v0.0.0-20201113202037-1643af1435f3/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201114224030-61ea331ec02b h1:Ych5r0Z6MLML1fgf5hTg9p5bV56Xqx9xv9hLgMBATWs= golang.org/x/tools v0.0.0-20201114224030-61ea331ec02b/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e h1:t96dS3DO8DGjawSLJL/HIdz8CycAd2v07XxqB3UPTi0= +golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/views.go b/views.go index 5164fd1..86e455b 100644 --- a/views.go +++ b/views.go @@ -50,11 +50,9 @@ func (app *appContext) InviteProxy(gc *gin.Context) { "validate": app.config.Section("password_validation").Key("enabled").MustBool(false), "requirements": app.validator.getCriteria(), "email": email, - "settings": map[string]bool{ - "bs5": app.config.Section("ui").Key("bs5").MustBool(false), - "username": !app.config.Section("email").Key("no_username").MustBool(false), - }, - "lang": app.storage.lang.Form["strings"], + "bs5": app.config.Section("ui").Key("bs5").MustBool(false), + "username": !app.config.Section("email").Key("no_username").MustBool(false), + "lang": app.storage.lang.Form["strings"], }) } else { gcHTML(gc, 404, "invalidCode.html", gin.H{