[Shopsys] Sliders extension (#3574)

shopsys · Nov 20, 2024 · 32ba352 · 32ba352
2 parents d830e3e + cccd1f2
commit 32ba352
Show file tree

Hide file tree

Showing 26 changed files with 195 additions and 201 deletions.
diff --git a/app/config/graphql/types/ModelType/Slider/SliderItem.types.yaml b/app/config/graphql/types/ModelType/Slider/SliderItem.types.yaml
@@ -1,41 +1,15 @@
 SliderItem:
     type: object
+    inherits:
+        - 'SliderItemDecorator'
     config:
         fields:
             uuid:
                 type: "Uuid!"
                 description: "UUID"
-            name:
-                type: "String!"
-                description: "Slider name"
-            link:
-                type: "String!"
-                description: "Target link"
-            extendedText:
-                type: "String"
-                description: "Text below slider"
-            extendedTextLink:
-                type: "String"
-                description: "Target link of text below slider"
             gtmId:
                 type: "String!"
                 description: "GTM ID"
             gtmCreative:
                 type: "String"
                 description: "GTM creative"
-            images:
-                type: "[Image!]!"
-                description: "Slider item images"
-                resolve: '@=query("imagesByEntityPromiseQuery", value, args["type"])'
-                args:
-                    type:
-                        type: "String"
-                        defaultValue: null
-            mainImage:
-                type: "Image!"
-                description: "Slider item image by params"
-                resolve: '@=query("mainImageByEntityPromiseQuery", value, args["type"])'
-                args:
-                    type:
-                        type: "String"
-                        defaultValue: null
diff --git a/app/config/packages/twig.yaml b/app/config/packages/twig.yaml
@@ -26,6 +26,7 @@ twig:
         - '@ShopsysFramework/Admin/Form/mailWhitelistFormTheme.html.twig'
         - '@ShopsysFramework/Admin/Form/multiLocaleBasicFileuploadFields.html.twig'
         - '@ShopsysFramework/Admin/Form/multiLocaleFileuploadFields.html.twig'
+        - '@ShopsysFramework/Admin/Form/numberSlider.html.twig'
         - '@ShopsysFramework/Admin/Form/orderItems.html.twig'
         - '@ShopsysFramework/Admin/Form/orderlistFields.html.twig'
         - '@ShopsysFramework/Admin/Form/parameterValueConversionList.html.twig'

diff --git a/app/schema.graphql b/app/schema.graphql
@@ -2363,10 +2363,8 @@ type Settings {
 }
 
 type SliderItem {
-  "Text below slider"
-  extendedText: String
-  "Target link of text below slider"
-  extendedTextLink: String
+  "Slider description"
+  description: String
   "GTM creative"
   gtmCreative: String
   "GTM ID"
@@ -2379,6 +2377,10 @@ type SliderItem {
   mainImage(type: String = null): Image!
   "Slider name"
   name: String!
+  "Opacity level for the background color of the slider description box"
+  opacity: Float!
+  "RGB color code for the background of the slider description box"
+  rgbBackgroundColor: String!
   "UUID"
   uuid: Uuid!
 }

diff --git a/app/src/DataFixtures/Demo/SliderItemDataFixture.php b/app/src/DataFixtures/Demo/SliderItemDataFixture.php
@@ -39,22 +39,29 @@ public function load(ObjectManager $manager): void
             $sliderItemData->domainId = $domainId;
             $sliderItemData->hidden = false;
             $sliderItemData->gtmId = 'sliderItemTest';
-            $sliderItemData->sliderExtendedText = t('Terms of promotion', [], Translator::DATA_FIXTURES_TRANSLATION_DOMAIN, $locale);
-            $sliderItemData->sliderExtendedTextLink = 'https://www.shopsys.cz';
             $sliderItemData->uuid = Uuid::uuid5(self::UUID_NAMESPACE, 'Terms of promotion' . $domainId)->toString();
 
             $sliderItemData->name = 'Shopsys';
             $sliderItemData->link = 'https://www.shopsys.cz';
+            $sliderItemData->description = t('This slider item promotes our latest offers and updates. Stay tuned for more exciting news and promotions. Click the link to learn more!', [], Translator::DATA_FIXTURES_TRANSLATION_DOMAIN, $locale);
+            $sliderItemData->rgbBackgroundColor = '#4844bd';
+            $sliderItemData->opacity = 0.8;
 
             $this->sliderItemFacade->create($sliderItemData);
 
             $sliderItemData->name = t('Documentation', [], Translator::DATA_FIXTURES_TRANSLATION_DOMAIN, $locale);
+            $sliderItemData->description = t('Explore our comprehensive documentation to get the most out of our platform. Find guides, tutorials, and detailed information to help you navigate and utilize all features effectively. Click the link to access the full documentation.', [], Translator::DATA_FIXTURES_TRANSLATION_DOMAIN, $locale);
+            $sliderItemData->rgbBackgroundColor = '#808080';
+            $sliderItemData->opacity = 0.8;
             $sliderItemData->link = 'https://docs.shopsys.com';
             $sliderItemData->uuid = Uuid::uuid5(self::UUID_NAMESPACE, 'Documentation' . $domainId)->toString();
 
             $this->sliderItemFacade->create($sliderItemData);
 
             $sliderItemData->name = t('Become one of us', [], Translator::DATA_FIXTURES_TRANSLATION_DOMAIN, $locale);
+            $sliderItemData->description = t('Join our team and be part of an innovative company. Explore exciting career opportunities and grow with us!', [], Translator::DATA_FIXTURES_TRANSLATION_DOMAIN, $locale);
+            $sliderItemData->rgbBackgroundColor = '#b3bf45';
+            $sliderItemData->opacity = 0.8;
             $sliderItemData->link = 'https://jobs.shopsys.cz';
             $sliderItemData->uuid = Uuid::uuid5(self::UUID_NAMESPACE, 'Become one of us' . $domainId)->toString();
 

diff --git a/app/src/Form/Admin/SliderItemFormTypeExtension.php b/app/src/Form/Admin/SliderItemFormTypeExtension.php
@@ -12,7 +12,6 @@
 use Shopsys\FrameworkBundle\Model\Slider\SliderItem;
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\UrlType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints;
 
@@ -23,7 +22,6 @@ class SliderItemFormTypeExtension extends AbstractTypeExtension
      */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $this->buildExtendedTextAndLinkForm($builder);
         $this->buildVisibilityIntervalForm($builder);
         $this->buildImagesGroup($builder, $options);
         $this->buildGtmForm($builder);
@@ -88,21 +86,6 @@ private function buildImagesGroup(FormBuilderInterface $builder, array $options)
             ]);
     }
 
