Fix missing alert message on front + add message must be logged in
This commit is contained in:
parent
a94bbdd7ff
commit
03e9643be1
9 changed files with 24 additions and 8 deletions
|
|
@ -3,6 +3,7 @@
|
|||
namespace App\Http\Middleware;
|
||||
|
||||
use Illuminate\Auth\Middleware\Authenticate as Middleware;
|
||||
use Illuminate\Support\Facades\Session;
|
||||
|
||||
class Authenticate extends Middleware
|
||||
{
|
||||
|
|
@ -19,6 +20,7 @@ class Authenticate extends Middleware
|
|||
'employee' => route('employees.login')
|
||||
];
|
||||
if (! $request->expectsJson()) {
|
||||
Session::flash('message', trans('Vous devez vous identifier pour àccéder à cette page'));
|
||||
foreach ($request->route()->gatherMiddleware() as $middleware) {
|
||||
if (\is_string($middleware) and strpos($middleware, 'auth:') !== false) {
|
||||
$route = $logins[str_replace('auth:', '', $middleware)] ?? null;
|
||||
|
|
|
|||
12
resources/sass/_classes.scss
vendored
12
resources/sass/_classes.scss
vendored
|
|
@ -10,3 +10,15 @@
|
|||
color: white;
|
||||
margin-right: 100px;
|
||||
}
|
||||
|
||||
.alertMessage {
|
||||
text-align: center;
|
||||
max-width: 80%;
|
||||
min-width: 15rem;
|
||||
margin: 1rem auto;
|
||||
padding: 0.5rem 1rem;
|
||||
background-color: #e5e2e2;
|
||||
font-weight: bold;
|
||||
border-radius: 0.4rem;
|
||||
font-family: Tahoma;
|
||||
}
|
||||
|
|
|
|||
2
resources/sass/back.scss
vendored
2
resources/sass/back.scss
vendored
|
|
@ -1,4 +1,4 @@
|
|||
@import "_import";
|
||||
@import "./_import";
|
||||
|
||||
@import "layouts/backend/top_nav";
|
||||
|
||||
|
|
|
|||
1
resources/sass/front.scss
vendored
1
resources/sass/front.scss
vendored
|
|
@ -1,2 +1,3 @@
|
|||
@import "~swiper/swiper.min";
|
||||
@import "front/style.sass";
|
||||
@import "./_import";
|
||||
|
|
|
|||
1
resources/sass/front_login.scss
vendored
1
resources/sass/front_login.scss
vendored
|
|
@ -1,2 +1,3 @@
|
|||
@import "~swiper/swiper.min";
|
||||
@import "front/styleLogin.sass";
|
||||
@import "./_import";
|
||||
|
|
|
|||
|
|
@ -29,4 +29,4 @@
|
|||
<!-- STYLES -->
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA=" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.16/dist/sweetalert2.min.css" integrity="sha256-qpXwccFYncH5gTqXFe9EXZ8QeDw1Re68bbNVfFZzIzg=" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="{{ asset('css/preload-back.css') }}">
|
||||
<link rel="stylesheet" href="{{ mix('css/preload-back.css') }}">
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
</head>
|
||||
<body>
|
||||
@include("layouts.frontend.header")
|
||||
<!--@include('layouts.frontend.message')-->
|
||||
@include('layouts.frontend.message')
|
||||
@yield('content')
|
||||
@include("layouts.frontend.footer")
|
||||
@stack('scriptsConstants')
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@
|
|||
@preload('mix-manifest.json')
|
||||
|
||||
<!-- STYLES -->
|
||||
<link rel="stylesheet" href="{{ asset('css/preload-front_login.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('css/preload-front.css') }}">
|
||||
<link rel="stylesheet" href="{{ mix('css/preload-front_login.css') }}">
|
||||
<link rel="stylesheet" href="{{ mix('css/preload-front.css') }}">
|
||||
<style>
|
||||
:root {
|
||||
@if(isset($societe->colors['primary']))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
@if(session('message'))
|
||||
<div>
|
||||
<div class="alertMessage">
|
||||
{{ session('message') }}
|
||||
</div>
|
||||
@endif
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue