From e5b6116ab332c1635832f106f5eacd0cb548f674 Mon Sep 17 00:00:00 2001
From: silas <silas@silas.link>
Date: Sat, 13 Oct 2018 22:19:21 +0200
Subject: [PATCH] Impressum fertig

---
 public/html/application/fragment/settings.html   |  2 +-
 public/js/app.js                                 | 16 ++++++++++++++++
 .../pwa/html/application/fragment/settings.html  |  6 +++++-
 .../pwa/html/application/impressum.html          |  9 ++++++---
 .../js/Fragment/WordRotatorSettingFragment.js    |  8 ++++++++
 .../Application/pwa/js/site/ImpressumSite.js     | 12 ++++++++++++
 6 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 src/module/Application/pwa/js/site/ImpressumSite.js

diff --git a/public/html/application/fragment/settings.html b/public/html/application/fragment/settings.html
index 1a1f4e7..1f55ba8 100644
--- a/public/html/application/fragment/settings.html
+++ b/public/html/application/fragment/settings.html
@@ -1 +1 @@
-<div class="max-height fill-me"><div class="row max-width grow flex-center"><div class="columns small-centered small-12 smedium-11 medium-9 large-7"><div class="row setting-row hidden" id=install-button><span class="columns small-6" data-translation=install></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class="row setting-row" id=theme-chooser><span class="columns small-6" data-translation=theme></span> <span class="columns small-6 text-right"><div id=theme-name></div></span></div><label class="switch row setting-row"><span class="columns small-6" data-translation=sound></span> <span class="columns small-6 text-right"><input type=checkbox class=setting id=play-sound name=play-sound value=1 data-default=1> <span class=slider></span></span></label> <label class="switch row setting-row"><span class="columns small-6" data-translation=music></span> <span class="columns small-6 text-right"><input type=checkbox class=setting id=play-music name=play-music value=1 data-default=1> <span class=slider></span></span></label><div class="row setting-row" id=credits-button><span class="columns small-6" data-translation=credits></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class="row setting-row" id=privacy-policy-button><span class="columns small-6" data-translation=privacy-policy></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class="row setting-row" id=impressum-button><span class="columns small-6" data-translation=impressum></span> <span class="columns small-6 text-right" data-translation=">"></span></div><label class="switch row setting-row"><span class="columns small-6" data-translation=track></span> <span class="columns small-6 text-right"><input type=checkbox class=setting id=track-switch name=matomoShouldTrack value=1 data-default=1 data-raw=1> <span class=slider></span></span></label> <button id=reset-levels class="button hidden" data-translation=reset-levels></button></div></div></div>
\ No newline at end of file
+<div class="max-height fill-me"><div class="row max-width grow flex-center"><div class="columns small-centered small-12 smedium-11 medium-9 large-7"><div class="row setting-row hidden" id=install-button><span class="columns small-6" data-translation=install></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class="row setting-row" id=theme-chooser><span class="columns small-6" data-translation=theme></span> <span class="columns small-6 text-right"><div id=theme-name></div></span></div><label class="switch row setting-row"><span class="columns small-6" data-translation=sound></span> <span class="columns small-6 text-right"><input type=checkbox class=setting id=play-sound name=play-sound value=1 data-default=1> <span class=slider></span></span></label> <label class="switch row setting-row"><span class="columns small-6" data-translation=music></span> <span class="columns small-6 text-right"><input type=checkbox class=setting id=play-music name=play-music value=1 data-default=1> <span class=slider></span></span></label><div class="row setting-row" id=credits-button><span class="columns small-6" data-translation=credits></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class="row setting-row" id=privacy-policy-button><span class="columns small-6" data-translation=privacy-policy></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class="row setting-row" id=impressum-button><span class="columns small-6" data-translation=impressum></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class="row setting-row" id=contact-button><span class="columns small-6" data-translation=contact></span> <span class="columns small-6 text-right" data-translation=">"></span></div><label class="switch row setting-row"><span class="columns small-6" data-translation=track></span> <span class="columns small-6 text-right"><input type=checkbox class=setting id=track-switch name=matomoShouldTrack value=1 data-default=1 data-raw=1> <span class=slider></span></span></label> <button id=reset-levels class="button hidden" data-translation=reset-levels></button></div></div></div>
\ No newline at end of file
diff --git a/public/js/app.js b/public/js/app.js
index f30f242..c1b24fb 100755
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -6900,6 +6900,16 @@ class ChooseThemeDialog extends Dialog {
     }
 }
 
