From fa5b8e9eba88370af78b327da842c6a866c98c59 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 10 Oct 2022 15:46:03 +0800 Subject: [PATCH] org secrets --- routers/web/org/setting.go | 11 ++++ routers/web/web.go | 4 ++ templates/org/settings/navbar.tmpl | 3 ++ templates/org/settings/secrets.tmpl | 79 +++++++++++++++++++++++++++++ templates/repo/settings/nav.tmpl | 2 +- templates/repo/settings/navbar.tmpl | 2 +- 6 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 templates/org/settings/secrets.tmpl diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 1a54fa6e86..b64fe0e69f 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -40,6 +40,8 @@ const ( tplSettingsLabels base.TplName = "org/settings/labels" // tplSettingsRunners template path for render runners settings tplSettingsRunners base.TplName = "org/settings/runners" + // tplSettingsSecrets template path for render secrets settings + tplSettingsSecrets base.TplName = "org/settings/secrets" ) // Settings render the main settings page @@ -249,3 +251,12 @@ func Labels(ctx *context.Context) { ctx.Data["LabelTemplates"] = repo_module.LabelTemplates ctx.HTML(http.StatusOK, tplSettingsLabels) } + +// Secrets render organization secrets page +func Secrets(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("repo.secrets") + ctx.Data["PageIsOrgSettings"] = true + ctx.Data["PageIsOrgSettingsSecrets"] = true + ctx.Data["RequireTribute"] = true + ctx.HTML(http.StatusOK, tplSettingsSecrets) +} diff --git a/routers/web/web.go b/routers/web/web.go index 3c8bcbe724..c0eb5f05b2 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -791,6 +791,10 @@ func RegisterRoutes(m *web.Route) { m.Post("/initialize", bindIgnErr(forms.InitializeLabelsForm{}), org.InitializeLabels) }) + m.Group("/secrets", func() { + m.Get("", org.Secrets) + }) + m.Group("/runners", func() { m.Get("", org.Runners) m.Get("/reset_registration_token", org.ResetRunnerRegistrationToken) diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 8f21762175..1d236a3d89 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -25,6 +25,9 @@ {{.locale.Tr "repo.runners"}} + + {{.locale.Tr "repo.secrets"}} + {{.locale.Tr "org.settings.delete"}} diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl new file mode 100644 index 0000000000..4657a9b296 --- /dev/null +++ b/templates/org/settings/secrets.tmpl @@ -0,0 +1,79 @@ +{{template "base/head" .}} +
+ {{template "org/header" .}} +
+
+ {{template "org/settings/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.locale.Tr "repo.settings.secrets"}} +
+
{{.locale.Tr "repo.settings.add_secret"}}
+
+

+
+
+
+ {{.CsrfTokenHtml}} +
+ {{.locale.Tr "repo.settings.secret_desc"}} +
+
+ + +
+
+ + +
+
+
+ + + {{$.locale.Tr "repo.settings.pull_request_read_info" | Str2html}} +
+
+ + +
+
+ {{if .Secrets}} +
+ {{range .Secrets}} +
+
+ +
+
+ {{svg "octicon-key" 32}} +
+
+ {{.Name}} +
+ {{Shadow .Data}} +
+
+ {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info"}} - {{if .PullRequest}} {{$.locale.Tr "repo.settings.pull_request_read_info"}} {{end}} +
+
+
+ {{end}} +
+ {{else}} + {{.locale.Tr "repo.settings.no_secret"}} + {{end}} +
+
+
+
+
+ diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl index 6239b04ed4..5cd1d86f78 100644 --- a/templates/repo/settings/nav.tmpl +++ b/templates/repo/settings/nav.tmpl @@ -12,7 +12,7 @@ {{if or .SignedUser.AllowGitHook .SignedUser.IsAdmin}}
  • {{.locale.Tr "repo.settings.githooks"}}
    • {{end}} -
  • {{.locale.Tr "repo.settings.deploy_keys"}}
    • +
  • {{.locale.Tr "repo.settings.secrets"}}
    • diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 82ae250df1..522e35d230 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -25,7 +25,7 @@ {{end}} - {{.locale.Tr "repo.settings.deploy_keys"}} + {{.locale.Tr "repo.settings.secrets"}} {{if .LFSStartServer}}