From 025a5a91466a5ca53a8a598b319eceddd7fb36ac Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Tue, 9 Apr 2019 18:38:17 +0530 Subject: [PATCH 1/5] changed product zoomer config --- .../Shop/src/Resources/views/products/view/gallery.blade.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php index 3b3180bc0..33b25dcb9 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php @@ -166,8 +166,7 @@ $('.zoomContainer').attr('style', 'z-index: -1 !important'); } else { - $('.zoomContainer').css({"position": "absolute", "top": "143px", "left" - : "249px", "height": "480px", "width": "480px", "z-index": "999" }); + $('.zoomContainer').css({"position": "absolute", "z-index": "999" }); } }); }) From 3fe81527586e34eb33f6f3bc3122653b3412f2f2 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 12 Apr 2019 18:20:33 +0530 Subject: [PATCH 2/5] added php tooltip.js dependency and laravel dusk for browser tests profiling --- composer.json | 1 + packages/Webkul/Ui/package.json | 1 + tests/Browser/ExampleTest.php | 23 +++++++++++++ tests/Browser/Pages/HomePage.php | 41 ++++++++++++++++++++++++ tests/Browser/Pages/Page.php | 20 ++++++++++++ tests/Browser/console/.gitignore | 2 ++ tests/Browser/screenshots/.gitignore | 2 ++ tests/DuskTestCase.php | 48 ++++++++++++++++++++++++++++ 8 files changed, 138 insertions(+) create mode 100644 tests/Browser/ExampleTest.php create mode 100644 tests/Browser/Pages/HomePage.php create mode 100644 tests/Browser/Pages/Page.php create mode 100644 tests/Browser/console/.gitignore create mode 100644 tests/Browser/screenshots/.gitignore create mode 100644 tests/DuskTestCase.php diff --git a/composer.json b/composer.json index aace66d41..684fd4891 100755 --- a/composer.json +++ b/composer.json @@ -35,6 +35,7 @@ "barryvdh/laravel-debugbar": "^3.1", "filp/whoops": "^2.0", "fzaninotto/faker": "^1.4", + "laravel/dusk": "^4.0", "mockery/mockery": "^1.0", "nunomaduro/collision": "^2.0", "phpunit/phpunit": "^7.0" diff --git a/packages/Webkul/Ui/package.json b/packages/Webkul/Ui/package.json index c95dc4ae9..8641ce6db 100755 --- a/packages/Webkul/Ui/package.json +++ b/packages/Webkul/Ui/package.json @@ -19,6 +19,7 @@ "flatpickr": "^4.4.6" }, "dependencies": { + "tooltip.js": "^1.3.1", "vue-swatches": "^1.0.3" } } diff --git a/tests/Browser/ExampleTest.php b/tests/Browser/ExampleTest.php new file mode 100644 index 000000000..2c80ac76c --- /dev/null +++ b/tests/Browser/ExampleTest.php @@ -0,0 +1,23 @@ +browse(function (Browser $browser) { + $browser->visit('/customer/login') + ->assertSee('login'); + }); + } +} diff --git a/tests/Browser/Pages/HomePage.php b/tests/Browser/Pages/HomePage.php new file mode 100644 index 000000000..4f5a87f4c --- /dev/null +++ b/tests/Browser/Pages/HomePage.php @@ -0,0 +1,41 @@ + '#selector', + ]; + } +} diff --git a/tests/Browser/Pages/Page.php b/tests/Browser/Pages/Page.php new file mode 100644 index 000000000..f8d76222c --- /dev/null +++ b/tests/Browser/Pages/Page.php @@ -0,0 +1,20 @@ + '#selector', + ]; + } +} diff --git a/tests/Browser/console/.gitignore b/tests/Browser/console/.gitignore new file mode 100644 index 000000000..d6b7ef32c --- /dev/null +++ b/tests/Browser/console/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/tests/Browser/screenshots/.gitignore b/tests/Browser/screenshots/.gitignore new file mode 100644 index 000000000..d6b7ef32c --- /dev/null +++ b/tests/Browser/screenshots/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/tests/DuskTestCase.php b/tests/DuskTestCase.php new file mode 100644 index 000000000..321941f5d --- /dev/null +++ b/tests/DuskTestCase.php @@ -0,0 +1,48 @@ +addArguments([ + '--disable-gpu', + '--headless', + '--no-sandbox' + ]); + + return RemoteWebDriver::create( + 'http://localhost:9515/', DesiredCapabilities::chrome() + ); + + // return RemoteWebDriver::create( + // 'http://localhost:9515', DesiredCapabilities::chrome()->setCapability( + // ChromeOptions::CAPABILITY, $options + // ) + // ); + } +} From f35e9a48d879c0ec2cf5de57f52671502311317a Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Sat, 13 Apr 2019 10:33:23 +0530 Subject: [PATCH 3/5] corrected composer.json provider path for UI package --- packages/Webkul/Ui/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Ui/composer.json b/packages/Webkul/Ui/composer.json index 9fd8ebe60..d4fee0754 100755 --- a/packages/Webkul/Ui/composer.json +++ b/packages/Webkul/Ui/composer.json @@ -16,7 +16,7 @@ "extra": { "laravel": { "providers": [ - "Webkul\\Ui\\UiServiceProvider" + "Webkul\\Ui\\Providers\\UiServiceProvider" ], "aliases": {} } From 492ef9a9882f6bbc1738e5154106341874e29a80 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Sat, 13 Apr 2019 11:59:54 +0530 Subject: [PATCH 4/5] added test for dusk customer login --- tests/Browser/ExampleTest.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/Browser/ExampleTest.php b/tests/Browser/ExampleTest.php index 2c80ac76c..d03a523f1 100644 --- a/tests/Browser/ExampleTest.php +++ b/tests/Browser/ExampleTest.php @@ -17,7 +17,10 @@ class ExampleTest extends DuskTestCase { $this->browse(function (Browser $browser) { $browser->visit('/customer/login') - ->assertSee('login'); + ->type('email', 'prashant@webkul.com') + ->type('password', '12345678') + ->click('input[type="submit"]') + ->screenshot('error'); }); } } From feaaaa89a5591cf181bea45a0257ba0c8b40c9d7 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Sun, 14 Apr 2019 15:30:43 +0530 Subject: [PATCH 5/5] fixed some style issues --- .../views/catalog/attributes/create.blade.php | 2 +- .../Shop/src/Resources/assets/sass/app.scss | 19 ++++++------------- .../views/layouts/header/index.blade.php | 4 ++-- .../src/Resources/assets/sass/_variables.scss | 1 + .../Ui/src/Resources/assets/sass/app.scss | 14 ++++++++++++++ 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php index 30bf27afe..d68f4d2d2 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php @@ -302,7 +302,7 @@ - diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index ce06c037e..ad2a342cb 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -421,7 +421,7 @@ input { display: grid; grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); grid-auto-rows: auto; - grid-column-gap: 48px; + grid-column-gap: 30px; grid-row-gap: 15px; justify-items: end; } @@ -827,7 +827,6 @@ section.slider-block { border-top-right-radius: 0px; border-bottom-right-radius: 0px; padding-left: 12px; - font-family: "Montserrat", sans-serif; font-size: 14px; } @@ -854,9 +853,8 @@ section.slider-block { > li { display: inline-block; border-right: 2px solid $border-color; - cursor: pointer; padding: 0 15px; - min-height: 26px; + min-height: 15px; padding-top: 3px; &:first-child { @@ -1362,14 +1360,6 @@ section.slider-block { .control-group { .subscribe-field { width: 100%; - - &::-webkit-input-placeholder { - font-family: "montserrat", sans-serif; - } - - &::-moz-placeholder { - font-family: "montserrat", sans-serif; - } } .btn-primary { @@ -2483,8 +2473,11 @@ section.cart { padding-top: 20px; .form-header { + display: inline-flex; + align-items: center; + justify-content: space-between; width: 100%; - display: inline-block; + height: 30px; .checkout-step-heading { font-size: 24px; diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index f86c3eb55..567663e5f 100755 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -97,11 +97,11 @@ diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss index 84cca50f7..a3342a9cc 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss @@ -1,5 +1,6 @@ $font-color: #3a3a3a; $brand-color: #0041FF; +$selection-color: rgba(0, 64, 255, 0.6); $info-color: #204d74; $danger-color: #FC6868; $success-color: #4CAF50; diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index 6f6b96123..cb118e4ce 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -15,6 +15,11 @@ outline: none; } +body { + letter-spacing: -0.26px; + line-height: 19px; +} + a:link, a:hover, a:visited, @@ -24,6 +29,11 @@ a:active { color: $brand-color; } +::selection { + background-color: $selection-color; + color: $color-white; + } + textarea { resize: none; } @@ -145,6 +155,10 @@ h5 { } } +.dropdown-toggle { + cursor: pointer; +} + .dropdown-open { position: relative; }