From d1b1b90de3894a7823af68d70fa4bd42f23d85ef Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Sun, 21 Feb 2021 15:51:42 +0000 Subject: [PATCH] Add email list accessible by edit button in settings --- api.go | 16 ++++---- css/base.css | 9 +++++ html/admin.html | 22 +++++++++- lang/admin/en-us.json | 4 ++ mail/created.txt | 2 + mail/deleted.txt | 1 + mail/email.txt | 3 ++ models.go | 7 +++- ts/admin.ts | 2 + ts/modules/settings.ts | 92 ++++++++++++++++++++++++++++++++++-------- ts/typings/d.ts | 1 + 11 files changed, 131 insertions(+), 28 deletions(-) diff --git a/api.go b/api.go index dbc42f5..5cdf5b7 100644 --- a/api.go +++ b/api.go @@ -1276,13 +1276,13 @@ func (app *appContext) ModifyConfig(gc *gin.Context) { // @tags Configuration func (app *appContext) GetEmails(gc *gin.Context) { gc.JSON(200, emailListDTO{ - "UserCreated": app.storage.lang.Email["en-us"].UserCreated["name"], - "InviteExpiry": app.storage.lang.Email["en-us"].InviteExpiry["name"], - "PasswordReset": app.storage.lang.Email["en-us"].PasswordReset["name"], - "UserDeleted": app.storage.lang.Email["en-us"].UserDeleted["name"], - "InviteEmail": app.storage.lang.Email["en-us"].InviteEmail["name"], - "WelcomeEmail": app.storage.lang.Email["en-us"].WelcomeEmail["name"], - "EmailConfirmation": app.storage.lang.Email["en-us"].EmailConfirmation["name"], + "UserCreated": {Name: app.storage.lang.Email["en-us"].UserCreated["name"], Enabled: app.storage.customEmails.UserCreated.Enabled}, + "InviteExpiry": {Name: app.storage.lang.Email["en-us"].InviteExpiry["name"], Enabled: app.storage.customEmails.InviteExpiry.Enabled}, + "PasswordReset": {Name: app.storage.lang.Email["en-us"].PasswordReset["name"], Enabled: app.storage.customEmails.PasswordReset.Enabled}, + "UserDeleted": {Name: app.storage.lang.Email["en-us"].UserDeleted["name"], Enabled: app.storage.customEmails.UserDeleted.Enabled}, + "InviteEmail": {Name: app.storage.lang.Email["en-us"].InviteEmail["name"], Enabled: app.storage.customEmails.InviteEmail.Enabled}, + "WelcomeEmail": {Name: app.storage.lang.Email["en-us"].WelcomeEmail["name"], Enabled: app.storage.customEmails.WelcomeEmail.Enabled}, + "EmailConfirmation": {Name: app.storage.lang.Email["en-us"].EmailConfirmation["name"], Enabled: app.storage.customEmails.EmailConfirmation.Enabled}, }) } @@ -1339,7 +1339,7 @@ func (app *appContext) SetEmail(gc *gin.Context) { // @Success 200 {object} boolResponse // @Failure 400 {object} boolResponse // @Failure 500 {object} boolResponse -// @Router /config/emails/{id}/{enable/disable} [post] +// @Router /config/emails/{id}/state/{enable/disable} [post] // @tags Configuration func (app *appContext) SetEmailState(gc *gin.Context) { id := gc.Param("id") diff --git a/css/base.css b/css/base.css index f10293b..e11c8af 100644 --- a/css/base.css +++ b/css/base.css @@ -153,6 +153,11 @@ div.card:contains(section.banner.footer) { margin: 0.5rem; } +.flex-col { + display: flex; + flex-direction: column; +} + @media screen and (max-width: 400px) { .row { flex-direction: column; @@ -273,6 +278,10 @@ sup.\~critical, .text-critical { width: 100%; } +.flex-auto { + flex: auto; +} + .center { justify-content: center; } diff --git a/html/admin.html b/html/admin.html index 6f397db..677745e 100644 --- a/html/admin.html +++ b/html/admin.html @@ -109,15 +109,33 @@ +