-    /**
-     * @param \Symfony\Component\Form\FormBuilderInterface $builder
-     */
-    private function buildExtendedTextAndLinkForm(FormBuilderInterface $builder): void
-    {
-        $builder->add('sliderExtendedText', TextType::class, [
-            'required' => false,
-            'label' => t('Text displayed under banner'),
-        ])
-        ->add('sliderExtendedTextLink', UrlType::class, [
-            'required' => false,
-            'label' => t('Link of text under banner'),
-        ]);
-    }
-
     /**
      * @param \Symfony\Component\Form\FormBuilderInterface $builder
      */

diff --git a/app/src/FrontendApi/Resolver/SliderItem/SliderItemResolverMap.php b/app/src/FrontendApi/Resolver/SliderItem/SliderItemResolverMap.php
diff --git a/app/src/Migrations/Version20241114072907.php b/app/src/Migrations/Version20241114072907.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Shopsys\MigrationBundle\Component\Doctrine\Migrations\AbstractMigration;
+
+class Version20241114072907 extends AbstractMigration
+{
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $schema
+     */
+    public function up(Schema $schema): void
+    {
+        $this->sql('ALTER TABLE slider_items DROP COLUMN slider_extended_text');
+        $this->sql('ALTER TABLE slider_items DROP COLUMN slider_extended_text_link');
+    }
+
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $schema
+     */
+    public function down(Schema $schema): void
+    {
+    }
+}
diff --git a/app/src/Model/Slider/SliderItem.php b/app/src/Model/Slider/SliderItem.php
@@ -30,18 +30,6 @@ class SliderItem extends BaseSliderItem
      */
     protected $datetimeVisibleTo;
 
-    /**
-     * @var string|null
-     * @ORM\Column(type="text",nullable=true)
-     */
-    protected $sliderExtendedText;
-
-    /**
-     * @var string|null
-     * @ORM\Column(type="text",nullable=true)
-     */
-    protected $sliderExtendedTextLink;
-
     /**
      * @var string|null
      * @ORM\Column(type="text",nullable=false)
@@ -69,8 +57,6 @@ public function __construct($sliderItemData)
 
         $this->datetimeVisibleFrom = $sliderItemData->datetimeVisibleFrom;
         $this->datetimeVisibleTo = $sliderItemData->datetimeVisibleTo;
-        $this->sliderExtendedText = $sliderItemData->sliderExtendedText;
-        $this->sliderExtendedTextLink = $sliderItemData->sliderExtendedTextLink;
         $this->gtmId = $sliderItemData->gtmId;
         $this->gtmCreative = $sliderItemData->gtmCreative;
         $this->uuid = $sliderItemData->uuid ?: Uuid::uuid4()->toString();
@@ -85,8 +71,6 @@ public function edit($sliderItemData)
 
         $this->datetimeVisibleFrom = $sliderItemData->datetimeVisibleFrom;
         $this->datetimeVisibleTo = $sliderItemData->datetimeVisibleTo;
-        $this->sliderExtendedText = $sliderItemData->sliderExtendedText;
-        $this->sliderExtendedTextLink = $sliderItemData->sliderExtendedTextLink;
         $this->gtmId = $sliderItemData->gtmId;
         $this->gtmCreative = $sliderItemData->gtmCreative;
     }
@@ -123,22 +107,6 @@ public function setDatetimeVisibleTo(?DateTime $datetimeVisibleTo): void
         $this->datetimeVisibleTo = $datetimeVisibleTo;
     }
 
-    /**
-     * @return string|null
-     */
-    public function getSliderExtendedText(): ?string
-    {
-        return $this->sliderExtendedText;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getSliderExtendedTextLink(): ?string
-    {
-        return $this->sliderExtendedTextLink;
-    }
-
     /**
      * @return string
      */

diff --git a/app/src/Model/Slider/SliderItemData.php b/app/src/Model/Slider/SliderItemData.php
@@ -18,16 +18,6 @@ class SliderItemData extends BaseSliderItemData
      */
     public $datetimeVisibleTo;
 
-    /**
-     * @var string|null
-     */
-    public $sliderExtendedText;
-
-    /**
-     * @var string|null
-     */
-    public $sliderExtendedTextLink;
-
     /**
      * @var \Shopsys\FrameworkBundle\Component\FileUpload\ImageUploadData
      */

diff --git a/app/src/Model/Slider/SliderItemDataFactory.php b/app/src/Model/Slider/SliderItemDataFactory.php
@@ -42,8 +42,6 @@ protected function fillFromSliderItem(BaseSliderItemData $sliderItemData, BaseSl
 
         $sliderItemData->datetimeVisibleFrom = $sliderItem->getDatetimeVisibleFrom();
         $sliderItemData->datetimeVisibleTo = $sliderItem->getDatetimeVisibleTo();
-        $sliderItemData->sliderExtendedText = $sliderItem->getSliderExtendedText();
-        $sliderItemData->sliderExtendedTextLink = $sliderItem->getSliderExtendedTextLink();
         $sliderItemData->gtmId = $sliderItem->getGtmId();
         $sliderItemData->gtmCreative = $sliderItem->getGtmCreative();
     }

diff --git a/app/tests/FrontendApiBundle/Functional/SliderItem/GetSliderItemsTest.php b/app/tests/FrontendApiBundle/Functional/SliderItem/GetSliderItemsTest.php
@@ -22,20 +22,14 @@ public function testGetSliderItems(): void
             [
                 'name' => t('Shopsys', [], Translator::DATA_FIXTURES_TRANSLATION_DOMAIN, $firstDomainLocale),
                 'link' => 'https://www.shopsys.cz',
-                'extendedText' => t('Terms of promotion', [], Translator::DATA_FIXTURES_TRANSLATION_DOMAIN, $firstDomainLocale),
-                'extendedTextLink' => 'https://www.shopsys.cz',
             ],
             [
                 'name' => t('Documentation', [], Translator::DATA_FIXTURES_TRANSLATION_DOMAIN, $firstDomainLocale),
                 'link' => 'https://docs.shopsys.com',
-                'extendedText' => t('Terms of promotion', [], Translator::DATA_FIXTURES_TRANSLATION_DOMAIN, $firstDomainLocale),
-                'extendedTextLink' => 'https://www.shopsys.cz',
             ],
             [
                 'name' => t('Become one of us', [], Translator::DATA_FIXTURES_TRANSLATION_DOMAIN, $firstDomainLocale),
                 'link' => 'https://jobs.shopsys.cz',
-                'extendedText' => t('Terms of promotion', [], Translator::DATA_FIXTURES_TRANSLATION_DOMAIN, $firstDomainLocale),
-                'extendedTextLink' => 'https://www.shopsys.cz',
             ],
         ];
 
