diff --git a/packages/Webkul/Customer/src/Providers/ComposerServiceProvider.php b/packages/Webkul/Customer/src/Providers/ComposerServiceProvider.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/Webkul/Shop/package.json b/packages/Webkul/Shop/package.json
index 48ee5dfd1..2c9a43496 100644
--- a/packages/Webkul/Shop/package.json
+++ b/packages/Webkul/Shop/package.json
@@ -16,5 +16,9 @@
"laravel-mix-merge-manifest": "^0.1.1",
"jquery": "^3.2",
"vue": "^2.1.10"
+ },
+ "dependencies": {
+ "vee-validate": "2.0.0-rc.26",
+ "vue-flatpickr": "^2.3.0"
}
}
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index f81b930a7..d2a5138e3 100644
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -1,12 +1,11 @@
['web']], function () {
- Route::get('/', 'Webkul\Shop\Http\Controllers\HomeController@index')->defaults('_config', [
- 'view' => 'shop::home.index'
+ Route::get('/', 'Webkul\Shop\Http\Controllers\HomeController@index')->defaults('_config', [
+ 'view' => 'shop::store.home.index'
]);
});
Route::group(['middleware' => ['web']], function () {
- Route::get('/foo', 'Webkul\Shop\Http\Controllers\HomeController@index1');
+ Route::get('/foo', 'Webkul\Shop\Http\Controllers\HomeController@index1');
});
-
diff --git a/packages/Webkul/Shop/src/Providers/EventServiceProvider.php b/packages/Webkul/Shop/src/Providers/EventServiceProvider.php
new file mode 100644
index 000000000..c7d186ceb
--- /dev/null
+++ b/packages/Webkul/Shop/src/Providers/EventServiceProvider.php
@@ -0,0 +1,41 @@
+createStoreNavigationMenu();
+ }
+
+ /**
+ * This method fires an event for menu creation, any package can add their menu item by listening to the customer.menu.build event
+ *
+ * @return void
+ */
+
+ public function createStoreNavigationMenu()
+ {
+ Event::listen('shop.navmenu.create', function () {
+ return Menu::create(function ($menu) {
+ Event::fire('shop.navmenu.build', $menu);
+ });
+ });
+
+ Event::listen('shop.navmenu.build', function ($menu) {
+ $menu->add('customer.account.profile', 'Profile');
+ $menu->add('customer.account.profile', 'Wishlist');
+ });
+ }
+}
diff --git a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
index f01bf4e21..9aa9fe4c3 100644
--- a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
+++ b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
@@ -3,6 +3,11 @@
namespace Webkul\Shop\Providers;
use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Routing\Router;
+use Illuminate\Support\Facades\Blade;
+
+// use Webkul\Shop\Providers\EventServiceProvider;
class ShopServiceProvider extends ServiceProvider
{
@@ -21,6 +26,13 @@ class ShopServiceProvider extends ServiceProvider
$this->loadViewsFrom(__DIR__ . '/../Resources/views', 'shop');
+ // $this->composeView();
+
+ Blade::directive('continue', function () {
+ return "";
+ });
+
+ // $this->app->register(EventServiceProvider::class);
}
/**
diff --git a/packages/Webkul/Shop/src/Resources/assets/images/arrow-left-dark.svg b/packages/Webkul/Shop/src/Resources/assets/images/arrow-left-dark.svg
new file mode 100644
index 000000000..fcc05f15b
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/assets/images/arrow-left-dark.svg
@@ -0,0 +1,12 @@
+
+
+
+ arrow-left-dark
+ Created with Sketch.
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/assets/images/arrow-right-light.svg b/packages/Webkul/Shop/src/Resources/assets/images/arrow-right-light.svg
new file mode 100644
index 000000000..7dd02995b
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/assets/images/arrow-right-light.svg
@@ -0,0 +1,12 @@
+
+
+
+ arrow-right-light
+ Created with Sketch.
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/assets/js/app.js b/packages/Webkul/Shop/src/Resources/assets/js/app.js
index 081f181e5..e858139d2 100644
--- a/packages/Webkul/Shop/src/Resources/assets/js/app.js
+++ b/packages/Webkul/Shop/src/Resources/assets/js/app.js
@@ -1,8 +1,8 @@
window.jQuery = window.$ = $ = require("jquery");
window.Vue = require("vue");
-// window.VeeValidate = require('vee-validate');
+window.VeeValidate = require("vee-validate");
-// Vue.use(VeeValidate);
+Vue.use(VeeValidate);
//pure JS for resizing of browser purposes only
@@ -29,6 +29,7 @@ $(window).resize(function() {
});
$(document).ready(function() {
+ Vue.component("image-slider", require("./components/imageSlider.vue"));
/* Responsiveness script goes here */
var w = $(document).width();
var window = {};
diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/editForm.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/editForm.vue
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/imageSlider.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/imageSlider.vue
new file mode 100644
index 000000000..0038732c8
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/assets/js/components/imageSlider.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss
index 052b9f479..758629423 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss
@@ -1,6 +1,7 @@
//shop variables
$font-name: "Montserrat", sans-serif;
$background-color: #f2f2f2;
+$fbackground-color: #f2f2f2;
$list-heading-color: rgba(165, 165, 165, 1);
$list-color: #242424;
$subscribe-btn-color: black;
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index c29b1e9f5..974fd6a37 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -208,6 +208,30 @@ body {
width: 100%;
object-fit: fill;
}
+ .slider-control {
+ display: inline-block;
+ vertical-align: middle;
+ position: absolute;
+ right: 10%;
+ margin-top: -60px;
+ margin-right: 10px;
+
+ .dark-left-icon {
+ background-color: white;
+ height: 48px;
+ width: 48px;
+ max-height: 100%;
+ max-width: 100%;
+ }
+
+ .light-right-icon {
+ background-color: black;
+ height: 48px;
+ width: 48px;
+ max-height: 100%;
+ max-width: 100%;
+ }
+ }
}
}
}
@@ -329,7 +353,7 @@ body {
}
.footer {
- background-color: $background-color;
+ background-color: $fbackground-color;
padding-left: 10%;
padding-right: 10%;
@@ -1296,7 +1320,7 @@ body {
}
}
.footer {
- background-color: $background-color;
+ background-color: $fbackground-color;
padding-left: 4%;
padding-right: 4%;
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/login/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/login/index.blade.php
index 31cb7fed7..d43e1eedd 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/login/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/login/index.blade.php
@@ -1,4 +1,4 @@
-@extends('shop::layouts.master')
+@extends('shop::store.layouts.master')
@section('content-wrapper')
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/profile/edit/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/profile/edit/index.blade.php
index a9c635a24..86dc5d38e 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/profile/edit/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/profile/edit/index.blade.php
@@ -1,4 +1,4 @@
-@extends('shop::layouts.master')
+@extends('shop::store.layouts.master')
@section('content-wrapper')
@include('shop::customers.profile.partials.sidemenu')
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/profile/home/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/profile/home/index.blade.php
index e50de94ff..c17ca05a2 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/profile/home/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/profile/home/index.blade.php
@@ -1,4 +1,4 @@
-@extends('shop::layouts.master')
+@extends('shop::store.layouts.master')
@section('content-wrapper')
@include('shop::customers.profile.partials.sidemenu')
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
index 3dfbf9f45..cc0e1b38e 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
@@ -1,4 +1,4 @@
-@extends('shop::layouts.master')
+@extends('shop::store.layouts.master')
@section('content-wrapper')
diff --git a/packages/Webkul/Shop/src/Resources/views/home/index.blade.php b/packages/Webkul/Shop/src/Resources/views/home/index.blade.php
deleted file mode 100644
index f2a1278bc..000000000
--- a/packages/Webkul/Shop/src/Resources/views/home/index.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-@extends('shop::layouts.master')
-@section('slider')
- @include('shop::layouts.slider')
-@endsection
-@section('content-wrapper')
- @include('shop::layouts.featuredproductgrid')
- @include('shop::layouts.newproductgrid')
- @include('shop::layouts.newsupdategrid')
-@endsection
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/slider.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/slider.blade.php
deleted file mode 100644
index fa67f4845..000000000
--- a/packages/Webkul/Shop/src/Resources/views/layouts/slider.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/footer.blade.php b/packages/Webkul/Shop/src/Resources/views/store/footer/index.blade.php
similarity index 100%
rename from packages/Webkul/Shop/src/Resources/views/layouts/footer.blade.php
rename to packages/Webkul/Shop/src/Resources/views/store/footer/index.blade.php
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/featuredproductgrid.blade.php b/packages/Webkul/Shop/src/Resources/views/store/grids/featured/featuredproductgrid.blade.php
similarity index 100%
rename from packages/Webkul/Shop/src/Resources/views/layouts/featuredproductgrid.blade.php
rename to packages/Webkul/Shop/src/Resources/views/store/grids/featured/featuredproductgrid.blade.php
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/newproductgrid.blade.php b/packages/Webkul/Shop/src/Resources/views/store/grids/newproduct/newproductgrid.blade.php
similarity index 100%
rename from packages/Webkul/Shop/src/Resources/views/layouts/newproductgrid.blade.php
rename to packages/Webkul/Shop/src/Resources/views/store/grids/newproduct/newproductgrid.blade.php
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/newsupdategrid.blade.php b/packages/Webkul/Shop/src/Resources/views/store/grids/newsupdate/newsupdategrid.blade.php
similarity index 100%
rename from packages/Webkul/Shop/src/Resources/views/layouts/newsupdategrid.blade.php
rename to packages/Webkul/Shop/src/Resources/views/store/grids/newsupdate/newsupdategrid.blade.php
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header.blade.php b/packages/Webkul/Shop/src/Resources/views/store/header/index.blade.php
similarity index 94%
rename from packages/Webkul/Shop/src/Resources/views/layouts/header.blade.php
rename to packages/Webkul/Shop/src/Resources/views/store/header/index.blade.php
index 78112fe91..63fadfa82 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/header.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/store/header/index.blade.php
@@ -3,7 +3,9 @@