From 94c28efe7f5e104febe7f90ed74bb6894bdfaa20 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Wed, 21 Feb 2024 21:03:39 +0500 Subject: [PATCH] some code improvemetns --- app/Http/Controllers/LocaleController.php | 20 +++ app/Http/Kernel.php | 3 +- app/Http/Middleware/SetLocale.php | 24 ++++ lang/tk.json | 3 +- public/assets/css/auth.css | 8 ++ .../views/vendor/nova/pages/login.blade.php | 129 ++++++------------ .../nova/partials/auth-layout.blade.php | 48 +++++++ routes/web.php | 7 +- 8 files changed, 154 insertions(+), 88 deletions(-) create mode 100644 app/Http/Controllers/LocaleController.php create mode 100644 app/Http/Middleware/SetLocale.php create mode 100644 public/assets/css/auth.css create mode 100644 resources/views/vendor/nova/partials/auth-layout.blade.php diff --git a/app/Http/Controllers/LocaleController.php b/app/Http/Controllers/LocaleController.php new file mode 100644 index 0000000..1c774b5 --- /dev/null +++ b/app/Http/Controllers/LocaleController.php @@ -0,0 +1,20 @@ +put('locale', $locale); + } + + return request()->json() ? response()->noContent() : back(); + } +} diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 59d4e15..5bcd7fa 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -64,6 +64,7 @@ class Kernel extends HttpKernel 'signed' => \App\Http\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, - 'un_verified' => \App\Http\Middleware\RedirectIfPhoneIsVerified::class, + 'unVerified' => \App\Http\Middleware\RedirectIfPhoneIsVerified::class, + 'setLocale' => \App\Http\Middleware\SetLocale::class, ]; } diff --git a/app/Http/Middleware/SetLocale.php b/app/Http/Middleware/SetLocale.php new file mode 100644 index 0000000..f7b4125 --- /dev/null +++ b/app/Http/Middleware/SetLocale.php @@ -0,0 +1,24 @@ +has('locale')) { + app()->setLocale(session('locale')); + } + + return $next($request); + } +} diff --git a/lang/tk.json b/lang/tk.json index 55600c7..022b76b 100644 --- a/lang/tk.json +++ b/lang/tk.json @@ -257,5 +257,6 @@ "I have read the contract": "Şertnama bilen tanyşdym", "Go to home": "Baş sahypa git", "Payment is successful": "Töleg geçdi", - "Payment has failed": "Töleg geçmedi" + "Payment has failed": "Töleg geçmedi", + "Help": "Kömek" } diff --git a/public/assets/css/auth.css b/public/assets/css/auth.css new file mode 100644 index 0000000..f11390f --- /dev/null +++ b/public/assets/css/auth.css @@ -0,0 +1,8 @@ +.bg-img { + background: url(/assets/images/login-bg.jpg) no-repeat fixed var(--sc-login-bg-position, 50% 50%); + background-size: cover; +} + +.login-section { + padding: 0px 150px; +} diff --git a/resources/views/vendor/nova/pages/login.blade.php b/resources/views/vendor/nova/pages/login.blade.php index 8bda41a..67afec6 100644 --- a/resources/views/vendor/nova/pages/login.blade.php +++ b/resources/views/vendor/nova/pages/login.blade.php @@ -1,90 +1,51 @@ +@extends('vendor.nova.partials.auth-layout') - - - - - - - - +@section('content') +
+
+ +
+
+
+ @csrf +
+ + - - - - - -
-
-
Töleg barlagy
-
- (+99312) 44-41-15 - Kömek -
- Tm | - En | - Ru + @error('username') + + {{ $message }} + + @enderror
-
-
-
- - +@stop diff --git a/resources/views/vendor/nova/partials/auth-layout.blade.php b/resources/views/vendor/nova/partials/auth-layout.blade.php new file mode 100644 index 0000000..8ee065d --- /dev/null +++ b/resources/views/vendor/nova/partials/auth-layout.blade.php @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + +
+
+
+ {{-- bg-green-500 --}} + + {{-- Töleg barlagy --}} +
+
+ (+99312) 44-41-15 + {{ __('Help') }} +
+ @foreach(config('app.locales') as $localeKey => $localeDisplayName) + + {{ $localeDisplayName }} + + @unless($loop->last) + | + @endif + + @endforeach +
+
+
+ + @yield('content') + +
+

“Turkmenbasy” PTB-y ©

+ SoftClub +
+
+ + + diff --git a/routes/web.php b/routes/web.php index cd685ce..443005b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -3,6 +3,7 @@ use App\Http\Controllers\Auth\LoginController; use App\Http\Controllers\Auth\RegisterController; use App\Http\Controllers\Auth\ResetPasswordController; +use App\Http\Controllers\LocaleController; use App\Http\Controllers\OnlinePaymentController; use Illuminate\Support\Facades\Route; @@ -17,7 +18,9 @@ use Illuminate\Support\Facades\Route; | */ -Route::middleware('guest')->group(function () { +Route::middleware(['guest', 'setLocale'])->group(function () { + Route::get('locale/{locale}', LocaleController::class)->name('locale.set'); + Route::get('/register', [RegisterController::class, 'showNovaRegisterpageForm'])->name('register'); Route::post('/register', [RegisterController::class, 'register']); @@ -28,7 +31,7 @@ Route::middleware('guest')->group(function () { Route::post('reset-password', [ResetPasswordController::class, 'store']); }); -Route::middleware(['auth', 'un_verified'])->group(function () { +Route::middleware(['auth', 'unVerified'])->group(function () { Route::get('sms-verification', [RegisterController::class, 'smsVerification'])->name('sms-verification'); Route::post('sms-verification', [RegisterController::class, 'verifySmsCode']); });