-
{{'auth.email'|_}}
-
+
+
+ {{ 'auth.password_reset'|_ }}
-
- {{ 'auth.password_restore_btn'|_ }}
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/plugins/rainlab/user/lang/tm/lang.php b/plugins/rainlab/user/lang/tm/lang.php
index 330c03aae..5e89adfe6 100644
--- a/plugins/rainlab/user/lang/tm/lang.php
+++ b/plugins/rainlab/user/lang/tm/lang.php
@@ -201,7 +201,7 @@ return [
'email_verification_check_message' => 'El. bukjaňyzy barlamygyňyzy haýyş edýäris',
'email_verified_message' => 'Siziň el. bukjaňyz tassyklandy',
'email_verification_link_invalid' => 'Tassyklama kody nädogry',
- 'email_already_verified' => 'Siz el. bukjaňyz eýýäm tassyklanan',
+ 'email_already_verified' => 'Siziň el. bukjaňyz eýýäm tassyklanan',
'phone_verified_message' => 'Siziň el telefonyňyz tassyklandy',
'phone_verification_code_invalid' => 'Nädogry SMS kody',
],
diff --git a/plugins/tps/birzha/components/PaymentApi.php b/plugins/tps/birzha/components/PaymentApi.php
index 764d7dc26..f0d1f8de6 100644
--- a/plugins/tps/birzha/components/PaymentApi.php
+++ b/plugins/tps/birzha/components/PaymentApi.php
@@ -36,6 +36,10 @@ class PaymentApi extends ComponentBase
$payment_id = $this->property('payment_id');
$payment = Payment::find($payment_id);
+ if(is_null($payment)) {
+ return Redirect::to('/404');
+ }
+
if($payment && \Input::get('status') === 'success' && \Input::get('orderId') === $payment->order_id) {
$responce = json_decode(CardApi::getStatus($payment->order_id), true);
diff --git a/plugins/vdomah/jwtauth/routes.php b/plugins/vdomah/jwtauth/routes.php
index da7684ed2..b75122faf 100644
--- a/plugins/vdomah/jwtauth/routes.php
+++ b/plugins/vdomah/jwtauth/routes.php
@@ -109,11 +109,16 @@ Route::group(['prefix' => 'api'], function() {
$credentials = Input::only($login_fields);
$rules = [
- 'email' => 'required|between:6,191|email',
- 'username' => 'required|digits_between:8,20|numeric',
+ 'email' => 'required|between:6,191|email|unique:users',
+ 'username' => 'required|numeric|unique:users',
'dial_code' => 'required',
];
+ // to check username
+ $credentials = array_merge($credentials,[
+ 'username' => $credentials['dial_code'] . $credentials['username']
+ ]);
+
$validation = \Validator::make($credentials, $rules,(new UserModel)->messages);
if ($validation->fails()) {
return Response::json(['error' => $validation->errors()], 400);
@@ -130,9 +135,7 @@ Route::group(['prefix' => 'api'], function() {
if (!array_key_exists('password_confirmation', $credentials) && array_key_exists('password', $credentials)) {
$credentials['password_confirmation'] = $credentials['password'];
}
- $userModel = Auth::register(array_merge($credentials,[
- 'username' => $credentials['dial_code'] . $credentials['username']
- ]), $automaticActivation);
+ $userModel = Auth::register($credentials, $automaticActivation);
if ($userModel->methodExists('getAuthApiSignupAttributes')) {
$user = $userModel->getAuthApiSignupAttributes();
@@ -151,7 +154,14 @@ Route::group(['prefix' => 'api'], function() {
];
}
} catch (Exception $e) {
- return Response::json(['error' => $e->getMessage()], 401);
+
+ \Log::info($e->getMessage());
+
+ return Response::json(['error' => [
+ 'ru' => trans('validation.api.sign_up_excp', [], 'ru'),
+ 'en' => trans('validation.api.sign_up_excp', [], 'en'),
+ 'tm' => trans('validation.api.sign_up_excp', [], 'tm'),
+ ]], 401);
}
$token = JWTAuth::fromUser($userModel);
diff --git a/themes/birzha/assets/css/main.css b/themes/birzha/assets/css/main.css
index d516acdc1..755d0e706 100644
--- a/themes/birzha/assets/css/main.css
+++ b/themes/birzha/assets/css/main.css
@@ -156,6 +156,51 @@ li {
}
+
+/* Accaunt ============================================ */
+
+.acc_lang {
+ position: fixed;
+ top: 50px;
+ right: 80px;
+ background: #fff;
+ border-radius: 10px;
+ z-index: 130;
+}
+
+.acc_lang .auto_container {
+ padding: 0;
+}
+
+.acc_lang .inner {
+ display: flex;
+ align-items: center;
+ padding: 10px 15px;
+}
+
+.acc_lang-item {
+ font-size: 14px;
+ font-weight: 600;
+ line-height: 1.5;
+ text-transform: uppercase;
+ display: block;
+ margin-right: 20px;
+
+ transition: .2s linear;
+ -ms-transition: .2s linear;
+ -webkit-transition: .2s linear;
+}
+
+.acc_lang-item:hover {
+ color: var(--blue);
+}
+
+.acc_lang-item:last-child {
+ margin-right: 0;
+}
+
+/* Accaunt end ======================================== */
+
/* Home page */
/* Register ============================================ */
.register {
@@ -186,12 +231,26 @@ li {
position: absolute;
top: 0;
left: 0;
- background: rgba(0, 49, 151, .5);
+ /* background: rgba(0, 49, 151, .5); */
+ background: url("../images/IMG-2.png") no-repeat center;
+ background-size: cover;
+ width: 100%;
+ height: 100%;
+ z-index: -2;
+}
+
+.register::before {
+ content: '';
+ position: absolute;
+ top: 0;
+ left: 0;
+ background: rgba(0, 49, 151, .3);
width: 100%;
height: 100%;
z-index: -1;
}
+
.register_wrap {
/* position: absolute;
top: 50%;
@@ -769,6 +828,30 @@ li {
display: none;
}
+.password::after {
+ content: '';
+ position: absolute;
+ top: 0;
+ left: 0;
+ /* background: rgba(0, 49, 151, .5); */
+ background: url("../images/IMG-2.png") no-repeat center;
+ background-size: cover;
+ width: 100%;
+ height: 100%;
+ z-index: -2;
+}
+
+.password::before {
+ content: '';
+ position: absolute;
+ top: 0;
+ left: 0;
+ background: rgba(0, 49, 151, .3);
+ width: 100%;
+ height: 100%;
+ z-index: -1;
+}
+
.password.active {
display: block;
}
@@ -808,7 +891,7 @@ li {
background: #fff;
padding: 80px 60px;
- display: none;
+ /* display: none; */
}
.pass_title {
@@ -855,6 +938,11 @@ li {
padding: 20px 0;
}
+.password_form .btn_bg {
+ margin: 25px 0;
+ width: 100%;
+}
+
/* Change Password end ============================================= */
@@ -6780,11 +6868,6 @@ input::-webkit-calendar-picker-indicator {
text-align: center;
}
- .form_txt {
- font-size: 16px;
- margin-bottom: 15px;
- }
-
.contact_input {
margin: 10px 0;
}
@@ -6983,4 +7066,4 @@ input::-webkit-calendar-picker-indicator {
font-size: 12px;
}
-}
+}
\ No newline at end of file
diff --git a/themes/birzha/assets/images/IMG-2.png b/themes/birzha/assets/images/IMG-2.png
new file mode 100644
index 000000000..78ea7ab6f
Binary files /dev/null and b/themes/birzha/assets/images/IMG-2.png differ
diff --git a/themes/birzha/assets/js/accaunt.js b/themes/birzha/assets/js/accaunt.js
new file mode 100644
index 000000000..3875dc33b
--- /dev/null
+++ b/themes/birzha/assets/js/accaunt.js
@@ -0,0 +1,102 @@
+// timing ====================
+function sleep(time) {
+ return new Promise((resolve) => setTimeout(resolve, time));
+}
+// timing ====================
+
+
+let register = document.querySelector('.register');
+let register_btn = document.querySelectorAll('.register_btn');
+let log_in = document.querySelectorAll('.log_in');
+let btn_1 = document.querySelector('#btn-1');
+let btn_2 = document.querySelector('#btn-2');
+
+let register_content = document.querySelector('.register_content');
+let register_content_2 = document.querySelector('.register_content_2');
+
+let phone_box = document.querySelectorAll('.phone_box');
+let iti__country = document.querySelectorAll('.iti__country');
+let iti__country_list = document.querySelectorAll('.iti__country-list');
+
+
+if (register_btn != undefined) {
+ register_btn.forEach(x => {
+ x.addEventListener('click', function () {
+ sleep(2).then(() => {
+ register.classList.toggle('active');
+ btn_2.classList.add('active');
+ btn_1.classList.remove('active');
+ selectElement('body').classList.add('active');
+
+
+ register_content.classList.add('active');
+ register_content_2.classList.remove('active');
+ });
+ });
+ })
+}
+
+if (log_in != undefined) {
+ log_in.forEach(x => {
+ x.addEventListener('click', function () {
+ sleep(2).then(() => {
+ register.classList.toggle('active');
+ btn_1.classList.add('active');
+ btn_2.classList.remove('active');
+ selectElement('body').classList.add('active');
+
+
+ register_content.classList.remove('active');
+ register_content_2.classList.add('active');
+ });
+ });
+ })
+}
+
+if (btn_1 != undefined) {
+ btn_1.addEventListener('click', function () {
+ sleep(2).then(() => {
+ btn_1.classList.add('active');
+ btn_2.classList.remove('active');
+
+ register_content.classList.remove('active');
+ register_content_2.classList.add('active');
+ });
+ });
+}
+
+if (btn_2 != undefined) {
+ btn_2.addEventListener('click', function () {
+ sleep(2).then(() => {
+ btn_2.classList.add('active');
+ btn_1.classList.remove('active');
+
+ register_content.classList.add('active');
+ register_content_2.classList.remove('active');
+ });
+ });
+}
+
+if (phone_box != undefined) {
+ phone_box.forEach(x => {
+ x.addEventListener('click', function () {
+ sleep(2).then(() => {
+ iti__country_list.forEach(e => {
+ e.classList.toggle('active');
+ })
+ });
+ });
+ })
+}
+
+if (iti__country != undefined) {
+ iti__country.forEach(x => {
+ x.addEventListener('click', function () {
+ sleep(2).then(() => {
+ iti__country_list.forEach(e => {
+ e.classList.remove('active');
+ })
+ });
+ });
+ })
+}
\ No newline at end of file
diff --git a/themes/birzha/layouts/account.htm b/themes/birzha/layouts/account.htm
new file mode 100644
index 000000000..fae66a039
--- /dev/null
+++ b/themes/birzha/layouts/account.htm
@@ -0,0 +1,100 @@
+[localePicker]
+forceUrl = 1
+
+[account]
+redirect = "index"
+paramCode = "code"
+forceSecure = 0
+requirePassword = 0
+view = "signin"
+
+[session]
+security = "all"
+==
+
+==
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% styles %}
+
+
+
+
+
+
{{this.page.title}}
+
+
+
+
+{% flash success %}
+
+ {{ message }}
+
+{% endflash %}
+
+{% flash error %}
+
+ {{ message }}
+
+{% endflash %}
+
+
+
+{% page %}
+
+
+
+{% framework extras %}
+{% scripts %}
+
+
+
+
+
\ No newline at end of file
diff --git a/themes/birzha/pages/bank_result.htm b/themes/birzha/pages/bank_result.htm
index 685521e42..e778ec863 100644
--- a/themes/birzha/pages/bank_result.htm
+++ b/themes/birzha/pages/bank_result.htm
@@ -9,11 +9,11 @@ localeTitle[ru] = "bank_result"
localeUrl[en] = "/bank_result/:payment_id"
localeUrl[ru] = "/bank_result/:payment_id"
-[paymentapi]
-payment_id = "{{ :payment_id }}"
-
[session]
security = "user"
-redirect = "index"
+redirect = "vojti"
+
+[paymentapi]
+payment_id = "{{ :payment_id }}"
==
{% component 'paymentapi' %}
\ No newline at end of file
diff --git a/themes/birzha/pages/category.htm b/themes/birzha/pages/category.htm
index ca369d153..c9002c6e7 100644
--- a/themes/birzha/pages/category.htm
+++ b/themes/birzha/pages/category.htm
@@ -9,6 +9,10 @@ localeTitle[ru] = "Категория"
localeUrl[en] = "/category/:slug"
localeUrl[ru] = "/category/:slug"
+[session]
+security = "user"
+redirect = "vojti"
+
[categories]
active = 1
slug = "{{ :slug }}"
diff --git a/themes/birzha/pages/contact-us.htm b/themes/birzha/pages/contact-us.htm
index ba2cc5c98..c35c59559 100644
--- a/themes/birzha/pages/contact-us.htm
+++ b/themes/birzha/pages/contact-us.htm
@@ -9,6 +9,10 @@ localeTitle[ru] = "Contact us"
localeUrl[en] = "/contact-us"
localeUrl[ru] = "/contact-us"
+[session]
+security = "user"
+redirect = "vojti"
+
[TPS\Birzha\Components\ContactForm contactForm]
==
{% component 'contactForm' %}
\ No newline at end of file
diff --git a/themes/birzha/pages/index.htm b/themes/birzha/pages/index.htm
index 916762844..b050a9dc3 100644
--- a/themes/birzha/pages/index.htm
+++ b/themes/birzha/pages/index.htm
@@ -10,6 +10,10 @@ localeTitle[ru] = "Главная страница"
localeUrl[en] = "/"
localeUrl[ru] = "/"
+[session]
+security = "user"
+redirect = "vojti"
+
[offers]
perPage = 0
sortOrder = "desc"
diff --git a/themes/birzha/pages/kabinet/add_offer.htm b/themes/birzha/pages/kabinet/add_offer.htm
index e942a141f..3a0ee926b 100644
--- a/themes/birzha/pages/kabinet/add_offer.htm
+++ b/themes/birzha/pages/kabinet/add_offer.htm
@@ -3,14 +3,14 @@ url = "/add-offer"
layout = "default"
is_hidden = 0
+[viewBag]
+localeTitle[ru] = "Добавить объявление"
+
[offerform]
[session]
security = "user"
-redirect = "index"
-
-[viewBag]
-localeTitle[ru] = "Добавить объявление"
+redirect = "vojti"
==
{% component 'offerform' %}
diff --git a/themes/birzha/pages/kabinet/balance.htm b/themes/birzha/pages/kabinet/balance.htm
index 3e52dcb6e..791be8384 100644
--- a/themes/birzha/pages/kabinet/balance.htm
+++ b/themes/birzha/pages/kabinet/balance.htm
@@ -13,6 +13,6 @@ localeUrl[ru] = "/balance"
[session]
security = "user"
-redirect = "index"
+redirect = "vojti"
==
{% component 'balance' %}
\ No newline at end of file
diff --git a/themes/birzha/pages/kabinet/edit_post.htm b/themes/birzha/pages/kabinet/edit_post.htm
index 7b86879f0..64a372bf9 100644
--- a/themes/birzha/pages/kabinet/edit_post.htm
+++ b/themes/birzha/pages/kabinet/edit_post.htm
@@ -8,11 +8,13 @@ localeUrl[en] = "/edit-post/:id"
localeUrl[ru] = "/edit-post/:id"
localeTitle[ru] = "Изменить объявление"
+[session]
+security = "user"
+redirect = "vojti"
+
[offerform]
productId = "{{ :id }}"
-[session]
-security = "user"
-redirect = "index"
+
==
{% component 'offerform' %}
\ No newline at end of file
diff --git a/themes/birzha/pages/kabinet/messages.htm b/themes/birzha/pages/kabinet/messages.htm
index 36848447e..4195292c9 100644
--- a/themes/birzha/pages/kabinet/messages.htm
+++ b/themes/birzha/pages/kabinet/messages.htm
@@ -7,10 +7,10 @@ is_hidden = 0
localeTitle[ru] = "Сообщения"
localeUrl[ru] = "/messages"
-[messages]
-
[session]
security = "user"
-redirect = "index"
+redirect = "vojti"
+
+[messages]
==
{% component 'messages' %}
\ No newline at end of file
diff --git a/themes/birzha/pages/kabinet/my_offers.htm b/themes/birzha/pages/kabinet/my_offers.htm
index c4eee699f..4c7177da6 100644
--- a/themes/birzha/pages/kabinet/my_offers.htm
+++ b/themes/birzha/pages/kabinet/my_offers.htm
@@ -9,11 +9,12 @@ localeTitle[ru] = "My posts"
localeUrl[en] = "/my-posts"
localeUrl[ru] = "/my-posts"
+[session]
+security = "user"
+redirect = "vojti"
+
[myOffers]
perPage = 0
-[session]
-security = "user"
-redirect = "index"
==
{% component 'myOffers' %}
\ No newline at end of file
diff --git a/themes/birzha/pages/kabinet/profile.htm b/themes/birzha/pages/kabinet/profile.htm
index 57c8affec..baca2a89e 100644
--- a/themes/birzha/pages/kabinet/profile.htm
+++ b/themes/birzha/pages/kabinet/profile.htm
@@ -11,7 +11,7 @@ localeTitle[ru] = "Профиль"
[session]
security = "user"
-redirect = "index"
+redirect = "vojti"
==
diff --git a/themes/birzha/pages/kabinet/transactions.htm b/themes/birzha/pages/kabinet/transactions.htm
index b5f1644fe..450134453 100644
--- a/themes/birzha/pages/kabinet/transactions.htm
+++ b/themes/birzha/pages/kabinet/transactions.htm
@@ -2,14 +2,19 @@ title = "Balans taryhy"
url = "/balans-taryhy"
layout = "default"
is_hidden = 0
+
+[session]
+security = "user"
+redirect = "vojti"
==
transactions()->orderBy('id', 'desc')->paginate(5);
+ if(\Auth::user()) {
+ $this['transactions'] = \Auth::user()->transactions()->orderBy('id', 'desc')->paginate(5);
+ }
}
?>
==
-
diff --git a/themes/birzha/pages/kabinet/verify_email.htm b/themes/birzha/pages/kabinet/verify_email.htm
index 7488567a2..ed0bab273 100644
--- a/themes/birzha/pages/kabinet/verify_email.htm
+++ b/themes/birzha/pages/kabinet/verify_email.htm
@@ -5,7 +5,7 @@ is_hidden = 0
[session]
security = "user"
-redirect = "index"
+redirect = "vojti"
[emailverify]
code = "{{ :code }}"
diff --git a/themes/birzha/pages/kategorii.htm b/themes/birzha/pages/kategorii.htm
index b70e5bf13..1ef168fe1 100644
--- a/themes/birzha/pages/kategorii.htm
+++ b/themes/birzha/pages/kategorii.htm
@@ -9,6 +9,10 @@ localeTitle[ru] = "Категории"
localeUrl[en] = "/categories"
localeUrl[ru] = "/kategorii"
+[session]
+security = "user"
+redirect = "vojti"
+
[categories]
active = 1
slug = "{{ :slug }}"
diff --git a/themes/birzha/pages/offer.htm b/themes/birzha/pages/offer.htm
index f6836868b..a9c147a39 100644
--- a/themes/birzha/pages/offer.htm
+++ b/themes/birzha/pages/offer.htm
@@ -9,6 +9,10 @@ localeTitle[ru] = "Объявление"
localeUrl[en] = "/offer/:slug/:id"
localeUrl[ru] = "/offer/:slug/:id"
+[session]
+security = "user"
+redirect = "vojti"
+
[singleoffer]
productSlug = "{{ :slug }}"
offerId = "{{ :id }}"
diff --git a/themes/birzha/pages/politika-konfidencialnosti.htm b/themes/birzha/pages/politika-konfidencialnosti.htm
index f9263b957..030d78906 100644
--- a/themes/birzha/pages/politika-konfidencialnosti.htm
+++ b/themes/birzha/pages/politika-konfidencialnosti.htm
@@ -8,8 +8,11 @@ localeTitle[en] = "Privacy policy"
localeTitle[ru] = "Политика конфиденциальности"
localeUrl[en] = "/privacy-policy"
localeUrl[ru] = "/politika-konfidencialnosti"
-==
+[session]
+security = "user"
+redirect = "vojti"
+==
diff --git a/themes/birzha/pages/reset-password.htm b/themes/birzha/pages/reset-password.htm
index 78915349c..a79905b90 100644
--- a/themes/birzha/pages/reset-password.htm
+++ b/themes/birzha/pages/reset-password.htm
@@ -1,6 +1,6 @@
title = "Açar çalyşmak"
url = "/password-reset"
-layout = "default"
+layout = "account"
is_hidden = 0
[viewBag]
diff --git a/themes/birzha/pages/search.htm b/themes/birzha/pages/search.htm
index b3de8f320..242f2521a 100644
--- a/themes/birzha/pages/search.htm
+++ b/themes/birzha/pages/search.htm
@@ -7,6 +7,10 @@ is_hidden = 0
localeTitle[en] = "Search results"
localeTitle[ru] = "Результаты поиска"
+[session]
+security = "user"
+redirect = "vojti"
+
[searchResults]
resultsPerPage = 3
showProviderBadge = 1
diff --git a/themes/birzha/pages/terms.htm b/themes/birzha/pages/terms.htm
index 21c6f5762..bbd82ffae 100644
--- a/themes/birzha/pages/terms.htm
+++ b/themes/birzha/pages/terms.htm
@@ -8,6 +8,10 @@ localeTitle[en] = "Trade terms"
localeTitle[ru] = "Условия торгов"
localeUrl[en] = "/trade-terms"
localeUrl[ru] = "/uslovia-torgov"
+
+[session]
+security = "user"
+redirect = "vojti"
==
+
+
+
+
+
+
+
+
+
+
+ {{ short_name }}
+
+
+ {{ 'site.name'|_ }}
+
+
+
+ {% if canRegister %}
+
+ {% component 'account' view = 'signup'%}
+
+ {% endif %}
+
+ {% component 'account' view = 'signin'%}
+
+
+
+
+
+
+
\ No newline at end of file