Fixed conflict

weni-ai · Feb 2, 2021 · f936c6e · f936c6e
2 parents 293791e + f2631a9
commit f936c6e
Show file tree

Hide file tree

Showing 25 changed files with 494 additions and 2 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     - "8080:8080"
     volumes:
       - ./themes/ilhasoft/:/opt/jboss/keycloak/themes/ilhasoft/
-      # - ./standalone.xml:/opt/jboss/keycloak/standalone/configuration/standalone.xml
+    #   - ./standalone.xml:/opt/jboss/keycloak/standalone/configuration/standalone.xml
     environment:
       KEYCLOAK_USER: "admin"
       KEYCLOAK_PASSWORD: "admin"
diff --git a/themes/ilhasoft/account/resources/img/favicon.ico b/themes/ilhasoft/account/resources/img/favicon.ico
diff --git a/themes/ilhasoft/email/html/email-test.ftl b/themes/ilhasoft/email/html/email-test.ftl
@@ -0,0 +1,40 @@
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+  <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
+</head>
+
+<body>
+    <div>
+        <div style="width: 670px; min-height: 724px;">
+          <header style="width: 670px; height: 52px; border-bottom: 1px solid #E2E6ED;"> 
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo.png" alt="Weni-Logo" style="margin-left: 24px; margin-top: 10px;"/>
+          </header>
+          <section style="width: 574px; min-height: 280px; margin: 50px auto;">
+            <div style="font-family: Lato; font-weight: bold; font-size: 20px; line-height: 28px; color: #262626; margin-top: 24px;">
+           ${msg("emailTestBodyHtml",realmName)?no_esc}
+            </div>
+          </section>
+
+          <footer style="width: 670px;height: 150px; border-top: 1px solid #E2E6ED; border-bottom: 8px solid #262626;margin: auto; text-align: center;">
+
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo-small.png" alt="Weni-Logo" style="margin: 15px 0;"/>
+
+
+            <div style="width: 450px; font-size: 12px;line-height: 20px;margin: auto;">
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Visite o nosso site</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Facebook</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Instagram</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Twitter</a>
+            </div>
+
+          ${msg("emailCopyright")?no_esc}
+
+          ${msg("emailFooterText")?no_esc}
+        </footer>
+            </div>
+        </div>
+</body>
+</html>
diff --git a/themes/ilhasoft/email/html/email-verification.ftl b/themes/ilhasoft/email/html/email-verification.ftl
@@ -0,0 +1,49 @@
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+  <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
+</head>
+
+<body>
+    <div>
+        <div style="width: 670px; min-height: 724px;">
+          <header style="width: 670px; height: 52px; border-bottom: 1px solid #E2E6ED;"> 
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo.png" alt="Weni-Logo" style="margin-left: 24px; margin-top: 10px;"/>
+          </header>
+          <section style="width: 574px; min-height: 280px; margin: 50px auto;">
+            <div style="font-family: Lato; font-style: normal; font-weight: normal; font-size: 20px; line-height: 24px; color: #808080;"> ${msg("emailVerificationWelcome",user.firstName)?no_esc}</div>
+
+            <div style="font-family: Lato; font-weight: bold; font-size: 20px; line-height: 28px; color: #262626; margin-top: 24px;">
+              ${msg("emailVerificationConfirmation")?no_esc}
+            </div>
+
+            ${msg("emailVerificationText", linkExpiration)?no_esc}
+
+            <div style="cursor:pointer; margin: auto; width: 400px; text-align: center;background: #3B414D;color: #FFFFFF;font-size: 16px;
+            font-family: Lato;margin-top:50px;border-radius: 4px; padding: 1px 0;">
+              ${msg("emailVerificationConfirmationButton", link)?no_esc}
+            </div>
+          </section>
+
+          <footer style="width: 670px;height: 150px; border-top: 1px solid #E2E6ED; border-bottom: 8px solid #262626;margin: auto; text-align: center;">
+
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo-small.png" alt="Weni-Logo" style="margin: 15px 0;"/>
+
+
+            <div style="width: 450px; font-size: 12px;line-height: 20px;margin: auto;">
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">${msg("emailAccessOurSite")?no_esc}</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Facebook</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Instagram</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Twitter</a>
+            </div>
+
+          ${msg("emailCopyright")?no_esc}
+
+          ${msg("emailFooterText")?no_esc}
+        </footer>
+            </div>
+        </div>
+</body>
+</html>
diff --git a/themes/ilhasoft/email/html/event-login_error.ftl b/themes/ilhasoft/email/html/event-login_error.ftl
@@ -0,0 +1,41 @@
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+  <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
+</head>
+
+<body>
+    <div>
+        <div style="width: 670px; min-height: 724px;">
+          <header style="width: 670px; height: 52px; border-bottom: 1px solid #E2E6ED;"> 
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo.png" alt="Weni-Logo" style="margin-left: 24px; margin-top: 10px;"/>
+          </header>
+          <section style="width: 574px; min-height: 280px; margin: 50px auto;">
+            <div style="font-family: Lato; font-style: normal; font-weight: normal; font-size: 20px; line-height: 24px; color: #808080;"> Hi, <span style="font-family: Lato;color: #262626; font-size: 20px; font-weight: bold; font-style: normal;">${user.firstName}!</span></div>
+
+            <div style="font-family: Lato; font-weight: bold; font-size: 20px; line-height: 28px; color: #262626; margin-top: 24px;">
+              ${msg("eventLoginErrorBodyHtml",event.date,event.ipAddress)?no_esc}
+            </div>
+
+          </section>
+
+          <footer style="width: 670px;height: 150px; border-top: 1px solid #E2E6ED; border-bottom: 8px solid #262626;margin: auto; text-align: center;">
+
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo-small.png" alt="Weni-Logo" style="margin: 15px 0;"/>
+
+
+            <div style="width: 450px; font-size: 12px;line-height: 20px;margin: auto;">
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">${msg("emailAccessOurSite")?no_esc}</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Facebook</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Instagram</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Twitter</a>
+            </div>
+
+          ${msg("emailCopyright")?no_esc}
+        </footer>
+            </div>
+        </div>
+</body>
+</html>
diff --git a/themes/ilhasoft/email/html/event-remove_totp.ftl b/themes/ilhasoft/email/html/event-remove_totp.ftl
@@ -0,0 +1,41 @@
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+  <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
+</head>
+
+<body>
+    <div>
+        <div style="width: 670px; min-height: 724px;">
+          <header style="width: 670px; height: 52px; border-bottom: 1px solid #E2E6ED;"> 
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo.png" alt="Weni-Logo" style="margin-left: 24px; margin-top: 10px;"/>
+          </header>
+          <section style="width: 574px; min-height: 280px; margin: 50px auto;">
+            <div style="font-family: Lato; font-style: normal; font-weight: normal; font-size: 20px; line-height: 24px; color: #808080;"> ${msg("emailVerificationWelcome",user.firstName)?no_esc}</div>
+
+            <div style="font-family: Lato; font-weight: bold; font-size: 20px; line-height: 28px; color: #262626; margin-top: 24px;">
+              ${msg("eventRemoveTotpBodyHtml",event.date, event.ipAddress)?no_esc}
+            </div>
+
+          </section>
+
+          <footer style="width: 670px;height: 150px; border-top: 1px solid #E2E6ED; border-bottom: 8px solid #262626;margin: auto; text-align: center;">
+
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo-small.png" alt="Weni-Logo" style="margin: 15px 0;"/>
+
+
+            <div style="width: 450px; font-size: 12px;line-height: 20px;margin: auto;">
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">${msg("emailAccessOurSite")?no_esc}</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Facebook</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Instagram</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Twitter</a>
+            </div>
+
+          ${msg("emailCopyright")?no_esc}
+        </footer>
+            </div>
+        </div>
+</body>
+</html>
diff --git a/themes/ilhasoft/email/html/event-update_password.ftl b/themes/ilhasoft/email/html/event-update_password.ftl
@@ -0,0 +1,41 @@
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+  <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
+</head>
+
+<body>
+    <div>
+        <div style="width: 670px; min-height: 724px;">
+          <header style="width: 670px; height: 52px; border-bottom: 1px solid #E2E6ED;"> 
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo.png" alt="Weni-Logo" style="margin-left: 24px; margin-top: 10px;"/>
+          </header>
+          <section style="width: 574px; min-height: 280px; margin: 50px auto;">
+            <div style="font-family: Lato; font-style: normal; font-weight: normal; font-size: 20px; line-height: 24px; color: #808080;"> ${msg("emailVerificationWelcome",user.firstName)?no_esc}</div>
+
+            <div style="font-family: Lato; font-weight: bold; font-size: 20px; line-height: 28px; color: #262626; margin-top: 24px;">
+              ${msg("eventUpdatePasswordBodyHtml",event.date, event.ipAddress)?no_esc}
+            </div>
+
+          </section>
+
+          <footer style="width: 670px;height: 150px; border-top: 1px solid #E2E6ED; border-bottom: 8px solid #262626;margin: auto; text-align: center;">
+
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo-small.png" alt="Weni-Logo" style="margin: 15px 0;"/>
+
+
+            <div style="width: 450px; font-size: 12px;line-height: 20px;margin: auto;">
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">${msg("emailAccessOurSite")?no_esc}</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Facebook</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Instagram</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Twitter</a>
+            </div>
+
+          ${msg("emailCopyright")?no_esc}
+        </footer>
+            </div>
+        </div>
+</body>
+</html>
diff --git a/themes/ilhasoft/email/html/event-update_totp.ftl b/themes/ilhasoft/email/html/event-update_totp.ftl
@@ -0,0 +1,41 @@
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+  <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
+</head>
+
+<body>
+    <div>
+        <div style="width: 670px; min-height: 724px;">
+          <header style="width: 670px; height: 52px; border-bottom: 1px solid #E2E6ED;"> 
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo.png" alt="Weni-Logo" style="margin-left: 24px; margin-top: 10px;"/>
+          </header>
+          <section style="width: 574px; min-height: 280px; margin: 50px auto;">
+            <div style="font-family: Lato; font-style: normal; font-weight: normal; font-size: 20px; line-height: 24px; color: #808080;"> ${msg("emailVerificationWelcome",user.firstName)?no_esc}</div>
+
+            <div style="font-family: Lato; font-weight: bold; font-size: 20px; line-height: 28px; color: #262626; margin-top: 24px;">
+              ${msg("eventUpdateTotpBodyHtml",event.date, event.ipAddress)?no_esc}
+            </div>
+
+          </section>
+
+          <footer style="width: 670px;height: 150px; border-top: 1px solid #E2E6ED; border-bottom: 8px solid #262626;margin: auto; text-align: center;">
+
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo-small.png" alt="Weni-Logo" style="margin: 15px 0;"/>
+
+
+            <div style="width: 450px; font-size: 12px;line-height: 20px;margin: auto;">
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">${msg("emailAccessOurSite")?no_esc}</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Facebook</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Instagram</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Twitter</a>
+            </div>
+
+          ${msg("emailCopyright")?no_esc}
+        </footer>
+            </div>
+        </div>
+</body>
+</html>
diff --git a/themes/ilhasoft/email/html/executeActions.ftl b/themes/ilhasoft/email/html/executeActions.ftl
@@ -0,0 +1,44 @@
+<#outputformat "plainText">
+<#assign requiredActionsText><#if requiredActions??><#list requiredActions><#items as reqActionItem>${msg("requiredAction.${reqActionItem}")}<#sep>, </#sep></#items></#list></#if></#assign>
+</#outputformat>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+  <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
+</head>
+
+<body>
+    <div>
+        <div style="width: 670px; min-height: 724px;">
+          <header style="width: 670px; height: 52px; border-bottom: 1px solid #E2E6ED;"> 
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo.png" alt="Weni-Logo" style="margin-left: 24px; margin-top: 10px;"/>
+          </header>
+          <section style="width: 574px; min-height: 280px; margin: 50px auto;">
+            <div style="font-family: Lato; font-style: normal; font-weight: normal; font-size: 20px; line-height: 24px; color: #808080;"> ${msg("emailVerificationWelcome",user.firstName)?no_esc}</div>
+
+            <div style="font-family: Lato; font-weight: bold; font-size: 20px; line-height: 28px; color: #262626; margin-top: 24px;">
+              ${msg("executeActionsBodyHtml",link, linkExpiration, realmName, requiredActionsText)?no_esc}
+            </div>
+
+          </section>
+
+          <footer style="width: 670px;height: 150px; border-top: 1px solid #E2E6ED; border-bottom: 8px solid #262626;margin: auto; text-align: center;">
+
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo-small.png" alt="Weni-Logo" style="margin: 15px 0;"/>
+
+
+            <div style="width: 450px; font-size: 12px;line-height: 20px;margin: auto;">
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">${msg("emailAccessOurSite")?no_esc}</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Facebook</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Instagram</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Twitter</a>
+            </div>
+
+          ${msg("emailCopyright")?no_esc}
+        </footer>
+            </div>
+        </div>
+</body>
+</html>
diff --git a/themes/ilhasoft/email/html/identity-provider-link.ftl b/themes/ilhasoft/email/html/identity-provider-link.ftl
@@ -0,0 +1,41 @@
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+  <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
+</head>
+
+<body>
+    <div>
+        <div style="width: 670px; min-height: 724px;">
+          <header style="width: 670px; height: 52px; border-bottom: 1px solid #E2E6ED;"> 
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo.png" alt="Weni-Logo" style="margin-left: 24px; margin-top: 10px;"/>
+          </header>
+          <section style="width: 574px; min-height: 280px; margin: 50px auto;">
+            <div style="font-family: Lato; font-style: normal; font-weight: normal; font-size: 20px; line-height: 24px; color: #808080;"> ${msg("emailVerificationWelcome",user.firstName)?no_esc}</div>
+
+            <div style="font-family: Lato; font-weight: bold; font-size: 20px; line-height: 28px; color: #262626; margin-top: 24px;">
+              ${msg("identityProviderLinkBodyHtml", identityProviderAlias, realmName, identityProviderContext.username, link, linkExpiration)?no_esc}
+            </div>
+
+          </section>
+
+          <footer style="width: 670px;height: 150px; border-top: 1px solid #E2E6ED; border-bottom: 8px solid #262626;margin: auto; text-align: center;">
+
+            <img src="https://weni-media-sp.s3-sa-east-1.amazonaws.com/logo/Logo-small.png" alt="Weni-Logo" style="margin: 15px 0;"/>
+
+
+            <div style="width: 450px; font-size: 12px;line-height: 20px;margin: auto;">
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">${msg("emailAccessOurSite")?no_esc}</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Facebook</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Instagram</a>
+              <a style="cursor: pointer;margin-right: 10px;color: #9CACCC;">Twitter</a>
+            </div>
+
+          ${msg("emailCopyright")?no_esc}
+        </footer>
+            </div>
+        </div>
+</body>
+</html>