-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #372 from mageplaza/2.4-develop
2.4 develop
- Loading branch information
Showing
13 changed files
with
230 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| <?php | ||
| /** | ||
| * Hyvä Themes - https://hyva.io | ||
| * Copyright © Hyvä Themes 2020-present. All rights reserved. | ||
| * This product is licensed per Magento install | ||
| * See https://hyva.io/license | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| use Hyva\Theme\Model\ViewModelRegistry; | ||
| use Hyva\Theme\ViewModel\Customer; | ||
| use Hyva\Theme\ViewModel\StoreConfig; | ||
| use Magento\Framework\Escaper; | ||
| use Magento\Framework\View\Element\Template; | ||
|
|
||
| /** @var Template $block */ | ||
| /** @var Escaper $escaper */ | ||
| /** @var ViewModelRegistry $viewModels */ | ||
|
|
||
| /** @var Customer $customer */ | ||
| $customer = $viewModels->require(Customer::class); | ||
| /** @var StoreConfig $storeConfig */ | ||
| $storeConfig = $viewModels->require(StoreConfig::class); | ||
| ?> | ||
| <div class="md:w-1/2 w-full flex flex-wrap pr-4"> | ||
| <div class="w-full grid grid-cols-1 sm:grid-cols-2 gap-8 xl:col-span-2"> | ||
| <div> | ||
| <h2 class="text-md leading-5 font-semibold tracking-wider uppercase"> | ||
| Company | ||
| </h2> | ||
| <ul class="mt-4"> | ||
| <li> | ||
| <a href="#" class="text-base leading-6"> | ||
| About | ||
| </a> | ||
| </li> | ||
| <li class="mt-4"> | ||
| <a href="<?= $escaper->escapeUrl($block->getUrl('customer/account')) ?>" | ||
| class="text-base leading-6"> | ||
| <?= $escaper->escapeHtml(__('My Account')) ?> | ||
| </a> | ||
| </li> | ||
| <?php if (!$customer->customerLoggedIn()): ?> | ||
| <li class="mt-4"> | ||
| <a href="<?= $escaper->escapeUrl($block->getUrl('sales/guest/form')) ?>" | ||
| class="text-base leading-6"> | ||
| <?= $escaper->escapeHtml(__('Orders and Returns')) ?> | ||
| </a> | ||
| </li> | ||
| <?php endif; ?> | ||
| <?php if ($storeConfig->getStoreConfig('catalog/seo/search_terms')): ?> | ||
| <li class="mt-4"> | ||
| <a href="<?= $escaper->escapeUrl($block->getUrl('search/term/popular')) ?>" | ||
| class="text-base leading-6"> | ||
| <?= $escaper->escapeHtml(__('Search Terms')) ?> | ||
| </a> | ||
| </li> | ||
| <?php endif; ?> | ||
| <li class="mt-4 mb-4"> | ||
| <a href="<?= $escaper->escapeUrl($block->getUrl('contact')) ?>" | ||
| class="text-base leading-6"> | ||
| <?= $escaper->escapeHtml(__('Contact')) ?> | ||
| </a> | ||
| </li> | ||
| <?= $block->getChildHtml() ?> | ||
| </ul> | ||
| </div> | ||
| <div> | ||
| <h2 class="text-md leading-5 font-semibold tracking-wider uppercase"> | ||
| Legal | ||
| </h2> | ||
| <ul class="mt-4"> | ||
| <li class="mt-4"> | ||
| <a href="#" class="text-base leading-6"> | ||
| Privacy | ||
| </a> | ||
| </li> | ||
| <li class="mt-4"> | ||
| <a href="#" class="text-base leading-6"> | ||
| Terms and Conditions | ||
| </a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| <?php | ||
| /** | ||
| * Mageplaza | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * This source file is subject to the Mageplaza.com license that is | ||
| * available through the world-wide-web at this URL: | ||
| * https://www.mageplaza.com/LICENSE.txt | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade this extension to newer | ||
| * version in the future. | ||
| * | ||
| * @category Mageplaza | ||
| * @package Mageplaza_Blog | ||
| * @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/) | ||
| * @license https://www.mageplaza.com/LICENSE.txt | ||
| */ | ||
|
|
||
| use Mageplaza\Blog\Block\Widget\Posts; | ||
| use Magento\Framework\Escaper; | ||
|
|
||
| /** @var Posts $block */ | ||
| /** @var Escaper $escaper */ | ||
| $posts = $block->getCollection(); | ||
| ?> | ||
|
|
||
| <div class="blog-widget-title"><a></a></div> | ||
| <div class="post-list-container mpcss" id="mpblog-list-container" style="margin-bottom: 50px"> | ||
| <div class="widget-title"> | ||
| <a href="<?= $escaper->escapeUrl($block->getBlogUrl('')) ?>"><?= $escaper->escapeHtml($block->getTitle()) ?></a> | ||
| </div> | ||
| <div class="row"> | ||
| <?php foreach ($posts as $post) : ?> | ||
| <div class="post-list-item" style="margin-left: 5px"> | ||
| <div class="post-item-wraper"> | ||
| <?php if ($post->getImage()) : ?> | ||
| <div class="post-image"> | ||
| <a href="<?= $escaper->escapeUrl($post->getUrl()) ?>"> | ||
| <img class="img-responsive" style="height: 220px; margin:auto" | ||
| src="<?= $escaper->escapeUrl($block->resizeImage($post->getImage(), '400x')) ?>" | ||
| alt="<?= $escaper->escapeHtml($post->getName()); ?>"/> | ||
| </a> | ||
| </div> | ||
| <?php endif; ?> | ||
| <div class="post-info-wraper"> | ||
| <h2 class="mp-post-title" style="font-size: 22px"> | ||
| <a class="post-link-title" title="<?= $escaper->escapeHtmlAttr($post->getName()) ?>" | ||
| href="<?= $escaper->escapeUrl($post->getUrl()) ?>"> | ||
| <?= $escaper->escapeHtml($post->getName()) ?> | ||
| </a> | ||
| </h2> | ||
| <div class="mp-post-info"> | ||
| <?= /** @noEscape */ $block->getPostInfo($post) ?> | ||
| </div> | ||
| <div class="post-short-description"> | ||
| <p><?= /** @noEscape */ $post->getShortDescription() ?></p> | ||
| </div> | ||
| <div class="mp-clearfix"></div> | ||
| <div class="mp-post-meta-info mp-alignright"> | ||
| <div class="actions"> | ||
| <a class="mp-read-more" href="<?= $escaper->escapeUrl($post->getUrl()) ?>" | ||
| title="<?= $escaper->escapeHtmlAttr(__('Read More')) ?>"> | ||
| <?= $escaper->escapeHtml(__('Read more')) ?> | ||
| </a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <?php endforeach; ?> | ||
| </div> | ||
| </div> | ||
| <style> | ||
| .mp-post-info { | ||
| color: #999999; | ||
| font-size: 10px; | ||
| line-height: 30px; | ||
| margin: 0; | ||
| } | ||
| .post-item-wraper:hover { | ||
| border: 1px solid #eee; | ||
| box-shadow: 3px 3px 4px 0 rgba(0, 0, 0, 0.3); | ||
| } | ||
| .post-item-wraper { | ||
| padding: 10px !important; | ||
| border: 1px solid #eee; | ||
|
|
||
| } | ||
| .post-list-item { | ||
| margin-bottom: 20px; | ||
| } | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters