From 140eb95da4921c9dba19c7566abe103d95ad7a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Fri, 17 Apr 2020 13:52:26 +0200 Subject: [PATCH 1/3] Enable webpack polling --- package.json | 2 +- webpack.config.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a989fa94..4147395d 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "WTFPL", "repository": "https://gitlab.com/dreipunktnull/ep_theme.git", "scripts": { - "dev": "./node_modules/.bin/encore dev --watch", + "dev": "./node_modules/.bin/encore dev --watch --watch-poll", "build": "./node_modules/.bin/encore production" }, "dependencies": { diff --git a/webpack.config.js b/webpack.config.js index 3e0c1fa7..915d1cd7 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -60,7 +60,8 @@ Encore babelConfig.plugins = [ '@babel/plugin-proposal-object-rest-spread', '@babel/plugin-syntax-dynamic-import' ] }) .configureWatchOptions(function (options) { - options.poll = 250; + options.poll = 500; + options.ignored = /node_modules/; }); const EpEventsConfig = Encore.getWebpackConfig(); From 64da0d2381e7598cfcfcf0e6416b1c3c1210d56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Fri, 17 Apr 2020 13:52:49 +0200 Subject: [PATCH 2/3] Adjust domain in ddev environment --- config/sites/ep-reisen/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sites/ep-reisen/config.yaml b/config/sites/ep-reisen/config.yaml index 11d04ecb..40a3567c 100644 --- a/config/sites/ep-reisen/config.yaml +++ b/config/sites/ep-reisen/config.yaml @@ -1,7 +1,7 @@ base: / baseVariants: - - base: 'https://eptypo3.ddev.site' + base: 'https://ep-reisen.ddev.site' condition: 'applicationContext == "Development"' - base: 'https://schnee-event.ddev.site' From 3fbfaac86c40ecb1a9a383c83610d96ae1879cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Fri, 17 Apr 2020 13:53:12 +0200 Subject: [PATCH 3/3] Replace calendar browse buttons with dropdown --- .../Private/Assets/js/components/Calendar.vue | 55 ++++++++++--------- .../Private/Assets/scss/remix/_calendar.scss | 14 ++++- .../Private/Templates/AjaxCalendar/Range.html | 1 - 3 files changed, 41 insertions(+), 29 deletions(-) diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Calendar.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Calendar.vue index bdc91a15..d72edf40 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Calendar.vue +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Calendar.vue @@ -6,21 +6,14 @@
Loading
-
-
- - +
+
+