TPS/elektronika_bagisto
TPS
/
elektronika_bagisto
6
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

updates

This commit is contained in:
shubhammehrotra.symfony@webkul.com 2020-01-08 17:24:24 +05:30
parent 7baf5b6c6d
commit 835bbbbf9d
17 changed files with 254 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
database/seeds/DatabaseSeeder.php
View File

@ -1,8 +1,8 @@
<?php
use Illuminate\Database\Seeder;
use Webkul\Velocity\Database\Seeders\VelocityMetaDataSeeder;
use Webkul\Admin\Database\Seeders\DatabaseSeeder as BagistoDatabaseSeeder;
use Webkul\Velocity\Database\Seeders\DatabaseSeeder as VelocityDatabaseSeeder;
class DatabaseSeeder extends Seeder
{
@ -14,6 +14,6 @@ class DatabaseSeeder extends Seeder
public function run()
{
$this->call(BagistoDatabaseSeeder::class);
$this->call(VelocityDatabaseSeeder::class);
$this->call(VelocityMetaDataSeeder::class);
}
}

131
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

@ -7,31 +7,11 @@
background-image: url("../images/Icon-Velocity.svg");
}
.router-link-active .velocity-icon,
.active .velocity-icon {
.router-link-active .velocity-icon, .active .velocity-icon {
background-image: url("../images/Icon-Velocity-Active.svg");
}
.router-link-active.velocity-icon,
.active.velocity-icon {
background-image: url("../images/Icon-Velocity-Active.svg");
}
.velocity-icon {
width: 60px;
height: 55px;
display: inline-block;
background-size: cover;
background-image: url("../images/Icon-Velocity.svg");
}
.router-link-active .velocity-icon,
.active .velocity-icon {
background-image: url("../images/Icon-Velocity-Active.svg");
}
.router-link-active.velocity-icon,
.active.velocity-icon {
.router-link-active.velocity-icon, .active.velocity-icon {
background-image: url("../images/Icon-Velocity-Active.svg");
}
@ -700,6 +680,22 @@
content: "\E99F";
}
.velocity-icon {
width: 60px;
height: 55px;
display: inline-block;
background-size: cover;
background-image: url("../images/Icon-Velocity.svg");
}
.router-link-active .velocity-icon, .active .velocity-icon {
background-image: url("../images/Icon-Velocity-Active.svg");
}
.router-link-active.velocity-icon, .active.velocity-icon {
background-image: url("../images/Icon-Velocity-Active.svg");
}
.qty-btn {
height: 36px;
display: inline-block;
@ -1191,6 +1187,7 @@
}
.customer-options {
top: 40px;
float: right;
padding: 20px;
height: 150px;
@ -1206,6 +1203,7 @@
.customer-options li {
padding: 3px 0;
height: unset !important;
}
.customer-options a {
@ -2632,8 +2630,6 @@ header #search-form > *:focus {
height: 100%;
padding: 20px;
border: none;
box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
-webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
}
.hot-categories-container .hot-category-wrapper .velocity-divide-page .left {
@ -2955,22 +2951,25 @@ body::after {
.footer .footer-content .newsletter-subscription .newsletter-wrapper input.subscribe-field {
width: 300px;
height: 38px;
border: none;
height: 38px;
font-size: 18px;
max-width: 250px;
padding: 10px 20px;
color: rgba(0, 0, 0, 0.83);
}
.footer .footer-content .newsletter-subscription .newsletter-wrapper button.subscribe-btn {
left: -1px;
left: -2px;
height: 38px;
font-size: 18px;
max-width: 110px;
line-height: 10px;
position: relative;
}
.footer .footer-content .newsletter-subscription .newsletter-wrapper .social-icons {
height: 100%;
padding: 20px 0;
color: #FFFFFF;
}
@ -2993,7 +2992,7 @@ body::after {
}
.footer .footer-content .newsletter-subscription .newsletter-wrapper .subscribe-newsletter {
padding: 30px 0;
padding: 25px 0 30px 0;
}
.footer .footer-content > .row {
@ -3013,7 +3012,15 @@ body::after {
line-height: 2.5rem;
}
.footer .footer-content > .row .footer-ct-content > div li a {
.footer .footer-content > .row .footer-ct-content > div ul {
margin-bottom: 0px;
}
.footer .footer-content > .row .footer-ct-content > div ul li {
margin-bottom: 5px;
}
.footer .footer-content > .row .footer-ct-content > div ul li a {
color: rgba(255, 255, 255, 0.83);
}
@ -4005,6 +4012,21 @@ button[disabled] {
vertical-align: middle;
}
@media only screen and (max-width: 1100px) {
.footer .footer-content .newsletter-subscription .newsletter-wrapper .social-icons {
width: 100%;
padding: 5px 0;
}
.footer .footer-content .newsletter-subscription .newsletter-wrapper .subscribe-newsletter {
width: 100%;
padding: 10px 0;
text-align: center;
}
.footer .footer-content .footer-statics > div:not(:last-child) {
margin-bottom: 30px;
}
}
/*!
* Bootstrap v3.4.1 (https://getbootstrap.com/)
* Copyright 2011-2019 Twitter, Inc.
@ -12173,15 +12195,23 @@ body {
#top #account .select-icon {
top: 0px;
left: -3px;
left: 0px;
padding-left: 5px;
}
#top #account .welcome-content {
width: 150px;
float: right;
display: table;
min-width: 150px;
cursor: pointer;
text-align: right;
}
#top #account .welcome-content * {
display: table-cell;
vertical-align: middle;
}
#top #account + .account-modal {
height: 135px;
}
@ -12194,16 +12224,6 @@ body {
height: 100%;
}
#top > div:last-child .welcome-content {
float: right;
display: table;
}
#top > div:last-child .welcome-content * {
display: table-cell;
vertical-align: middle;
}
.dropdown-menu {
border-top: 3px solid #269c77;
border-radius: 0px;
@ -12315,11 +12335,15 @@ header .logo {
}
header #search-form {
height: 35px;
height: 40px;
margin: 5px 0px;
background: #FFFFFF;
}
header #search-form * {
height: 100%;
}
header #search-form .btn-group, header #search-form .quantity {
max-width: 550px;
}
@ -12330,7 +12354,7 @@ header #search-form .btn-group .selectdiv, header #search-form .quantity .select
header #search-form .btn-group .selectdiv:before, header #search-form .quantity .selectdiv:before {
top: 13px;
left: 100px;
left: 108px;
z-index: 10;
font-size: 16px;
content: "\E906";
@ -12366,11 +12390,6 @@ header #search-form input {
border-left: 1px solid #CCCCCC;
}
header #search-form .btn, header #search-form .quantity button, .quantity header #search-form button,
header #search-form .quantity input, .quantity header #search-form input {
height: 40px;
}
header #search-form .btn:hover, header #search-form .quantity button:hover, .quantity header #search-form button:hover,
header #search-form .quantity input:hover, .quantity header #search-form input:hover {
text-decoration: none;
@ -12643,15 +12662,15 @@ header .dropdown-menu-large .dropdown-footer .checkout-link {
}
#nav-menu .secondary-navbar li a {
padding: 5px 20px 5px 5px;
font-family: SourceSansPro-Semibold;
font-size: 16px;
color: #FFFFFF;
letter-spacing: 0;
display: block;
position: relative;
text-decoration: none;
cursor: pointer;
font-size: 16px;
font-weight: 600;
letter-spacing: 0;
position: relative;
color: #FFFFFF;
text-decoration: none;
padding: 5px 20px 5px 5px;
}
.viewed-products .viewed-products-listing {
@ -12780,10 +12799,6 @@ i.within-circle {
height: 50px;
}
.mb60 {
margin-bottom: 60px;
}
.center_div {
margin: 0 auto;
width: 80%;

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

@ -1,13 +1,14 @@
@import "icons";
@import "variables";
@import "mixins";
@import "rango";
@import "icons";
@import "mixins";
@import "variables";
@import "components/UI";
@import "components/app";
@import "components/home";
@import "components/footer";
@import "components/shared";
@import "components/product-view";
@import "components/media";
@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
@ -179,15 +180,24 @@ body {
.select-icon {
top: 0px;
left: -3px;
left: 0px;
padding-left: 5px;
}
.welcome-content {
@extend .unselectable;
width: 150px;
float: right;
display: table;
min-width: 150px;
cursor: pointer;
text-align: right;
* {
display: table-cell;
vertical-align: middle;
}
}
+ .account-modal {
@ -201,16 +211,6 @@ body {
* {
height: 100%;
}
.welcome-content {
float: right;
display: table;
* {
display: table-cell;
vertical-align: middle;
}
}
}
}
@ -330,10 +330,14 @@ header {
}
#search-form {
height: 35px;
height: 40px;
margin: 5px 0px;
background: $white-color;
* {
height: 100%;
}
.btn-group {
max-width: 550px;
@ -345,7 +349,7 @@ header {
.selectdiv:before {
top: 13px;
left: 100px;
left: 108px;
z-index: 10;
font-size: 16px;
content: "\E906";
@ -385,8 +389,6 @@ header {
}
.btn {
height: 40px;
&:hover {
text-decoration: none;
}
@ -631,10 +633,6 @@ header {
left: 283px;
width: 250px;
height: 350px;
.child-category {
}
}
}
}
@ -656,15 +654,15 @@ header {
float: left;
a {
padding: 5px 20px 5px 5px;
font-family: SourceSansPro-Semibold;
font-size: 16px;
color: #FFFFFF;
letter-spacing: 0;
display: block;
position: relative;
text-decoration: none;
cursor: pointer;
font-size: 16px;
font-weight: 600;
letter-spacing: 0;
position: relative;
color: $white-color;
text-decoration: none;
padding: 5px 20px 5px 5px;
}
}
}
@ -795,10 +793,6 @@ i.within-circle {
height: 50px;
}
.mb60 {
margin-bottom: 60px;
}
.center_div {
margin: 0 auto;
width: 80%/* value of your choice which suits your alignment */

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

@ -405,6 +405,7 @@
}
.customer-options{
top: 40px;
float: right;
padding: 20px;
height: 150px;
@ -422,6 +423,7 @@
li {
padding: 3px 0;
height: unset !important;
}
a {

21
packages/Webkul/Velocity/src/Resources/assets/sass/components/footer.scss vendored
View File

@ -19,22 +19,25 @@
input.subscribe-field {
width: 300px;
height: 38px;
border: none;
height: 38px;
font-size: 18px;
max-width: 250px;
padding: 10px 20px;
color: rgba(0,0,0,0.83);
}
button.subscribe-btn {
left: -1px;
left: -2px;
height: 38px;
font-size: 18px;
max-width: 110px;
line-height: 10px;
position: relative;
}
.social-icons {
height: 100%;
padding: 20px 0;
color: $light-color;
@ -57,7 +60,7 @@
}
.subscribe-newsletter {
padding: 30px 0;
padding: 25px 0 30px 0;
}
}
}
@ -78,8 +81,16 @@
font-size: 14px;
line-height: 2.5rem;
li a {
color: rgba(255,255,255,0.83);
ul {
margin-bottom: 0px;
li {
margin-bottom: 5px;
a {
color: rgba(255,255,255,0.83);
}
}
}
}
}

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

@ -358,8 +358,8 @@ header #search-form > *:focus {
height: 100%;
padding: 20px;
border: none;
box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
-webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
// box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
// -webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
}
.velocity-divide-page {

42
packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss vendored Normal file
View File

@ -0,0 +1,42 @@
@media only screen and (max-width: 1100px) {
.footer {
.footer-content {
.newsletter-subscription {
.newsletter-wrapper {
.social-icons {
width: 100%;
padding: 5px 0;
}
.subscribe-newsletter {
width: 100%;
padding: 10px 0;
text-align: center;
}
}
}
.footer-statics {
> div:not(:last-child) {
margin-bottom: 30px;
}
}
}
}
}
@media only screen and (max-width: 992px) {
}
@media only screen and (max-width: 768px) {
// body {
// display: none;
// }
}
@media only screen and (max-width: 576px) {
// body {
// display: block;
// }
}

4
packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php
View File

@ -27,10 +27,10 @@
<script type="text/x-template" id="cart-btn-template">
<button
:class="`btn btn-link disable-box-shadow ${parseInt(itemCount) ? 'dropdown-icon-custom' : ''}`"
type="button"
id="mini-cart"
@click="toggleMiniCart">
@click="toggleMiniCart"
class="btn btn-link disable-box-shadow">
<div class="mini-cart-content">
<i class="rango-cart-1 fs24 text-down-3"></i>

1
packages/Webkul/Velocity/src/Resources/views/customers/account/partials/sidemenu.blade.php
View File

@ -14,6 +14,7 @@
<a class="unset fw6 full-width" href="{{ $subMenuItem['url'] }}">
<i class="icon {{ $index }} text-down-3"></i>
<span>{{ trans($subMenuItem['name']) }}<span>
<i class="rango-arrow-right pull-right text-down-3"></i>
</a>
</li>
@endforeach

89
packages/Webkul/Velocity/src/Resources/views/customers/signup/forgot-password.blade.php
View File

@ -1,58 +1,69 @@
@extends('shop::layouts.master')
@section('page_title')
{{ __('shop::app.customer.forgot-password.page_title') }}
@stop
{{ __('shop::app.customer.forgot-password.page_title') }}
@endsection
@section('content-wrapper')
<div class="auth-content">
<div class="container">
<div class="login-text">
<h2 style="font-weight:bold;" class="fs24">
{{ __('velocity::app.customer.forget-password.forgot-password')}}
<div style="" class="w3-card-login"><a href="{{ route('customer.session.index') }}" class="btn-new-customer-login">{{ __('velocity::app.customer.signup-form.login')}}</a></div>
</h2>
</div>
<div class="mb60" style="height:260px;width:575px;border:1px solid #E5E5E5;margin: 0 auto;margin-bottom:44px;">
<div style="margin: 45px;">
<div class="auth-content form-container">
<div class="container">
<div class="heading">
<h2 class="fs24 fw6">
{{ __('velocity::app.customer.forget-password.forgot-password')}}
</h2>
<p class="fs16" style="font-weight:bold">
<a href="{{ route('customer.session.index') }}" class="btn-new-customer">
<button type="button" class="theme-btn light">
{{ __('velocity::app.customer.signup-form.login') }}
</button>
</a>
</div>
<div class="body">
<h3 class="fw6">
{{ __('velocity::app.customer.forget-password.recover-password')}}
</p>
</h3>
<p class="fs16">
{{ __('velocity::app.customer.forget-password.recover-password-text')}}
</p>
{!! view_render_event('bagisto.shop.customers.forget_password.before') !!}
<form method="post" action="{{ route('customer.forgot-password.store') }}" @submit.prevent="onSubmit">
<form
method="post"
action="{{ route('customer.register.create') }}"
@submit.prevent="onSubmit">
{{ csrf_field() }}
<div class="login-form">
{!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!}
<div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
<label for="email" class="label-style">{{ __('shop::app.customer.forgot-password.email') }}</label>
<input type="email" class="form-control" name="email" v-validate="'required|email'">
<span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
</div>
<br>
{!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!}
<div class="button-group">
<button type="submit" class="btn btn-dark-green">
{{ __('shop::app.customer.forgot-password.submit') }}
</button>
</div>
{!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!}
<div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
<label for="email" class="required label-style">
{{ __('shop::app.customer.forgot-password.email') }}
</label>
<input
type="email"
class="form-style"
name="email"
v-validate="'required|email'" />
<span class="control-error" v-if="errors.has('email')">
@{{ errors.first('email') }}
</span>
</div>
{!! view_render_event('bagisto.shop.customers.forget_password_form_controls.after') !!}
<button class="theme-btn" type="submit">
{{ __('shop::app.customer.forgot-password.submit') }}
</button>
</form>
{!! view_render_event('bagisto.shop.customers.forget_password.before') !!}
{!! view_render_event('bagisto.shop.customers.forget_password.after') !!}
</div>
</div>
</div>
</div>
@endsection
@endsection

1
packages/Webkul/Velocity/src/Resources/views/customers/signup/index.blade.php
View File

@ -7,7 +7,6 @@
@section('content-wrapper')
<div class="auth-content form-container">
<div class="container">
<div class="heading">
<h2 class="fs24 fw6">
{{ __('velocity::app.customer.signup-form.user-registration')}}

2
packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-left.blade.php
View File

@ -1,4 +1,4 @@
<div class="col-4 software-description">
<div class="col-lg-4 col-md-12 col-sm-12 software-description">
<div class="logo">
<a href="{{ route('shop.home.index') }}">
@if ($logo = core()->getCurrentChannel()->logo_url)

6
packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-middle.blade.php
View File

@ -1 +1,5 @@
{!! $velocityMetaData->footer_middle_content !!}
<div class="col-lg-4 col-md-12 col-sm-12 footer-ct-content">
<div class="row">
{!! $velocityMetaData->footer_middle_content !!}
</div>
</div>

14
packages/Webkul/Velocity/src/Resources/views/layouts/footer/footer-links/footer-right.blade.php
View File

@ -20,14 +20,13 @@
}
@endphp
<div class="col-4 footer-rt-content">
<div class="col-lg-4 col-md-12 col-sm-12 footer-rt-content">
<div class="row">
<div class="mb5">
<div class="mb5 col-12">
<h3>{{ __('velocity::app.home.payment-methods') }}</h3>
</div>
<div class="payment-methods">
<div class="payment-methods col-12">
@foreach($activePayments as $paymentMethod)
<div class="method-sticker">
{{ $paymentMethod}}
@ -37,11 +36,11 @@
</div>
<div class="row">
<div class="mb5">
<h3>{{ __('velocity::app.home.payment-methods') }}</h3>
<div class="mb5 col-12">
<h3>{{ __('velocity::app.home.shipping-methods') }}</h3>
</div>
<div class="shipping-methods">
<div class="shipping-methods col-12">
@foreach($activeShippings as $shippingMethod)
<div class="method-sticker">
{{ $shippingMethod}}
@ -49,5 +48,4 @@
@endforeach
</div>
</div>
</div>

1
packages/Webkul/Velocity/src/Resources/views/layouts/footer/index.blade.php
View File

@ -2,7 +2,6 @@
<div class="footer-content">
@include('shop::layouts.footer.newsletter-subscription')
@include('shop::layouts.footer.footer-links')
@if ($categories)

51
packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php
View File

@ -3,38 +3,33 @@
|| core()->getConfigData('customer.settings.newsletter.subscription')
)
<div class="newsletter-subscription">
<div class="newsletter-wrapper">
@if ($velocityMetaData->subscription_bar_content)
{!! $velocityMetaData->subscription_bar_content !!}
@endif
<div class="newsletter-wrapper row">
@if ($velocityMetaData->subscription_bar_content)
{!! $velocityMetaData->subscription_bar_content !!}
@endif
@if (core()->getConfigData('customer.settings.newsletter.subscription'))
<div class="subscribe-newsletter">
@if (core()->getConfigData('customer.settings.newsletter.subscription'))
<div class="subscribe-newsletter">
<div class="form-container">
<form action="{{ route('shop.subscribe') }}">
<div class="subscriber-form-div">
<div :class="`control-group ${errors.has('subscriber_email') ? 'has-error' : ''}`">
<input
type="email"
name="subscriber_email"
class="control subscribe-field"
placeholder="{{ __('velocity::app.customer.login-form.your-email-address') }}"
required />
<div class="form-container">
<form action="{{ route('shop.subscribe') }}">
<div class="subscriber-form-div">
<div
:class="`control-group ${errors.has('subscriber_email') ? 'has-error' : ''}`">
<input
type="email"
class="control subscribe-field"
name="subscriber_email"
placeholder="{{ __('velocity::app.customer.login-form.your-email-address') }}"
required />
<button class="theme-btn subscribe-btn fw6">
{{ __('shop::app.subscription.subscribe') }}
</button>
</div>
</div>
</form>
<button class="theme-btn subscribe-btn fw6">
{{ __('shop::app.subscription.subscribe') }}
</button>
</div>
</div>
</form>
</div>
@endif
</div>
@endif
</div>
</div>
@endif

3
packages/Webkul/Velocity/src/Resources/views/layouts/header/index.blade.php
View File

@ -9,12 +9,11 @@
</a>
<div class="row no-margin right">
<div class="col-8 no-padding">
<div class="col-8 no-padding input-group">
<form
method="GET"
role="search"
id="search-form"
class="input-group"
action="{{ route('shop.search.index') }}">
<div