+class ImpressumSite extends WordRotatorBaseSite{
+    constructor(siteManager) {
+        super(siteManager, "html/application/impressum.html", "impressum");
+    }
+}
+
+InitPromise.addPromise(app => {
+    app.addDeepLink("impressum", ImpressumSite);
+});
+
 class WordRotatorSettingFragment extends LocalStorageSettingsFragment {
     constructor(site) {
         super(site, "html/application/fragment/settings.html");
@@ -6953,6 +6963,12 @@ class WordRotatorSettingFragment extends LocalStorageSettingsFragment {
         this.findBy("#privacy-policy-button").addEventListener("click", () => {
             this.getSite().startSite(PrivacyPolicySite);
         });
+        this.findBy("#contact-button").addEventListener("click", () => {
+            this.getSite().startSite(ContactSite);
+        });
+        this.findBy("#impressum-button").addEventListener("click", () => {
+            this.getSite().startSite(ImpressumSite);
+        });
 
         InstallManager.setCanInstallListener(() => {
             let installButton = this.findBy("#install-button");
diff --git a/src/module/Application/pwa/html/application/fragment/settings.html b/src/module/Application/pwa/html/application/fragment/settings.html
index e463381..19fcb11 100644
--- a/src/module/Application/pwa/html/application/fragment/settings.html
+++ b/src/module/Application/pwa/html/application/fragment/settings.html
@@ -25,7 +25,7 @@
                     <input type="checkbox" class="setting" id="play-music" name='play-music' value="1"
                            data-default="1">
                     <span class="slider"></span>
-                </span>
+                </span> 
             </label>
             <div class='row setting-row' id='credits-button'>
                 <span class='columns small-6' data-translation="credits"></span>
@@ -39,6 +39,10 @@
                 <span class='columns small-6' data-translation="impressum"></span>
                 <span class='columns small-6 text-right' data-translation=">"></span>
             </div>
+            <div class='row setting-row' id='contact-button'>
+                <span class='columns small-6' data-translation="contact"></span>
+                <span class='columns small-6 text-right' data-translation=">"></span>
+            </div>
             <label class="switch row setting-row">
                 <span class='columns small-6' data-translation="track"></span>
                 <span class='columns small-6 text-right'>
diff --git a/src/module/Application/pwa/html/application/impressum.html b/src/module/Application/pwa/html/application/impressum.html
index 9a55489..d60f56c 100644
--- a/src/module/Application/pwa/html/application/impressum.html
+++ b/src/module/Application/pwa/html/application/impressum.html
@@ -1,8 +1,11 @@
 <div>
     <h2>Impressum</h2>
     <p>Silas Günther<br />
-        Mariabrunnstraße 48<br />52064 Aachen</p>
-    <p>Telefon: +4915782273429<br />
-        E-Mail: <a href="mailto:wordRotator@silas.link">wordRotator@silas.link</a><br />
+        Mariabrunnstraße 48<br />
+        52064 Aachen<br/>
+        Deutschland
+    </p>
+    <p>E-Mail: <a href="mailto:wordRotator@silas.link">wordRotator@silas.link</a><br />
+        <a href = "contactMe" class = "link" target="_blank">Kontaktformular</a>
     </p>
 </div>
\ No newline at end of file
diff --git a/src/module/Application/pwa/js/Fragment/WordRotatorSettingFragment.js b/src/module/Application/pwa/js/Fragment/WordRotatorSettingFragment.js
index 1e70171..ba4f3c2 100644
--- a/src/module/Application/pwa/js/Fragment/WordRotatorSettingFragment.js
+++ b/src/module/Application/pwa/js/Fragment/WordRotatorSettingFragment.js
@@ -5,6 +5,8 @@ import {InstallManager, Matomo, SoundManager} from "../../../../../js/lib/pwa-as
 import {CreditsSite} from "../site/CreditsSite";
 import {PrivacyPolicySite} from "../site/PrivacyPolicySite";
 import {ChooseThemeDialog} from "../dialog/ChooseThemeDialog";
+import {ContactSite} from "../../../../../js/lib/pwa-contact";
+import {ImpressumSite} from "../site/ImpressumSite";
 
 export class WordRotatorSettingFragment extends LocalStorageSettingsFragment {
     constructor(site) {
@@ -59,6 +61,12 @@ export class WordRotatorSettingFragment extends LocalStorageSettingsFragment {
         this.findBy("#privacy-policy-button").addEventListener("click", () => {
             this.getSite().startSite(PrivacyPolicySite);
         });
+        this.findBy("#contact-button").addEventListener("click", () => {
+            this.getSite().startSite(ContactSite);
+        });
+        this.findBy("#impressum-button").addEventListener("click", () => {
+            this.getSite().startSite(ImpressumSite);
+        });
 
         InstallManager.setCanInstallListener(() => {
             let installButton = this.findBy("#install-button");
diff --git a/src/module/Application/pwa/js/site/ImpressumSite.js b/src/module/Application/pwa/js/site/ImpressumSite.js
new file mode 100644
index 0000000..712f66e
--- /dev/null
+++ b/src/module/Application/pwa/js/site/ImpressumSite.js
@@ -0,0 +1,12 @@
+import {WordRotatorBaseSite} from "./WordRotatorBaseSite";
+import {InitPromise} from "../../../../../js/lib/pwa-lib";
+
+export class ImpressumSite extends WordRotatorBaseSite{
+    constructor(siteManager) {
+        super(siteManager, "html/application/impressum.html", "impressum");
+    }
+}
+
+InitPromise.addPromise(app => {
+    app.addDeepLink("impressum", ImpressumSite);
+});
\ No newline at end of file