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

Webpack mix files updated and assets compiled for production

This commit is contained in:
jitendra 2019-02-20 12:38:09 +05:30
parent cdb457a337
commit 5e4ab5dd8f
12 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=7683c8f127f6ad2ac3ce",
"/js/admin.js": "/js/admin.js?id=da5ebef9c25a064e7ed6",
"/css/admin.css": "/css/admin.css?id=ccc39419fee98ed8ac7b"
}
}

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

@ -19,7 +19,7 @@
</head>
<body @if (app()->getLocale() == 'ar') class="rtl" style="scroll-behavior: smooth;">
<body @if (app()->getLocale() == 'ar') class="rtl" @endif style="scroll-behavior: smooth;">
{!! view_render_event('bagisto.admin.layout.body.before') !!}
<div id="app">

7
packages/Webkul/Admin/webpack.mix.js vendored
View File

@ -1,8 +1,11 @@
const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest");
var publicPath = 'publishable/assets';
// var publicPath = "../../../public/vendor/webkul/admin/assets";
if (mix.inProduction()) {
var publicPath = 'publishable/assets';
} else {
var publicPath = "../../../public/vendor/webkul/admin/assets";
}
mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications();

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

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=0076f480705e7ce1f8e0",
"/js/shop.js": "/js/shop.js?id=e25827d4b84cbe5d76fb",
"/css/shop.css": "/css/shop.css?id=f55c895c4bc57f6cd61b"
}
}

7
packages/Webkul/Shop/webpack.mix.js vendored
View File

@ -1,8 +1,11 @@
const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest");
var publicPath = 'publishable/assets';
// var publicPath = "../../../public/themes/default/assets";
if (mix.inProduction()) {
var publicPath = 'publishable/assets';
} else {
var publicPath = "../../../public/themes/default/assets";
}
mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications();

2
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

6
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=d984bc35663c0fd9cf3f",
"/css/ui.css": "/css/ui.css?id=ec6e8734bcf3862ca9c7"
}
"/js/ui.js": "/js/ui.js?id=8f9e12057b68b45d7046",
"/css/ui.css": "/css/ui.css?id=e7caa868a32a7ddceb90"
}

8
packages/Webkul/Ui/src/Resources/assets/sass/components.scss vendored
View File

@ -70,23 +70,21 @@
}
.dropdown-list.dropdown-container {
padding: 5px;
padding: 15px;
width: 100%;
top: 43px;
ul {
li {
.control-group {
padding: 15px;
margin-bottom: 15px;
}
}
}
.apply-filter {
padding: 10px;
width: 80%;
margin-left: 10%;
margin-bottom: 5%;
width: 100%;
}
}

9
packages/Webkul/Ui/webpack.mix.js vendored
View File

@ -1,12 +1,17 @@
const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest");
var publicPath = 'publishable/assets';
// var publicPath = "../../../public/vendor/webkul/ui/assets";
if (mix.inProduction()) {
var publicPath = 'publishable/assets';
} else {
var publicPath = "../../../public/vendor/webkul/ui/assets";
}
mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications();
mix.inProduction()
mix.js(
[
__dirname + "/src/Resources/assets/js/app.js",