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

made the translations for customer login and sign up page, more tranlation strings coming up in next commits

This commit is contained in:
prashant-webkul 2018-08-09 11:30:51 +05:30
parent 4b6bb9540f
commit 7701805d9b
11 changed files with 56 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/Webkul/Admin/src/Providers/EventServiceProvider.php
View File

@ -123,27 +123,14 @@ class EventServiceProvider extends ServiceProvider
*/
public function createProductFormAccordian()
{
Event::listen('admin.catalog.products.accordian.create', function () {
return ProductFormAccordian::create(function ($accordian) {
Event::fire('admin.catalog.products.accordian.build', $accordian);
});
});
<<<<<<< HEAD
Event::listen('admin.catalog.products.accordian.build', function ($accordian) {
$accordian->add('categories', 'Categories', 'admin::catalog.products.accordians.categories', 1);
=======
Event::listen('admin.catalog.products.accordian.build', function($accordian) {
$accordian->add('images', 'Inventories', 'admin::catalog.products.accordians.inventories', 1);
$accordian->add('inventories', 'Inventories', 'admin::catalog.products.accordians.inventories', 1);
$accordian->add('images', 'Images', 'admin::catalog.products.accordians.images', 2);
$accordian->add('categories', 'Categories', 'admin::catalog.products.accordians.categories', 3);
$accordian->add('variations', 'Variations', 'admin::catalog.products.accordians.variations', 4);
// $accordian->add('product-links', 'Linked Products', 'admin::catalog.products.accordians.product-links', 4);
>>>>>>> 4703b72eaa739072f971fb12c4009cad50a01588
});
}
}

2
packages/Webkul/Customer/src/Http/routes.php
View File

@ -5,7 +5,7 @@ Route::group(['middleware' => ['web']], function () {
// Login Routes
Route::get('login', 'Webkul\Customer\Http\Controllers\SessionController@show')->defaults('_config', [
'view' => 'shop::customers.login.index',
'view' => 'shop::customers.session.index',
])->name('customer.session.index');
Route::post('login', 'Webkul\Customer\Http\Controllers\SessionController@create')->defaults('_config', [

2
packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
View File

@ -21,6 +21,8 @@ class ShopServiceProvider extends ServiceProvider
{
include __DIR__ . '/../Http/routes.php';
$this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'shop');
$this->publishes([
__DIR__ . '/../../publishable/assets' => public_path('vendor/webkul/shop/assets'),
], 'public');

2
packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss vendored
View File

@ -1,7 +1,6 @@
//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;
@ -14,7 +13,6 @@ $offer-color: #ff6472;
$sign-up-text-color: #5e5e5e;
$login-text: #3a3a3a;
$background-color: #ffffff;
$border-color: #ffe8e8e8;
$forgot-password-color: #0031f0;
$profile-content-color: #5e5e5e;
//customer variables ends here

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

@ -462,7 +462,7 @@ body {
}
.footer {
background-color: $fbackground-color;
background-color: $background-color;
padding-left: 10%;
padding-right: 10%;
@ -1429,7 +1429,7 @@ body {
}
}
.footer {
background-color: $fbackground-color;
background-color: $background-color;
padding-left: 4%;
padding-right: 4%;

34
packages/Webkul/Shop/src/Resources/lang/en/app.php Normal file
View File

@ -0,0 +1,34 @@
<?php
return [
'customer' => [
'signup-text' => [
'account_exists' => 'Already have an account',
'title' => 'Sign In'
],
'signup-form' => [
'title' => 'Sign Up',
'firstname' => 'First Name',
'lastname' => 'Last Name',
'email' => 'Email',
'password' => 'Password',
'confirm_pass' => 'Confirm Password',
'button_title' => 'Register',
'agree' => 'Agree',
'terms' => 'Terms',
'conditions' => 'Conditions',
'using' => 'by using this website'
],
'login-text' => [
'no_account' => 'Don\'t have account',
'title' => 'Sign In',
],
'login-form' => [
'title' => 'Sign Up',
'email' => 'E-Mail',
'password' => 'Password',
'forgot_pass' => 'Forgot Password?',
'button_title' => 'Sign In'
]
],
];

12
packages/Webkul/Shop/src/Resources/views/customers/login/index.blade.php → packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
View File

@ -2,25 +2,25 @@
@section('content-wrapper')
<div class="content">
<div class="sign-up-text">
Don't have account - <a href="{{ route('customer.register.index') }}">Sign Up</a>
{{ __('shop::app.customer.login-text.no_account') }} - <a href="{{ route('customer.register.index') }}">{{ __('shop::app.customer.login-form.title') }}</a>
</div>
<form method="POST" action="{{ route('customer.session.create') }}">
{{ csrf_field() }}
<div class="login-form">
<div class="login-text">Sign In</div>
<div class="login-text">{{ __('shop::app.customer.login-text.title') }}</div>
<div class="control-group">
<label for="email">E-Mail</label>
<label for="email">{{ __('shop::app.customer.login-form.email') }}</label>
<input type="text" class="control" name="email">
</div>
<div class="control-group">
<label for="password">Password</label>
<label for="password">{{ __('shop::app.customer.login-form.password') }}</label>
<input type="password" class="control" name="password">
</div>
<div class="forgot-password-link">
<a href="">Forgot Password?</a>
<a href="">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
</div>
<input class="btn btn-primary btn-lg" type="submit" value="sign in">
<input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.login-form.button_title') }}">
</div>
</form>
</div>

18
packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
View File

@ -2,41 +2,41 @@
@section('content-wrapper')
<div class="content">
<div class="sign-up-text">
Already have an account - <a href="{{ route('customer.session.index') }}">Sign In</a>
{{ __('shop::app.customer.signup-text.account_exists') }} - <a href="{{ route('customer.session.index') }}">{{ __('shop::app.customer.signup-text.title') }}</a>
</div>
<form method="post" action="{{ route('customer.register.create') }}">
{{ csrf_field() }}
<div class="login-form">
<div class="login-text">Sign Up</div>
<div class="login-text">{{ __('shop::app.customer.signup-form.title') }}</div>
<div class="control-group">
<label for="email">First Name</label>
<label for="first_name">{{ __('shop::app.customer.signup-form.firstname') }}</label>
<input type="text" class="control" name="first_name">
</div>
<div class="control-group">
<label for="email">Last Name</label>
<label for="last_name">{{ __('shop::app.customer.signup-form.lastname') }}</label>
<input type="text" class="control" name="last_name">
</div>
<div class="control-group">
<label for="email">Email</label>
<label for="email">{{ __('shop::app.customer.signup-form.email') }}</label>
<input type="email" class="control" name="email">
</div>
<div class="control-group">
<label for="email">Password</label>
<label for="password">{{ __('shop::app.customer.signup-form.password') }}</label>
<input type="password" class="control" name="password">
</div>
<div class="control-group">
<label for="email">Confirm Password</label>
<label for="confirm_password">{{ __('shop::app.customer.signup-form.confirm_pass') }}</label>
<input type="password" class="control" name="confirm_password">
</div>
<div class="signup-confirm">
<span class="checkbox">
<input type="checkbox" id="checkbox2" name="agreement" required>
<label class="checkbox-view" for="checkbox2"></label>
<span>Agree <a href="">Terms</a> & <a href="">Conditions</a> by using this website.</span>
<span>{{ __('shop::app.customer.signup-form.agree') }} <a href="">{{ __('shop::app.customer.signup-form.terms') }}</a> & <a href="">{{ __('shop::app.customer.signup-form.conditions') }}</a> {{ __('shop::app.customer.signup-form.using') }}.</span>
</span>
</div>
<input class="btn btn-primary btn-lg" type="submit" value="sign in">
<input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.signup-form.button_title') }}">
</div>
</form>

6
packages/Webkul/Ui/src/DataGrid/Helpers/Column.php
View File

@ -150,12 +150,6 @@ class Column extends AbstractFillable
public function render($obj)
{
// if (property_exists($obj, ($this->readableName = $this->correct()))) {
// $this->value = $obj->{$this->readableName};
// dump($this->value);
// $this->wrap($obj);
// }
// return $obj->{$this->alias};
if (property_exists($obj, ($this->aliasing = $this->alias))) {
$this->value = $obj->{$this->aliasing};
$this->wrap($obj);

3
packages/Webkul/Ui/src/Resources/assets/js/app.js vendored
View File

@ -6,11 +6,8 @@ Vue.component("tree-item", require("./components/tree-view/tree-item"));
Vue.component("tree-checkbox", require("./components/tree-view/tree-checkbox"));
Vue.component("tree-radio", require("./components/tree-view/tree-radio"));
Vue.component("modal", require("./components/modal"));
<<<<<<< HEAD
Vue.component("image-upload", require("./components/image/image-upload"));
=======
Vue.component("image-wrapper", require("./components/image/image-wrapper"));
Vue.component("image-item", require("./components/image/image-item"));
Vue.directive("slugify", require("./directives/slugify"));
Vue.directive("code", require("./directives/code"));
>>>>>>> 4703b72eaa739072f971fb12c4009cad50a01588

6
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -224,12 +224,8 @@ h2 {
tbody td {
padding: 10px;
border-bottom: solid 1px #d3d3d3;
<<<<<<< HEAD
color: #3a3a3a;
=======
color: $font-color;
vertical-align: top;
>>>>>>> 4703b72eaa739072f971fb12c4009cad50a01588
&.actions {
text-align: right;
@ -240,7 +236,7 @@ h2 {
}
}
}
tbody tr:last-child td {
border-bottom: none;
}