@@ -47,8 +41,6 @@ public function testGetSliderItems(): void
                 [
                     'name',
                     'link',
-                    'extendedText',
-                    'extendedTextLink',
                 ],
                 $sliderItem,
                 array_shift($expectedSliderItemsData),

diff --git a/app/tests/FrontendApiBundle/Functional/SliderItem/graphql/SliderItemsQuery.graphql b/app/tests/FrontendApiBundle/Functional/SliderItem/graphql/SliderItemsQuery.graphql
@@ -3,8 +3,6 @@ query SliderItemsQuery ($imageType: String) {
         uuid
         name
         link
-        extendedText
-        extendedTextLink
         images (type: $imageType) {
             url
             name

diff --git a/app/translations/dataFixtures.cs.po b/app/translations/dataFixtures.cs.po
@@ -880,6 +880,9 @@ msgstr "Ergonomie"
 msgid "Expect delivery by the end of next month"
 msgstr "Očekávejte dodávku koncem příštího měsíce"
 
+msgid "Explore our comprehensive documentation to get the most out of our platform. Find guides, tutorials, and detailed information to help you navigate and utilize all features effectively. Click the link to access the full documentation."
+msgstr "Prozkoumejte naši komplexní dokumentaci, abyste získali maximum z naší platformy. Najdete zde průvodce, návody a podrobné informace, které vám pomohou efektivně se orientovat a využívat všechny funkce. Klikněte na odkaz pro přístup k celé dokumentaci."
+
 msgid "Extension rod plastic TM-4610"
 msgstr "Nástavec tyčový plast TM-4610"
 
@@ -1075,6 +1078,9 @@ msgstr "JURA Impressa J9 TFT Carbon"
 msgid "Job at Shopsys"
 msgstr "Práce v Shopsys"
 
+msgid "Join our team and be part of an innovative company. Explore exciting career opportunities and grow with us!"
+msgstr "Přidejte se k nám a buďte součástí inovativní společnosti. Objevte vzrušující kariérní příležitosti a rosťte s námi!"
+
 msgid "Kabel HDMI A - HDMI A M/M 2m gold-plated connectors High Speed HD"
 msgstr "Kabel HDMI A - HDMI A M/M 2m zlacene konektory High Speed HD"
 
@@ -1780,9 +1786,6 @@ msgstr "Obchodní podmínky obchodních domů"
 msgid "Terms and conditions of eshop"
 msgstr "Obchodní podmínky e-shopu"
 
-msgid "Terms of promotion"
-msgstr "Pravidla akce"
-
 msgid "Thank you for your order no. {number} placed at {date}"
 msgstr "Děkujeme za objednávku č. {number} ze dne {date}"
 
@@ -1831,6 +1834,9 @@ msgstr "Konec nemotornému odkládání hrnců na novou kuchyňskou linku nebo n
 msgid "This product is not an independently functional unit and may require professional installation."
 msgstr "Přenosný pevný disk GT SuperSpeed USB 3.0 se inspiruje dlouhou historií sportovních vozů"
 
+msgid "This slider item promotes our latest offers and updates. Stay tuned for more exciting news and promotions. Click the link to learn more!"
+msgstr "Tenhle posuvník propaguje naše nejnovější nabídky a aktualizace. Buďte v obraze a sledujte další vzrušující novinky a akce. Klikněte na odkaz a dozvíte se více!"
+
 msgid "Ticket for 100 CZK"
 msgstr "Poukázka na 100 CZK"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,6 @@ query SliderItemsQuery ($imageType: String) { @@
             uuid
             name
             link
-            extendedText
-            extendedTextLink
             images (type: $imageType) {
                 url
                 name
@@ Expand Down @@