diff --git a/package-lock.json b/package-lock.json index 3cb889d8..b8dace2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5413,6 +5413,11 @@ "invert-kv": "1.0.0" } }, + "load-google-maps-api": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/load-google-maps-api/-/load-google-maps-api-1.3.2.tgz", + "integrity": "sha512-uc0kW24xpTtw2g1g3qIXGgFF+u2Rlp+7a1Hze7Esuz24tHkbblJH0LZGjRVZuL7mqIxEWp+lP7ANt1/OiZRJbA==" + }, "load-json-file": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", diff --git a/package.json b/package.json index 4220e75b..848c4de8 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "iframe-resizer": "^3.5.5", "jquery": "^2.2.4", "jquery-lazy": "^1.7.4", + "load-google-maps-api": "^1.3.2", "moment": "^2.19.4", "normalize.css": "^7.0.0", "picturefill": "^3.0.2", diff --git a/web/typo3conf/ext/ep_products/Configuration/TypoScript/setup.txt b/web/typo3conf/ext/ep_products/Configuration/TypoScript/setup.txt index ede298a7..d75bf6f2 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TypoScript/setup.txt +++ b/web/typo3conf/ext/ep_products/Configuration/TypoScript/setup.txt @@ -35,6 +35,7 @@ plugin.tx_epproducts { searchLogIgnoreIps = {$plugin.tx_epproducts.settings.searchLogIgnoreIps} groupsPageUid = {$plugin.tx_eptheme.settings.groupsPageUid} groupsContactFormPageUid = {$plugin.tx_eptheme.settings.groupsContactFormPageUid} + googleMapsApiKey = {$plugin.tx_eptheme.settings.googleMapsApiKey} datePickerPresets { 1 { label = Silvester diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/gmap.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/gmap.ts index 6ba33011..b991d541 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/gmap.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/gmap.ts @@ -4,5 +4,5 @@ tt_content.gmap { dataProcessing { 10 = EP\EpTheme\DataProcessing\TeaserProcessor } - settings.teaserTextMaxChars = {$plugin.tx_eptheme.settings.teaserTextMaxChars} + settings.googleMapsApiKey = {$plugin.tx_eptheme.settings.googleMapsApiKey} } diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.ts index 3b684653..b4c9f110 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.ts @@ -20,10 +20,6 @@ page { includeJSFooterlibs { manifest = EXT:ep_theme/Resources/Public/js/manifest.js vendor = EXT:ep_theme/Resources/Public/js/vendor.js - gmaps = {$plugin.tx_eptheme.settings.googleMapsJsApiUrl} - gmaps.external = 1 - gmaps.async = 1 - gmaps.disableCompression = 1 } includeJSFooter { diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt index 91b3d8d0..9c7a2b1a 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt @@ -104,6 +104,8 @@ plugin.tx_eptheme { googleStaticMapsBaseUrl = https://maps.googleapis.com/maps/api/staticmap?key=AIzaSyDDOforD1O_j4xXy2nJybC2yQqbUAw9ClY # cat=eptheme/300/120; type=string; label=Google Maps Js API Url googleMapsJsApiUrl = https://maps.googleapis.com/maps/api/js?key=AIzaSyDDOforD1O_j4xXy2nJybC2yQqbUAw9ClY + # cat=eptheme/300/120; type=string; label=Google Maps Js API Url + googleMapsApiKey = AIzaSyDDOforD1O_j4xXy2nJybC2yQqbUAw9ClY # cat=eptheme.events/700/100; type=string; label=Event date day from eventDateDayFrom = diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt index 52800c36..297b70f1 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt @@ -69,6 +69,7 @@ plugin.tx_eptheme { bpnBookingUrlTemplateCode = {$plugin.tx_eptheme.settings.bpnBookingUrlTemplateCode} googleStaticMapsBaseUrl = {$plugin.tx_eptheme.settings.googleStaticMapsBaseUrl} googleMapsJsApiUrl = {$plugin.tx_eptheme.settings.googleMapsJsApiUrl} + googleMapsApiKey = {$plugin.tx_eptheme.settings.googleMapsApiKey} datePickerPresets < plugin.tx_epproducts.settings.datePickerPresets searchPageHeaderImage = {$plugin.tx_eptheme.settings.searchPageHeaderImage} showSkipassBadge = {$plugin.tx_eptheme.settings.showSkipassBadge} diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Gmap.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Gmap.vue index 64a9a29a..e54c7762 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Gmap.vue +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Gmap.vue @@ -2,25 +2,28 @@
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html index b58055ef..46f8e416 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html @@ -9,9 +9,10 @@
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Map/General.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Map/General.html index 6b1654b7..00efe95e 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Map/General.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Map/General.html @@ -4,7 +4,7 @@ - +