home page updates

This commit is contained in:
shubhammehrotra.symfony@webkul.com 2019-12-31 17:26:29 +05:30
parent b5ae57a520
commit 1b27169266
29 changed files with 381 additions and 300 deletions

View File

@ -60,9 +60,7 @@ class ProductsCategoriesProxyController extends Controller
*/
public function index(string $slugOrPath)
{
if ($category = $this->categoryRepository->findByPath($slugOrPath)) {
return view($this->_config['category_view'], compact('category'));
}

View File

@ -730,6 +730,7 @@
.btn-add-to-cart {
padding: 8px;
color: #fff !important;
border-radius: 0px !important;
border-color: #26A37C !important;
background-color: #26A37C !important;
}
@ -869,10 +870,6 @@
border: 1px solid #CCCCCC;
}
.category-container {
padding: 30px 50px;
}
.filters-container {
margin: 20px 0;
}
@ -1019,6 +1016,16 @@
display: block;
}
#product-card-new .cart-wish-wrap .wishlist-icon {
height: 32px;
display: table;
}
#product-card-new .cart-wish-wrap .wishlist-icon > i {
display: table-cell;
vertical-align: middle;
}
.quantity {
width: 100%;
padding-bottom: 10px;
@ -1197,7 +1204,6 @@
z-index: 100;
width: 350px;
left: -230px;
display: none;
position: absolute;
}
@ -1512,10 +1518,6 @@
padding: .3rem 1.25rem;
}
#home-right-bar-container.col-12 .category-container {
padding: 30px 0;
}
.wishlist-icon {
vertical-align: middle;
}
@ -1741,7 +1743,7 @@
display: none;
font-size: 14px;
font-weight: 600;
padding: 6px 14px;
padding: 2px 10px;
position: absolute;
border-radius: 12px;
}
@ -1773,6 +1775,20 @@
color: white;
}
#sidebar .category-content {
margin-bottom: 10px;
}
#sidebar .category-content .category-title {
top: -1px;
font-weight: 600;
position: relative;
}
.category-container .grid-card {
width: 22rem;
}
/* @author Shubham Mehrotra */
body {
overflow-x: hidden;
@ -1790,6 +1806,14 @@ body .container-margin {
position: absolute !important;
}
.account-modal .theme-btn, .account-modal .cart-details .continue-shopping-btn, .cart-details .account-modal .continue-shopping-btn, .account-modal .account-content .account-layout .bottom-toolbar .pagination .page-item, .account-content .account-layout .bottom-toolbar .pagination .account-modal .page-item {
padding: .375rem .75rem;
}
.account-modal .modal-footer .text-left {
padding-left: 5px;
}
.category-list-container {
padding-left: 0px;
display: inline-block;
@ -1838,7 +1862,7 @@ body .container-margin {
width: 22px;
height: 20px;
float: right;
margin-right: 11px;
margin-right: 10px;
background-image: url("../images/Icon-Arrow-Right.svg");
}
@ -2227,7 +2251,13 @@ header #search-form > *:focus {
background-color: #4D7EA8;
}
.content-list li a {
.content-list ul {
display: -webkit-inline-box;
display: -ms-inline-flexbox;
display: inline-flex;
}
.content-list ul li a {
display: block;
cursor: pointer;
font-size: 16px;
@ -2235,7 +2265,6 @@ header #search-form > *:focus {
letter-spacing: 0;
position: relative;
text-decoration: none;
font-family: SourceSansPro-Semibold;
padding: 5px 20px 5px 5px;
}
@ -2403,6 +2432,7 @@ body::after {
.footer .newsletter-subscription .newsletter-wrapper .social-icons {
padding: 20px 0;
color: #FFFFFF;
}
.footer .newsletter-subscription .newsletter-wrapper .social-icons i {
@ -2500,6 +2530,10 @@ body::after {
color: rgba(255, 255, 255, 0.52);
}
.footer .footer-content .footer-statics .software-description p {
font-size: 14px;
}
.footer .top-brands {
padding: 40px;
padding-left: 10%;
@ -2628,6 +2662,14 @@ body::after {
padding-top: 20px !important;
}
.pl0 {
padding-left: 0px !important;
}
.pl15 {
padding-left: 15px !important;
}
.pl10 {
padding-left: 10px !important;
}
@ -2705,7 +2747,7 @@ body::after {
}
.mb10, .product-view .left .main-product-image {
margin-bottom: 10px;
margin-bottom: 10px !important;
}
.mb15, .product-view .right .info, .product-detail .right .info {
@ -2770,7 +2812,7 @@ body::after {
color: rgba(0, 0, 0, 0.53);
}
.clr-dark {
.clr-dark, .footer .footer-content .footer-statics .software-description p {
color: rgba(255, 255, 255, 0.52);
}
@ -2969,8 +3011,8 @@ body::after {
float: left;
width: 30%;
height: 270px;
max-width: 280px;
max-height: 270px;
max-width: 150px;
max-height: 150px;
background: #f2f2f2;
}
@ -2980,28 +3022,6 @@ body::after {
padding-left: 20px;
}
.lg-card-container.list-card .sticker {
border-bottom-right-radius: 15px;
position: absolute;
top: 15px;
left: 15px;
text-transform: uppercase;
padding: 4px 13px;
font-size: 14px;
color: #fff;
-webkit-box-shadow: 1px 1px 1px #ccc;
box-shadow: 1px 1px 1px #ccc;
font-weight: 500;
}
.lg-card-container.list-card .sticker.sale {
background: #ff6472;
}
.lg-card-container.list-card .sticker.new {
background: #ff6472;
}
.lg-card-container.list-card .product-rating .stars {
display: inline-block;
}
@ -3011,7 +3031,17 @@ body::after {
}
.lg-card-container.list-card .product-information {
padding-top: 68px;
height: 150px;
display: table;
}
.lg-card-container.list-card .product-information > div {
display: table-cell;
vertical-align: middle;
}
.lg-card-container.list-card .product-price .sticker {
display: block;
}
.lg-card-container.grid-card {

View File

@ -35585,6 +35585,18 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony default export */ __webpack_exports__["default"] = ({
props: ['categories', 'url', 'addClass', 'mainSidebar'],
data: function data() {
var slicedCategories = this.categories;
if (slicedCategories && slicedCategories.length > 9) {
slicedCategories = this.categories.slice(0, 9);
}
return {
slicedCategories: slicedCategories
};
},
mounted: function mounted() {
if (window.location.href !== this.url + '/' && this.mainSidebar || this.categories && this.categories.length == 0) {
this.toggleSidebar();
@ -35633,7 +35645,7 @@ var render = function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _vm.categories && _vm.categories.length > 0
return _vm.slicedCategories && _vm.slicedCategories.length > 0
? _c(
"nav",
{
@ -35643,11 +35655,15 @@ var render = function() {
[
_c(
"ul",
{ attrs: { type: "none" } },
_vm._l(_vm.categories, function(category, index) {
{ staticClass: "pl15", attrs: { type: "none" } },
_vm._l(_vm.slicedCategories, function(category, index) {
return _c(
"li",
{ key: index, attrs: { id: "category-" + category.id } },
{
key: index,
staticClass: "category-content",
attrs: { id: "category-" + category.id }
},
[
_c(
"a",
@ -35655,10 +35671,7 @@ var render = function() {
staticClass: "category unset",
class: category.children.length > 0 ? "fw6" : "",
attrs: {
href:
_vm.url +
"/categories/" +
category["translations"][0].slug
href: _vm.url + "/" + category["translations"][0].slug
},
on: {
mouseover: function($event) {
@ -35670,18 +35683,18 @@ var render = function() {
}
},
[
_c("span", [_vm._v(_vm._s(category["name"]))]),
_c("span", { staticClass: "category-title" }, [
_vm._v(_vm._s(category["name"]))
]),
_vm._v(" "),
category.children.length > 0
? _c("i", {
staticClass: "angle-right-icon text-down-3",
on: {
click: function($event) {
return _vm.toggleSubCategory(index)
}
}
})
: _vm._e()
_c("i", {
staticClass: "angle-right-icon",
on: {
click: function($event) {
return _vm.toggleSubCategory(index)
}
}
})
]
),
_vm._v(" "),
@ -36706,7 +36719,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
//
//
//
//
/* harmony default export */ __webpack_exports__["default"] = ({
props: ['heading', 'headerContent', 'isEnabled']
@ -36720,58 +36732,54 @@ var render = function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c(
"div",
{ class: "row " + (_vm.isEnabled == "0" ? "disabled" : "") },
[
_c(
"div",
{ staticClass: "main-category fs20 pt10 col-2 pl30 unselectable" },
[
_c("i", {
class:
"rango-view-list " +
(_vm.isEnabled == "0" ? "" : "cursor-pointer") +
" align-vertical-top",
on: {
click: function($event) {
_vm.isEnabled == "0" ? "" : _vm.toggleSidebar()
}
return _c("div", { staticClass: "row" }, [
_c(
"div",
{ staticClass: "main-category fs20 pt10 col-2 pl30 unselectable" },
[
_c("i", {
class:
"rango-view-list " +
(_vm.isEnabled == "0" ? "" : "cursor-pointer") +
" align-vertical-top",
on: {
click: function($event) {
_vm.isEnabled == "0" ? "" : _vm.toggleSidebar()
}
}),
_vm._v(" "),
_c("span", {
staticClass: "text-up",
domProps: { textContent: _vm._s(_vm.heading) }
})
]
),
_vm._v(" "),
_c("div", { staticClass: "content-list row no-margin col-10" }, [
_c(
"ul",
{ staticClass: "no-margin", attrs: { type: "none" } },
_vm._l(_vm.headerContent, function(content, index) {
return _c("li", { key: index }, [
content["content_type"] == "link"
? _c("a", {
attrs: {
href: "content['page_link']",
target: content["link_target"] ? "_blank" : "_self"
},
domProps: { textContent: _vm._s(content.title) }
})
: _c("a", {
attrs: { href: "#" },
domProps: { textContent: _vm._s(content.title) }
})
])
}),
0
)
])
]
)
}
}),
_vm._v(" "),
_c("span", {
staticClass: "text-up",
domProps: { textContent: _vm._s(_vm.heading) }
})
]
),
_vm._v(" "),
_c("div", { staticClass: "content-list row no-margin col-10" }, [
_c(
"ul",
{ staticClass: "no-margin", attrs: { type: "none" } },
_vm._l(_vm.headerContent, function(content, index) {
return _c("li", { key: index }, [
content["content_type"] == "link"
? _c("a", {
attrs: {
href: content["page_link"],
target: content["link_target"] ? "_blank" : "_self"
},
domProps: { textContent: _vm._s(content.title) }
})
: _c("a", {
attrs: { href: "#" },
domProps: { textContent: _vm._s(content.title) }
})
])
}),
0
)
])
])
}
var staticRenderFns = []
render._withStripped = true

View File

@ -22,8 +22,7 @@ class VelocityMetaDataSeeder extends Seeder
'slider' => 1,
'subscription_bar_content' => '<div class="social-icons wk-icon xyz"><i class="within-circle rango-facebook" title="facebook"></i><i class="within-circle rango-twitter" title="twitter"></i><i class="within-circle rango-linked-in" title="linkedin"></i>
<i class="within-circle rango-pintrest" title="Pinterest"></i><i class="within-circle rango-youtube" title="Youtube"></i><i class="within-circle rango-instagram" title="instagram"></i></div>'
'subscription_bar_content' => '<div class="social-icons wk-icon"><i class="fs24 within-circle rango-facebook" title="facebook"></i> <i class="fs24 within-circle rango-twitter" title="twitter"></i> <i class="fs24 within-circle rango-linked-in" title="linkedin"></i> <i class="fs24 within-circle rango-pintrest" title="Pinterest"></i> <i class="fs24 within-circle rango-youtube" title="Youtube"></i> <i class="fs24 within-circle rango-instagram" title="instagram"></i></div>'
]);
}
}

View File

@ -1,7 +1,6 @@
<template>
<div :class="`row ${isEnabled == '0' ? 'disabled' : ''}`">
<div
class="main-category fs20 pt10 col-2 pl30 unselectable">
<div class="row">
<div class="main-category fs20 pt10 col-2 pl30 unselectable">
<i
:class="`rango-view-list ${isEnabled == '0' ? '' : 'cursor-pointer'} align-vertical-top`"
@click="(isEnabled == '0') ? '' : toggleSidebar()">
@ -14,7 +13,7 @@
<li v-for="(content, index) in headerContent" :key="index">
<a
v-if="(content['content_type'] == 'link')"
href="content['page_link']"
:href="content['page_link']"
:target="content['link_target'] ? '_blank' : '_self'"
v-text="content.title">
</a>

View File

@ -3,25 +3,25 @@
<nav
:class="`${addClass ? addClass : ''}`"
id="sidebar"
v-if="categories && categories.length > 0">
v-if="slicedCategories && slicedCategories.length > 0">
<ul type="none">
<ul type="none" class="pl15">
<li
:key="index"
class="category-content"
:id="`category-${category.id}`"
v-for="(category, index) in categories">
v-for="(category, index) in slicedCategories">
<a
class="category unset"
:class="(category.children.length > 0) ? 'fw6' : ''"
:href="`${url}/categories/${category['translations'][0].slug}`"
@mouseover="hover(index, 'mouseover')"
@mouseleave="hover(index, 'mouseleave')">
@mouseleave="hover(index, 'mouseleave')"
:class="(category.children.length > 0) ? 'fw6' : ''"
:href="`${url}/${category['translations'][0].slug}`">
<span>{{ category['name'] }}</span>
<span class="category-title">{{ category['name'] }}</span>
<i
class="angle-right-icon text-down-3"
v-if="category.children.length > 0"
class="angle-right-icon"
@click="toggleSubCategory(index)">
</i>
</a>
@ -44,6 +44,18 @@
export default {
props: ['categories', 'url', 'addClass', 'mainSidebar'],
data: function () {
let slicedCategories = this.categories;
if (slicedCategories && slicedCategories.length > 9) {
slicedCategories = this.categories.slice(0, 9);
}
return {
slicedCategories
}
},
mounted: function () {
if (
(window.location.href !== `${this.url}/` && this.mainSidebar)

View File

@ -32,6 +32,7 @@
.btn-add-to-cart {
padding: 8px;
color: #fff !important;
border-radius: 0px !important;
border-color: #26A37C !important;
background-color: #26A37C !important;

View File

@ -93,10 +93,6 @@
}
}
.category-container {
padding: 30px 50px;
}
.filters-container {
margin: 20px 0;
@ -250,6 +246,18 @@
display: block;
}
}
.cart-wish-wrap {
.wishlist-icon {
height: 32px;
display: table;
> i {
display: table-cell;
vertical-align: middle;
}
}
}
}
.quantity {
@ -447,7 +455,6 @@
z-index: 100;
width: 350px;
left: -230px;
display: none;
position: absolute;
.close {
@ -803,14 +810,6 @@
}
}
#home-right-bar-container {
&.col-12 {
.category-container {
padding: 30px 0;
}
}
}
.wishlist-icon {
vertical-align: middle;
@ -1040,7 +1039,7 @@
display: none;
font-size: 14px;
font-weight: 600;
padding: 6px 14px;
padding: 2px 10px;
position: absolute;
border-radius: 12px;
@ -1068,8 +1067,27 @@
margin-left: 0px;
}
}
.method-sticker {
background-color: grey;
display: block;
color: white;
}
#sidebar {
.category-content {
margin-bottom: 10px;
.category-title {
top: -1px;
font-weight: 600;
position: relative;
}
}
}
.category-container {
.grid-card {
width: 22rem;
}
}

View File

@ -36,6 +36,7 @@
.social-icons {
padding: 20px 0;
color: $light-color;
i {
margin: 0;
@ -136,6 +137,16 @@
}
}
}
.footer-statics {
.software-description {
p {
@extend .clr-dark;
font-size: 14px;
}
}
}
}
.top-brands {

View File

@ -16,6 +16,16 @@ body {
z-index: 100;
width: 350px !important;
position: absolute !important;
.theme-btn {
padding: .375rem .75rem;
}
.modal-footer {
.text-left {
padding-left: 5px;
}
}
}
.category-list-container {
@ -68,7 +78,7 @@ body {
width: 22px;
height: 20px;
float: right;
margin-right: 11px;
margin-right: 10px;
background-image: url("../images/Icon-Arrow-Right.svg");
}
@ -524,17 +534,20 @@ header #search-form > *:focus {
display: inline-block;
background-color: #4D7EA8;
li {
a {
display: block;
cursor: pointer;
font-size: 16px;
color: #FFFFFF;
letter-spacing: 0;
position: relative;
text-decoration: none;
font-family: SourceSansPro-Semibold;
padding: 5px 20px 5px 5px;
ul {
display: inline-flex;
li {
a {
display: block;
cursor: pointer;
font-size: 16px;
color: #FFFFFF;
letter-spacing: 0;
position: relative;
text-decoration: none;
padding: 5px 20px 5px 5px;
}
}
}
}

View File

@ -65,6 +65,12 @@
.pt20 {
padding-top: 20px !important;
}
.pl0 {
padding-left: 0px !important;
}
.pl15 {
padding-left: 15px !important;
}
.pl10 {
padding-left: 10px !important;
}
@ -123,7 +129,7 @@
margin-right: 20px;
}
.mb10 {
margin-bottom: 10px;
margin-bottom: 10px !important;
}
.mb15 {
margin-bottom: 15px;
@ -379,8 +385,8 @@
float: left;
width: 30%;
height: 270px;
max-width: 280px;
max-height: 270px;
max-width: 150px;
max-height: 150px;
background: #f2f2f2;
}
@ -390,28 +396,6 @@
padding-left: 20px;
}
.sticker {
border-bottom-right-radius: 15px;
position: absolute;
top: 15px;
left: 15px;
text-transform: uppercase;
padding: 4px 13px;
font-size: 14px;
color: #fff;
-webkit-box-shadow: 1px 1px 1px #ccc;
box-shadow: 1px 1px 1px #ccc;
font-weight: 500;
&.sale {
background: #ff6472;
}
&.new {
background: #ff6472;
}
}
.product-rating {
.stars {
display: inline-block;
@ -423,7 +407,19 @@
}
.product-information {
padding-top: 68px;
height: 150px;
display: table;
> div {
display: table-cell;
vertical-align: middle;
}
}
.product-price {
.sticker {
display: block;
}
}
}

View File

@ -98,7 +98,8 @@
methods: {
toggleMiniCart: function () {
let modal = $('#cart-modal-content')[0];
modal.classList.toggle('hide');
if (modal)
modal.classList.toggle('hide');
event.stopPropagation();
}

View File

@ -44,8 +44,8 @@
<textarea
class="control"
id="subscription-content"
name="subscription-content">
id="subscription_bar_content"
name="subscription_bar_content">
{{ $metaData->subscription_bar_content}}
</textarea>
</div>
@ -107,7 +107,7 @@
width: "100%",
image_advtab: true,
valid_elements : '*[*]',
selector: 'textarea#home_page_content,textarea#footer_left_content,textarea#subscription-content,textarea#footer_middle_content',
selector: 'textarea#home_page_content,textarea#footer_left_content,textarea#subscription_bar_content,textarea#footer_middle_content',
plugins: 'image imagetools media wordcount save fullscreen code',
toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor | link | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat | code',
});

View File

@ -7,11 +7,22 @@
@section('content')
<div class="content">
<form method="POST" action="{{ route('admin.channels.update', $channel->id) }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
<form
method="POST"
action="{{ route('admin.channels.update', $channel->id) }}"
@submit.prevent="onSubmit"
enctype="multipart/form-data">
<div class="page-header">
<div class="page-title">
<h1>
<i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
<i
class="icon angle-left-icon back-link"
onclick="history.length > 1
? history.go(-1)
: window.location = '{{ url('/admin/dashboard') }}';
">
</i>
{{ __('admin::app.settings.channels.edit-title') }}
</h1>
@ -31,13 +42,35 @@
{!! view_render_event('bagisto.admin.settings.channel.edit.before') !!}
<accordian :title="'{{ __('admin::app.settings.channels.general') }}'" :active="true">
<accordian
:title="'{{ __('admin::app.settings.channels.general') }}'"
:active="true">
<div slot="body">
<div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
<label for="code" class="required">{{ __('admin::app.settings.channels.code') }}</label>
<input type="text" v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.settings.channels.code') }}&quot;" value="{{ $channel->code }}" disabled="disabled"/>
<input type="hidden" name="code" value="{{ $channel->code }}"/>
<div
class="control-group"
:class="[errors.has('code') ? 'has-error' : '']">
<label for="code" class="required">
{{ __('admin::app.settings.channels.code') }}
</label>
<input
id="code"
name="code"
type="text"
class="control"
disabled="disabled"
v-validate="'required'"
value="{{ $channel->code }}"
data-vv-as="&quot;{{ __('admin::app.settings.channels.code') }}&quot;" />
<input
name="code"
type="hidden"
value="{{ $channel->code }}" />
<span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
</div>

View File

@ -78,7 +78,7 @@
<div class="row col-12 cursor-pointer">
<a href="{{ route('shop.checkout.cart.remove', ['id' => $item->id]) }}" class="unset">
<span class="rango-delete fs24 mr10"></span>
<span class="rango-delete fs24"></span>
<span class="align-vertical-top">{{ __('shop::app.checkout.cart.remove') }}</span>
</a>
</div>

View File

@ -9,11 +9,6 @@
<div class="container-fluid accessories">
<card-list-header
heading="Accessories"
view-all="{{
(isset($cardCount) && (sizeof($products) > $cardCount))
? 'http://localhost/PHP/laravel/Bagisto/bagisto-clone/public/categories/category1'
: false
}}"
scrollable="accessories-carousel"
></card-list-header>

View File

@ -53,12 +53,6 @@
<card-list-header
heading="Customer Reviews"
view-all="{{
(isset($cardCount) && (sizeof($reviews) > $cardCount))
? 'http://localhost/PHP/laravel/Bagisto/bagisto-clone/public/categories/category1'
: false
}}"
{{-- scrollable="true" --}}
></card-list-header>
<div class="row">

View File

@ -18,13 +18,6 @@
<card-list-header
heading="{{ __('shop::app.home.featured-products') }}"
view-all="{{
$featuredProductsCount > (isset($cardCount) ? $cardCount : 6)
? 'http://localhost/PHP/laravel/Bagisto/bagisto-clone/public/categories/category1'
: false
}}"
scrollable="{{
($featuredProductsCount > (isset($cardCount) ? $cardCount : 6))
? 'fearured-products-carousel'

View File

@ -1,8 +1,6 @@
@php
$newProducts = app('Webkul\Product\Repositories\ProductRepository')->getNewProducts(6)->items();
// $newProducts = array_merge(array_merge($newProducts, $newProducts), $newProducts);
$showRecentlyViewed = false;
@endphp
@ -11,11 +9,6 @@
<card-list-header
heading="{{ __('shop::app.home.new-products') }}"
view-all="{{
(sizeof($newProducts) > (isset($cardCount) ? $cardCount : 6))
? 'http://localhost/PHP/laravel/Bagisto/bagisto-clone/public/categories/category1'
: false
}}"
scrollable="new-products-carousel"
></card-list-header>

View File

@ -126,11 +126,6 @@
<card-list-header
heading="Plants"
view-all="{{
(sizeof($products) > $cardCount)
? 'http://localhost/PHP/laravel/Bagisto/bagisto-clone/public/categories/category1'
: false
}}"
></card-list-header>
{!! view_render_event('bagisto.shop.new-products.before') !!}

View File

@ -14,7 +14,5 @@
</a>
</div>
<p class="clr-dark fs14">
{{ $velocityMetaData->footer_left_content }}
</p>
{!! $velocityMetaData->footer_left_content !!}
</div>

View File

@ -1,12 +1,3 @@
@php
$categories = [];
foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category){
if ($category->slug)
array_push($categories, $category);
}
@endphp
<div class="footer">
<div class="footer-content">

View File

@ -1,33 +1,40 @@
@if (core()->getConfigData('customer.settings.newsletter.subscription'))
@if (
$velocityMetaData->subscription_bar_content
|| core()->getConfigData('customer.settings.newsletter.subscription')
)
<div class="newsletter-subscription">
<div class="newsletter-wrapper">
{!! $velocityMetaData->subscription_bar_content !!}
@if ($velocityMetaData->subscription_bar_content)
{!! $velocityMetaData->subscription_bar_content !!}
@endif
<div class="subscribe-newsletter">
@if (core()->getConfigData('customer.settings.newsletter.subscription'))
<div class="subscribe-newsletter">
<div class="form-container">
<div class="form-container">
<form action="{{ route('shop.subscribe') }}">
<div class="subscriber-form-div">
<div
:class="`control-group ${errors.has('subscriber_email') ? 'has-error' : ''}`">
<form action="{{ route('shop.subscribe') }}">
<div class="subscriber-form-div">
<div
:class="`control-group ${errors.has('subscriber_email') ? 'has-error' : ''}`">
<input
type="email"
class="control subscribe-field"
name="subscriber_email"
placeholder="{{ __('velocity::app.customer.login-form.your-email-address') }}"
required />
<input
type="email"
class="control subscribe-field"
name="subscriber_email"
placeholder="{{ __('velocity::app.customer.login-form.your-email-address') }}"
required />
<button class="theme-btn subscribe-btn fw6">
{{ __('shop::app.subscription.subscribe') }}
</button>
<button class="theme-btn subscribe-btn fw6">
{{ __('shop::app.subscription.subscribe') }}
</button>
</div>
</div>
</div>
</form>
</div>
</div>
</form>
</div>
</div>
@endif
</div>
</div>
@endif

View File

@ -69,20 +69,22 @@
<div class="categories-sidebar-container col-12 no-padding">
@php
$velocityContent = app('Webkul\Velocity\Repositories\ContentRepository')->getAllContents();
@endphp
<content-header
heading= "{{ __('velocity::app.menu-navbar.text-category') }}"
:header-content="{{ json_encode(
app('Webkul\Velocity\Repositories\ContentRepository')->getAllContents()
) }}"
:header-content="{{ json_encode($velocityContent) }}"
is-enabled="{{ sizeof($categories) }}"
></content-header>
<div class="container">
<div class="row col-12 pr0">
<div class="container no-padding">
<div class="row pr0">
<sidebar-component
main-sidebar=true
url="{{ url()->to('/') }}"
add-class="col-2 category-list-container pt10"
add-class="col-2 category-list-container pt10 no-padding mt15"
:categories="{{ json_encode($categories) }}"
></sidebar-component>

View File

@ -53,7 +53,7 @@
<a href="{{ route('customer.session.index') }}">
<button
type="button"
class="theme-btn fs16">
class="theme-btn fs15">
{{ __('velocity::app.header.sign-in') }}
</button>

View File

@ -9,7 +9,11 @@
<input type="hidden" name="product_id" value="{{ $product->product_id }}">
<input type="hidden" name="quantity" value="1">
<button type="submit" class="btn btn-add-to-cart" {{ ! $product->isSaleable() ? 'disabled' : '' }}>
<button
type="submit"
class="btn btn-add-to-cart"
{{ ! $product->isSaleable() ? 'disabled' : '' }}>
@if (! (isset($showCartIcon) && !$showCartIcon))
<span class="rango-cart-1 fs20"></span>
@endif

View File

@ -1,3 +1,5 @@
@inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
@extends('shop::layouts.master')
@section('page_title')
@ -10,12 +12,11 @@
@stop
@section('content-wrapper')
@inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
<div class="main">
<section class="cart-details row offset-1">
{!! view_render_event('bagisto.shop.productOrCategory.index.before', ['category' => $category]) !!}
<div class="category-container">
<div class="category-container col-12">
@php
$isDisplayMode = in_array(
@ -29,7 +30,7 @@
$products = $productRepository->getAll($category->id);
@endphp
<h1 class="fw6">{{ $category->name }}</h1>
<h1 class="fw6 mb10">{{ $category->name }}</h1>
@if ($isDisplayMode && $products->count())
@if ($category->description)
@ -108,7 +109,7 @@
</div>
{!! view_render_event('bagisto.shop.productOrCategory.index.after', ['category' => $category]) !!}
</div>
</section>
@stop
@push('scripts')

View File

@ -30,26 +30,28 @@
<div class="product-information">
<div class="product-name">
<a
href="{{ route('shop.productOrCategory.index', $product->url_key) }}"
title="T-Shirt" class="unset">
<div>
<div class="product-name">
<a
href="{{ route('shop.productOrCategory.index', $product->url_key) }}"
title="T-Shirt" class="unset">
<span class="fs16">{{ $product->name }}</span>
</a>
</div>
<span class="fs16">{{ $product->name }}</span>
</a>
</div>
<div class="product-price">
@include ('shop::products.price', ['product' => $product])
</div>
<div class="product-price">
@include ('shop::products.price', ['product' => $product])
</div>
<div class="product-rating">
<star-ratings ratings="3"></star-ratings>
<span>{{ $totalReviews }} Ratings</span>
</div>
<div class="product-rating">
<star-ratings ratings="3"></star-ratings>
<span>{{ $totalReviews }} Ratings</span>
</div>
<div class="cart-wish-wrap row">
@include ('shop::products.add-to-cart', ['product' => $product])
<div class="cart-wish-wrap row mt5">
@include ('shop::products.add-to-cart', ['product' => $product])
</div>
</div>
</div>
</div>

View File

@ -8,23 +8,10 @@
@endphp
<a
href="
@if ($isWished)
{{ route('customer.wishlist.remove', $product->product_id) }}
@else
{{ route('customer.wishlist.add', $product->product_id) }}
@endif
"
class="unset wishlist-icon col-4 offset-4 text-right">
class="unset wishlist-icon col-4 offset-4 text-right"
href="{{ route('customer.wishlist.' . ($isWished ? 'remove' : 'add'), $product->product_id) }}">
<i
class="fs24
@if ($isWished)
rango-heart-fill
@else
rango-heart
@endif
"></i>
<i class="fs24 {{ $isWished ? 'rango-heart-fill' : 'rango-heart'}}"></i>
</a>
{!! view_render_event('bagisto.shop.products.wishlist.after') !!}