fix conflicts

.idea/login_themes.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/markdown.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownSettings">
+    <enabledExtensions>
+      <entry key="MermaidLanguageExtension" value="false" />
+      <entry key="PlantUMLLanguageExtension" value="false" />
+    </enabledExtensions>
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/login_themes.iml" filepath="$PROJECT_DIR$/.idea/login_themes.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="85b506cf-b6d5-4bac-8be7-4abe7ebf24cc" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectId" id="28QMnImbN1p35QBBgvMmZRQI8pI" />
+  <component name="ProjectViewState">
+    <option name="autoscrollFromSource" value="true" />
+    <option name="autoscrollToSource" value="true" />
+    <option name="foldersAlwaysOnTop" value="false" />
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+    <option name="showMembers" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_package_manager_path" value="npm" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="85b506cf-b6d5-4bac-8be7-4abe7ebf24cc" name="Changes" comment="" />
+      <created>1651144522780</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1651144522780</updated>
+      <workItem from="1651144523986" duration="2372000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>

amalati/theme.css

@@ -1 +1,49 @@
-#this is the theme file for keycloak and amalati
+.login-pf body {
+    background: url(background.png) !important;
+    background-size: cover !important;
+}
+
+.login-pf-page .login-pf-header h1 {
+    background: #618c36 !important;
+}
+
+.pf-c-button.pf-m-primary {
+    background: #618c36 !important;
+}
+
+div#kc-registration span a:hover {
+    background: #83b451;
+}
+
+#kc-header {
+    background: #ffffff;
+}
+
+.app-logo {
+    background-image: url(logo.png);
+    background-size: 100%;
+    background-repeat: no-repeat;
+}
+
+.login-pf-page .login-pf-page-header p::before {
+    content: "Create infinitely nested trees and turn your plans and vision into managed work.";
+}
+
+.login-main-title::before {
+    content: "Login";
+}
+
+.login-sub-heading::before {
+    content: "Create, tend and grow your trees of wonder and promise.";
+}
+
+#new-to-app::before {
+    content: "New to amalati?";
+}
+
+.register-main-title::before {
+    content: "Create your account";
+}
+.register-sub-heading::before {
+    content: "Join and start planting your trees in Amalati!";
+}

amalati/theme.js

@@ -0,0 +1,7 @@
+document.onload = function () {
+  const privacyPolicy = document.getElementById('privacy-policy');
+
+  if (privacyPolicy) {
+    privacyPolicy.innerHTML = '<span>By signing up you agree to the TheGardenPrivacy Policy <a href="https://thegarden.rocks/privacy/">Privacy Policy</a></span>'
+  }
+}