Conflicts resolved
This commit is contained in:
jitendra
commit
ad427a0ef8
|
|
@ -66,7 +66,7 @@ jobs:
|
|||
run: set -e && php artisan db:seed --env=testing
|
||||
|
||||
- name: Vendor Publish
|
||||
run: set -e && php artisan vendor:publish --all --force --env=testing
|
||||
run: set -e && php artisan bagisto:publish --force --env=testing
|
||||
|
||||
- name: Execute Unit Tests
|
||||
run: set -e && vendor/bin/codecept run unit
|
||||
|
|
|
|||
|
|
@ -0,0 +1,114 @@
|
|||
<?php
|
||||
|
||||
namespace Webkul\Core\Console\Commands;
|
||||
|
||||
use Illuminate\Console\Command;
|
||||
|
||||
class BagistoPublish extends Command
|
||||
{
|
||||
/**
|
||||
* The name and signature of the console command.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $signature = 'bagisto:publish { --force : Overwrite any existing files }';
|
||||
|
||||
/**
|
||||
* The console command description.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $description = 'Publish the available assets';
|
||||
|
||||
/**
|
||||
* List of providers.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $providers = [
|
||||
/**
|
||||
* Package providers.
|
||||
*/
|
||||
[
|
||||
'name' => 'DB Blade Compiler',
|
||||
'provider' => \Flynsarmy\DbBladeCompiler\DbBladeCompilerServiceProvider::class,
|
||||
],
|
||||
|
||||
/**
|
||||
* Bagisto providers.
|
||||
*/
|
||||
[
|
||||
'name' => 'Admin',
|
||||
'provider' => \Webkul\Admin\Providers\AdminServiceProvider::class,
|
||||
],
|
||||
[
|
||||
'name' => 'UI',
|
||||
'provider' => \Webkul\Ui\Providers\UiServiceProvider::class,
|
||||
],
|
||||
[
|
||||
'name' => 'Core',
|
||||
'provider' => \Webkul\Core\Providers\CoreServiceProvider::class,
|
||||
],
|
||||
[
|
||||
'name' => 'Shop',
|
||||
'provider' => \Webkul\Shop\Providers\ShopServiceProvider::class,
|
||||
],
|
||||
[
|
||||
'name' => 'Product',
|
||||
'provider' => \Webkul\Product\Providers\ProductServiceProvider::class,
|
||||
],
|
||||
[
|
||||
'name' => 'Velocity',
|
||||
'provider' => \Webkul\Velocity\Providers\VelocityServiceProvider::class,
|
||||
],
|
||||
[
|
||||
'name' => 'Booking Product',
|
||||
'provider' => \Webkul\BookingProduct\Providers\BookingProductServiceProvider::class,
|
||||
],
|
||||
[
|
||||
'name' => 'Social',
|
||||
'provider' => \Webkul\SocialLogin\Providers\SocialLoginServiceProvider::class,
|
||||
],
|
||||
];
|
||||
|
||||
/**
|
||||
* Execute the console command.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function handle()
|
||||
{
|
||||
$this->publishAllPackages();
|
||||
}
|
||||
|
||||
/**
|
||||
* Publish all packages.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function publishAllPackages(): void
|
||||
{
|
||||
collect($this->providers)->each(function ($provider) {
|
||||
$this->publishPackage($provider);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Publish package.
|
||||
*
|
||||
* @param array $provider
|
||||
* @return void
|
||||
*/
|
||||
public function publishPackage(array $provider): void
|
||||
{
|
||||
$this->line('');
|
||||
$this->line('-----------------------------------------');
|
||||
$this->info('Publishing ' . $provider['name']);
|
||||
$this->line('-----------------------------------------');
|
||||
|
||||
$this->call('vendor:publish', [
|
||||
'--provider' => $provider['provider'],
|
||||
'--force' => $this->option('force'),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
@ -53,9 +53,9 @@ class Install extends Command
|
|||
$result = $this->call('db:seed');
|
||||
$this->info($result);
|
||||
|
||||
// running `php artisan vendor:publish --all`
|
||||
// running `php artisan bagisto:publish --force`
|
||||
$this->warn('Step: Publishing assets and configurations...');
|
||||
$result = $this->call('vendor:publish', ['--all' => true, '--force' => true]);
|
||||
$result = $this->call('bagisto:publish', ['--force' => true]);
|
||||
$this->info($result);
|
||||
|
||||
// running `php artisan storage:link`
|
||||
|
|
|
|||
|
|
@ -103,6 +103,7 @@ class CoreServiceProvider extends ServiceProvider
|
|||
{
|
||||
if ($this->app->runningInConsole()) {
|
||||
$this->commands([
|
||||
\Webkul\Core\Console\Commands\BagistoPublish::class,
|
||||
\Webkul\Core\Console\Commands\BagistoVersion::class,
|
||||
\Webkul\Core\Console\Commands\Install::class,
|
||||
\Webkul\Core\Console\Commands\ExchangeRateUpdate::class,
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/ui.js": "/js/ui.js?id=e8457a62399c39389e50",
|
||||
"/js/ui.js": "/js/ui.js?id=a13fbc5b58c0a7b9c6ee",
|
||||
"/css/ui.css": "/css/ui.css?id=35f409e9ac92e008f443"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,12 +28,25 @@ import Debounce from './directives/debounce';
|
|||
import Slugify from './directives/slugify';
|
||||
import SlugifyTarget from './directives/slugify-target';
|
||||
|
||||
/* config section */
|
||||
/**
|
||||
* Configs.
|
||||
*/
|
||||
VTooltip.options.defaultDelay = 0;
|
||||
Vue.config.productionTip = false;
|
||||
|
||||
/* component section */
|
||||
/**
|
||||
* Directives.
|
||||
*/
|
||||
Vue.directive('tooltip', VTooltip.VTooltip);
|
||||
Vue.directive('slugify', Slugify);
|
||||
Vue.directive('slugify-target', SlugifyTarget);
|
||||
Vue.directive('code', Code);
|
||||
Vue.directive('alert', Alert);
|
||||
Vue.directive('debounce', Debounce);
|
||||
|
||||
/**
|
||||
* Components.
|
||||
*/
|
||||
Vue.component('datagrid-plus', DatagridPlus);
|
||||
Vue.component('flash-wrapper', FlashWrapper);
|
||||
Vue.component('flash', Flash);
|
||||
|
|
@ -48,21 +61,18 @@ Vue.component('modal', Modal);
|
|||
Vue.component('image-upload', ImageUpload);
|
||||
Vue.component('image-wrapper', ImageWrapper);
|
||||
Vue.component('image-item', ImageItem);
|
||||
Vue.directive('slugify', Slugify);
|
||||
Vue.directive('slugify-target', SlugifyTarget);
|
||||
Vue.directive('code', Code);
|
||||
Vue.directive('alert', Alert);
|
||||
Vue.component('datetime', DatetimeComponent);
|
||||
Vue.component('date', DateComponent);
|
||||
Vue.component('time-component', TimeComponent);
|
||||
Vue.component('swatch-picker', SwatchPicker);
|
||||
Vue.directive('debounce', Debounce);
|
||||
Vue.component('overlay-loader', OverlayLoader);
|
||||
Vue.component('multiselect', Multiselect);
|
||||
Vue.component('default-image', DefaultImage);
|
||||
Vue.component('draggable', Draggable);
|
||||
|
||||
/* filter section */
|
||||
/**
|
||||
* Filter.
|
||||
*/
|
||||
Vue.filter('truncate', function(value, limit, trail) {
|
||||
if (!value) value = '';
|
||||
|
||||
|
|
@ -72,6 +82,9 @@ Vue.filter('truncate', function(value, limit, trail) {
|
|||
return value.length > limit ? value.substring(0, limit) + trail : value;
|
||||
});
|
||||
|
||||
/**
|
||||
* Get laravel CSRF token.
|
||||
*/
|
||||
Vue.prototype.getCsrf = () => {
|
||||
let token = document.head.querySelector('meta[name="csrf-token"]');
|
||||
|
||||
|
|
@ -84,7 +97,9 @@ Vue.prototype.getCsrf = () => {
|
|||
return token.content;
|
||||
};
|
||||
|
||||
/* require section */
|
||||
/**
|
||||
* Require.
|
||||
*/
|
||||
require('flatpickr/dist/flatpickr.css');
|
||||
require('vue-swatches/dist/vue-swatches.min.css');
|
||||
require('vue-multiselect/dist/vue-multiselect.min.css');
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
<div class="dropdown-filters per-page">
|
||||
<page-filter
|
||||
:per-page="perPage"
|
||||
:per-page-count="perPageCount"
|
||||
:translations="translations"
|
||||
@onFilter="paginateData($event)"
|
||||
></page-filter>
|
||||
|
|
@ -115,7 +114,6 @@ export default {
|
|||
id: btoa(this.src),
|
||||
isDataLoaded: false,
|
||||
massActionTargets: [],
|
||||
perPageCount: [10, 20, 30, 40, 50],
|
||||
url: this.src
|
||||
};
|
||||
},
|
||||
|
|
@ -211,10 +209,6 @@ export default {
|
|||
}
|
||||
}
|
||||
|
||||
if (this.perPageCount.indexOf(parseInt(this.perPage)) === -1) {
|
||||
this.perPageCount.unshift(this.perPage);
|
||||
}
|
||||
|
||||
this.isDataLoaded = true;
|
||||
this.perPage = this.itemsPerPage;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -25,10 +25,11 @@
|
|||
|
||||
<script>
|
||||
export default {
|
||||
props: ['perPage', 'perPageCount', 'translations'],
|
||||
props: ['perPage', 'translations'],
|
||||
|
||||
data() {
|
||||
return {
|
||||
perPageCount: [10, 20, 30, 40, 50],
|
||||
currentSelection: this.perPage
|
||||
};
|
||||
},
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@ export default {
|
|||
* Else, it will reload table only.
|
||||
*/
|
||||
if (data.redirect !== undefined && data.redirect) {
|
||||
window.location.href = data.redirectUrl;
|
||||
window.location.href = data.redirect;
|
||||
} else {
|
||||
self.$emit('onActionSuccess');
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ $commands = [
|
|||
],
|
||||
'publish' => [
|
||||
'key' => 'publish_results',
|
||||
'command' => 'cd ../.. && '. $phpbin .' artisan vendor:publish --all --force 2>&1'
|
||||
'command' => 'cd ../.. && '. $phpbin .' artisan bagisto:publish --force 2>&1'
|
||||
],
|
||||
'storage_link' => [
|
||||
'key' => 'storage_link_results',
|
||||
|
|
|
|||
Loading…
Reference in New Issue