diff --git a/src/ActionLinkManager.cpp b/src/ActionLinkManager.cpp index e1225bc..3d708c5 100644 --- a/src/ActionLinkManager.cpp +++ b/src/ActionLinkManager.cpp @@ -110,7 +110,7 @@ namespace OpenWifi { case OpenWifi::SecurityObjects::LinkActions::SUB_SIGNUP: { auto Signup = Poco::StringTokenizer(UInfo.signingUp,":"); - if(AuthService::SendEmailToSubUser(i.id, UInfo.email, MessagingTemplates::SIGNUP_VERIFICATION, Signup.count()==1 ? "" : Signup[0])) { + if(AuthService::SendEmailToSubUser(i.id, UInfo.email, MessagingTemplates::SUB_SIGNUP_VERIFICATION, Signup.count()==1 ? "" : Signup[0])) { poco_information(Logger(),fmt::format("Send new subscriber email verification link to {}",UInfo.email)); } StorageService()->ActionLinksDB().SentAction(i.id); diff --git a/src/AuthService.cpp b/src/AuthService.cpp index 3d64683..035b740 100644 --- a/src/AuthService.cpp +++ b/src/AuthService.cpp @@ -689,14 +689,14 @@ namespace OpenWifi { } break; - case MessagingTemplates::SIGNUP_VERIFICATION: { + case MessagingTemplates::SUB_SIGNUP_VERIFICATION: { MessageAttributes Attrs; Attrs[RECIPIENT_EMAIL] = UInfo.email; Attrs[LOGO] = GetSubLogoAssetURI(); Attrs[SUBJECT] = "Signup e-mail Address Verification"; Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=signup_verification&id=" + LinkId ; Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=signup_verification&id=" + LinkId ; - SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::SIGNUP_VERIFICATION, OperatorName), Attrs, true); + SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::SUB_SIGNUP_VERIFICATION, OperatorName), Attrs, true); UInfo.waitingForEmailCheck = true; } break; diff --git a/src/MessagingTemplates.h b/src/MessagingTemplates.h index df0a892..fd06c75 100644 --- a/src/MessagingTemplates.h +++ b/src/MessagingTemplates.h @@ -19,7 +19,7 @@ namespace OpenWifi { enum EMAIL_REASON { FORGOT_PASSWORD = 0, EMAIL_VERIFICATION, - SIGNUP_VERIFICATION, + SUB_SIGNUP_VERIFICATION, EMAIL_INVITATION, VERIFICATION_CODE, SUB_FORGOT_PASSWORD, @@ -37,7 +37,7 @@ namespace OpenWifi { switch (r) { case FORGOT_PASSWORD: return AddOperator(EmailTemplateNames[FORGOT_PASSWORD],OperatorName); case EMAIL_VERIFICATION: return AddOperator(EmailTemplateNames[EMAIL_VERIFICATION],OperatorName); - case SIGNUP_VERIFICATION: return AddOperator(EmailTemplateNames[SIGNUP_VERIFICATION],OperatorName); + case SUB_SIGNUP_VERIFICATION: return AddOperator(EmailTemplateNames[SUB_SIGNUP_VERIFICATION],OperatorName); case EMAIL_INVITATION: return AddOperator(EmailTemplateNames[EMAIL_INVITATION],OperatorName); case VERIFICATION_CODE: return AddOperator(EmailTemplateNames[VERIFICATION_CODE],OperatorName); case SUB_FORGOT_PASSWORD: return AddOperator(EmailTemplateNames[SUB_FORGOT_PASSWORD],OperatorName); @@ -60,7 +60,7 @@ namespace OpenWifi { inline const static std::vector EmailTemplateNames = { "password_reset", "email_verification", - "signup_verification", + "sub_signup_verification", "email_invitation", "verification_code", "sub_password_reset", diff --git a/src/RESTAPI/RESTAPI_action_links.cpp b/src/RESTAPI/RESTAPI_action_links.cpp index 12d562f..0ceacac 100644 --- a/src/RESTAPI/RESTAPI_action_links.cpp +++ b/src/RESTAPI/RESTAPI_action_links.cpp @@ -62,7 +62,7 @@ namespace OpenWifi { void RESTAPI_action_links::DoNewSubVerification(SecurityObjects::ActionLink &Link) { Logger_.information(fmt::format("REQUEST-SUB-SIGNUP({}): For ID={}", Request->clientAddress().toString(), Link.userId)); - Poco::File FormFile{ Daemon()->AssetDir() + "/signup_verification.html"}; + Poco::File FormFile{ Daemon()->AssetDir() + "/sub_signup_verification.html"}; Types::StringPairVec FormVars{ {"UUID", Link.id}, {"PASSWORD_VALIDATION", AuthService()->PasswordValidationExpression()}}; SendHTMLFileBack(FormFile,FormVars); @@ -161,7 +161,7 @@ namespace OpenWifi { } if(Password1!=Password2 || !AuthService()->ValidateSubPassword(Password1)) { - Poco::File FormFile{ Daemon()->AssetDir() + "/password_reset_error.html"}; + Poco::File FormFile{ Daemon()->AssetDir() + "/sub_password_reset_error.html"}; Types::StringPairVec FormVars{ {"UUID", Id}, {"ERROR_TEXT", "For some reason, the passwords entered do not match or they do not comply with" " accepted password creation restrictions. Please consult our on-line help" @@ -173,14 +173,14 @@ namespace OpenWifi { SecurityObjects::UserInfo UInfo; bool Found = StorageService()->SubDB().GetUserById(Link.userId,UInfo); if(!Found) { - Poco::File FormFile{ Daemon()->AssetDir() + "/signup_verification_error.html"}; + Poco::File FormFile{ Daemon()->AssetDir() + "/sub_signup_verification_error.html"}; Types::StringPairVec FormVars{ {"UUID", Id}, {"ERROR_TEXT", "This request does not contain a valid user ID. Please contact your system administrator."}}; return SendHTMLFileBack(FormFile,FormVars); } if(UInfo.blackListed || UInfo.suspended) { - Poco::File FormFile{ Daemon()->AssetDir() + "/signup_verification_error.html"}; + Poco::File FormFile{ Daemon()->AssetDir() + "/sub_signup_verification_error.html"}; Types::StringPairVec FormVars{ {"UUID", Id}, {"ERROR_TEXT", "Please contact our system administrators. We have identified an error in your account that must be resolved first."}}; return SendHTMLFileBack(FormFile,FormVars); @@ -188,7 +188,7 @@ namespace OpenWifi { bool GoodPassword = AuthService()->SetSubPassword(Password1,UInfo); if(!GoodPassword) { - Poco::File FormFile{ Daemon()->AssetDir() + "/signup_verification_error.html"}; + Poco::File FormFile{ Daemon()->AssetDir() + "/sub_signup_verification_error.html"}; Types::StringPairVec FormVars{ {"UUID", Id}, {"ERROR_TEXT", "You cannot reuse one of your recent passwords."}}; return SendHTMLFileBack(FormFile,FormVars); @@ -202,7 +202,7 @@ namespace OpenWifi { StorageService()->SubDB().UpdateUserInfo(UInfo.email,Link.userId,UInfo); - Poco::File FormFile{ Daemon()->AssetDir() + "/signup_verification_success.html"}; + Poco::File FormFile{ Daemon()->AssetDir() + "/sub_signup_verification_success.html"}; Types::StringPairVec FormVars{ {"UUID", Id}, {"USERNAME", UInfo.email} }; StorageService()->ActionLinksDB().CompleteAction(Id); diff --git a/wwwassets/404_error.css b/wwwassets/404_error.css index 45b7cca..2b73a37 100644 --- a/wwwassets/404_error.css +++ b/wwwassets/404_error.css @@ -1,294 +1,308 @@ @import url(https://fonts.googleapis.com/css?family=Ubuntu); -html, -body { - background: #28254c; - font-family: "Ubuntu"; +html, body { + font-family: "Ubuntu"; } * { - box-sizing: border-box; + box-sizing: border-box; } + .box { - width: 350px; - height: 100%; - max-height: 600px; - min-height: 450px; - background: #332f63; - border-radius: 20px; - position: absolute; - left: 50%; - top: 50%; - transform: translate(-50%, -50%); - padding: 30px 50px; + width: 350px; + height: 100%; + max-height: 600px; + min-height: 450px; + background: #332F63; + border-radius: 20px; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + padding: 30px 50px; } .box .box__ghost { - padding: 15px 25px 25px; - position: absolute; - left: 50%; - top: 30%; - transform: translate(-50%, -30%); + padding: 15px 25px 25px; + position: absolute; + left: 50%; + top: 20%; + transform: translate(-50%, -30%); +} + +.logo-box { + width: 100%; + text-align: center; + display: flex; + justify-content: center; +} +.logo-img { + width: 100%; + height: 100%; + max-height: 120px; + margin-left:15px; + margin-top: 10px; + object-fit: contain; } .box .box__ghost .symbol:nth-child(1) { - opacity: 0.2; - animation: shine 4s ease-in-out 3s infinite; + opacity: 0.2; + animation: shine 4s ease-in-out 3s infinite; } .box .box__ghost .symbol:nth-child(1):before, .box .box__ghost .symbol:nth-child(1):after { - content: ""; - width: 12px; - height: 4px; - background: #fff; - position: absolute; - border-radius: 5px; - bottom: 65px; - left: 0; + content: ""; + width: 12px; + height: 4px; + background: #fff; + position: absolute; + border-radius: 5px; + bottom: 65px; + left: 0; } .box .box__ghost .symbol:nth-child(1):before { - transform: rotate(45deg); + transform: rotate(45deg); } .box .box__ghost .symbol:nth-child(1):after { - transform: rotate(-45deg); + transform: rotate(-45deg); } .box .box__ghost .symbol:nth-child(2) { - position: absolute; - left: -5px; - top: 30px; - height: 18px; - width: 18px; - border: 4px solid; - border-radius: 50%; - border-color: #fff; - opacity: 0.2; - animation: shine 4s ease-in-out 1.3s infinite; + position: absolute; + left: -5px; + top: 30px; + height: 18px; + width: 18px; + border: 4px solid; + border-radius: 50%; + border-color: #fff; + opacity: 0.2; + animation: shine 4s ease-in-out 1.3s infinite; } .box .box__ghost .symbol:nth-child(3) { - opacity: 0.2; - animation: shine 3s ease-in-out 0.5s infinite; + opacity: 0.2; + animation: shine 3s ease-in-out 0.5s infinite; } .box .box__ghost .symbol:nth-child(3):before, .box .box__ghost .symbol:nth-child(3):after { - content: ""; - width: 12px; - height: 4px; - background: #fff; - position: absolute; - border-radius: 5px; - top: 5px; - left: 40px; + content: ""; + width: 12px; + height: 4px; + background: #fff; + position: absolute; + border-radius: 5px; + top: 5px; + left: 40px; } .box .box__ghost .symbol:nth-child(3):before { - transform: rotate(90deg); + transform: rotate(90deg); } .box .box__ghost .symbol:nth-child(3):after { - transform: rotate(180deg); + transform: rotate(180deg); } .box .box__ghost .symbol:nth-child(4) { - opacity: 0.2; - animation: shine 6s ease-in-out 1.6s infinite; + opacity: 0.2; + animation: shine 6s ease-in-out 1.6s infinite; } .box .box__ghost .symbol:nth-child(4):before, .box .box__ghost .symbol:nth-child(4):after { - content: ""; - width: 15px; - height: 4px; - background: #fff; - position: absolute; - border-radius: 5px; - top: 10px; - right: 30px; + content: ""; + width: 15px; + height: 4px; + background: #fff; + position: absolute; + border-radius: 5px; + top: 10px; + right: 30px; } .box .box__ghost .symbol:nth-child(4):before { - transform: rotate(45deg); + transform: rotate(45deg); } .box .box__ghost .symbol:nth-child(4):after { - transform: rotate(-45deg); + transform: rotate(-45deg); } .box .box__ghost .symbol:nth-child(5) { - position: absolute; - right: 5px; - top: 40px; - height: 12px; - width: 12px; - border: 3px solid; - border-radius: 50%; - border-color: #fff; - opacity: 0.2; - animation: shine 1.7s ease-in-out 7s infinite; + position: absolute; + right: 5px; + top: 40px; + height: 12px; + width: 12px; + border: 3px solid; + border-radius: 50%; + border-color: #fff; + opacity: 0.2; + animation: shine 1.7s ease-in-out 7s infinite; } .box .box__ghost .symbol:nth-child(6) { - opacity: 0.2; - animation: shine 2s ease-in-out 6s infinite; + opacity: 0.2; + animation: shine 2s ease-in-out 6s infinite; } .box .box__ghost .symbol:nth-child(6):before, .box .box__ghost .symbol:nth-child(6):after { - content: ""; - width: 15px; - height: 4px; - background: #fff; - position: absolute; - border-radius: 5px; - bottom: 65px; - right: -5px; + content: ""; + width: 15px; + height: 4px; + background: #fff; + position: absolute; + border-radius: 5px; + bottom: 65px; + right: -5px; } .box .box__ghost .symbol:nth-child(6):before { - transform: rotate(90deg); + transform: rotate(90deg); } .box .box__ghost .symbol:nth-child(6):after { - transform: rotate(180deg); + transform: rotate(180deg); } .box .box__ghost .box__ghost-container { - background: #fff; - width: 100px; - height: 100px; - border-radius: 100px 100px 0 0; - position: relative; - margin: 0 auto; - animation: upndown 3s ease-in-out infinite; + background: #fff; + width: 100px; + height: 100px; + border-radius: 100px 100px 0 0; + position: relative; + margin: 0 auto; + animation: upndown 3s ease-in-out infinite; } .box .box__ghost .box__ghost-container .box__ghost-eyes { - position: absolute; - left: 50%; - top: 45%; - height: 12px; - width: 70px; + position: absolute; + left: 50%; + top: 45%; + height: 12px; + width: 70px; } .box .box__ghost .box__ghost-container .box__ghost-eyes .box__eye-left { - width: 12px; - height: 12px; - background: #332f63; - border-radius: 50%; - margin: 0 10px; - position: absolute; - left: 0; + width: 12px; + height: 12px; + background: #332F63; + border-radius: 50%; + margin: 0 10px; + position: absolute; + left: 0; } .box .box__ghost .box__ghost-container .box__ghost-eyes .box__eye-right { - width: 12px; - height: 12px; - background: #332f63; - border-radius: 50%; - margin: 0 10px; - position: absolute; - right: 0; + width: 12px; + height: 12px; + background: #332F63; + border-radius: 50%; + margin: 0 10px; + position: absolute; + right: 0; } .box .box__ghost .box__ghost-container .box__ghost-bottom { - display: flex; - position: absolute; - top: 100%; - left: 0; - right: 0; + display: flex; + position: absolute; + top: 100%; + left: 0; + right: 0; } .box .box__ghost .box__ghost-container .box__ghost-bottom div { - flex-grow: 1; - position: relative; - top: -10px; - height: 20px; - border-radius: 100%; - background-color: #fff; + flex-grow: 1; + position: relative; + top: -10px; + height: 20px; + border-radius: 100%; + background-color: #fff; } .box .box__ghost .box__ghost-container .box__ghost-bottom div:nth-child(2n) { - top: -12px; - margin: 0 0px; - border-top: 15px solid #332f63; - background: transparent; + top: -12px; + margin: 0 0px; + border-top: 15px solid #332F63; + background: transparent; } .box .box__ghost .box__ghost-shadow { - height: 20px; - box-shadow: 0 50px 15px 5px #3b3769; - border-radius: 50%; - margin: 0 auto; - animation: smallnbig 3s ease-in-out infinite; + height: 20px; + box-shadow: 0 50px 15px 5px #3B3769; + border-radius: 50%; + margin: 0 auto; + animation: smallnbig 3s ease-in-out infinite; } .box .box__description { - position: absolute; - bottom: 30px; - left: 50%; - transform: translateX(-50%); + position: absolute; + bottom: 30px; + left: 50%; + transform: translateX(-50%); } .box .box__description .box__description-container { - color: #fff; - text-align: center; - width: 200px; - font-size: 16px; - margin: 0 auto; + color: #fff; + text-align: left; + width: 200px; + font-size: 16px; + margin: 0 auto; } .box .box__description .box__description-container .box__description-title { - font-size: 24px; - letter-spacing: 0.5px; + font-size: 24px; + letter-spacing: 0.5px; } .box .box__description .box__description-container .box__description-text { - color: #8c8aa7; - line-height: 20px; - margin-top: 20px; + color: #8C8AA7; + line-height: 20px; + margin-top: 20px; } .box .box__description .box__button { - display: block; - position: relative; - background: #ff5e65; - border: 1px solid transparent; - border-radius: 50px; - height: 50px; - text-align: center; - text-decoration: none; - color: #fff; - line-height: 50px; - font-size: 18px; - padding: 0 70px; - white-space: nowrap; - margin-top: 25px; - transition: background 0.5s ease; - overflow: hidden; - -webkit-mask-image: -webkit-radial-gradient(white, black); + display: block; + position: relative; + background: #FF5E65; + border: 1px solid transparent; + border-radius: 50px; + height: 50px; + text-align: center; + text-decoration: none; + color: #fff; + line-height: 50px; + font-size: 18px; + padding: 0 70px; + white-space: nowrap; + margin-top: 25px; + transition: background 0.5s ease; + overflow: hidden; + -webkit-mask-image: -webkit-radial-gradient(white, black); } .box .box__description .box__button:before { - content: ""; - position: absolute; - width: 20px; - height: 100px; - background: #fff; - bottom: -25px; - left: 0; - border: 2px solid #fff; - transform: translateX(-50px) rotate(45deg); - transition: transform 0.5s ease; + content: ""; + position: absolute; + width: 20px; + height: 100px; + background: #fff; + bottom: -25px; + left: 0; + border: 2px solid #fff; + transform: translateX(-50px) rotate(45deg); + transition: transform 0.5s ease; } .box .box__description .box__button:hover { - background: transparent; - border-color: #fff; + background: transparent; + border-color: #fff; } .box .box__description .box__button:hover:before { - transform: translateX(250px) rotate(45deg); + transform: translateX(250px) rotate(45deg); } @keyframes upndown { - 0% { - transform: translateY(5px); - } - 50% { - transform: translateY(15px); - } - 100% { - transform: translateY(5px); - } + 0% { + transform: translateY(5px); + } + 50% { + transform: translateY(15px); + } + 100% { + transform: translateY(5px); + } } @keyframes smallnbig { - 0% { - width: 90px; - } - 50% { - width: 100px; - } - 100% { - width: 90px; - } + 0% { + width: 90px; + } + 50% { + width: 100px; + } + 100% { + width: 90px; + } } @keyframes shine { - 0% { - opacity: 0.2; - } - 25% { - opacity: 0.1; - } - 50% { - opacity: 0.2; - } - 100% { - opacity: 0.2; - } + 0% { + opacity: 0.2; + } + 25% { + opacity: 0.1; + } + 50% { + opacity: 0.2; + } + 100% { + opacity: 0.2; + } } \ No newline at end of file diff --git a/wwwassets/404_error.html b/wwwassets/404_error.html index cfd59a0..32fa22c 100644 --- a/wwwassets/404_error.html +++ b/wwwassets/404_error.html @@ -1,70 +1,64 @@ - + - - Whoops... - + + Whoops! + + +
Arilia
+
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
- -
-
-
Whoops!
-
You know computers sometimes go crazy... So we'll just assume one of them got - fed up and refused to help you... - If you get this again, we need to know. We need to let that thing know who's the boss... -
-
- +
+
+ +
+
+
Whoops!
+
You know computers sometimes go crazy...
+
So we'll just assume one of them got + fed up and refused to help you...
+
If you get this again, we need to know. We need to let that thing know who's the boss...
- -
- - + - \ No newline at end of file + diff --git a/wwwassets/access_policy.html b/wwwassets/access_policy.html index 043eb51..3b33204 100644 --- a/wwwassets/access_policy.html +++ b/wwwassets/access_policy.html @@ -1,102 +1,15 @@ + Access Policy - +
-
OpenWifi
+
Arilia
@@ -105,8 +18,15 @@
  • Must be a TIP Member.
+ + + diff --git a/wwwassets/common.css b/wwwassets/common.css new file mode 100644 index 0000000..356e806 --- /dev/null +++ b/wwwassets/common.css @@ -0,0 +1,171 @@ +body {font-family: Arial, Helvetica, sans-serif;} + +input[type=text], input[type=password] { + width: 100%; + padding: 12px 20px; + margin: 8px 0; + display: inline-block; + border: 1px solid #ccc; + box-sizing: border-box; +} + +button { + background-color: #04AA6D; + color: white; + padding: 14px 20px; + margin: 8px 0; + border: none; + cursor: pointer; + width: 100%; +} + +button:hover { + opacity: 0.8; +} + +.logo-grid { + display: grid; + grid-template-columns: 20% 60% 20%; + margin-top: calc(10vh) +} + +.logo-grid > div > img { + width: 100%; + height: 100%; + max-height: 200px; + object-fit: contain; +} + + +.info-card { + padding: 30px; + box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); + display: block; + width: 50%; + min-width: 400px; + border: 1em; + background-color: white; + width: 40%; + height: auto; + margin-left: auto; + margin-right: auto; + margin-bottom: auto; + margin-top: 50px; + position: relative; + border-radius: 15px; +} + +.info-list { + margin-left: 5%; +} + +.info-title { + margin-left: 5%; + color: #63B3ED; +} + +.flex-box { + display: flex; + flex-direction: row; + justify-content: left; + align-items: center; + margin-left: 5%; + margin-top: 6px; + margin-bottom: 6px; + min-height: 30px +} + +.flex-box > h3 { + margin-right: 4px; + margin-top: 5px; + margin-bottom: 5px; +} + +.container { + padding: 16px; +} + +span.password1 { + float: right; + padding-top: 16px; +} + +body { + background-color: #ebedef; +} + +/* Change styles for span and cancel button on extra small screens */ +@media screen and (max-width: 300px) { + span.password1 { + display: block; + float: none; + } + .cancelbtn { + width: 100%; + } +} + +.form-container { + border: 0px; + margin-left: 5%; +} + +.form-label { + float: left; +} + +.form-input { + border-radius: 15px; +} + +.form-control { + margin-bottom: 6px; +} + +.form-submit-btn { + display: inline-flex; + appearance: none; + -webkit-box-align: center; + align-items: center; + -webkit-box-pack: center; + justify-content: center; + -webkit-user-select: none; + position: relative; + white-space: nowrap; + vertical-align: middle; + outline-color: transparent; + outline-style: solid; + outline-width: 2px; + outline-offset: 2px; + line-height: 1.2; + border-top-left-radius: 15px; + border-top-right-radius: 15px; + border-bottom-right-radius: 15px; + border-bottom-left-radius: 15px; + height: 45px; + background-color:#4299E1; + font-size: 15px; + padding-inline-start: 16px; + padding-inline-end: 16px; + width: 100%; + margin-bottom: 20px; + color: white; + margin-top: 20px; +} + +.footer{ + display: flex; + flex-direction: row; + justify-content: left; + align-items: center; + margin-left: 5%; +} + +hr.rounded { + margin-top: 40px; + margin-bottom: 0px; + margin-left: 5%; + margin-right: 5%; + border-top: 1px solid #bbb; + border-radius: 5px; +} \ No newline at end of file diff --git a/wwwassets/email_verification_error.html b/wwwassets/email_verification_error.html index 229d301..0fc553c 100644 --- a/wwwassets/email_verification_error.html +++ b/wwwassets/email_verification_error.html @@ -1,121 +1,38 @@ - - email Verification Error - - + Email Verification Error + +
-
OpenWifi
+
Arilia
-

Password reset failed...

-
-

ID

- ${UUID} -
-
-

Error

- ${ERROR_TEXT} +
+

Email Verification Failed...

+
+

ID:

+ ${UUID} +
+
+

Error:

+ ${ERROR_TEXT} +
+ + + + - \ No newline at end of file + diff --git a/wwwassets/email_verification_success.html b/wwwassets/email_verification_success.html index 790db57..6468858 100644 --- a/wwwassets/email_verification_success.html +++ b/wwwassets/email_verification_success.html @@ -1,119 +1,36 @@ - - email was successfully validated - - + Email Validated! + +
-
-
OpenWifi
-
+
+
Arilia
+
-

email was successfully validated

-
-

ID

- ${UUID} -
-
-

Thank you ${USERNAME} for validating your email.

+
+

Email verification completed!

+
+

ID:

+ ${UUID} +
+
+

Thank you ${USERNAME} for completing email verification!

+
+ + + + - \ No newline at end of file + diff --git a/wwwassets/footer.html b/wwwassets/footer.html new file mode 100644 index 0000000..eb8fc05 --- /dev/null +++ b/wwwassets/footer.html @@ -0,0 +1,11 @@ +
+ \ No newline at end of file diff --git a/wwwassets/password_policy.html b/wwwassets/password_policy.html index 0a66e39..8d2374a 100644 --- a/wwwassets/password_policy.html +++ b/wwwassets/password_policy.html @@ -1,113 +1,20 @@ + Password Policy - + - +
-
OpenWifi
+
Arilia
-
-

Password rules

+

Password Policy

  • Must be at least 8 characters long
  • Must contain 1 uppercase letter
  • @@ -115,9 +22,16 @@
  • Must contain 1 digit
  • Must contain 1 special character
+ + + diff --git a/wwwassets/password_reset.html b/wwwassets/password_reset.html index e237b7f..9265a71 100644 --- a/wwwassets/password_reset.html +++ b/wwwassets/password_reset.html @@ -1,168 +1,62 @@ + Reset Password - + -
-
OpenWifi
+
Arilia
-
- -
-

Reset Password

-
- - -
-
- - -
-
- -
- -
-
    -
  • Must be at least 8 characters long
  • -
  • Must contain 1 uppercase letter
  • -
  • Must contain 1 lowercase letter
  • -
  • Must contain 1 digit
  • -
  • Must contain 1 special character
  • -
-
+
+

Reset Password

+ +
+ + +
+
+ + +
+
+ +
+ +
    +
  • Must be at least 8 characters long
  • +
  • Must contain 1 uppercase letter
  • +
  • Must contain 1 lowercase letter
  • +
  • Must contain 1 digit
  • +
  • Must contain 1 special character
  • +
+ - + + - \ No newline at end of file + diff --git a/wwwassets/password_reset_error.html b/wwwassets/password_reset_error.html index 12b0ddb..1fe6bb2 100644 --- a/wwwassets/password_reset_error.html +++ b/wwwassets/password_reset_error.html @@ -1,121 +1,38 @@ + Reset Password Error - + - +
-
OpenWifi
+
Arilia
-

Reset Password Failed

-
-

ID

+

Reset Password Failed...

+
+

ID:

${UUID}
-
-

Error

+
+

Error:

${ERROR_TEXT}
+ + + + diff --git a/wwwassets/password_reset_success.html b/wwwassets/password_reset_success.html index f3f2e42..c640b58 100644 --- a/wwwassets/password_reset_success.html +++ b/wwwassets/password_reset_success.html @@ -1,85 +1,36 @@ + Reset Password Success - + - -
-
-
OpenWifi
-
-
-

Password was successfully reset

-
-

Thank you ${USERNAME} for resetting your password.

+
+
+
Arilia
+
+
+ +
+

Password was successfully reset!

+
+

Thank you ${USERNAME} for resetting your password

-
- Click here to access the system. + + + + + + - \ No newline at end of file + diff --git a/wwwassets/signup_verification.html b/wwwassets/signup_verification.html deleted file mode 100644 index 94d93b6..0000000 --- a/wwwassets/signup_verification.html +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - -
-
-
OpenWifi
-
-
- -
- -
-

Signup Completion

-
- - -
-
- - -
-
- -
- -
-
    -
  • Must be at least 8 characters long
  • -
  • Must contain 1 uppercase letter
  • -
  • Must contain 1 lowercase letter
  • -
  • Must contain 1 digit
  • -
  • Must contain 1 special character
  • -
-
-
-
- - - - \ No newline at end of file diff --git a/wwwassets/signup_verification_error.html b/wwwassets/signup_verification_error.html deleted file mode 100644 index 8992f46..0000000 --- a/wwwassets/signup_verification_error.html +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - -
-
-
OpenWifi
-
-
- - -
-

Signup completion failed

-
-

ID

- ${UUID} -
-
-

Error

- ${ERROR_TEXT} -
-
- - - diff --git a/wwwassets/signup_verification_success.html b/wwwassets/signup_verification_success.html deleted file mode 100644 index 011d226..0000000 --- a/wwwassets/signup_verification_success.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - -
-
-
OpenWifi
-
-
- -

Signup was successfully done

-
-

Thank you ${USERNAME} for signing up for service.

-
-
- You can access your account using the mobile app. -
- - \ No newline at end of file diff --git a/wwwassets/sub_404_error.html b/wwwassets/sub_404_error.html index e69de29..931b49d 100644 --- a/wwwassets/sub_404_error.html +++ b/wwwassets/sub_404_error.html @@ -0,0 +1,62 @@ + + + + + Whoops! + + + +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
Whoops!
+
You know computers sometimes go crazy...
+
So we'll just assume one of them got + fed up and refused to help you...
+
If you get this again, we need to know. We need to let that thing know who's the boss...
+
Arilia
+
+
+ +
+ + + + diff --git a/wwwassets/sub_access_policy.html b/wwwassets/sub_access_policy.html index e69de29..7a06665 100644 --- a/wwwassets/sub_access_policy.html +++ b/wwwassets/sub_access_policy.html @@ -0,0 +1,33 @@ + + + + Access Policy + + + + + +
+
+
Arilia
+
+
+ +
+

Site Access rules

+
    +
  • Must be a TIP Member.
  • +
+ + + + + + + diff --git a/wwwassets/sub_email_verification_error.html b/wwwassets/sub_email_verification_error.html index e69de29..fb83a82 100644 --- a/wwwassets/sub_email_verification_error.html +++ b/wwwassets/sub_email_verification_error.html @@ -0,0 +1,38 @@ + + + + Email Verification Error + + + + + +
+
+
Arilia
+
+
+ +
+

Email Verification Failed...

+
+

ID:

+ ${UUID} +
+
+

Error:

+ ${ERROR_TEXT} +
+ + + + + + + diff --git a/wwwassets/sub_email_verification_success.html b/wwwassets/sub_email_verification_success.html index e69de29..16775cc 100644 --- a/wwwassets/sub_email_verification_success.html +++ b/wwwassets/sub_email_verification_success.html @@ -0,0 +1,37 @@ + + + + Email Validated! + + + + + +
+
+
Arilia
+
+
+ +
+

Email verification completed!

+
+

ID:

+ ${UUID} +
+
+

Thank you ${USERNAME} for completing email verification!

+
+ + + + + + + diff --git a/wwwassets/sub_footer.html b/wwwassets/sub_footer.html new file mode 100644 index 0000000..eb8fc05 --- /dev/null +++ b/wwwassets/sub_footer.html @@ -0,0 +1,11 @@ +
+ \ No newline at end of file diff --git a/wwwassets/sub_password_policy.html b/wwwassets/sub_password_policy.html index e69de29..d3f1444 100644 --- a/wwwassets/sub_password_policy.html +++ b/wwwassets/sub_password_policy.html @@ -0,0 +1,37 @@ + + + + Password Policy + + + + + +
+
+
Arilia
+
+
+ +
+

Password Policy

+
    +
  • Must be at least 8 characters long
  • +
  • Must contain 1 uppercase letter
  • +
  • Must contain 1 lowercase letter
  • +
  • Must contain 1 digit
  • +
  • Must contain 1 special character
  • +
+ + + + + + + diff --git a/wwwassets/sub_password_reset.html b/wwwassets/sub_password_reset.html index e69de29..4760889 100644 --- a/wwwassets/sub_password_reset.html +++ b/wwwassets/sub_password_reset.html @@ -0,0 +1,62 @@ + + + + Reset Password + + + + + +
+
+
Arilia
+
+
+ +
+

Reset Password

+
+
+ + +
+
+ + +
+
+ +
+
+
    +
  • Must be at least 8 characters long
  • +
  • Must contain 1 uppercase letter
  • +
  • Must contain 1 lowercase letter
  • +
  • Must contain 1 digit
  • +
  • Must contain 1 special character
  • +
+ + + + + + + diff --git a/wwwassets/sub_password_reset_error.html b/wwwassets/sub_password_reset_error.html index e69de29..20eab41 100644 --- a/wwwassets/sub_password_reset_error.html +++ b/wwwassets/sub_password_reset_error.html @@ -0,0 +1,38 @@ + + + + Reset Password Error + + + + + +
+
+
Arilia
+
+
+ +
+

Reset Password Failed...

+
+

ID:

+ ${UUID} +
+
+

Error:

+ ${ERROR_TEXT} +
+ + + + + + + diff --git a/wwwassets/sub_password_reset_success.html b/wwwassets/sub_password_reset_success.html index e69de29..55c42d0 100644 --- a/wwwassets/sub_password_reset_success.html +++ b/wwwassets/sub_password_reset_success.html @@ -0,0 +1,36 @@ + + + + Reset Password Success + + + + + +
+
+
Arilia
+
+
+ +
+

Password was successfully reset!

+
+

Thank you ${USERNAME} for resetting your password

+
+ + + + + + + + diff --git a/wwwassets/sub_signup_verification.html b/wwwassets/sub_signup_verification.html new file mode 100644 index 0000000..b300881 --- /dev/null +++ b/wwwassets/sub_signup_verification.html @@ -0,0 +1,62 @@ + + + + Signup Completion + + + + + +
+
+
Arilia
+
+
+ +
+

Signup Completion

+
+
+ + +
+
+ + +
+
+ +
+
+
    +
  • Must be at least 8 characters long
  • +
  • Must contain 1 uppercase letter
  • +
  • Must contain 1 lowercase letter
  • +
  • Must contain 1 digit
  • +
  • Must contain 1 special character
  • +
+ + + + + + + diff --git a/wwwassets/sub_signup_verification_error.html b/wwwassets/sub_signup_verification_error.html new file mode 100644 index 0000000..b100afc --- /dev/null +++ b/wwwassets/sub_signup_verification_error.html @@ -0,0 +1,38 @@ + + + + Signup Completion Error + + + + + +
+
+
Arilia
+
+
+ +
+

Signup Completion Failed...

+
+

ID:

+ ${UUID} +
+
+

Error:

+ ${ERROR_TEXT} +
+ + + + + + + diff --git a/wwwassets/sub_signup_verification_success.html b/wwwassets/sub_signup_verification_success.html new file mode 100644 index 0000000..21e5e11 --- /dev/null +++ b/wwwassets/sub_signup_verification_success.html @@ -0,0 +1,36 @@ + + + + Signup Completed! + + + + + +
+
+
Arilia
+
+
+ +
+

Signup process completed

+
+ Thank you ${USERNAME} for signing up for service! +
+
+ You can now access your account using the mobile app +
+ + + + + + +