Merge branch 'main' into auth-pages

This commit is contained in:
2024-02-23 17:15:52 +05:00
committed by GitHub
3 changed files with 9 additions and 14 deletions

View File

@@ -15,6 +15,6 @@ class LocaleController extends Controller
session()->put('locale', $locale); session()->put('locale', $locale);
} }
return request()->json() ? response()->noContent() : back(); return redirect('/login');
} }
} }

View File

@@ -15,9 +15,7 @@ class SetLocale
*/ */
public function handle(Request $request, Closure $next): Response public function handle(Request $request, Closure $next): Response
{ {
if (session()->has('locale')) { app()->setLocale(session('locale') ?: 'tk');
app()->setLocale(session('locale'));
}
return $next($request); return $next($request);
} }

View File

@@ -13,18 +13,19 @@
</head> </head>
<body> <body>
<div class=""> <div class="">
<div class="bg-white d-center px-4 py-1 absolute w-full shadow-lg"> <div class="bg-white flex justify-between px-4 py-1 absolute w-full shadow-lg">
<div class="px-8 text-white text-sm p-1 rounded uppercase font-bold"> <div class="px-8 text-sm p-1 rounded uppercase font-bold">
{{-- bg-green-500 --}} <a href="#"> “Turkmenbasy” PTB-y © </a>
{{-- <a href="#"> Töleg barlagy </a> --}}
</div> </div>
<div class="flex items-center"> <div class="flex items-center">
<a href="tel:+99312444115" class="mr-6 text-sm text-gray-900">(+99312) 44-42-34</a> <a href="tel:+99312444115" class="mr-6 text-sm text-gray-900">(+99312) 44-42-34</a>
<a href="#" class="mr-6 text-sm text-gray-900 uppercase">{{ __('Help') }}</a> <a href="#" class="mr-6 text-sm text-gray-900 uppercase">{{ __('Help') }}</a>
<div class="flex text-sm text-gray-900 space-x-1 uppercase"> <div class="flex text-sm text-gray-900 space-x-1 uppercase">
@foreach(config('app.locales') as $localeKey => $localeDisplayName) @foreach(config('app.locales') as $localeKey => $localeDisplayName)
<a href="{{ route('locale.set', ['locale' => $localeKey]) }}" class="{{ session('locale') === $localeKey ? 'font-bold' : '' }}"> <a
href="{{ route('locale.set', ['locale' => $localeKey]) }}"
class="{{ app()->getLocale() === $localeKey ? 'font-bold' : '' }}"
>
{{ $localeKey }} {{ $localeKey }}
@unless($loop->last) @unless($loop->last)
@@ -38,10 +39,6 @@
@yield('content') @yield('content')
<div class="bg-white flex justify-between p-1 px-3 text-sm fixed bottom-0 left-0 right-0">
<p>“Turkmenbasy” PTB-y ©</p>
{{-- <a href="#"></a> --}}
</div>
</div> </div>
<script src="/assets/js/inputmask.min.js"></script> <script src="/assets/js/inputmask.min.js"></script>
<script src="/assets/js/sweetalert2@11.js"></script> <script src="/assets/js/sweetalert2@11.js"></script>