From 2aaf4f4632aa02fb2fa62a545efaff01630ca931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Fri, 26 Apr 2019 11:39:06 +0200 Subject: [PATCH] Replace social media extension --- composer.json | 4 +- composer.lock | 130 ++++++++++++------ .../TypoScript/Extensions/PbSocial.typoscript | 14 -- .../Extensions/PxaSocialFeed.typoscript | 21 +++ .../Configuration/TypoScript/constants.txt | 2 +- .../Configuration/TypoScript/setup.txt | 2 +- .../Private/Assets/scss/remix/_teaserbox.scss | 17 +++ .../Resources/Private/Language/locallang.xlf | 3 + .../Private/Layouts/SocialMedia/Default.html | 4 +- .../SocialMedia/Feed/Provider-facebook.html | 44 ------ .../SocialMedia/Feed/Provider-instagram.html | 10 -- .../Templates/FluidStyledContent/List.html | 4 +- .../Templates/SocialMedia/Feeds/List.html | 35 +++++ .../SocialMedia/Item/ShowSocialFeed.html | 8 -- 14 files changed, 174 insertions(+), 124 deletions(-) delete mode 100644 web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PbSocial.typoscript create mode 100644 web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PxaSocialFeed.typoscript delete mode 100644 web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-facebook.html delete mode 100644 web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-instagram.html create mode 100644 web/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html delete mode 100644 web/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Item/ShowSocialFeed.html diff --git a/composer.json b/composer.json index c4a2c2ee..13a8afe3 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,6 @@ "typo3/cms-wizard-sortpages": "^8.7", "typo3-ter/media": "^4.5", "typo3-ter/ods-redirects": "^1.3", - "plusb/pb_social": "^1.3", "typo3-ter/html-compress": "^1.1", "yohang/calendr": "^2.1", "wyrihaximus/html-compress": "^1.4", @@ -65,7 +64,8 @@ "fluidtypo3/vhs": "^4.3", "webdevops/metaseo": "3.0.0", "helhum/typo3-console": "^4.9", - "gridelementsteam/gridelements": "^8.2" + "gridelementsteam/gridelements": "^8.2", + "pixelant/pxa-social-feed": "^1.10" }, "scripts": { "typo3-cms-scripts": [ diff --git a/composer.lock b/composer.lock index c3357178..1efda058 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cb935efb0e505c4bd4d95395eff4a1ac", + "content-hash": "7abc7ffed601cfa5c0bbf6336d5efa3d", "packages": [ { "name": "christophlehmann/imageoptimizer", @@ -694,6 +694,64 @@ ], "time": "2014-09-09T13:34:57+00:00" }, + { + "name": "facebook/graph-sdk", + "version": "5.7.0", + "source": { + "type": "git", + "url": "https://github.com/facebook/php-graph-sdk.git", + "reference": "2d8250638b33d73e7a87add65f47fabf91f8ad9b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facebook/php-graph-sdk/zipball/2d8250638b33d73e7a87add65f47fabf91f8ad9b", + "reference": "2d8250638b33d73e7a87add65f47fabf91f8ad9b", + "shasum": "" + }, + "require": { + "php": "^5.4|^7.0" + }, + "require-dev": { + "guzzlehttp/guzzle": "~5.0", + "mockery/mockery": "~0.8", + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "guzzlehttp/guzzle": "Allows for implementation of the Guzzle HTTP client", + "paragonie/random_compat": "Provides a better CSPRNG option in PHP 5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.x-dev" + } + }, + "autoload": { + "psr-4": { + "Facebook\\": "src/Facebook/" + }, + "files": [ + "src/Facebook/polyfills.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Facebook Platform" + ], + "authors": [ + { + "name": "Facebook", + "homepage": "https://github.com/facebook/php-graph-sdk/contributors" + } + ], + "description": "Facebook SDK for PHP", + "homepage": "https://github.com/facebook/php-graph-sdk", + "keywords": [ + "facebook", + "sdk" + ], + "time": "2018-12-11T22:56:31+00:00" + }, { "name": "fluidtypo3/vhs", "version": "4.4.0", @@ -1702,67 +1760,61 @@ "time": "2016-04-19T09:28:22+00:00" }, { - "name": "plusb/pb_social", - "version": "1.3.4", + "name": "pixelant/pxa-social-feed", + "version": "v1.10.0", "source": { "type": "git", - "url": "https://bitbucket.org/plus-b/pb_social.git", - "reference": "8aa104521133c32eca30dfb1b309eae18e5a8e60" + "url": "https://github.com/pixelant/pxa_social_feed.git", + "reference": "94ffd4a197e47e03227b6ecdb7af7227a67a16fc" }, "dist": { "type": "zip", - "url": "https://bitbucket.org/plus-b/pb_social/get/8aa104521133c32eca30dfb1b309eae18e5a8e60.zip", - "reference": "8aa104521133c32eca30dfb1b309eae18e5a8e60", + "url": "https://api.github.com/repos/pixelant/pxa_social_feed/zipball/94ffd4a197e47e03227b6ecdb7af7227a67a16fc", + "reference": "94ffd4a197e47e03227b6ecdb7af7227a67a16fc", "shasum": "" }, "require": { - "php": ">=5.6", - "typo3/cms-core": "^7.6 || ^8.7 || ^9.5" + "facebook/graph-sdk": "^5.6.3", + "typo3/cms-core": "^8.7 || ^9.5" }, "replace": { - "pb_social": "self.version", - "typo3-ter/pb_social": "self.version" + "pxa_social_feed": "self.version", + "typo3-ter/pxa-social-feed": "self.version" + }, + "require-dev": { + "nimut/testing-framework": "^2.0", + "squizlabs/php_codesniffer": "2.*", + "symfony/finder": "^3.0" }, "type": "typo3-cms-extension", + "extra": { + "branch-alias": { + "dev-master": "0.0.x-dev" + }, + "typo3/cms": { + "cms-package-dir": "{$vendor-dir}/typo3/cms", + "web-dir": ".Build/Web" + } + }, "autoload": { "psr-4": { - "PlusB\\PbSocial\\": "Classes" - }, - "classmap": [ - "Resources/Private/Libs" - ] + "Pixelant\\PxaSocialFeed\\": "Classes/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0-or-later" + "GPL-2.0+" ], "authors": [ { - "name": "Mikolaj Jedrzejewski, Ramon Mohi, Kai Lorenz, Robert Becker, Arend Maubach", - "homepage": "https://www.plusb.de", + "name": "Pixelant", + "email": "info@pixelant.net", + "homepage": "https://www.pixelant.net", "role": "Developer" } ], - "description": "Social Media Streams", - "homepage": "https://www.plusb.de", - "keywords": [ - "Social Media Streams", - "TYPO3 CMS", - "facebook", - "imgur", - "instagram", - "linkedin", - "pb_social", - "pinterest", - "plus B", - "plusB", - "tumblr", - "twitter", - "tx_news", - "vimeo", - "youtube" - ], - "time": "2018-11-19T10:55:21+00:00" + "description": "Add Facebook, Instagram, and Twitter feeds to your site.", + "time": "2019-03-13T09:49:44+00:00" }, { "name": "psr/http-message", diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PbSocial.typoscript b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PbSocial.typoscript deleted file mode 100644 index 0b8d7fac..00000000 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PbSocial.typoscript +++ /dev/null @@ -1,14 +0,0 @@ - - -plugin.tx_pbsocial { - settings { - load-jquery = 0 - } - view { - templateRootPaths.100 = EXT:ep_theme/Resources/Private/Templates/SocialMedia/ - layoutRootPaths.100 = EXT:ep_theme/Resources/Private/Layouts/SocialMedia/ - partialRootPaths.100 = EXT:ep_theme/Resources/Private/Partials/SocialMedia/ - } -} - -page.includeJSFooter.pbsocialjs > diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PxaSocialFeed.typoscript b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PxaSocialFeed.typoscript new file mode 100644 index 00000000..5cf96da3 --- /dev/null +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PxaSocialFeed.typoscript @@ -0,0 +1,21 @@ + + +plugin.tx_pxasocialfeed { + view { + layoutRootPaths.100 = EXT:ep_theme/Resources/Private/Layouts/SocialMedia/ + templateRootPaths.100 = EXT:ep_theme/Resources/Private/Templates/SocialMedia/ + partialRootPaths.100 = EXT:ep_theme/Resources/Private/Partials/SocialMedia/ + } +} + +page.includeCSS { + pxa_social_feed_1 > +} + +page.includeJSFooter { + pxa_social_feed_1 > + pxa_social_feed_2 > + pxa_social_feed_3 > + pxa_social_feed_4 > + pxa_social_feed_5 > +} diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt index 51fe308f..7ae8db85 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt @@ -160,4 +160,4 @@ plugin.tx_eptheme { - + diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt index 5e5be1ca..a7cc6366 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt @@ -3,8 +3,8 @@ - + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_teaserbox.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_teaserbox.scss index bf96df91..ac7b2771 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_teaserbox.scss +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_teaserbox.scss @@ -102,6 +102,19 @@ } + &--social-media { + height: 200px; + background-size: cover; + } +} + +.teaserbox__icon { + position: absolute; + z-index: 10; + top: 8px; + left: 8px; + color: white; + font-size: 125%; } .teaserbox__main { @@ -178,6 +191,10 @@ } } + &--fixed-height { + height: 220px; + overflow: hidden; + } } .teaserbox__aside { diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Language/locallang.xlf b/web/typo3conf/ext/ep_theme/Resources/Private/Language/locallang.xlf index 21dacb40..d771813b 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Language/locallang.xlf +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Language/locallang.xlf @@ -34,6 +34,9 @@ Details + + Zum Post + Details & Buchen diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/SocialMedia/Default.html b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/SocialMedia/Default.html index f37ab663..57c391a4 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/SocialMedia/Default.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Layouts/SocialMedia/Default.html @@ -1,3 +1 @@ - + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-facebook.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-facebook.html deleted file mode 100644 index 4c74c091..00000000 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-facebook.html +++ /dev/null @@ -1,44 +0,0 @@ - - - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-instagram.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-instagram.html deleted file mode 100644 index bbd08d51..00000000 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SocialMedia/Feed/Provider-instagram.html +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/List.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/List.html index 76e15ef6..b9693c96 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/List.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/List.html @@ -84,10 +84,10 @@ Social Media Plugin - +
- +
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html new file mode 100644 index 00000000..b3a6b5c1 --- /dev/null +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html @@ -0,0 +1,35 @@ +
+ + + + + + +
+ +
+ + + +
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Item/ShowSocialFeed.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Item/ShowSocialFeed.html deleted file mode 100644 index 1aee5f27..00000000 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Item/ShowSocialFeed.html +++ /dev/null @@ -1,8 +0,0 @@ - - - -