Merge pull request #6307 from devansh-webkul/booking-product-dependency-set

This commit is contained in:
Devansh 2022-04-18 14:36:33 +05:30 committed by GitHub
commit bb1cb5eba3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 55 additions and 45 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=fecd2e4463e43c5595a5",
"/css/admin.css": "/css/admin.css?id=932732d5f00ca02d5043"
"/js/admin.js": "/js/admin.js?id=551bdd2fab3e31a7d5b1",
"/css/admin.css": "/css/admin.css?id=0a408f23127642584bbc"
}

View File

@ -1,4 +1,3 @@
@import 'colors';
$toggleSize: 31px;
$toggleMargin: -25px 10px;
$toggleLine: 2px;

View File

@ -0,0 +1 @@
{}

View File

@ -1,25 +1,24 @@
{
"private": true,
"scripts": {
"dev": "npm run development",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch-poll": "cross-env npm run watch -- --watch-poll --progress",
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"cross-env": "^6.0.3",
"laravel-mix": "^5.0.0",
"laravel-mix-merge-manifest": "^0.1.2",
"sass": "^1.25.0",
"sass-loader": "^8.0.2",
"vue": "^2.6.12",
"vue-loader": "^15.9.6",
"vue-template-compiler": "^2.6.12"
},
"dependencies": {
"vue-cal": "^3.10.1"
}
"private": true,
"scripts": {
"dev": "npm run development",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch-poll": "cross-env npm run watch -- --watch-poll --progress",
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"cross-env": "^6.0.3",
"laravel-mix": "^5.0.0",
"laravel-mix-merge-manifest": "^0.1.2",
"sass": "^1.25.0",
"sass-loader": "^8.0.2",
"vue": "^2.6.14",
"vue-template-compiler": "^2.6.12"
},
"dependencies": {
"vue-cal": "^3.10.1"
}
}

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{
"/css/default-booking.css": "/css/default-booking.css?id=76de1f2b8e064c1e9043",
"/css/velocity-booking.css": "/css/velocity-booking.css?id=481d94b621e06671752a",
"/js/admin-booking.js": "/js/admin-booking.js?id=5cc56229ce47cbecd1be",
"/js/admin-booking.js": "/js/admin-booking.js?id=c063601e89b1bdc6f82b",
"/css/admin-booking.css": "/css/admin-booking.css?id=02be5e2fa5a499045cbe"
}

View File

@ -1,34 +1,45 @@
const mix = require("laravel-mix");
const mix = require('laravel-mix');
if (mix == 'undefined') {
const { mix } = require("laravel-mix");
const { mix } = require('laravel-mix');
}
require("laravel-mix-merge-manifest");
require('laravel-mix-merge-manifest');
let publicPath = '../../../public/themes/default/assets';
if (mix.inProduction()) {
var publicPath = 'publishable/assets';
} else {
var publicPath = "../../../public/themes/default/assets";
publicPath = 'publishable/assets';
}
mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications();
mix.js(__dirname + "/src/Resources/assets/js/app.js", "js/admin-booking.js")
.copyDirectory(__dirname + "/src/Resources/assets/images", publicPath + "/images")
.sass(__dirname + "/src/Resources/assets/sass/admin.scss", "css/admin-booking.css")
.sass(__dirname + "/src/Resources/assets/sass/default.scss", "css/default-booking.css")
.sass(__dirname + "/src/Resources/assets/sass/velocity.scss", "css/velocity-booking.css")
mix.js(__dirname + '/src/Resources/assets/js/app.js', 'js/admin-booking.js')
.copyDirectory(
__dirname + '/src/Resources/assets/images',
publicPath + '/images'
)
.sass(
__dirname + '/src/Resources/assets/sass/admin.scss',
'css/admin-booking.css'
)
.sass(
__dirname + '/src/Resources/assets/sass/default.scss',
'css/default-booking.css'
)
.sass(
__dirname + '/src/Resources/assets/sass/velocity.scss',
'css/velocity-booking.css'
)
.options({
processCssUrls: false
processCssUrls: false,
});
if (! mix.inProduction()) {
if (!mix.inProduction()) {
mix.sourceMaps();
}
if (mix.inProduction()) {
mix.version();
}
}