EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/2020.01-08'

Browse Source
This commit is contained in:
Björn Fromme
2020-01-28 12:18:29 +01:00
parent cac996607a 75c6c01bea
commit 374c134cc2
4 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ddev/config.yaml
+1 -1
View File
@@ -15,7 +15,7 @@ additional_hostnames:
- ski-wochenenden - ski-wochenenden
- schnee-event - schnee-event
additional_fqdns: [] additional_fqdns: []
nfs_mount_enabled: true nfs_mount_enabled: false
provider: default provider: default
omit_containers: [dba] omit_containers: [dba]
use_dns_when_possible: true use_dns_when_possible: true
package.json
+1 -1
View File
@@ -6,7 +6,7 @@
"license": "WTFPL", "license": "WTFPL",
"repository": "https://gitlab.com/dreipunktnull/ep_theme.git", "repository": "https://gitlab.com/dreipunktnull/ep_theme.git",
"scripts": { "scripts": {
"dev": "./node_modules/.bin/encore dev --watch --watch-poll", "dev": "./node_modules/.bin/encore dev --watch --watch-poll=500",
"build": "./node_modules/.bin/encore production" "build": "./node_modules/.bin/encore production"
}, },
"dependencies": { "dependencies": {
public/typo3conf/ext/ep_products/Classes/Service/SnowreportImportService.php
+10 -2
View File
@@ -205,22 +205,30 @@ class SnowreportImportService implements SingletonInterface
$snowReportStoragePid = SettingsUtility::get('snowReportStoragePid'); $snowReportStoragePid = SettingsUtility::get('snowReportStoragePid');
foreach ($xml->children() as $item) foreach ($xml->children() as $item)
{ {
$include = (string) $item->aktuell === 'true';
$available = (string) $item->verf === 'true';
$vendorUid = (int) $item->uid; $vendorUid = (int) $item->uid;
$result = $this->webcamRepository->findByVendorUid($vendorUid); $result = $this->webcamRepository->findByVendorUid($vendorUid);
// Skip invalid cams
if ($include === false && $result->count() === 0) {
continue;
}
// Add new cam if not in db yet
if ($result->count() === 0) { if ($result->count() === 0) {
$webcam = new Webcam(); $webcam = new Webcam();
$webcam->setVendorUid($vendorUid); $webcam->setVendorUid($vendorUid);
$webcam->setPid($snowReportStoragePid); $webcam->setPid($snowReportStoragePid);
$webcam->setUrl((string) $item->url); $webcam->setUrl((string) $item->url);
$webcam->setName((string) $item->dt); $webcam->setName((string) $item->dt);
$webcam->setAvailable((string) $item->verf === 'true'); $webcam->setAvailable($available);
$this->webcamRepository->add($webcam); $this->webcamRepository->add($webcam);
$snowreport->addWebcam($webcam); $snowreport->addWebcam($webcam);
} else { } else {
// Update cam in db and set availability
$webcam = $result->getFirst(); $webcam = $result->getFirst();
$webcam->setUrl((string) $item->url); $webcam->setUrl((string) $item->url);
$webcam->setName((string) $item->dt); $webcam->setName((string) $item->dt);
$webcam->setAvailable((string) $item->verf === 'true'); $webcam->setAvailable($available && $include);
} }
static::$validWebcamUids[] = $vendorUid; static::$validWebcamUids[] = $vendorUid;
} }
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
+19 -7
View File
@@ -160,7 +160,7 @@ new Vue({
accessibility: false, // This is a hack to avoid a slick carousel bug. see: https://github.com/kenwheeler/slick/issues/1407#issuecomment-325228683 accessibility: false, // This is a hack to avoid a slick carousel bug. see: https://github.com/kenwheeler/slick/issues/1407#issuecomment-325228683
mobileFirst: true, mobileFirst: true,
infinite: false, infinite: false,
slidesToShow: 1.25, slidesToShow: 1.15,
slidesToScroll: 1, slidesToScroll: 1,
arrows: false, arrows: false,
dots: false, dots: false,
@@ -175,15 +175,21 @@ new Vue({
} }
}, },
{ {
breakpoint: 830, breakpoint: 992,
settings: { settings: {
slidesToShow: 2.75, slidesToShow: 2.75,
} }
}, },
{ {
breakpoint: 480, breakpoint: 640,
settings: { settings: {
slidesToShow: 2.25, slidesToShow: 2.5,
}
},
{
breakpoint: 384,
settings: {
slidesToShow: 1.75,
} }
} }
] ]
@@ -196,7 +202,7 @@ new Vue({
accessibility: false, // This is a hack to avoid a slick carousel bug. see: https://github.com/kenwheeler/slick/issues/1407#issuecomment-325228683 accessibility: false, // This is a hack to avoid a slick carousel bug. see: https://github.com/kenwheeler/slick/issues/1407#issuecomment-325228683
mobileFirst: true, mobileFirst: true,
infinite: false, infinite: false,
slidesToShow: 1.25, slidesToShow: 1.15,
slidesToScroll: 1, slidesToScroll: 1,
arrows: false, arrows: false,
responsive: [ responsive: [
@@ -216,9 +222,15 @@ new Vue({
} }
}, },
{ {
breakpoint: 768, breakpoint: 640,
settings: { settings: {
slidesToShow: 2.25, slidesToShow: 2.5,
}
},
{
breakpoint: 384,
settings: {
slidesToShow: 1.75,
} }
} }
] ]