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

Merge pull request #5682 from deepaksinghgusain227/search-bar-issue 

Search Bar image issue
This commit is contained in:
Devansh 2022-01-25 12:59:41 +05:30 committed by GitHub
parent 1c8dd851b9 c14ed6c012
commit efae3a7dba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=9d5b79be5419c0a5c1bc",
"/css/shop.css": "/css/shop.css?id=34b435fc92b3747c69ee"
"/css/shop.css": "/css/shop.css?id=7540700482be9e937cf0"
}

2
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -4041,7 +4041,7 @@ ol.breadcrumb {
.image-search-container {
.icon {
&.camera-icon {
top: 10px;
top: 3px;
position: relative;
margin-left: 10px;
}

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

@ -242,7 +242,7 @@
<input type="file" :id="'image-search-container-' + _uid" ref="image_search_input" v-on:change="uploadImage()"/>
<img :id="'uploaded-image-url-' + + _uid" :src="uploaded_image_url" alt="" width="20" height="20" />
<img :id="'uploaded-image-url-' + + _uid" :src="uploaded_image_url" alt="" width="20" height="20" style="display:none" />
</label>
</div>
</script>

18
packages/Webkul/Shop/src/Resources/views/layouts/header/nav-menu/navmenu.blade.php
View File

@ -1,25 +1,20 @@
{!! view_render_event('bagisto.shop.layout.header.category.before') !!}
<?php
$categories = [];
foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category) {
if ($category->slug) {
array_push($categories, $category);
}
}
?>
<category-nav categories='@json($categories)' url="{{url()->to('/')}}"></category-nav>
{!! view_render_event('bagisto.shop.layout.header.category.after') !!}
@push('scripts')
<script type="text/x-template" id="category-nav-template">
<ul class="nav">
@ -36,9 +31,7 @@ foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCateg
<script>
Vue.component('category-nav', {
template: '#category-nav-template',
props: {
categories: {
type: [Array, String, Object],
@ -47,16 +40,13 @@ foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCateg
return [];
})
},
url: String
},
data: function(){
return {
items_count:0
};
},
computed: {
items: function() {
return JSON.parse(this.categories)
@ -88,32 +78,26 @@ foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCateg
<script>
Vue.component('category-item', {
template: '#category-item-template',
props: {
item: Object,
url: String,
},
data: function() {
return {
items_count:0,
show: false,
};
},
mounted: function() {
if(window.innerWidth > 770){
this.show = true;
}
},
computed: {
haveChildren: function() {
return this.item.children.length ? true : false;
},
name: function() {
if (this.item.translations && this.item.translations.length) {
this.item.translations.forEach(function(translation) {
@ -121,11 +105,9 @@ foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCateg
return translation.name;
});
}
return this.item.name;
}
},
methods: {
showOrHide: function() {
this.show = !this.show;