Add AppConfig as a function and get app settings from there

Signed-off-by: Jo Vandeginste <[email protected]>
jovandeginste · Apr 9, 2024 · 3374238 · 3374238
1 parent 7183d05
commit 3374238
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/pkg/app/data.go b/pkg/app/data.go
@@ -52,8 +52,6 @@ func (a *App) getCurrentUser(c echo.Context) *database.User {
 
 func (a *App) defaultData(c echo.Context) map[string]interface{} {
 	data := map[string]interface{}{}
-	data["RegistrationDisabled"] = a.Config.RegistrationDisabled
-	data["SocialsDisabled"] = a.Config.SocialsDisabled
 
 	a.addError(data, c)
 	a.addNotice(data, c)

diff --git a/pkg/app/templates.go b/pkg/app/templates.go
@@ -54,6 +54,7 @@ func (a *App) viewTemplateFunctions() template.FuncMap {
 	return template.FuncMap{
 		"i18n":        echoFunc,
 		"Version":     func() *Version { return &a.Version },
+		"AppConfig":   func() *Config { return &a.Config },
 		"language":    func() string { return BrowserLanguage },
 		"humanizer":   func() *humanize.Humanizer { return h },
 		"CurrentUser": func() *database.User { return nil },

diff --git a/views/user/user_login.html b/views/user/user_login.html
@@ -51,7 +51,7 @@ <h3 class="{{ IconFor `user-signin` }}">{{ i18n "Sign in" }}</h3>
             </form>
           </div>
 
-          {{ if not .RegistrationDisabled }}
+          {{ if not AppConfig.RegistrationDisabled }}
           <div class="inner-form">
             <h3 class="{{ IconFor `user-register` }}">
               {{ i18n "Create a new account" }}

diff --git a/views/workouts/workouts_show.html b/views/workouts/workouts_show.html
@@ -52,7 +52,7 @@ <h2 class="{{ IconFor .Type.String }}">
               </script>
               <script src="{{ RouteFor `assets` }}/map.js"></script>
             </div>
-            {{ if and (not $.SocialsDisabled) (not
+            {{ if and (not AppConfig.SocialsDisabled) (not
             CurrentUser.Profile.SocialsDisabled) }} {{ template "workout_social"
             .}} {{ end }}
           </div>