Fixed CMS page, block nesting, content. Fixed composer nesting.

scandipwa · Jul 17, 2020 · 92741fa · 92741fa
1 parent 73e5172
commit 92741fa
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -1,22 +1,22 @@
 {
-  "name": "scandipwa/sample-data",
-  "description": "Sample data for ScandiPWA",
-  "type": "magento2-module",
-  "require": {
-    "magento/magento2-base": "^2.3.2"
-  },
-  "autoload": {
-    "files": [
-      "src/registration.php"
-    ],
-    "psr-4": {
-      "ScandiPWA\\SampleData\\": "src/"
-    }
-  },
-  "support": {
-    "email": "[email protected]"
-  },
-  "licence": [
-    "OSL-3.0"
-  ]
+    "name": "scandipwa/sample-data",
+    "description": "Sample data for ScandiPWA",
+    "type": "magento2-module",
+    "require": {
+        "magento/magento2-base": "^2.3.2"
+    },
+    "autoload": {
+        "files": [
+            "src/registration.php"
+        ],
+        "psr-4": {
+            "ScandiPWA\\SampleData\\": "src/"
+        }
+    },
+    "support": {
+        "email": "[email protected]"
+    },
+    "licence": [
+        "OSL-3.0"
+    ]
 }
diff --git a/src/files/data/html/cms-blocks/homepage-category-preview.html b/src/files/data/html/cms-blocks/homepage-category-preview.html
@@ -1,13 +1,26 @@
 <div class="HomepageCategories">
-    <figure class="HomepageCategories-Figure">
-        <img src="{{media url=wysiwyg/homepage/two-woman-in-field.jpg}}" alt="Two woman in the field">
-        <figcaption class="HomepageCategories-Figcaption"><a href="/category/women" class="HomepageCategories-Button Button"> SHOP <strong>WOMEN</strong> </a></figcaption>
-    </figure>
-    <figure class="HomepageCategories-Figure">
-        <img src="{{media url=wysiwyg/homepage/man-on-the-roof.jpg}}" alt="Man on the roof">
-        <figcaption class="HomepageCategories-Figcaption"><a href="/category/men" class="HomepageCategories-Button Button"> SHOP <strong>MEN</strong> </a></figcaption>
-    </figure>
-    <figure class="HomepageCategories-Figure">
-        <img src="{{media url=wysiwyg/homepage/sunglasses-in-hands.jpg}}" alt="Sunglasses in hands">
-    </figure>
+    <a href="/women.html">
+        <figure class="HomepageCategories-Figure">
+            <img src="{{media url=wysiwyg/homepage/two-woman-in-field.jpg}}" alt="Two woman in the field">
+            <figcaption class="HomepageCategories-Figcaption">
+                <p class="HomepageCategories-Button Button"> SHOP <strong>WOMEN</strong> </p>
+            </figcaption>
+        </figure>
+    </a>
+    <a href="/men.html">
+        <figure class="HomepageCategories-Figure">
+            <img src="{{media url=wysiwyg/homepage/man-on-the-roof.jpg}}" alt="Man on the roof">
+            <figcaption class="HomepageCategories-Figcaption">
+                <p class="HomepageCategories-Button Button"> SHOP <strong>MEN</strong> </p>
+            </figcaption>
+        </figure>
+    </a>
+    <a href="/women.html">
+        <figure class="HomepageCategories-Figure">
+            <img src="{{media url=wysiwyg/homepage/sunglasses-in-hands.jpg}}" alt="Sunglasses in hands">
+            <figcaption class="HomepageCategories-Figcaption">
+                <p class="HomepageCategories-Button Button"> SHOP <strong>WOMEN</strong> </p>
+            </figcaption>
+        </figure>
+    </a>
 </div>
diff --git a/src/files/data/html/cms-pages/homepage.html b/src/files/data/html/cms-pages/homepage.html
@@ -1 +1,4 @@
-<p>{{widget type="Scandiweb\Slider\Block\Widget\Slider" slider_id="1"}} {{widget type="Magento\Cms\Block\Widget\Block" template="widget/static_block/default.phtml" block_id="1"}} {{widget type="Magento\Cms\Block\Widget\Block" template="widget/static_block/default.phtml" block_id="2"}} {{widget type="Magento\CatalogWidget\Block\Product\ProductsList" show_pager="0" products_count="12" template="Magento_CatalogWidget::product/widget/content/grid.phtml" cache_lifetime="2592000" conditions_encoded="^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`any`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`category_ids`,`operator`:`==`,`value`:`3`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`category_ids`,`operator`:`==`,`value`:`4`^]^]"}}</p>
+{{widget type="Scandiweb\Slider\Block\Widget\Slider" slider_id="1"}}
+{{widget type="Magento\Cms\Block\Widget\Block" template="widget/static_block/default.phtml" block_id="1"}}
+{{widget type="Magento\Cms\Block\Widget\Block" template="widget/static_block/default.phtml" block_id="2"}}
+{{widget type="Magento\CatalogWidget\Block\Product\ProductsList" show_pager="0" products_count="12" template="Magento_CatalogWidget::product/widget/content/grid.phtml" cache_lifetime="2592000" conditions_encoded="^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`any`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`category_ids`,`operator`:`==`,`value`:`3`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`category_ids`,`operator`:`==`,`value`:`4`^]^]"}}
diff --git a/src/files/data/html/sliders/homepage-slider.html b/src/files/data/html/sliders/homepage-slider.html
@@ -1,4 +1,2 @@
 <h1 class="HomeSlider-Heading">SUMMER mood</h1>
-<p>
-    <button class="Button">SEE DRESS COLLECTION</button>
-</p>
+<a href="/women.html" class="Button">SEE DRESS COLLECTION</a>