Projekt

Obecné

Profil

« Předchozí | Další » 

Revize cb8813b1

Přidáno uživatelem Marek Zábran před asi 4 roky(ů)

Oprava dobrazení errorů v loginu za zachování správného menu na errorpage.
Logout se v erroru nezobrazí, protože tu buguje.

Zobrazit rozdíly:

app/Http/Kernel.php
17 17
        \App\Http\Middleware\TrustProxies::class,
18 18
        \Fruitcake\Cors\HandleCors::class,
19 19
        \App\Http\Middleware\CheckForMaintenanceMode::class,
20
        \Illuminate\Session\Middleware\StartSession::class,
21
        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
20
        //\Illuminate\Session\Middleware\StartSession::class,
21
        //\Illuminate\View\Middleware\ShareErrorsFromSession::class,
22 22
        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
23 23
        \App\Http\Middleware\TrimStrings::class,
24 24
        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
resources/views/auth/login.blade.php
2 2

  
3 3
@section('title', 'Login')
4 4

  
5
@section('breadcrumb')
5
{{--@section('breadcrumb')
6 6
    <li class="breadcrumb-item active" aria-current="page">Login</li>
7
@endsection
7
@endsection--}}
8 8

  
9 9
@section('content')
10 10
    <div class="vertical-center">
resources/views/auth/register.blade.php
2 2

  
3 3
@section('title', 'Register')
4 4

  
5
@section('breadcrumb')
5
{{--@section('breadcrumb')
6 6
    <li class="breadcrumb-item active" aria-current="page">Register</li>
7
@endsection
7
@endsection--}}
8 8

  
9 9
@section('content')
10 10
    <div class="vertical-center">
resources/views/inc/sidebar.blade.php
1 1
<div id="sidebar" class="sidenav">
2 2
    <a href="javascript:void(0)" class="arrow arrow-left" onclick="closeNav()"></a>
3 3
    <ul style="padding-left: 0; margin-top: 5rem;">
4
    @guest
4
        @if(Request::is('login')||Request::is('register'))
5 5
        <li class="nav-item">
6 6
            <a class="menu-item text-headline" href="{{ url('/') }}">
7 7
                {{ __('general.home') }}
......
48 48
            <a class="menu-item text-headline" href="{{ url('/czech') }}">
49 49
                {{ __('general.cs') }}
50 50
            </a>
51
            @guest
52
                @else
51 53
            <a class="menu-item text-headline" href="{{ route('logout') }}" onclick="
52 54
            event.preventDefault();
53 55
            document.getElementById('logout-form').submit();">
......
57 59
            <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
58 60
                @csrf
59 61
            </form>
62
                @endguest
60 63
        </li>
61
    @endguest
64
    @endif
62 65
    </ul>
63 66
</div>
64 67

  
......
70 73
        </a>
71 74
    @endif
72 75
    <div class="bar-desktop">
73
        @guest
76
        @if(Request::is('login')||Request::is('register'))
74 77
                <a class="menu-item text-headline-desktop" href="{{ url('/') }}">
75 78
                    {{ __('general.home') }}
76 79
                </a>
......
110 113
        <a class="menu-item text-headline-desktop" href="{{ url('/czech') }}">
111 114
            {{ __('general.cs') }}
112 115
        </a>
116
        @guest
117
            @else
113 118
        <a class="menu-item text-headline-desktop" href="{{ route('logout') }}" onclick="
114 119
            event.preventDefault();
115 120
            document.getElementById('logout-form').submit();">
......
119 124
        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
120 125
            @csrf
121 126
        </form>
122
        @endguest
127
            @endguest
128
        @endif
123 129
    </div>
124 130
</nav>
125 131
{{--<label for="logo" class="col-md-12 kaplicky" style="display: inline-block; text-align: center; padding: 1.25rem; padding-bottom: 0">{{ __('kaplicky') }}</label>

Také k dispozici: Unified diff