mirror of
https://github.com/hrfee/jfa-go.git
synced 2024-09-20 03:10:11 +00:00
Compare commits
No commits in common. "9bcbffde5d3eac298a1e9c9e715ee7c63c8985d0" and "f07c60afb0799bf8550c9d268b08ba34bcd89de9" have entirely different histories.
9bcbffde5d
...
f07c60afb0
@ -403,7 +403,7 @@
|
|||||||
"value": "",
|
"value": "",
|
||||||
"depends_true": "enabled",
|
"depends_true": "enabled",
|
||||||
"required": "false",
|
"required": "false",
|
||||||
"description": "Click the edit icon next to the \"User Page\" Setting to add custom Markdown messages that will be shown to the user. Note message cards are not private, little effort is required for anyone to view them."
|
"description": "Click the edit icon next to the \"User Page\" Setting to add custom Markdown messages that will be shown to the user."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -30,7 +30,6 @@
|
|||||||
window.reCAPTCHA = {{ .reCAPTCHA }};
|
window.reCAPTCHA = {{ .reCAPTCHA }};
|
||||||
window.reCAPTCHASiteKey = "{{ .reCAPTCHASiteKey }}";
|
window.reCAPTCHASiteKey = "{{ .reCAPTCHASiteKey }}";
|
||||||
window.userPageEnabled = {{ .userPageEnabled }};
|
window.userPageEnabled = {{ .userPageEnabled }};
|
||||||
window.userPageAddress = "{{ .userPageAddress }}";
|
|
||||||
</script>
|
</script>
|
||||||
{{ if .passwordReset }}
|
{{ if .passwordReset }}
|
||||||
<script src="js/pwr.js" type="module"></script>
|
<script src="js/pwr.js" type="module"></script>
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
window.validationStrings = JSON.parse({{ .validationStrings }});
|
window.validationStrings = JSON.parse({{ .validationStrings }});
|
||||||
</script>
|
</script>
|
||||||
{{ template "header.html" . }}
|
{{ template "header.html" . }}
|
||||||
<title>{{ .strings.myAccount }}</title>
|
<title>{{ .lang.Strings.myAccount }}</title>
|
||||||
</head>
|
</head>
|
||||||
<body class="max-w-full overflow-x-hidden section">
|
<body class="max-w-full overflow-x-hidden section">
|
||||||
<div id="modal-email" class="modal">
|
<div id="modal-email" class="modal">
|
||||||
|
@ -1,152 +0,0 @@
|
|||||||
{
|
|
||||||
"meta": {
|
|
||||||
"name": ""
|
|
||||||
},
|
|
||||||
"strings": {
|
|
||||||
"pageTitle": "",
|
|
||||||
"next": "",
|
|
||||||
"back": "",
|
|
||||||
"optional": "",
|
|
||||||
"serverType": "",
|
|
||||||
"disabled": "",
|
|
||||||
"enabled": "",
|
|
||||||
"port": "",
|
|
||||||
"message": "",
|
|
||||||
"serverAddress": "",
|
|
||||||
"emailSubject": "",
|
|
||||||
"URL": "",
|
|
||||||
"apiKey": "",
|
|
||||||
"error": "",
|
|
||||||
"errorInvalidUserPass": "",
|
|
||||||
"errorNotAdmin": "",
|
|
||||||
"errorUserDisabled": "",
|
|
||||||
"error404": "",
|
|
||||||
"errorConnectionRefused": "",
|
|
||||||
"errorUnknown": ""
|
|
||||||
},
|
|
||||||
"startPage": {
|
|
||||||
"welcome": "",
|
|
||||||
"pressStart": "",
|
|
||||||
"httpsNotice": "",
|
|
||||||
"start": ""
|
|
||||||
},
|
|
||||||
"endPage": {
|
|
||||||
"finished": "",
|
|
||||||
"restartMessage": "",
|
|
||||||
"refreshPage": ""
|
|
||||||
},
|
|
||||||
"language": {
|
|
||||||
"title": "",
|
|
||||||
"description": "",
|
|
||||||
"defaultAdminLang": "",
|
|
||||||
"defaultFormLang": "",
|
|
||||||
"defaultEmailLang": ""
|
|
||||||
},
|
|
||||||
"general": {
|
|
||||||
"title": "",
|
|
||||||
"listenAddress": "",
|
|
||||||
"urlBase": "",
|
|
||||||
"urlBaseNotice": "",
|
|
||||||
"lightTheme": "",
|
|
||||||
"darkTheme": "",
|
|
||||||
"useHTTPS": "",
|
|
||||||
"httpsPort": "",
|
|
||||||
"useHTTPSNotice": "",
|
|
||||||
"pathToCertificate": "",
|
|
||||||
"pathToKeyFile": ""
|
|
||||||
},
|
|
||||||
"updates": {
|
|
||||||
"title": "",
|
|
||||||
"description": "",
|
|
||||||
"updateChannel": "",
|
|
||||||
"stable": "",
|
|
||||||
"unstable": ""
|
|
||||||
},
|
|
||||||
"login": {
|
|
||||||
"title": "",
|
|
||||||
"description": "",
|
|
||||||
"authorizeWithJellyfin": "",
|
|
||||||
"authorizeManual": "",
|
|
||||||
"adminOnly": "",
|
|
||||||
"allowAll": "",
|
|
||||||
"allowAllDescription": "",
|
|
||||||
"emailNotice": ""
|
|
||||||
},
|
|
||||||
"jellyfinEmby": {
|
|
||||||
"title": "",
|
|
||||||
"description": "",
|
|
||||||
"embyNotice": "",
|
|
||||||
"internal": "",
|
|
||||||
"external": "",
|
|
||||||
"replaceJellyfin": "",
|
|
||||||
"replaceJellyfinNotice": "",
|
|
||||||
"addressExternalNotice": "",
|
|
||||||
"testConnection": ""
|
|
||||||
},
|
|
||||||
"ombi": {
|
|
||||||
"title": "",
|
|
||||||
"description": "",
|
|
||||||
"apiKeyNotice": ""
|
|
||||||
},
|
|
||||||
"messages": {
|
|
||||||
"title": "",
|
|
||||||
"description": ""
|
|
||||||
},
|
|
||||||
"email": {
|
|
||||||
"title": "",
|
|
||||||
"description": "",
|
|
||||||
"method": "",
|
|
||||||
"useEmailAsUsername": "",
|
|
||||||
"useEmailAsUsernameNotice": "",
|
|
||||||
"fromAddress": "",
|
|
||||||
"senderName": "",
|
|
||||||
"dateFormat": "",
|
|
||||||
"dateFormatNotice": "",
|
|
||||||
"encryption": "",
|
|
||||||
"mailgunApiURL": ""
|
|
||||||
},
|
|
||||||
"notifications": {
|
|
||||||
"title": "",
|
|
||||||
"description": ""
|
|
||||||
},
|
|
||||||
"welcomeEmails": {
|
|
||||||
"title": "",
|
|
||||||
"description": ""
|
|
||||||
},
|
|
||||||
"inviteEmails": {
|
|
||||||
"title": "",
|
|
||||||
"description": ""
|
|
||||||
},
|
|
||||||
"passwordResets": {
|
|
||||||
"title": "",
|
|
||||||
"description": "",
|
|
||||||
"pathToJellyfin": "",
|
|
||||||
"pathToJellyfinNotice": "",
|
|
||||||
"resetLinks": "",
|
|
||||||
"resetLinksNotice": "",
|
|
||||||
"resetLinksLanguage": "",
|
|
||||||
"setPassword": "",
|
|
||||||
"setPasswordNotice": ""
|
|
||||||
},
|
|
||||||
"passwordValidation": {
|
|
||||||
"title": "",
|
|
||||||
"description": "",
|
|
||||||
"length": "",
|
|
||||||
"uppercase": "",
|
|
||||||
"lowercase": "",
|
|
||||||
"numbers": "",
|
|
||||||
"special": ""
|
|
||||||
},
|
|
||||||
"helpMessages": {
|
|
||||||
"title": "",
|
|
||||||
"description": "",
|
|
||||||
"contactMessage": "",
|
|
||||||
"contactMessageNotice": "",
|
|
||||||
"helpMessage": "",
|
|
||||||
"helpMessageNotice": "",
|
|
||||||
"successMessage": "",
|
|
||||||
"successMessageNotice": "",
|
|
||||||
"emailMessage": "",
|
|
||||||
"emailMessageNotice": ""
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
"meta": {
|
|
||||||
"name": ""
|
|
||||||
},
|
|
||||||
"strings": {
|
|
||||||
"startMessage": "",
|
|
||||||
"discordStartMessage": "",
|
|
||||||
"matrixStartMessage": "",
|
|
||||||
"invalidPIN": "",
|
|
||||||
"pinSuccess": "",
|
|
||||||
"languageMessage": "",
|
|
||||||
"languageMessageDiscord": "",
|
|
||||||
"languageSet": "",
|
|
||||||
"discordDMs": ""
|
|
||||||
}
|
|
||||||
}
|
|
@ -36,7 +36,6 @@ interface formWindow extends Window {
|
|||||||
reCAPTCHA: boolean;
|
reCAPTCHA: boolean;
|
||||||
reCAPTCHASiteKey: string;
|
reCAPTCHASiteKey: string;
|
||||||
userPageEnabled: boolean;
|
userPageEnabled: boolean;
|
||||||
userPageAddress: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
loadLangSelector("form");
|
loadLangSelector("form");
|
||||||
@ -349,8 +348,7 @@ const create = (event: SubmitEvent) => {
|
|||||||
} else {
|
} else {
|
||||||
if (window.userPageEnabled) {
|
if (window.userPageEnabled) {
|
||||||
const userPageNoticeArea = document.getElementById("modal-success-user-page-area");
|
const userPageNoticeArea = document.getElementById("modal-success-user-page-area");
|
||||||
const link = `<a href="${window.userPageAddress}" target="_blank">${userPageNoticeArea.getAttribute("my-account-term")}</a>`;
|
userPageNoticeArea.textContent = userPageNoticeArea.textContent.replace("{myAccount}", userPageNoticeArea.getAttribute("my-account-term"));
|
||||||
userPageNoticeArea.innerHTML = userPageNoticeArea.textContent.replace("{myAccount}", link);
|
|
||||||
}
|
}
|
||||||
window.successModal.show();
|
window.successModal.show();
|
||||||
}
|
}
|
||||||
|
7
views.go
7
views.go
@ -596,12 +596,6 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
|
|||||||
discord := discordEnabled && app.config.Section("discord").Key("show_on_reg").MustBool(true)
|
discord := discordEnabled && app.config.Section("discord").Key("show_on_reg").MustBool(true)
|
||||||
matrix := matrixEnabled && app.config.Section("matrix").Key("show_on_reg").MustBool(true)
|
matrix := matrixEnabled && app.config.Section("matrix").Key("show_on_reg").MustBool(true)
|
||||||
|
|
||||||
userPageAddress := app.config.Section("invite_emails").Key("url_base").String()
|
|
||||||
if userPageAddress == "" {
|
|
||||||
userPageAddress = app.config.Section("password_resets").Key("url_base").String()
|
|
||||||
}
|
|
||||||
userPageAddress += "/my/account"
|
|
||||||
|
|
||||||
data := gin.H{
|
data := gin.H{
|
||||||
"urlBase": app.getURLBase(gc),
|
"urlBase": app.getURLBase(gc),
|
||||||
"cssClass": app.cssClass,
|
"cssClass": app.cssClass,
|
||||||
@ -636,7 +630,6 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
|
|||||||
"reCAPTCHA": app.config.Section("captcha").Key("recaptcha").MustBool(false),
|
"reCAPTCHA": app.config.Section("captcha").Key("recaptcha").MustBool(false),
|
||||||
"reCAPTCHASiteKey": app.config.Section("captcha").Key("recaptcha_site_key").MustString(""),
|
"reCAPTCHASiteKey": app.config.Section("captcha").Key("recaptcha_site_key").MustString(""),
|
||||||
"userPageEnabled": app.config.Section("user_page").Key("enabled").MustBool(false),
|
"userPageEnabled": app.config.Section("user_page").Key("enabled").MustBool(false),
|
||||||
"userPageAddress": userPageAddress,
|
|
||||||
}
|
}
|
||||||
if telegram {
|
if telegram {
|
||||||
data["telegramPIN"] = app.telegram.NewAuthToken()
|
data["telegramPIN"] = app.telegram.NewAuthToken()
|
||||||
|
Loading…
Reference in New Issue
Block a user