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

Merge branch 'master' of https://github.com/bagisto/bagisto into tensorflow

This commit is contained in:
Shubham Mehrotra 2020-06-18 13:21:10 +05:30
parent af35928a79 15a07fde3c
commit 1b8fb76dd2
8 changed files with 106 additions and 23 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=8800d2830d2fa9f0254d",
"/js/velocity.js": "/js/velocity.js?id=2fdb2d6210b201deb11c",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=d81e6ff285145a3d2833"
"/css/velocity.css": "/css/velocity.css?id=37c5d44764a05752f863"
}

14
packages/Webkul/Velocity/src/Resources/assets/js/app.js vendored
View File

@ -226,6 +226,10 @@ $(document).ready(function () {
},
created: function () {
setTimeout(() => {
document.body.classList.remove("modal-open");
}, 0);
window.addEventListener('click', () => {
let modals = document.getElementsByClassName('sensitive-modal');
@ -334,11 +338,17 @@ $(document).ready(function () {
},
showLoader: function () {
this.showPageLoader = true;
$('#loader').show();
$('.overlay-loader').show();
document.body.classList.add("modal-open");
},
hideLoader: function () {
this.showPageLoader = false;
$('#loader').hide();
$('.overlay-loader').hide();
document.body.classList.remove("modal-open");
}
}
});

68
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -2446,6 +2446,74 @@
}
}
//CSS for loader
.cp-spinner {
width: 48px;
height: 48px;
position: absolute;
display: inline-block;
box-sizing: border-box;
left: calc(50% - 24px);
margin-top: calc(40% - 24px);
}
.overlay-loader {
top: 50%;
left: 50%;
z-index: 11;
position: fixed;
margin-top: -24px;
margin-left: -24px;
}
@media only screen and (max-width: 720px) {
.cp-spinner {
left: 50%;
margin-left: -24px;
top: 50%;
margin-top: -24px;
}
}
//Spinner style
.cp-round:before {
border-radius: 50%;
content: " ";
width: 48px;
height: 48px;
display: inline-block;
box-sizing: border-box;
border-top: solid 6px grey;
border-right: solid 6px grey;
border-bottom: solid 6px grey;
border-left: solid 6px grey;
position: absolute;
top: 0;
left: 0;
}
.cp-round:after {
border-radius: 50%;
content: " ";
width: 48px;
height: 48px;
display: inline-block;
box-sizing: border-box;
border-top: solid 6px $theme-color;
border-right: solid 6px transparent;
border-bottom: solid 6px transparent;
border-left: solid 6px transparent;
position: absolute;
top: 0;
left: 0;
animation: spin 1s ease-in-out infinite;
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
.image-search-container {
top: 9px;
right: 45px;

7
packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php Executable file → Normal file
View File

@ -106,7 +106,7 @@
placeholder="{{ __('velocity::app.header.search-text') }}"
:value="searchedQuery.term ? searchedQuery.term.split('+').join(' ') : ''" />
<image-search-component></image-search-component>
{{-- <image-search-component></image-search-component> --}}
<button class="btn" type="submit" id="header-search-icon">
<i class="fs16 fw6 rango-search"></i>
@ -156,8 +156,8 @@
</div>
</script>
<script src="https://cdn.jsdelivr.net/npm/@tensorflow/tfjs"></script>
<script src="https://cdn.jsdelivr.net/npm/@tensorflow-models/mobilenet"></script>
{{-- <script src="https://cdn.jsdelivr.net/npm/@tensorflow/tfjs"></script>
<script src="https://cdn.jsdelivr.net/npm/@tensorflow-models/mobilenet"></script> --}}
<script type="text/x-template" id="sidebar-categories-template">
<div class="wrapper" v-if="rootCategories">
@ -377,7 +377,6 @@
try {
var queryString = '';
var analysedResult = [];
debugger
net = await mobilenet.load();
const imgElement = document.getElementById('uploaded-image-url');

28
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php
View File

@ -209,23 +209,22 @@
this.$validator.validateAll(scope)
.then(result => {
if (result) {
document.body.style.cursor = 'wait';
this.$root.showLoader();
switch (scope) {
case 'address-form':
this.saveAddress();
document.body.style.cursor = 'default';
break;
case 'shipping-form':
if (this.showShippingSection) {
document.body.style.cursor = 'wait';
this.$root.showLoader();
this.saveShipping();
break;
}
case 'payment-form':
document.body.style.cursor = 'wait';
this.$root.showLoader();
this.savePayment();
this.isPlaceOrderEnabled = ! this.validateAddressForm();
@ -301,7 +300,7 @@
console.log(this.is_customer_exist);
if (response.data)
document.body.style.cursor = 'default';
this.$root.hideLoader();
})
.catch(function (error) {})
})
@ -396,9 +395,12 @@
shippingMethods = response.data.shippingMethods;
this.getOrderSummary();
this.$root.hideLoader();
})
.catch(error => {
this.disable_button = false;
this.$root.hideLoader();
this.handleErrorResponse(error.response, 'address-form')
})
@ -409,12 +411,10 @@
this.$http.post("{{ route('shop.checkout.save-shipping') }}", {'shipping_method': this.selected_shipping_method})
.then(response => {
this.$root.hideLoader();
this.disable_button = false;
this.showPaymentSection = true;
document.body.style.cursor = 'default';
paymentHtml = Vue.compile(response.data.html)
this.completed_step = this.step_numbers[response.data.jump_to_section] + 1;
@ -431,7 +431,7 @@
})
.catch(error => {
this.disable_button = false;
this.$root.hideLoader();
this.handleErrorResponse(error.response, 'shipping-form')
})
},
@ -448,7 +448,7 @@
this.disable_button = false;
this.showSummarySection = true;
document.body.style.cursor = 'default';
this.$root.hideLoader();
reviewHtml = Vue.compile(response.data.html)
this.completed_step = this.step_numbers[response.data.jump_to_section] + 1;
@ -460,6 +460,7 @@
})
.catch(error => {
this.disable_button = false;
this.$root.hideLoader();
this.handleErrorResponse(error.response, 'payment-form')
});
}
@ -470,18 +471,23 @@
this.disable_button = false;
this.isPlaceOrderEnabled = false;
this.$root.showLoader();
this.$http.post("{{ route('shop.checkout.save-order') }}", {'_token': "{{ csrf_token() }}"})
.then(function(response) {
.then(response => {
if (response.data.success) {
if (response.data.redirect_url) {
this.$root.hideLoader();
window.location.href = response.data.redirect_url;
} else {
this.$root.hideLoader();
window.location.href = "{{ route('shop.checkout.success') }}";
}
}
})
.catch(error => {
this.disable_button = true;
this.$root.hideLoader();
window.showAlert(`alert-danger`, this.__('shop.general.alert.danger'), "{{ __('shop::app.common.error') }}");
})

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

@ -131,8 +131,8 @@
</div>
</div>
<div class="modal-parent" style="top: 0" v-if="showPageLoader">
<overlay-loader :is-open="showPageLoader"></overlay-loader>
<div class="modal-parent" id="loader" style="top: 0" v-show="showPageLoader">
<overlay-loader :is-open="true"></overlay-loader>
</div>
</div>