From 0598f6502b3e9f8ff4c2207cb85260911a814a89 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Tue, 23 Feb 2021 21:29:11 +0100 Subject: [PATCH] Switched auth assets from statik to go:embed --- Makefile | 4 - auth/assets/templates/scenarios.yaml | 2 +- auth/assets/templates/template-dev.html.tpl | 3 +- auth/auth.go | 25 +++- auth/handlers/assets.go | 125 -------------------- auth/handlers/handle_dev.go | 4 +- auth/handlers/handler.go | 23 +++- auth/handlers/routes.go | 11 +- auth/handlers/static.go | 6 - auth/templates.go | 11 +- 10 files changed, 60 insertions(+), 154 deletions(-) delete mode 100644 auth/handlers/assets.go delete mode 100644 auth/handlers/static.go diff --git a/Makefile b/Makefile index c5f29ab5c..0cd72ff04 100644 --- a/Makefile +++ b/Makefile @@ -145,10 +145,6 @@ provision: docs: $(STATIK) $(STATIK) -p docs -m -Z -f -src=./docs -auth: $(STATIK) - $(STATIK) -dest auth -p handlers -a embedded_assets -m -Z -f -src=./auth/assets - - ####################################################################################################################### # Quality Assurance diff --git a/auth/assets/templates/scenarios.yaml b/auth/assets/templates/scenarios.yaml index 94ef9a875..e7cc4010d 100644 --- a/auth/assets/templates/scenarios.yaml +++ b/auth/assets/templates/scenarios.yaml @@ -31,7 +31,7 @@ login: - { Label: Facebook, Handle: facebook, Icon: facebook } - { Label: Corteza, Handle: corteza, Icon: oidc } - Without signup & pass reset: + Without signup and pass reset: settings: LocalEnabled: true SignupEnabled: false diff --git a/auth/assets/templates/template-dev.html.tpl b/auth/assets/templates/template-dev.html.tpl index 2d59eceb4..86e0d80a1 100644 --- a/auth/assets/templates/template-dev.html.tpl +++ b/auth/assets/templates/template-dev.html.tpl @@ -7,7 +7,7 @@ @@ -39,7 +39,6 @@