From 7fc54547c48188cdf7db0f7028b59b8e6a31b037 Mon Sep 17 00:00:00 2001 From: silas Date: Tue, 16 Oct 2018 10:20:13 +0200 Subject: [PATCH] selectWordsAction --- .idea/php.xml | 6 ++ .idea/scopes/html.xml | 2 +- .idea/watcherTasks.xml | 2 +- .idea/wordRotator.iml | 1 + config/autoload/local.php | 3 + config/autoload/test.local.php | 3 + public/css/wordRotator.css | 2 +- public/html/application/credits.html | 2 +- public/html/application/impressum.html | 1 + public/js/app.js | 74 +++++++++++++++++- public/js/lang/de.json | 2 +- public/version/1/html/selectWords.html | 1 + src/js/init.js | 1 + .../Application/config/controller.config.php | 3 +- .../config/routes/routes.index.php | 22 ++++-- .../pwa/html/application/credits.html | 3 - .../Application/pwa/js/site/CreditsSite.js | 2 +- .../pwa/js/site/SelectWordsSite.js | 75 +++++++++++++++++++ .../pwa/public/html/application/credits.html | 5 ++ .../html/application/dialog/chooseTheme.html | 0 .../html/application/dialog/share.html | 0 .../{ => public}/html/application/end.html | 0 .../html/application/fragment/settings.html | 0 .../html/application/impressum.html | 0 .../{ => public}/html/application/level.html | 0 .../{ => public}/html/application/menu.html | 0 .../html/application/privacyPolicy.html | 0 .../html/application/setting-template.html | 0 .../{ => public}/html/application/sync.html | 0 .../public/version/1/html/selectWords.html | 25 +++++++ .../Application/pwa/translations/de.json | 6 +- .../src/Controller/IndexController.php | 26 +++---- .../src/Model/Manager/WordManager.php | 2 +- .../src/Model/Repository/WordRepository.php | 4 +- 34 files changed, 238 insertions(+), 35 deletions(-) create mode 100644 public/html/application/impressum.html create mode 100644 public/version/1/html/selectWords.html delete mode 100644 src/module/Application/pwa/html/application/credits.html create mode 100644 src/module/Application/pwa/js/site/SelectWordsSite.js create mode 100644 src/module/Application/pwa/public/html/application/credits.html rename src/module/Application/pwa/{ => public}/html/application/dialog/chooseTheme.html (100%) rename src/module/Application/pwa/{ => public}/html/application/dialog/share.html (100%) rename src/module/Application/pwa/{ => public}/html/application/end.html (100%) rename src/module/Application/pwa/{ => public}/html/application/fragment/settings.html (100%) rename src/module/Application/pwa/{ => public}/html/application/impressum.html (100%) rename src/module/Application/pwa/{ => public}/html/application/level.html (100%) rename src/module/Application/pwa/{ => public}/html/application/menu.html (100%) rename src/module/Application/pwa/{ => public}/html/application/privacyPolicy.html (100%) rename src/module/Application/pwa/{ => public}/html/application/setting-template.html (100%) rename src/module/Application/pwa/{ => public}/html/application/sync.html (100%) create mode 100644 src/module/Application/pwa/public/version/1/html/selectWords.html diff --git a/.idea/php.xml b/.idea/php.xml index aab2d27..bdc7722 100755 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -83,6 +83,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/scopes/html.xml b/.idea/scopes/html.xml index daf8c2f..1f1cf7a 100755 --- a/.idea/scopes/html.xml +++ b/.idea/scopes/html.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml index 42c33f3..56a22d6 100755 --- a/.idea/watcherTasks.xml +++ b/.idea/watcherTasks.xml @@ -42,7 +42,7 @@ -