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

resolved conflicts

This commit is contained in:
Shubham Mehrotra 2020-03-24 19:32:07 +05:30
parent b079b6f83c 0632ea757c
commit 6aaef49e2a
7 changed files with 38 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/Webkul/Velocity/package.json
View File

@ -10,23 +10,20 @@
"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": {
"axios": "^0.19.0",
"cross-env": "^6.0.3",
"jquery": "^3.4.1",
"laravel-mix": "^5.0.0",
"laravel-mix-merge-manifest": "^0.1.2",
"sass": "^1.24.4",
"sass-loader": "^8.0.0",
"vue": "^2.6.11",
"vue-carousel": "^0.18.0",
"vue-template-compiler": "^2.6.11"
"axios": "^0.18",
"cross-env": "^5.1.4",
"jquery": "^3.2",
"laravel-mix": "^2.1",
"laravel-mix-merge-manifest": "^0.1.1",
"vue": "^2.1.10",
"vue-carousel": "^0.18.0"
},
"dependencies": {
"accounting": "^0.4.1",
"bootstrap-sass": "^3.4.1",
"font-awesome": "^4.7.0",
"material-icons": "^0.3.1",
"vee-validate": "^2.2.15",
"vee-validate": "2.0.0-rc.26",
"vue-slider-component": "^3.1.0",
"vue-toast-notification": "0.0.2"
}

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

File diff suppressed because one or more lines are too long

65
packages/Webkul/Velocity/publishable/assets/js/velocity.js.LICENSE.txt
View File

@ -1,65 +0,0 @@
/*!
* Bootstrap v3.4.1 (https://getbootstrap.com/)
* Copyright 2011-2019 Twitter, Inc.
* Licensed under the MIT license
*/
/*!
* Sizzle CSS Selector Engine v2.3.4
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://js.foundation/
*
* Date: 2019-04-08
*/
/*!
* Vue.js v2.6.11
* (c) 2014-2019 Evan You
* Released under the MIT License.
*/
/*!
* accounting.js v0.4.1
* Copyright 2014 Open Exchange Rates
*
* Freely distributable under the MIT license.
* Portions of accounting.js are inspired or borrowed from underscore.js
*
* Full details and documentation:
* http://openexchangerates.github.io/accounting.js/
*/
/*!
* jQuery JavaScript Library v3.4.1
* https://jquery.com/
*
* Includes Sizzle.js
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2019-05-01T21:04Z
*/
/*!
* vue-carousel v0.18.0-alpha
* (c) 2019 todd.beauchamp@ssense.com
* https://github.com/ssense/vue-carousel#readme
*/
/**
* vee-validate v2.2.15
* (c) 2019 Abdelrahman Awad
* @license MIT
*/
/**
* vue-class-component v7.0.1
* (c) 2015-present Evan You
* @license MIT
*/

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

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=7c0b28c4bad16ac7f9bc",
"/js/velocity.js": "/js/velocity.js?id=a8a0bb91fbd4d49c1cb6",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=4109f5e05451bbc83138"
}

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

@ -29,44 +29,25 @@ Vue.filter('currency', function (value, argument) {
window.Vue = Vue;
window.Carousel = VueCarousel;
import VueSlider from 'vue-slider-component';
import MiniCart from './UI/components/mini-cart';
import ModalComponent from './UI/components/modal';
import AddToCart from './UI/components/add-to-cart';
import StarRating from './UI/components/star-rating';
import QuantityBtn from './UI/components/quantity-btn';
import Sidebar from './UI/components/sidebar';
import ProductCard from './UI/components/product-card';
import Wishlist from './UI/components/wishlist';
import Carousel from './UI/components/carousel';
import ChildSidebar from './UI/components/child-sidebar';
import CardHeader from './UI/components/card-header';
import ImageMagnifier from './UI/components/image-magnifier';
import ProductCompare from './UI/components/product-compare';
import ShimmerComponent from './UI/components/shimmer-component';
import ResponsiveSidebar from './UI/components/responsive-sidebar';
import ProductQuickView from './UI/components/product-quick-view';
import ProductQuickViewBtn from './UI/components/product-quick-view-btn';
// UI components
Vue.component("vue-slider", VueSlider);
Vue.component('mini-cart', MiniCart);
Vue.component('modal-component', ModalComponent);
Vue.component("add-to-cart", AddToCart);
Vue.component('star-ratings', StarRating);
Vue.component('quantity-btn', QuantityBtn);
Vue.component('sidebar-component', Sidebar);
Vue.component("product-card", ProductCard);
Vue.component("wishlist-component", Wishlist);
Vue.component('carousel-component', Carousel);
Vue.component('child-sidebar', ChildSidebar);
Vue.component('card-list-header', CardHeader);
Vue.component('magnify-image', ImageMagnifier);
Vue.component('compare-component', ProductCompare);
Vue.component("shimmer-component", ShimmerComponent);
Vue.component('responsive-sidebar', ResponsiveSidebar);
Vue.component('product-quick-view', ProductQuickView);
Vue.component('product-quick-view-btn', ProductQuickViewBtn);
Vue.component("vue-slider", require("vue-slider-component"));
Vue.component('mini-cart', require('./UI/components/mini-cart'));
Vue.component('modal-component', require('./UI/components/modal'));
Vue.component("add-to-cart", require("./UI/components/add-to-cart"));
Vue.component('star-ratings', require('./UI/components/star-rating'));
Vue.component('quantity-btn', require('./UI/components/quantity-btn'));
Vue.component('sidebar-component', require('./UI/components/sidebar'));
Vue.component("product-card", require("./UI/components/product-card"));
Vue.component("wishlist-component", require("./UI/components/wishlist"));
Vue.component('carousel-component', require('./UI/components/carousel'));
Vue.component('child-sidebar', require('./UI/components/child-sidebar'));
Vue.component('card-list-header', require('./UI/components/card-header'));
Vue.component('magnify-image', require('./UI/components/image-magnifier'));
Vue.component('compare-component', require('./UI/components/product-compare'));
Vue.component("shimmer-component", require("./UI/components/shimmer-component"));
Vue.component('responsive-sidebar', require('./UI/components/responsive-sidebar'));
Vue.component('product-quick-view', require('./UI/components/product-quick-view'));
Vue.component('product-quick-view-btn', require('./UI/components/product-quick-view-btn'));
window.eventBus = new Vue();

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

@ -249,6 +249,10 @@ body {
> div:last-child {
height: 32px;
* {
// height: 100%;
}
}
.locale-icon {

14
packages/Webkul/Velocity/webpack.mix.js vendored
View File

@ -1,9 +1,4 @@
const mix = require("laravel-mix");
if (mix == 'undefined') {
const { mix } = require("laravel-mix");
}
const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest");
var publicPath = "../../../public/themes/velocity/assets";
@ -17,7 +12,8 @@ mix.disableNotifications();
mix
.js(
__dirname + "/src/Resources/assets/js/app.js", "js/velocity.js"
__dirname + "/src/Resources/assets/js/app.js",
"js/velocity.js"
)
.sass(
@ -26,7 +22,9 @@ mix
)
.sass(
__dirname + '/src/Resources/assets/sass/app.scss',
__dirname + '/' + publicPath + '/css/velocity.css'
__dirname + '/' + publicPath + '/css/velocity.css', {
includePaths: ['node_modules/bootstrap-sass/assets/stylesheets/'],
}
)
.options({