|
|
@@ -8,177 +8,15 @@ import (
|
|
|
"net/http"
|
|
|
"net/url"
|
|
|
|
|
|
+ "github.com/pquerna/otp"
|
|
|
"github.com/qor5/web"
|
|
|
"github.com/qor5/x/i18n"
|
|
|
- "github.com/pquerna/otp"
|
|
|
. "github.com/theplant/htmlgo"
|
|
|
"golang.org/x/text/language"
|
|
|
"golang.org/x/text/language/display"
|
|
|
"gorm.io/gorm"
|
|
|
)
|
|
|
|
|
|
-const (
|
|
|
- wrapperClass = "flex pt-16 flex-col max-w-md mx-auto"
|
|
|
- titleClass = "leading-tight text-3xl mt-0 mb-6"
|
|
|
- labelClass = "block mb-2 text-sm text-gray-600 dark:text-gray-200"
|
|
|
- inputClass = "block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-400 bg-white border border-gray-200 rounded-md dark:placeholder-gray-600 dark:bg-gray-900 dark:text-gray-300 dark:border-gray-700 focus:border-blue-400 dark:focus:border-blue-400 focus:ring-blue-400 focus:outline-none focus:ring focus:ring-opacity-40"
|
|
|
- buttonClass = "w-full px-6 py-3 tracking-wide text-white transition-colors duration-200 transform bg-blue-500 rounded-md hover:bg-blue-400 focus:outline-none focus:bg-blue-400 focus:ring focus:ring-blue-300 focus:ring-opacity-50"
|
|
|
-)
|
|
|
-
|
|
|
-func errNotice(msg string) HTMLComponent {
|
|
|
- if msg == "" {
|
|
|
- return nil
|
|
|
- }
|
|
|
-
|
|
|
- return Div().Class("bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative text-center").
|
|
|
- Role("alert").
|
|
|
- Children(
|
|
|
- Span(msg).Class("block sm:inline"),
|
|
|
- )
|
|
|
-}
|
|
|
-
|
|
|
-func warnNotice(msg string) HTMLComponent {
|
|
|
- if msg == "" {
|
|
|
- return nil
|
|
|
- }
|
|
|
-
|
|
|
- return Div().Class("bg-orange-100 border border-orange-400 text-orange-700 px-4 py-3 rounded relative text-center").
|
|
|
- Role("alert").
|
|
|
- Children(
|
|
|
- Span(msg).Class("block sm:inline"),
|
|
|
- )
|
|
|
-}
|
|
|
-
|
|
|
-func infoNotice(msg string) HTMLComponent {
|
|
|
- if msg == "" {
|
|
|
- return nil
|
|
|
- }
|
|
|
-
|
|
|
- return Div().Class("bg-blue-100 border border-blue-400 text-blue-700 px-4 py-3 rounded relative text-center").
|
|
|
- Role("alert").
|
|
|
- Children(
|
|
|
- Span(msg).Class("block sm:inline"),
|
|
|
- )
|
|
|
-}
|
|
|
-
|
|
|
-func errorBody(msg string) HTMLComponent {
|
|
|
- return Div(
|
|
|
- Text(msg),
|
|
|
- )
|
|
|
-}
|
|
|
-
|
|
|
-func passwordInputWithRevealFunction(
|
|
|
- name string,
|
|
|
- placeholder string,
|
|
|
- id string,
|
|
|
- val string,
|
|
|
-) HTMLComponent {
|
|
|
- return Div(
|
|
|
- Input(name).Placeholder(placeholder).Type("password").Class(inputClass).Class("pr-10").Id(id).
|
|
|
- Value(val),
|
|
|
- Div(
|
|
|
- RawHTML(fmt.Sprintf(`<svg class="h-6 text-gray-700 block" id="icon-%s-showed" fill="none" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 576 512" width="1rem">
|
|
|
- <path fill="currentColor"
|
|
|
- d="M572.52 241.4C518.29 135.59 410.93 64 288 64S57.68 135.64 3.48 241.41a32.35 32.35 0 0 0 0 29.19C57.71 376.41 165.07 448 288 448s230.32-71.64 284.52-177.41a32.35 32.35 0 0 0 0-29.19zM288 400a144 144 0 1 1 144-144 143.93 143.93 0 0 1-144 144zm0-240a95.31 95.31 0 0 0-25.31 3.79 47.85 47.85 0 0 1-66.9 66.9A95.78 95.78 0 1 0 288 160z">
|
|
|
- </path>
|
|
|
-</svg>`, id)),
|
|
|
- RawHTML(fmt.Sprintf(`<svg class="h-6 text-gray-700 hidden" id="icon-%s-hidden" fill="none" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 640 512" width="1rem">
|
|
|
- <path fill="currentColor"
|
|
|
- d="M320 400c-75.85 0-137.25-58.71-142.9-133.11L72.2 185.82c-13.79 17.3-26.48 35.59-36.72 55.59a32.35 32.35 0 0 0 0 29.19C89.71 376.41 197.07 448 320 448c26.91 0 52.87-4 77.89-10.46L346 397.39a144.13 144.13 0 0 1-26 2.61zm313.82 58.1l-110.55-85.44a331.25 331.25 0 0 0 81.25-102.07 32.35 32.35 0 0 0 0-29.19C550.29 135.59 442.93 64 320 64a308.15 308.15 0 0 0-147.32 37.7L45.46 3.37A16 16 0 0 0 23 6.18L3.37 31.45A16 16 0 0 0 6.18 53.9l588.36 454.73a16 16 0 0 0 22.46-2.81l19.64-25.27a16 16 0 0 0-2.82-22.45zm-183.72-142l-39.3-30.38A94.75 94.75 0 0 0 416 256a94.76 94.76 0 0 0-121.31-92.21A47.65 47.65 0 0 1 304 192a46.64 46.64 0 0 1-1.54 10l-73.61-56.89A142.31 142.31 0 0 1 320 112a143.92 143.92 0 0 1 144 144c0 21.63-5.29 41.79-13.9 60.11z">
|
|
|
- </path>
|
|
|
-</svg>`, id)),
|
|
|
- ).Class("absolute right-0 inset-y-0 px-2 flex items-center text-sm cursor-pointer").Id(fmt.Sprintf("btn-reveal-%s", id)),
|
|
|
- Script(fmt.Sprintf(`
|
|
|
-(function(){
|
|
|
- var passElem = document.getElementById("%s");
|
|
|
- var revealBtn = document.getElementById("btn-reveal-%s");
|
|
|
- var showedIcon = document.getElementById("icon-%s-showed");
|
|
|
- var hiddenIcon = document.getElementById("icon-%s-hidden");
|
|
|
- revealBtn.onclick = function() {
|
|
|
- if (passElem.type === "password") {
|
|
|
- passElem.type = "text";
|
|
|
- showedIcon.classList.remove("block");
|
|
|
- showedIcon.classList.add("hidden");
|
|
|
- hiddenIcon.classList.remove("hidden");
|
|
|
- hiddenIcon.classList.add("block");
|
|
|
- } else {
|
|
|
- passElem.type = "password";
|
|
|
- hiddenIcon.classList.remove("block");
|
|
|
- hiddenIcon.classList.add("hidden");
|
|
|
- showedIcon.classList.remove("hidden");
|
|
|
- showedIcon.classList.add("block");
|
|
|
- }
|
|
|
- };
|
|
|
-})();`, id, id, id, id)),
|
|
|
- ).Class("relative")
|
|
|
-}
|
|
|
-
|
|
|
-func passwordStrengthMeter(inputID string) HTMLComponent {
|
|
|
- meterID := fmt.Sprintf("%s-strength-meter", inputID)
|
|
|
- return Div(
|
|
|
- Div(
|
|
|
- Div(
|
|
|
- Div().Class("password-strength-meter-section h-2 rounded-xl transition-colors bg-gray-200"),
|
|
|
- ).Class("w-1/5 px-1"),
|
|
|
- Div(
|
|
|
- Div().Class("password-strength-meter-section h-2 rounded-xl transition-colors bg-gray-200"),
|
|
|
- ).Class("w-1/5 px-1"),
|
|
|
- Div(
|
|
|
- Div().Class("password-strength-meter-section h-2 rounded-xl transition-colors bg-gray-200"),
|
|
|
- ).Class("w-1/5 px-1"),
|
|
|
- Div(
|
|
|
- Div().Class("password-strength-meter-section h-2 rounded-xl transition-colors bg-gray-200"),
|
|
|
- ).Class("w-1/5 px-1"),
|
|
|
- Div(
|
|
|
- Div().Class("password-strength-meter-section h-2 rounded-xl transition-colors bg-gray-200"),
|
|
|
- ).Class("w-1/5 px-1"),
|
|
|
- ).Class("flex mt-2 -mx-1 hidden").Id(meterID),
|
|
|
- Script(fmt.Sprintf(`
|
|
|
-(function(){
|
|
|
- var passElem = document.getElementById("%s");
|
|
|
- var meterElem = document.getElementById("%s");
|
|
|
- var meterSectionElems = document.getElementsByClassName("password-strength-meter-section");
|
|
|
- function checkStrength(val) {
|
|
|
- if (!val) {
|
|
|
- return 0;
|
|
|
- };
|
|
|
- return zxcvbn(val).score + 1;
|
|
|
- };
|
|
|
- // bg-gray-200 bg-red-400 bg-yellow-400 bg-green-500
|
|
|
- function updateMeter() {
|
|
|
- if (passElem.value) {
|
|
|
- meterElem.classList.remove("hidden");
|
|
|
- } else {
|
|
|
- if (!meterElem.classList.contains("hidden")) {
|
|
|
- meterElem.classList.add("hidden");
|
|
|
- }
|
|
|
- }
|
|
|
- var s = checkStrength(passElem.value);
|
|
|
- for (var i = 0; i < meterSectionElems.length; i++) {
|
|
|
- var elem = meterSectionElems[i];
|
|
|
- if (i >= s) {
|
|
|
- elem.classList.add("bg-gray-200");
|
|
|
- elem.classList.remove("bg-red-400", "bg-yellow-400", "bg-green-500");
|
|
|
- } else if (s <= 2) {
|
|
|
- elem.classList.add("bg-red-400");
|
|
|
- elem.classList.remove("bg-gray-200", "bg-yellow-400", "bg-green-500");
|
|
|
- } else if (s <= 4) {
|
|
|
- elem.classList.add("bg-yellow-400");
|
|
|
- elem.classList.remove("bg-red-400", "bg-gray-200", "bg-green-500");
|
|
|
- } else {
|
|
|
- elem.classList.add("bg-green-500");
|
|
|
- elem.classList.remove("bg-red-400", "bg-yellow-400", "bg-gray-200");
|
|
|
- }
|
|
|
- }
|
|
|
- };
|
|
|
- updateMeter();
|
|
|
- passElem.oninput = function(e) {
|
|
|
- updateMeter();
|
|
|
- };
|
|
|
-})();`, inputID, meterID)),
|
|
|
- )
|
|
|
-}
|
|
|
-
|
|
|
func defaultLoginPage(vh *ViewHelper) web.PageFunc {
|
|
|
return func(ctx *web.EventContext) (r web.PageResponse, err error) {
|
|
|
// i18n start
|
|
|
@@ -245,13 +83,13 @@ func defaultLoginPage(vh *ViewHelper) web.PageFunc {
|
|
|
userPassHTML = Div(
|
|
|
Form(
|
|
|
Div(
|
|
|
- Label(msgr.AccountLabel).Class(labelClass).For("account"),
|
|
|
- Input("account").Placeholder(msgr.AccountPlaceholder).Class(inputClass).
|
|
|
+ Label(msgr.AccountLabel).Class(DefaultViewCommon.LabelClass).For("account"),
|
|
|
+ Input("account").Placeholder(msgr.AccountPlaceholder).Class(DefaultViewCommon.InputClass).
|
|
|
Value(wIn.Account),
|
|
|
),
|
|
|
Div(
|
|
|
- Label(msgr.PasswordLabel).Class(labelClass).For("password"),
|
|
|
- passwordInputWithRevealFunction("password", msgr.PasswordPlaceholder, "password", wIn.Password),
|
|
|
+ Label(msgr.PasswordLabel).Class(DefaultViewCommon.LabelClass).For("password"),
|
|
|
+ DefaultViewCommon.PasswordInputWithRevealFunction("password", msgr.PasswordPlaceholder, "password", wIn.Password),
|
|
|
).Class("mt-6"),
|
|
|
If(isRecaptchaEnabled,
|
|
|
Div(
|
|
|
@@ -260,7 +98,7 @@ func defaultLoginPage(vh *ViewHelper) web.PageFunc {
|
|
|
).Class("hidden"),
|
|
|
),
|
|
|
Div(
|
|
|
- Button(msgr.SignInBtn).Class(buttonClass).
|
|
|
+ Button(msgr.SignInBtn).Class(DefaultViewCommon.ButtonClass).
|
|
|
ClassIf("g-recaptcha", isRecaptchaEnabled).AttrIf("data-sitekey", vh.RecaptchaSiteKey(), isRecaptchaEnabled).AttrIf("data-callback", "onSubmit", isRecaptchaEnabled),
|
|
|
).Class("mt-6"),
|
|
|
).Id("login-form").Method(http.MethodPost).Action(vh.PasswordLoginURL()),
|
|
|
@@ -284,7 +122,7 @@ func defaultLoginPage(vh *ViewHelper) web.PageFunc {
|
|
|
).Class("mt-12 bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500").
|
|
|
Attr("onChange", "window.location.href=this.value"),
|
|
|
),
|
|
|
- ).Class(wrapperClass)
|
|
|
+ ).Class(DefaultViewCommon.WrapperClass)
|
|
|
|
|
|
r.Body = Div(
|
|
|
Link(StyleCSSURL).Type("text/css").Rel("stylesheet"),
|
|
|
@@ -297,9 +135,9 @@ function onSubmit(token) {
|
|
|
document.getElementById("login-form").submit();
|
|
|
}
|
|
|
`)),
|
|
|
- errNotice(fMsg),
|
|
|
- warnNotice(wMsg),
|
|
|
- infoNotice(iMsg),
|
|
|
+ DefaultViewCommon.ErrNotice(fMsg),
|
|
|
+ DefaultViewCommon.WarnNotice(wMsg),
|
|
|
+ DefaultViewCommon.InfoNotice(iMsg),
|
|
|
bodyForm,
|
|
|
)
|
|
|
|
|
|
@@ -315,7 +153,7 @@ func defaultForgetPasswordPage(vh *ViewHelper) web.PageFunc {
|
|
|
wIn := vh.GetWrongForgetPasswordInputFlash(ctx.W, ctx.R)
|
|
|
secondsToResend := vh.GetSecondsToRedoFlash(ctx.W, ctx.R)
|
|
|
activeBtnText := msgr.SendResetPasswordEmailBtn
|
|
|
- activeBtnClass := buttonClass
|
|
|
+ activeBtnClass := DefaultViewCommon.ButtonClass
|
|
|
inactiveBtnText := msgr.ResendResetPasswordEmailBtn
|
|
|
inactiveBtnClass := "w-full px-6 py-3 tracking-wide text-white transition-colors duration-200 transform bg-gray-500 rounded-md"
|
|
|
inactiveBtnTextWithInitSeconds := fmt.Sprintf("%s (%d)", inactiveBtnText, secondsToResend)
|
|
|
@@ -340,22 +178,22 @@ function onSubmit(token) {
|
|
|
document.getElementById("forget-form").submit();
|
|
|
}
|
|
|
`)),
|
|
|
- errNotice(fMsg),
|
|
|
+ DefaultViewCommon.ErrNotice(fMsg),
|
|
|
If(secondsToResend > 0,
|
|
|
- warnNotice(msgr.SendEmailTooFrequentlyNotice),
|
|
|
+ DefaultViewCommon.WarnNotice(msgr.SendEmailTooFrequentlyNotice),
|
|
|
),
|
|
|
Div(
|
|
|
- H1(msgr.ForgotMyPasswordTitle).Class(titleClass),
|
|
|
+ H1(msgr.ForgotMyPasswordTitle).Class(DefaultViewCommon.TitleClass),
|
|
|
Form(
|
|
|
Div(
|
|
|
- Label(msgr.ForgetPasswordEmailLabel).Class(labelClass).For("account"),
|
|
|
- Input("account").Placeholder(msgr.ForgetPasswordEmailPlaceholder).Class(inputClass).Value(wIn.Account),
|
|
|
+ Label(msgr.ForgetPasswordEmailLabel).Class(DefaultViewCommon.LabelClass).For("account"),
|
|
|
+ Input("account").Placeholder(msgr.ForgetPasswordEmailPlaceholder).Class(DefaultViewCommon.InputClass).Value(wIn.Account),
|
|
|
),
|
|
|
If(doTOTP,
|
|
|
Div(
|
|
|
- Label(msgr.TOTPValidateCodeLabel).Class(labelClass).For("otp"),
|
|
|
+ Label(msgr.TOTPValidateCodeLabel).Class(DefaultViewCommon.LabelClass).For("otp"),
|
|
|
Input("otp").Placeholder(msgr.TOTPValidateCodePlaceholder).
|
|
|
- Class(inputClass).
|
|
|
+ Class(DefaultViewCommon.InputClass).
|
|
|
Value(wIn.TOTP),
|
|
|
).Class("mt-6"),
|
|
|
),
|
|
|
@@ -374,7 +212,7 @@ function onSubmit(token) {
|
|
|
),
|
|
|
).Class("mt-6"),
|
|
|
).Id("forget-form").Method(http.MethodPost).Action(actionURL),
|
|
|
- ).Class(wrapperClass),
|
|
|
+ ).Class(DefaultViewCommon.WrapperClass),
|
|
|
)
|
|
|
|
|
|
if secondsToResend > 0 {
|
|
|
@@ -415,7 +253,7 @@ func defaultResetPasswordLinkSentPage(vh *ViewHelper) web.PageFunc {
|
|
|
Div(
|
|
|
H1(fmt.Sprintf("%s %s.", msgr.ResetPasswordLinkWasSentTo, a)).Class("leading-tight text-2xl mt-0 mb-4"),
|
|
|
H2(msgr.ResetPasswordLinkSentPrompt).Class("leading-tight text-1xl mt-0"),
|
|
|
- ).Class(wrapperClass),
|
|
|
+ ).Class(DefaultViewCommon.WrapperClass),
|
|
|
)
|
|
|
return
|
|
|
}
|
|
|
@@ -476,34 +314,34 @@ func defaultResetPasswordPage(vh *ViewHelper) web.PageFunc {
|
|
|
r.Body = Div(
|
|
|
Link(StyleCSSURL).Type("text/css").Rel("stylesheet"),
|
|
|
Script("").Src(ZxcvbnJSURL),
|
|
|
- errNotice(fMsg),
|
|
|
+ DefaultViewCommon.ErrNotice(fMsg),
|
|
|
Div(
|
|
|
- H1(msgr.ResetYourPasswordTitle).Class(titleClass),
|
|
|
+ H1(msgr.ResetYourPasswordTitle).Class(DefaultViewCommon.TitleClass),
|
|
|
Form(
|
|
|
Input("user_id").Type("hidden").Value(id),
|
|
|
Input("token").Type("hidden").Value(token),
|
|
|
Div(
|
|
|
- Label(msgr.ResetPasswordLabel).Class(labelClass).For("password"),
|
|
|
- passwordInputWithRevealFunction("password", msgr.ResetPasswordPlaceholder, "password", wIn.Password),
|
|
|
- passwordStrengthMeter("password"),
|
|
|
+ Label(msgr.ResetPasswordLabel).Class(DefaultViewCommon.LabelClass).For("password"),
|
|
|
+ DefaultViewCommon.PasswordInputWithRevealFunction("password", msgr.ResetPasswordPlaceholder, "password", wIn.Password),
|
|
|
+ DefaultViewCommon.PasswordStrengthMeter("password"),
|
|
|
),
|
|
|
Div(
|
|
|
- Label(msgr.ResetPasswordConfirmLabel).Class(labelClass).For("confirm_password"),
|
|
|
- passwordInputWithRevealFunction("confirm_password", msgr.ResetPasswordConfirmPlaceholder, "confirm_password", wIn.ConfirmPassword),
|
|
|
+ Label(msgr.ResetPasswordConfirmLabel).Class(DefaultViewCommon.LabelClass).For("confirm_password"),
|
|
|
+ DefaultViewCommon.PasswordInputWithRevealFunction("confirm_password", msgr.ResetPasswordConfirmPlaceholder, "confirm_password", wIn.ConfirmPassword),
|
|
|
).Class("mt-6"),
|
|
|
If(doTOTP,
|
|
|
Div(
|
|
|
- Label(msgr.TOTPValidateCodeLabel).Class(labelClass).For("otp"),
|
|
|
+ Label(msgr.TOTPValidateCodeLabel).Class(DefaultViewCommon.LabelClass).For("otp"),
|
|
|
Input("otp").Placeholder(msgr.TOTPValidateCodePlaceholder).
|
|
|
- Class(inputClass).
|
|
|
+ Class(DefaultViewCommon.InputClass).
|
|
|
Value(wIn.TOTP),
|
|
|
).Class("mt-6"),
|
|
|
),
|
|
|
Div(
|
|
|
- Button(msgr.Confirm).Class(buttonClass),
|
|
|
+ Button(msgr.Confirm).Class(DefaultViewCommon.ButtonClass),
|
|
|
).Class("mt-6"),
|
|
|
).Method(http.MethodPost).Action(actionURL),
|
|
|
- ).Class(wrapperClass),
|
|
|
+ ).Class(DefaultViewCommon.WrapperClass),
|
|
|
)
|
|
|
return
|
|
|
}
|
|
|
@@ -524,36 +362,36 @@ func defaultChangePasswordPage(vh *ViewHelper) web.PageFunc {
|
|
|
r.Body = Div(
|
|
|
Link(StyleCSSURL).Type("text/css").Rel("stylesheet"),
|
|
|
Script("").Src(ZxcvbnJSURL),
|
|
|
- errNotice(fMsg),
|
|
|
+ DefaultViewCommon.ErrNotice(fMsg),
|
|
|
Div(
|
|
|
- H1(msgr.ChangePasswordTitle).Class(titleClass),
|
|
|
+ H1(msgr.ChangePasswordTitle).Class(DefaultViewCommon.TitleClass),
|
|
|
Form(
|
|
|
Div(
|
|
|
- Label(msgr.ChangePasswordOldLabel).Class(labelClass).For("old_password"),
|
|
|
- passwordInputWithRevealFunction("old_password", msgr.ChangePasswordOldPlaceholder, "old_password", wIn.OldPassword),
|
|
|
+ Label(msgr.ChangePasswordOldLabel).Class(DefaultViewCommon.LabelClass).For("old_password"),
|
|
|
+ DefaultViewCommon.PasswordInputWithRevealFunction("old_password", msgr.ChangePasswordOldPlaceholder, "old_password", wIn.OldPassword),
|
|
|
),
|
|
|
Div(
|
|
|
- Label(msgr.ChangePasswordNewLabel).Class(labelClass).For("password"),
|
|
|
- passwordInputWithRevealFunction("password", msgr.ChangePasswordNewPlaceholder, "password", wIn.NewPassword),
|
|
|
- passwordStrengthMeter("password"),
|
|
|
+ Label(msgr.ChangePasswordNewLabel).Class(DefaultViewCommon.LabelClass).For("password"),
|
|
|
+ DefaultViewCommon.PasswordInputWithRevealFunction("password", msgr.ChangePasswordNewPlaceholder, "password", wIn.NewPassword),
|
|
|
+ DefaultViewCommon.PasswordStrengthMeter("password"),
|
|
|
).Class("mt-6"),
|
|
|
Div(
|
|
|
- Label(msgr.ChangePasswordNewConfirmLabel).Class(labelClass).For("confirm_password"),
|
|
|
- passwordInputWithRevealFunction("confirm_password", msgr.ChangePasswordNewConfirmPlaceholder, "confirm_password", wIn.ConfirmPassword),
|
|
|
+ Label(msgr.ChangePasswordNewConfirmLabel).Class(DefaultViewCommon.LabelClass).For("confirm_password"),
|
|
|
+ DefaultViewCommon.PasswordInputWithRevealFunction("confirm_password", msgr.ChangePasswordNewConfirmPlaceholder, "confirm_password", wIn.ConfirmPassword),
|
|
|
).Class("mt-6"),
|
|
|
If(vh.TOTPEnabled(),
|
|
|
Div(
|
|
|
- Label(msgr.TOTPValidateCodeLabel).Class(labelClass).For("otp"),
|
|
|
+ Label(msgr.TOTPValidateCodeLabel).Class(DefaultViewCommon.LabelClass).For("otp"),
|
|
|
Input("otp").Placeholder(msgr.TOTPValidateCodePlaceholder).
|
|
|
- Class(inputClass).
|
|
|
+ Class(DefaultViewCommon.InputClass).
|
|
|
Value(wIn.TOTP),
|
|
|
).Class("mt-6"),
|
|
|
),
|
|
|
Div(
|
|
|
- Button(msgr.Confirm).Class(buttonClass),
|
|
|
+ Button(msgr.Confirm).Class(DefaultViewCommon.ButtonClass),
|
|
|
).Class("mt-6"),
|
|
|
).Method(http.MethodPost).Action(vh.ChangePasswordURL()),
|
|
|
- ).Class(wrapperClass),
|
|
|
+ ).Class(DefaultViewCommon.WrapperClass),
|
|
|
)
|
|
|
return
|
|
|
}
|
|
|
@@ -574,7 +412,7 @@ func defaultTOTPSetupPage(vh *ViewHelper) web.PageFunc {
|
|
|
var key *otp.Key
|
|
|
totpSecret := u.GetTOTPSecret()
|
|
|
if len(totpSecret) == 0 {
|
|
|
- r.Body = errorBody("need setup totp")
|
|
|
+ r.Body = DefaultViewCommon.ErrorBody("need setup totp")
|
|
|
return
|
|
|
}
|
|
|
key, err = otp.NewKeyFromURL(
|
|
|
@@ -588,24 +426,24 @@ func defaultTOTPSetupPage(vh *ViewHelper) web.PageFunc {
|
|
|
|
|
|
img, err := key.Image(200, 200)
|
|
|
if err != nil {
|
|
|
- r.Body = errorBody(err.Error())
|
|
|
+ r.Body = DefaultViewCommon.ErrorBody(err.Error())
|
|
|
return
|
|
|
}
|
|
|
|
|
|
err = png.Encode(&QRCode, img)
|
|
|
if err != nil {
|
|
|
- r.Body = errorBody(err.Error())
|
|
|
+ r.Body = DefaultViewCommon.ErrorBody(err.Error())
|
|
|
return
|
|
|
}
|
|
|
|
|
|
r.PageTitle = "TOTP Setup"
|
|
|
r.Body = Div(
|
|
|
Link(StyleCSSURL).Type("text/css").Rel("stylesheet"),
|
|
|
- errNotice(fMsg),
|
|
|
+ DefaultViewCommon.ErrNotice(fMsg),
|
|
|
Div(
|
|
|
Div(
|
|
|
H1(msgr.TOTPSetupTitle).
|
|
|
- Class(titleClass),
|
|
|
+ Class(DefaultViewCommon.TitleClass),
|
|
|
Label(msgr.TOTPSetupScanPrompt),
|
|
|
),
|
|
|
Div(
|
|
|
@@ -618,13 +456,13 @@ func defaultTOTPSetupPage(vh *ViewHelper) web.PageFunc {
|
|
|
Form(
|
|
|
Label(msgr.TOTPSetupEnterCodePrompt),
|
|
|
Input("otp").Placeholder(msgr.TOTPSetupCodePlaceholder).
|
|
|
- Class(inputClass).
|
|
|
+ Class(DefaultViewCommon.InputClass).
|
|
|
Class("mt-6"),
|
|
|
Div(
|
|
|
- Button(msgr.Verify).Class(buttonClass),
|
|
|
+ Button(msgr.Verify).Class(DefaultViewCommon.ButtonClass),
|
|
|
).Class("mt-6"),
|
|
|
).Method(http.MethodPost).Action(vh.ValidateTOTPURL()),
|
|
|
- ).Class(wrapperClass).Class("text-center"),
|
|
|
+ ).Class(DefaultViewCommon.WrapperClass).Class("text-center"),
|
|
|
)
|
|
|
|
|
|
return
|
|
|
@@ -640,23 +478,23 @@ func defaultTOTPValidatePage(vh *ViewHelper) web.PageFunc {
|
|
|
r.PageTitle = "TOTP Validate"
|
|
|
r.Body = Div(
|
|
|
Link(StyleCSSURL).Type("text/css").Rel("stylesheet"),
|
|
|
- errNotice(fMsg),
|
|
|
+ DefaultViewCommon.ErrNotice(fMsg),
|
|
|
Div(
|
|
|
Div(
|
|
|
H1(msgr.TOTPValidateTitle).
|
|
|
- Class(titleClass),
|
|
|
+ Class(DefaultViewCommon.TitleClass),
|
|
|
Label(msgr.TOTPValidateEnterCodePrompt),
|
|
|
),
|
|
|
Form(
|
|
|
Input("otp").Placeholder(msgr.TOTPValidateCodePlaceholder).
|
|
|
- Class(inputClass).
|
|
|
+ Class(DefaultViewCommon.InputClass).
|
|
|
Class("mt-6").
|
|
|
Attr("autofocus", true),
|
|
|
Div(
|
|
|
- Button(msgr.Verify).Class(buttonClass),
|
|
|
+ Button(msgr.Verify).Class(DefaultViewCommon.ButtonClass),
|
|
|
).Class("mt-6"),
|
|
|
).Method(http.MethodPost).Action(vh.ValidateTOTPURL()),
|
|
|
- ).Class(wrapperClass).Class("text-center"),
|
|
|
+ ).Class(DefaultViewCommon.WrapperClass).Class("text-center"),
|
|
|
)
|
|
|
|
|
|
return
|
xuxinx