merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Component Reused And Particals Removed

This commit is contained in:
devansh bawari 2021-07-29 18:45:32 +05:30
parent b0bd3a30a9
commit 287c3b5f71
10 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=9d0aebc2bf58444011cd",
"/js/velocity.js": "/js/velocity.js?id=f5fb2423466111a73712",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=10aa7ac507fb85f8acbc"
"/css/velocity.css": "/css/velocity.css?id=29a0849a44b50cc36048"
}

4
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/header-compare-with-badge.vue
View File

@ -6,13 +6,13 @@
<span class="badge" v-text="compareCount"></span>
</div>
<span v-text="__('customer.compare.text')"></span>
<span v-text="__('customer.compare.text')" v-if="isText == 'true'"></span>
</a>
</template>
<script type="text/javascript">
export default {
props: ['isCustomer', 'src'],
props: ['isCustomer', 'isText', 'src'],
data: function() {
return {

6
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/header-wishlist-with-badge.vue
View File

@ -1,16 +1,18 @@
<template>
<a class="wishlist-btn unset" :href="src">
<i class="material-icons">favorite_border</i>
<div class="badge-container" v-if="wishlistCount > 0">
<span class="badge" v-text="wishlistCount"></span>
</div>
<span v-text="__('header.wishlist')"></span>
<span v-text="__('header.wishlist')" v-if="isText == 'true'"></span>
</a>
</template>
<script type="text/javascript">
export default {
props: ['isCustomer', 'src'],
props: ['isCustomer', 'isText', 'src'],
data: function() {
return {

2
packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss vendored
View File

@ -147,7 +147,7 @@
.badge-wrapper,
.badge-container {
top: -2px;
top: -32px;
left: -12px;
position: relative;

55
packages/Webkul/Velocity/src/Resources/views/shop/UI/header.blade.php
View File

@ -19,7 +19,7 @@
<span>
@guest('customer')
<a class="unset" href="{{ route('customer.session.index') }}">
{{ __('velocity::app.responsive.header.greeting', ['customer' => 'Guest']) }}
{{ __('velocity::app.responsive.header.greeting', ['customer' => 'Guest']) }}
</a>
@endguest
@ -343,38 +343,30 @@
</a>
</div>
@php
$showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false;
$showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
@endphp
<div class="right-vc-header col-6">
@php
$showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false;
@endphp
@if ($showCompare)
<a
class="compare-btn unset"
@auth('customer')
href="{{ route('velocity.customer.product.compare') }}"
@endauth
@guest('customer')
href="{{ route('velocity.product.compare') }}"
@endguest
>
<div class="badge-container" v-if="compareCount > 0">
<span class="badge" v-text="compareCount"></span>
</div>
<i class="material-icons">compare_arrows</i>
</a>
<compare-component-with-badge
is-customer="{{ auth()->guard('customer')->check() ? 'true' : 'false' }}"
is-text="false"
src="{{ auth()->guard('customer')->check() ? route('velocity.customer.product.compare') : route('velocity.product.compare') }}">
</compare-component-with-badge>
@endif
@php
$showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
@endphp
@if ($showWishlist)
<a class="wishlist-btn unset" :href="`{{ route('customer.wishlist.index') }}`">
<div class="badge-container" v-if="wishlistCount > 0">
<span class="badge" v-text="wishlistCount"></span>
</div>
<i class="material-icons">favorite_border</i>
</a>
<wishlist-component-with-badge
is-customer="{{ auth()->guard('customer')->check() ? 'true' : 'false' }}"
is-text="false"
src="{{ route('customer.wishlist.index') }}">
</wishlist-component-with-badge>
@endif
<a class="unset cursor-pointer" @click="openSearchBar">
@ -382,10 +374,11 @@
</a>
<a href="{{ route('shop.checkout.cart.index') }}" class="unset">
<div class="badge-wrapper">
<span class="badge">@{{ cartItemsCount }}</span>
</div>
<i class="material-icons text-down-3">shopping_cart</i>
<div class="badge-wrapper">
<span class="badge" v-text="cartItemsCount"></span>
</div>
</a>
</div>

1
packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php
View File

@ -1 +0,0 @@
@include('velocity::UI.header')

2
packages/Webkul/Velocity/src/Resources/views/shop/layouts/header/index.blade.php
View File

@ -49,6 +49,7 @@
<wishlist-component-with-badge
is-customer="{{ auth()->guard('customer')->check() ? 'true' : 'false' }}"
is-text="true"
src="{{ route('customer.wishlist.index') }}">
</wishlist-component-with-badge>
@ -66,6 +67,7 @@
<compare-component-with-badge
is-customer="{{ auth()->guard('customer')->check() ? 'true' : 'false' }}"
is-text="true"
src="{{ auth()->guard('customer')->check() ? route('velocity.customer.product.compare') : route('velocity.product.compare') }}">
</compare-component-with-badge>

2
packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php
View File

@ -37,7 +37,7 @@
<body @if (core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl') class="rtl" @endif>
{!! view_render_event('bagisto.shop.layout.body.before') !!}
@include('shop::UI.particals')
@include('velocity::UI.header')
{{-- main app --}}
<div id="app">