Ainias/wordRotator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
silas 2018-10-12 21:34:07 +02:00
parent 864530ecf1
commit 607a96ad72
8 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/php.xml generated
View File

@ -77,6 +77,11 @@
<path value="$PROJECT_DIR$/vendor/doctrine/reflection" /> <path value="$PROJECT_DIR$/vendor/doctrine/reflection" />
<path value="$PROJECT_DIR$/vendor/doctrine/event-manager" /> <path value="$PROJECT_DIR$/vendor/doctrine/event-manager" />
<path value="$PROJECT_DIR$/vendor/doctrine/persistence" /> <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> </include_path>
</component> </component>
</project> </project>

1
.idea/vcs.xml generated
View File

@ -5,6 +5,7 @@
<mapping directory="$PROJECT_DIR$/vendor/ainias/pwa-assets" vcs="Git" /> <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-lib" vcs="Git" />
<mapping directory="$PROJECT_DIR$/vendor/ainias/pwa-zf-code-management" 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-core" vcs="Git" />
<mapping directory="$PROJECT_DIR$/vendor/ainias/pwa-zf-cronjob" 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" /> <mapping directory="$PROJECT_DIR$/vendor/ainias/pwa-zf-user-management" vcs="Git" />

1
.idea/wordRotator.iml generated
View File

@ -3,7 +3,6 @@
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$"> <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/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$/public/js" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/event-manager" /> <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/event-manager" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/persistence" /> <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/persistence" />

5
composer.json
View File

@ -39,6 +39,7 @@
"ainias/pwa-zf-cronjob":"dev-es6 as 0.0.10", "ainias/pwa-zf-cronjob":"dev-es6 as 0.0.10",
"ainias/pwa-zf-code-management":"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-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-lib": "dev-es6 as 0.0.10",
"ainias/pwa-assets": "dev-es6 as 0.0.10" "ainias/pwa-assets": "dev-es6 as 0.0.10"
}, },
@ -61,6 +62,10 @@
"require-dev": { "require-dev": {
}, },
"repositories": [ "repositories": [
{
"type": "vcs",
"url": "silas.link:pwaContact"
},
{ {
"type": "vcs", "type": "vcs",
"url": "silas.link:pwaCore" "url": "silas.link:pwaCore"

1
config/modules.config.php
View File

@ -28,6 +28,7 @@ return [
'DoctrineORMModule', 'DoctrineORMModule',
'Ainias\Core', 'Ainias\Core',
'Ainias\Contact',
'Ainias\Cronjob', 'Ainias\Cronjob',
'Ainias\CodeManagement', 'Ainias\CodeManagement',
'Ainias\UserManagement', 'Ainias\UserManagement',

6
public/js/app.js
View File

@ -6669,6 +6669,12 @@ class MenuSite extends WordRotatorBaseSite {
this.listener(); this.listener();
window.addEventListener("resize", 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; return res;
} }

8
src/module/Application/pwa/html/application/impressum.html Normal file
View File

@ -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>

2
test/test.testcafe.js
View File

@ -466,7 +466,7 @@ test('SendUserstats', async t => {
}); });
test.only('SendUserstatsInPrivacyPolicy', async t => { test('SendUserstatsInPrivacyPolicy', async t => {
await waitForMainMenu(t); await waitForMainMenu(t);
let matomoCheck = ClientFunction(() => { let matomoCheck = ClientFunction(() => {
return new Promise((resolve) => { return new Promise((resolve) => {