Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 3b97c440

Přidáno uživatelem Marek Zábran před téměř 5 roky(ů)

Issue Task #7849 @1.25h
Opraven Login a Registrace, aby opovídal přesně návrhu.
Přidány všechny fonty.
Opraveno přesměrování na cetegories.

Zobrazit rozdíly:

app/Http/Controllers/Auth/LoginController.php
26 26
     *
27 27
     * @var string
28 28
     */
29
    protected $redirectTo = RouteServiceProvider::HOME;
29
    protected $redirectTo = RouteServiceProvider::CATEGORIES;
30 30

  
31 31
    /**
32 32
     * Create a new controller instance.
app/Providers/RouteServiceProvider.php
23 23
     */
24 24
    public const HOME = '/artefact';
25 25

  
26
    /**
27
     * The path to categories.
28
     *
29
     * @var string
30
     */
31
    public const CATEGORIES = '/categories';
32

  
26 33
    /**
27 34
     * Define your route model bindings, pattern filters, etc.
28 35
     *
resources/sass/_custom.scss
37 37
            }
38 38
        }
39 39
    }
40
    
40

  
41
    .col-md-8{
42
        .card{
43
            border: none;
44
            text-align: center;
45
            font-size: 8pt;
46
        }
47
        .btn{
48
            font-size: 8pt;
49
        }
50
    }
51

  
41 52
    .card-body {
42 53
    	background-color: $cusBlack;
43 54
    	font-family: Avenir;
44 55
    	color: $cusBrown3;
45
	}
46

  
47
	.btn-primary {
48
    	background-color: $cusBlack;
49
    	border-color: $cusWhite;
50
	}
51

  
52
	.btn-primary:hover {
53
    	background-color: $cusWhite;
54
    	color: $cusBlack;
55
    	border-color: $cusWhite;
56
	}
57 56

  
58
	.btn-primary:focus {
59
    	background-color: $cusWhite;
60
    	color: $cusBlack;
61
    	border-color: $cusWhite;
62
    	outline: none !important;
63
    	box-shadow: none !important;
64 57
	}
65 58

  
66
	.btn-primary:active {
67
    	background-color: $cusWhite;
68
    	color: $cusBlack;
69
    	border-color: $cusWhite;
70
    	outline: none !important;
71
    	box-shadow: none !important;
72
    	background-color: transparent !important;
73
    	border-color: transparent !important;
74
	}
59
    .logo{
60
        color: $cusWhite;
61
        font-size: 11pt;
62
        font-family: Avenir Black;
63
    }
75 64

  
76 65
	.form-control {
77 66
    	background-color: $cusBlack;
78 67
    	margin-top: -1px;
79
    	//border: 0px;
80 68
    	//border-bottom: 1px;
81 69
    	border-top-color: $cusBlack;
82 70
    	border-left-color: $cusBlack;
83 71
    	border-right-color: $cusBlack;
84
    	border-bottom-color: $cusWhite;
72
    	border-bottom-color: 0.5pt $cusWhite;
85 73
    	color: $cusWhite;
74
        box-shadow: none;
75
        //transition: none;
76
        font-size: 8pt;
86 77
	}
87 78

  
79
    .form-control:focus {
80
        background-color: $cusBlack;
81
        margin-top: -1px;
82
        //border-bottom: 1px;
83
        border-top-color: $cusBlack;
84
        border-left-color: $cusBlack;
85
        border-right-color: $cusBlack;
86
        border-bottom-color: 0.5pt $cusWhite;
87
        color: $cusWhite;
88
        box-shadow: none;
89
        //transition: none;
90
        font-size: 8pt;
91
    }
92

  
88 93
    .button-square {
89 94
        background-color: $black;
90 95
        color: $white;
resources/sass/app.scss
1 1
// Fonts
2 2
@import url('https://fonts.googleapis.com/css?family=Nunito');
3
@import url('https://db.onlinewebfonts.com/c/2090551770be22b09600a40b0b4673b7?family=Avenir+Medium');
4
@import url('https://db.onlinewebfonts.com/c/275de2221d9f0c4c9257d17f5a1e4006?family=Avenir+Black');
5
@import url('https://db.onlinewebfonts.com/c/1a045963159927274c92b0444fb83c17?family=Avenir');
3 6

  
4 7
// Variables
5 8
@import 'variables';
resources/views/auth/login.blade.php
17 17
                    <form method="POST" action="{{ route('login') }}">
18 18
                        @csrf
19 19

  
20
                        <label for="logo" class="col-md-4 logo">{{ __('kaplicky') }}</label>
21

  
20 22
                        <div class="form-group row">
21
                            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
23
                            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('e-mail') }}</label>
22 24

  
23 25
                            <div class="col-md-6">
24 26
                                <input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
......
32 34
                        </div>
33 35

  
34 36
                        <div class="form-group row">
35
                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
37
                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('password') }}</label>
36 38

  
37 39
                            <div class="col-md-6">
38 40
                                <input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
......
45 47
                            </div>
46 48
                        </div>
47 49

  
48
                        <div class="form-group row">
50
                        {{--<div class="form-group row">
49 51
                            <div class="col-md-6 offset-md-4">
50 52
                                <div class="form-check">
51 53
                                    <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
......
55 57
                                    </label>
56 58
                                </div>
57 59
                            </div>
58
                        </div>
60
                        </div>--}}
59 61

  
60
                        <div class="form-group row mb-0">
61
                            <div class="col-md-8 offset-md-4">
62
                                <button type="submit" class="btn btn-primary btn-black">
63
                                    {{ __('Login') }}
62
                            <div class="col-md-12">
63
                                <button type="submit" class="btn button-square ">
64
                                    {{ __('join') }}
64 65
                                </button>
65 66

  
66
                                @if (Route::has('password.request'))
67
                                {{-- @if (Route::has('password.request'))
67 68
                                    <a class="btn btn-link" href="{{ route('password.request') }}">
68 69
                                        {{ __('Forgot Your Password?') }}
69 70
                                    </a>
70
                                @endif
71
                                @endif --}}
71 72
                            </div>
72
                        </div>
73 73
                    </form>
74 74
                </div>
75 75
            </div>
resources/views/auth/passwords/confirm.blade.php
35 35

  
36 36
                        <div class="form-group row mb-0">
37 37
                            <div class="col-md-8 offset-md-4">
38
                                <button type="submit" class="btn btn-primary">
38
                                <button type="submit" class="btn button-square">
39 39
                                    {{ __('Confirm Password') }}
40 40
                                </button>
41 41

  
resources/views/auth/passwords/email.blade.php
39 39

  
40 40
                        <div class="form-group row mb-0">
41 41
                            <div class="col-md-6 offset-md-4">
42
                                <button type="submit" class="btn btn-primary">
42
                                <button type="submit" class="btn button-square">
43 43
                                    {{ __('Send Password Reset Link') }}
44 44
                                </button>
45 45
                            </div>
resources/views/auth/passwords/reset.blade.php
57 57

  
58 58
                        <div class="form-group row mb-0">
59 59
                            <div class="col-md-6 offset-md-4">
60
                                <button type="submit" class="btn btn-primary">
60
                                <button type="submit" class="btn button-square">
61 61
                                    {{ __('Reset Password') }}
62 62
                                </button>
63 63
                            </div>
resources/views/auth/register.blade.php
17 17
                    <form method="POST" action="{{ route('register') }}">
18 18
                        @csrf
19 19

  
20
                        <label for="logo" class="col-md-4 logo">{{ __('kaplicky') }}</label>
20 21
                        <div class="form-group row">
21 22
                            <label for="name" class="col-md-4 col-form-label text-md-right">{{ __('Name') }}</label>
22 23

  
......
67 68
                            </div>
68 69
                        </div>
69 70

  
70
                        <div class="form-group row mb-0">
71
                            <div class="col-md-6 offset-md-4">
72
                                <button type="submit" class="btn btn-primary">
71

  
72
                            <div class="col-md-12">
73
                                <button type="submit" class="btn button-square">
73 74
                                    {{ __('Register') }}
74 75
                                </button>
75 76
                            </div>
76
                        </div>
77

  
77 78
                    </form>
78 79
                </div>
79 80
            </div>
resources/views/auth/verify.blade.php
24 24
                    {{ __('If you did not receive the email') }},
25 25
                    <form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
26 26
                        @csrf
27
                        <button type="submit" class="btn btn-link p-0 m-0 align-baseline">{{ __('click here to request another') }}</button>.
27
                        <button type="submit" class="btn button-square">{{ __('click here to request another') }}</button>.
28 28
                    </form>
29 29
                </div>
30 30
            </div>

Také k dispozici: Unified diff