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

Kontaktformular eingefügt

Browse Source
This commit is contained in:
silas 2018-10-13 18:48:40 +02:00
parent 607a96ad72
commit c7102ed527
23 changed files with 105 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/php.xml generated
View File

@ -82,6 +82,7 @@
<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" />
<path value="$PROJECT_DIR$/vendor/ainias/pwa-zf-user-management" />
</include_path>
</component>
</project>

6
bin/createImportScss.js
View File

@ -34,9 +34,9 @@ files.forEach(file => {
fs.unlink(dir + "/" + file, function (err) {
if (err) return console.log(err);
});
fs.writeFile(dir + "/" + newFileName, result, 'utf8', function (err) {
if (err) return console.log(err);
fs.writeFile(dir + "/" + newFileName, result, 'utf8', function (err) {
if (err) return console.log(err);
});
});
});
}

6
config/autoload/beta.local.php
View File

@ -43,6 +43,12 @@ return [
'sender' => 'beta@silas.link',
),
"contact" => [
"prefix" => "[WR]",
"contact-email" => "beta@silas.link",
"contact-name" => "Admin",
],
'systemvariablen' => array(
'passwordHash' => 'hencxkgj',
'websiteName' => 'WordRotator - Beta',

8
config/autoload/local.php
View File

@ -48,9 +48,15 @@ return [
'ssl' => 'tls',
),
),
'sender' => 'stories@silas.link',
'sender' => 'local@silas.link',
),
"contact" => [
"prefix" => "[WR]",
"contact-email" => "wordrotator@silas.link",
"contact-name" => "Admin",
],
'systemVariables' => array(
'passwordHash' => '',
'websiteName' => '',

8
config/autoload/prod.local.php
View File

@ -40,9 +40,15 @@ return [
'ssl' => 'tls',
),
),
'sender' => 'stories@silas.link',
'sender' => 'wordRotator@silas.link',
),
"contact" => [
"prefix" => "[WR]",
"contact-email" => "wordrotator@silas.link",
"contact-name" => "Admin",
],
'systemvariablen' => array(
'passwordHash' => 'kxykgdgkhxyfbgxhjipab-lmk<s52f',
'websiteName' => 'WordRotator',

5
config/autoload/test.local.php
View File

@ -31,6 +31,11 @@ return [
),
'sender' => 'test.framework@silas.link',
),
"contact" => [
"prefix" => "[WR]",
"contact-email" => "local@silas.link",
"contact-name" => "Admin",
],
'systemVariables' => array(
'passwordHash' => 'sdvsdg',

2
public/.htaccess
View File

@ -28,6 +28,8 @@ RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$
RewriteRule ^(.*) - [E=BASE:%1]
RewriteRule ^(.*)$ %{ENV:BASE}/index.html [L]
Options -Indexes
<IfModule mod_mime.c>
AddType application/x-javascript .js
AddType text/css .css

2
public/css/wordRotator.css
View File

File diff suppressed because one or more lines are too long

2
public/html/application/menu.html
View File

@ -1 +1 @@
<div class="max-height flex-center"><div id=segment-leaf-template class="segment segment-leaf"><div class=leaf-element></div></div><div id=segment-parent-template class="segment segment-parent"><div class=child-container></div></div><div id=segment-row-template class="segment segment-row"><div class=child-container></div></div><div id=segment-triangle-template class="segment segment-triangle"><div class=child-container></div></div><div class="height-60 max-width flex-center"><div id=level></div><span id=level-number-container class="visible in-main-menu"><span id=level-number>1</span></span></div><div class="height-30 flex-center fill-me"><button class="button grow text-center" id=play-button><span data-translation=play></span></button><div class="max-width line-height-1 fill-me vertical"><label class=switch><div data-view=img/speaker.svg></div><input type=checkbox class=setting id=play-sound> <span class=slider></span></label><div class="grow center" id=share-button><span data-view=img/share.svg></span></div><label class="switch right"><div data-view=img/music.svg></div><input type=checkbox class=setting id=play-music> <span class=slider></span></label></div></div><div class="height-10 flex-center fill-me"><div class="max-width line-height-1"><span class=right id=share-buttons></span></div></div></div>
<div class="max-height flex-center"><div id=segment-leaf-template class="segment segment-leaf"><div class=leaf-element></div></div><div id=segment-parent-template class="segment segment-parent"><div class=child-container></div></div><div id=segment-row-template class="segment segment-row"><div class=child-container></div></div><div id=segment-triangle-template class="segment segment-triangle"><div class=child-container></div></div><div class="height-60 max-width flex-center"><div id=level></div><span id=level-number-container class="visible in-main-menu"><span id=level-number>1</span></span></div><div class="height-30 flex-center fill-me"><button class="button grow text-center" id=play-button><span data-translation=play></span></button><div class="max-width line-height-1 fill-me vertical"><label class=switch><div data-view=img/speaker.svg></div><input type=checkbox class=setting id=play-sound> <span class=slider></span></label><div class="grow center" id=share-button><span data-view=img/share.svg></span></div><label class="switch right"><div data-view=img/music.svg></div><input type=checkbox class=setting id=play-music> <span class=slider></span></label></div></div></div>

2
public/html/application/privacyPolicy.html
View File

File diff suppressed because one or more lines are too long

28
public/js/app.js
View File

@ -2028,7 +2028,7 @@ class SiteManager {
site.actionMenu = site.createActionBarMenu(this.buildActionBarMenu());
return this.show(siteContainer);
}).catch((e) => {
console.error("site start error:", e);
console.error("site start error for site ", siteConstructor.name, e);
});
return finishPromise;
@ -3748,7 +3748,6 @@ class LocalStorageSettingsFragment extends Fragment {
}
setting.addEventListener("change", function () {
// console.log(setting);
let value = this.value;
if (isCheckable && !this.checked) {
value = null;
@ -5178,6 +5177,28 @@ InitPromise.addPromise(function (app) {
app.addDeepLink("code", CodeSite);
});
class ContactSite extends AbstractSite{
constructor(siteManager) {
super(siteManager, 'contact/html/contact.html', ContactSite.DEEP_LINK);
}
onFirstStart() {
new Form(this.findBy("#contact-form"), "contact", "post").onSubmit((d) => {
FlashMessenger.addMessage("contact-message-sent");
this.finish();
});
super.onFirstStart();
}
}
ContactSite.DEEP_LINK = "contactMe";
InitPromise.addPromise((app) => {
if (ContactSite.DEEP_LINK){
app.addDeepLink(ContactSite.DEEP_LINK, ContactSite);
}
});
class WordRotatorBaseSite extends AbstractSite {
// createActionBarMenu(menu) {
// menu = super.createActionBarMenu(menu);
@ -6298,7 +6319,7 @@ class LevelSite extends WordRotatorBaseSite {
clearTimeout(this.wonParams.coinCounterTimer);
//LevelCounter * 2 - 1, damit der durchschnittswert stimmt
Matomo.push(["trackEvent", "LevelSite", "NextLevel", "Level Number Average", this.levelCounter*2-1]);
// Matomo.push(["trackEvent", "LevelSite", "NextLevel", "Level Number Average", this.levelCounter*2-1]);
Matomo.push(["trackEvent", "LevelSite", "NextLevel", "Level Number Normal", this.levelCounter]);
return this.tutorial();
@ -6670,6 +6691,7 @@ class MenuSite extends WordRotatorBaseSite {
window.addEventListener("resize", this.listener);
//Musikbuttons update, falls in den Einstellungen umgestellt
let settingsManager = SettingsManager.getInstance();
let playSoundButton = this.findBy("#play-sound");
playSoundButton.checked = settingsManager.getSetting("play-sound", true);
let playMusicButton = this.findBy("#play-music");

2
public/js/lang/de.json
View File

File diff suppressed because one or more lines are too long

2
public/js/lang/en.json
View File

File diff suppressed because one or more lines are too long

1
src/js/init.js
View File

@ -15,6 +15,7 @@ import "./lib/pwa-core"
import "./lib/pwa-assets"
import "./lib/pwa-code-management"
import "./lib/pwa-user-management"
import "./lib/pwa-contact"
import {SettingsManager, SettingsSite} from "./lib/pwa-core";

26
src/js/lib/pwa-contact.js Normal file
View File

@ -0,0 +1,26 @@
import { AbstractSite, FlashMessenger, InitPromise } from './pwa-lib.js';
import { Form } from './pwa-core.js';
class ContactSite extends AbstractSite{
constructor(siteManager) {
super(siteManager, 'contact/html/contact.html', ContactSite.DEEP_LINK);
}
onFirstStart() {
new Form(this.findBy("#contact-form"), "contact", "post").onSubmit((d) => {
FlashMessenger.addMessage("contact-message-sent");
this.finish();
});
super.onFirstStart();
}
}
ContactSite.DEEP_LINK = "contactMe";
InitPromise.addPromise((app) => {
if (ContactSite.DEEP_LINK){
app.addDeepLink(ContactSite.DEEP_LINK, ContactSite);
}
});
export { ContactSite };

1
src/js/lib/pwa-core.js
View File

@ -393,7 +393,6 @@ class LocalStorageSettingsFragment extends Fragment {
}
setting.addEventListener("change", function () {
// console.log(setting);
let value = this.value;
if (isCheckable && !this.checked) {
value = null;

2
src/js/lib/pwa-lib.js
View File

@ -2028,7 +2028,7 @@ class SiteManager {
site.actionMenu = site.createActionBarMenu(this.buildActionBarMenu());
return this.show(siteContainer);
}).catch((e) => {
console.error("site start error:", e);
console.error("site start error for site ", siteConstructor.name, e);
});
return finishPromise;

6
src/module/Application/pwa/html/application/menu.html
View File

@ -36,10 +36,4 @@
</label>
</div>
</div>
<div class='height-10 flex-center fill-me'>
<div class='max-width line-height-1'>
<span class='right' id='share-buttons'></span>
</div>
</div>
</div>

2
src/module/Application/pwa/html/application/privacyPolicy.html
View File

@ -1,4 +1,4 @@
<div class="max-height overflow-y-auto">
<div class="max-height">
<h2>Datenschutzerklärung</h2>
<h3 id="dsg-general-intro"></h3>
<p>Diese Datenschutzerklärung klärt Sie über die Art, den Umfang und Zweck der Verarbeitung von personenbezogenen

2
src/module/Application/pwa/js/site/LevelSite.js
View File

@ -186,7 +186,7 @@ export class LevelSite extends WordRotatorBaseSite {
clearTimeout(this.wonParams.coinCounterTimer);
//LevelCounter * 2 - 1, damit der durchschnittswert stimmt
Matomo.push(["trackEvent", "LevelSite", "NextLevel", "Level Number Average", this.levelCounter*2-1]);
// Matomo.push(["trackEvent", "LevelSite", "NextLevel", "Level Number Average", this.levelCounter*2-1]);
Matomo.push(["trackEvent", "LevelSite", "NextLevel", "Level Number Normal", this.levelCounter]);
return this.tutorial();

1
src/module/Application/pwa/js/site/MenuSite.js
View File

@ -86,6 +86,7 @@ export class MenuSite extends WordRotatorBaseSite {
window.addEventListener("resize", this.listener);
//Musikbuttons update, falls in den Einstellungen umgestellt
let settingsManager = SettingsManager.getInstance();
let playSoundButton = this.findBy("#play-sound");
playSoundButton.checked = settingsManager.getSetting("play-sound", true);
let playMusicButton = this.findBy("#play-music");

4
src/scss/_settings.scss
View File

@ -4,9 +4,9 @@ $themes: map-merge($themes,(dark: (
class: dark,
themeColor: #373737,
lightThemeColor: #4b4b4b,
linkColor: white,
linkColor: #fff,
spinnerColor: #ffffff,
navBarTextColor: white,
navBarTextColor: #fff,
textColor: #ffffff,
textColor2: #9b9b9b,
lightLinkColor: #ffffff,

17
src/scss/wordRotator.scss
View File

@ -343,17 +343,22 @@ $coinTowerDimension: 28px;
body {
overscroll-behavior: contain;
user-select: none;
}
#site-content {
overflow: hidden;
overflow: visible;
}
div.mainContainer{
overflow-x: hidden;
}
#img-sound:before {
content: "";
max-width: 1.4em;
background: url('../img/speaker.svg')
}
//#img-sound:before {
// content: "";
// max-width: 1.4em;
// background: url('../img/speaker.svg')
//}
.clickable{
cursor: pointer;