From 5e3a97272aa2405f2084360f72ee310ea7135abb Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Wed, 25 Feb 2026 17:21:37 +0000 Subject: [PATCH] Nest setting object inside URL, use URL in sidebar --- html/template/sync/component/sidebar.html | 10 ++-- html/template/sync/layout/authenticated.html | 2 +- html/template/sync/settings.html | 8 +-- sync/url.go | 63 ++++++++++++-------- 4 files changed, 47 insertions(+), 36 deletions(-) diff --git a/html/template/sync/component/sidebar.html b/html/template/sync/component/sidebar.html index 83d8d87b..7f628b2c 100644 --- a/html/template/sync/component/sidebar.html +++ b/html/template/sync/component/sidebar.html @@ -51,14 +51,14 @@ title="Notifications" >
- {{ if gt (len .Notifications) 0 }} + {{ if gt (len .User.Notifications) 0 }} - {{ if gt (len .Notifications) 99 }} + {{ if gt (len .User.Notifications) 99 }} 99+ {{ else }} - {{ len .Notifications }} + {{ len .User.Notifications }} {{ end }} @@ -112,7 +112,7 @@
  • Help
    • - {{ if eq .Role "root" }} + {{ if eq .User.Role "root" }}
  • {{ if .User }} - {{ template "sync/component/sidebar.html" .User }} + {{ template "sync/component/sidebar.html" . }} {{ end }} diff --git a/html/template/sync/settings.html b/html/template/sync/settings.html index c40097c6..4816b596 100644 --- a/html/template/sync/settings.html +++ b/html/template/sync/settings.html @@ -28,7 +28,7 @@ organization.

    - + Manage Users @@ -50,7 +50,7 @@

    Manage Products @@ -75,7 +75,7 @@

    Manage Integrations @@ -99,7 +99,7 @@

    Manage Organization diff --git a/sync/url.go b/sync/url.go index e034bdd4..cd6d4dd0 100644 --- a/sync/url.go +++ b/sync/url.go @@ -5,35 +5,46 @@ import ( ) type contentURL struct { - OAuthRefreshArcGIS string - Root string - Route string - SamplePoolCSV string - Setting string - SettingIntegration string - SettingOrganization string - SettingPesticide string - SettingPesticideAdd string - SettingUser string - SettingUserAdd string - Tegola string - UploadCSVPool string + OAuthRefreshArcGIS string + Root string + Route string + SamplePoolCSV string + Setting contentURLSetting + Tegola string + UploadCSVPool string +} + +type contentURLSetting struct { + Fieldseeker string + Integration string + Organization string + Pesticide string + PesticideAdd string + Root string + User string + UserAdd string } func newContentURL() contentURL { return contentURL{ - OAuthRefreshArcGIS: config.MakeURLNidus("/arcgis/oauth/begin"), - Root: config.MakeURLNidus("/"), - Route: config.MakeURLNidus("/route"), - SamplePoolCSV: config.MakeURLNidus("/static/file/sample-pool.csv"), - Setting: config.MakeURLNidus("/setting"), - SettingIntegration: config.MakeURLNidus("/setting/integration"), - SettingOrganization: config.MakeURLNidus("/setting/organization"), - SettingPesticide: config.MakeURLNidus("/setting/pesticide"), - SettingPesticideAdd: config.MakeURLNidus("/setting/pesticide/add"), - SettingUser: config.MakeURLNidus("/setting/user"), - SettingUserAdd: config.MakeURLNidus("/setting/user/add"), - Tegola: config.MakeURLTegola("/"), - UploadCSVPool: config.MakeURLNidus("/upload/pool"), + OAuthRefreshArcGIS: config.MakeURLNidus("/arcgis/oauth/begin"), + Root: config.MakeURLNidus("/"), + Route: config.MakeURLNidus("/route"), + SamplePoolCSV: config.MakeURLNidus("/static/file/sample-pool.csv"), + Setting: newContentURLSetting(), + Tegola: config.MakeURLTegola("/"), + UploadCSVPool: config.MakeURLNidus("/upload/pool"), + } +} +func newContentURLSetting() contentURLSetting { + return contentURLSetting{ + Fieldseeker: config.MakeURLNidus("/setting/integration/fieldseeker"), + Integration: config.MakeURLNidus("/setting/integration"), + Organization: config.MakeURLNidus("/setting/organization"), + Pesticide: config.MakeURLNidus("/setting/pesticide"), + PesticideAdd: config.MakeURLNidus("/setting/pesticide/add"), + Root: config.MakeURLNidus("/setting"), + User: config.MakeURLNidus("/setting/user"), + UserAdd: config.MakeURLNidus("/setting/user/add"), } }