From 607a96ad72dc9891c2a8bd0f41d0ba2ff60b2baa Mon Sep 17 00:00:00 2001
From: silas <silas@silas.link>
Date: Fri, 12 Oct 2018 21:34:07 +0200
Subject: [PATCH] update

---
 .idea/php.xml                                             | 5 +++++
 .idea/vcs.xml                                             | 1 +
 .idea/wordRotator.iml                                     | 1 -
 composer.json                                             | 5 +++++
 config/modules.config.php                                 | 1 +
 public/js/app.js                                          | 6 ++++++
 .../Application/pwa/html/application/impressum.html       | 8 ++++++++
 test/test.testcafe.js                                     | 2 +-
 8 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 src/module/Application/pwa/html/application/impressum.html

diff --git a/.idea/php.xml b/.idea/php.xml
index 8138e58..a913a08 100755
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -77,6 +77,11 @@
       <path value="$PROJECT_DIR$/vendor/doctrine/reflection" />
       <path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
       <path value="$PROJECT_DIR$/vendor/doctrine/persistence" />
+      <path value="$PROJECT_DIR$/vendor/ainias/pwa-zf-contact" />
+      <path value="$PROJECT_DIR$/vendor/ainias/pwa-assets" />
+      <path value="$PROJECT_DIR$/vendor/ainias/pwa-zf-contact" />
+      <path value="$PROJECT_DIR$/vendor/ainias/pwa-zf-contact" />
+      <path value="$PROJECT_DIR$/vendor/ainias/pwa-zf-contact" />
     </include_path>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 1625096..103dbef 100755
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -5,6 +5,7 @@
     <mapping directory="$PROJECT_DIR$/vendor/ainias/pwa-assets" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/vendor/ainias/pwa-lib" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/vendor/ainias/pwa-zf-code-management" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/vendor/ainias/pwa-zf-contact" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/vendor/ainias/pwa-zf-core" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/vendor/ainias/pwa-zf-cronjob" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/vendor/ainias/pwa-zf-user-management" vcs="Git" />
diff --git a/.idea/wordRotator.iml b/.idea/wordRotator.iml
index 86ac3ff..93b726a 100755
--- a/.idea/wordRotator.iml
+++ b/.idea/wordRotator.iml
@@ -3,7 +3,6 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/module/Application/src" isTestSource="false" packagePrefix="Application\" />
-      <sourceFolder url="file://$MODULE_DIR$/src/module/Application/pwa/html" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/public/js" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/event-manager" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/persistence" />
diff --git a/composer.json b/composer.json
index 5645d7a..3622d02 100755
--- a/composer.json
+++ b/composer.json
@@ -39,6 +39,7 @@
         "ainias/pwa-zf-cronjob":"dev-es6 as 0.0.10",
         "ainias/pwa-zf-code-management":"dev-es6 as 0.0.10",
         "ainias/pwa-zf-core":"dev-es6 as 0.0.10",
+        "ainias/pwa-zf-contact": "dev-master as 0.0.10",
         "ainias/pwa-lib": "dev-es6 as 0.0.10",
         "ainias/pwa-assets": "dev-es6 as 0.0.10"
     },
@@ -61,6 +62,10 @@
     "require-dev": {
     },
     "repositories": [
+        {
+            "type": "vcs",
+            "url": "silas.link:pwaContact"
+        },
         {
             "type": "vcs",
             "url": "silas.link:pwaCore"
diff --git a/config/modules.config.php b/config/modules.config.php
index fc4a00c..f6823e2 100755
--- a/config/modules.config.php
+++ b/config/modules.config.php
@@ -28,6 +28,7 @@ return [
     'DoctrineORMModule',
 
     'Ainias\Core',
+    'Ainias\Contact',
     'Ainias\Cronjob',
     'Ainias\CodeManagement',
     'Ainias\UserManagement',
diff --git a/public/js/app.js b/public/js/app.js
index 237e4a4..a2f0a9f 100755
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -6669,6 +6669,12 @@ class MenuSite extends WordRotatorBaseSite {
         this.listener();
         window.addEventListener("resize", this.listener);
 
+        //Musikbuttons update, falls in den Einstellungen umgestellt
+        let playSoundButton = this.findBy("#play-sound");
+        playSoundButton.checked = settingsManager.getSetting("play-sound", true);
+        let playMusicButton = this.findBy("#play-music");
+        playMusicButton.checked = settingsManager.getSetting("play-music", true);
+
         return res;
     }
 
diff --git a/src/module/Application/pwa/html/application/impressum.html b/src/module/Application/pwa/html/application/impressum.html
new file mode 100644
index 0000000..9a55489
--- /dev/null
+++ b/src/module/Application/pwa/html/application/impressum.html
@@ -0,0 +1,8 @@
+<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 />
+    </p>
+</div>
\ No newline at end of file
diff --git a/test/test.testcafe.js b/test/test.testcafe.js
index 331075a..af77276 100644
--- a/test/test.testcafe.js
+++ b/test/test.testcafe.js
@@ -466,7 +466,7 @@ test('SendUserstats', async t => {
 });
 
 
-test.only('SendUserstatsInPrivacyPolicy', async t => {
+test('SendUserstatsInPrivacyPolicy', async t => {
     await waitForMainMenu(t);
     let matomoCheck = ClientFunction(() => {
         return new Promise((resolve) => {