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

Moved Some JS To Compiled Portion

This commit is contained in:
devansh bawari 2021-07-15 13:42:07 +05:30
parent b6748f93b6
commit 3a57016884
6 changed files with 77 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=3e3ec5f958646d31a4b8",
"/js/velocity.js": "/js/velocity.js?id=c4402b16a156190bbbe1",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=170046c99c8d10e332ef"
}

44
packages/Webkul/Velocity/src/Helpers/Helper.php
View File

@ -2,15 +2,15 @@
namespace Webkul\Velocity\Helpers;
use Webkul\Product\Helpers\Review;
use Illuminate\Support\Facades\Storage;
use Webkul\Product\Facades\ProductImage;
use Webkul\Product\Models\Product as ProductModel;
use Webkul\Product\Repositories\ProductRepository;
use Webkul\Product\Repositories\ProductFlatRepository;
use Webkul\Velocity\Repositories\OrderBrandsRepository;
use Webkul\Product\Repositories\ProductReviewRepository;
use Webkul\Attribute\Repositories\AttributeOptionRepository;
use Webkul\Product\Facades\ProductImage;
use Webkul\Product\Helpers\Review;
use Webkul\Product\Models\Product as ProductModel;
use Webkul\Product\Repositories\ProductFlatRepository;
use Webkul\Product\Repositories\ProductRepository;
use Webkul\Product\Repositories\ProductReviewRepository;
use Webkul\Velocity\Repositories\OrderBrandsRepository;
use Webkul\Velocity\Repositories\VelocityMetadataRepository;
class Helper extends Review
@ -247,6 +247,36 @@ class Helper extends Review
return $reviews;
}
/**
* Get messages from session.
*
* @return void
*/
public function getMessage()
{
$message = [
'message' => '',
'messageType' => '',
'messageLabel' => '',
];
if ($message['message'] = session('success')) {
$message['messageType'] = 'alert-success';
$message['messageLabel'] = __('velocity::app.shop.general.alert.success');
} else if ($message['message'] = session('warning')) {
$message['messageType'] = 'alert-warning';
$message['messageLabel'] = __('velocity::app.shop.general.alert.warning');
} else if ($message['message'] = session('error')) {
$message['messageType'] = 'alert-danger';
$message['messageLabel'] = __('velocity::app.shop.general.alert.error');
} else if ($message['message'] = session('info')) {
$message['messageType'] = 'alert-info';
$message['messageLabel'] = __('velocity::app.shop.general.alert.info');
}
return $message;
}
/**
* Get json translations.
*

7
packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
View File

@ -106,11 +106,14 @@ class VelocityServiceProvider extends ServiceProvider
private function loadGloableVariables()
{
view()->composer('*', function ($view) {
$velocityMetaData = Cache::remember('velocityMetaData', 3600, function () {
return app(\Webkul\Velocity\Helpers\Helper::class)->getVelocityMetaData();
$velocityHelper = app(\Webkul\Velocity\Helpers\Helper::class);
$velocityMetaData = Cache::remember('velocityMetaData', 3600, function () use ($velocityHelper) {
return $velocityHelper->getVelocityMetaData();
});
$view->with('showRecentlyViewed', true);
$view->with('velocityHelper', $velocityHelper);
$view->with('velocityMetaData', $velocityMetaData);
});

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

@ -89,7 +89,9 @@ Vue.component('velocity-overlay-loader', require('./UI/components/overlay-loader
* Start from here.
**/
$(document).ready(function() {
// define a mixin object
/**
* Define a mixin object.
*/
Vue.mixin(require('./UI/components/trans'));
Vue.mixin({
@ -421,14 +423,33 @@ $(document).ready(function() {
}
});
window.app = app;
// for compilation of html coming from server
Vue.component('vnode-injector', {
/**
* For compilation of html coming from server.
*/
Vue.component('vnode-injector', {
functional: true,
props: ['nodes'],
render(h, { props }) {
return props.nodes;
}
});
window.app = app;
window.showAlert = (messageType, messageLabel, message) => {
if (messageType && message !== '') {
let alertId = Math.floor(Math.random() * 1000);
let html = `<div class="alert ${messageType} alert-dismissible" id="${alertId}">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong>${messageLabel ? messageLabel + '!' : ''} </strong> ${message}.
</div>`;
$('#alert-container').append(html).ready(() => {
window.setTimeout(() => {
$(`#alert-container #${alertId}`).remove();
}, 5000);
});
}
};
});

44
packages/Webkul/Velocity/src/Resources/views/shop/layouts/scripts.blade.php
View File

@ -6,44 +6,13 @@
<script type="text/javascript">
(() => {
window.showAlert = (messageType, messageLabel, message) => {
if (messageType && message !== '') {
let alertId = Math.floor(Math.random() * 1000);
let html = `<div class="alert ${messageType} alert-dismissible" id="${alertId}">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong>${messageLabel ? messageLabel + '!' : ''} </strong> ${message}.
</div>`;
$('#alert-container').append(html).ready(() => {
window.setTimeout(() => {
$(`#alert-container #${alertId}`).remove();
}, 5000);
});
}
}
let messageType = '';
let messageLabel = '';
@if ($message = session('success'))
messageType = 'alert-success';
messageLabel = "{{ __('velocity::app.shop.general.alert.success') }}";
@elseif ($message = session('warning'))
messageType = 'alert-warning';
messageLabel = "{{ __('velocity::app.shop.general.alert.warning') }}";
@elseif ($message = session('error'))
messageType = 'alert-danger';
messageLabel = "{{ __('velocity::app.shop.general.alert.error') }}";
@elseif ($message = session('info'))
messageType = 'alert-info';
messageLabel = "{{ __('velocity::app.shop.general.alert.info') }}";
@endif
if (messageType && '{{ $message }}' !== '') {
window.showAlert(messageType, messageLabel, '{{ $message }}');
/* activate session messages */
let message = @json($velocityHelper->getMessage());
if (message.messageType && message.message !== '') {
window.showAlert(message.messageType, message.messageLabel, message.message);
}
/* activate server error messages */
window.serverErrors = [];
@if (isset($errors))
@if (count($errors))
@ -51,7 +20,8 @@
@endif
@endif
window._translations = @json(app('Webkul\Velocity\Helpers\Helper')->jsonTranslations());
/* add translations */
window._translations = @json($velocityHelper->jsonTranslations());
})();
</script>