Changeset 1c25bcf for resources/views


Ignore:
Timestamp:
10/25/21 21:49:53 (3 years ago)
Author:
Berat Kjufliju <kufliju@…>
Branches:
develop, master
Children:
e756bd9
Parents:
05e57e2
Message:

added 2fa, bug fixes, edited blades

Location:
resources/views
Files:
1 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • resources/views/auth/create_password.blade.php

    r05e57e2 r1c25bcf  
    77    <!-- logo -->
    88    <div id="logo">
    9         <img class="logo" src="{{ url('assets/media/images/logo.png') }}" alt="image">
    10         <img class="logo-dark" src="{{ url('assets/media/images/logo-dark.png') }}" alt="image">
     9        <img class="logo" width="150" src="{{ url('assets/media/images/logo.png') }}" alt="image">
    1110    </div>
    1211    <!-- ./ logo -->
    … …  
    1716    <form action="{{ route("auth.create-password", ["id" => $id, "token" => $token]) }}" method="post">
    1817        @csrf
    19         @if ($errors->any())
    20             <div class="alert alert-danger">
    21                 <ul class="m-0 pl-2">
    22                     @foreach ($errors->all() as $error)
    23                         <li>{{ $error }}</li>
    24                     @endforeach
    25                 </ul>
    26             </div>
    27         @endif
     18
    2819        <div class="form-group">
    2920            <input id="password" type="password" name="password" class="form-control" placeholder="Password" autocomplete="off" required autofocus>

  • resources/views/auth/forgot.blade.php

    r05e57e2 r1c25bcf  
    77    <!-- logo -->
    88    <div id="logo">
    9         <img class="logo" src="{{ url('assets/media/images/logo.png') }}" alt="image">
     9        <img class="logo" width="150" src="{{ url('assets/media/images/logo.png') }}" alt="image">
    1010    </div>
    1111    <!-- ./ logo -->
    … …  
    1616    <form action="{{ route("auth.forgot") }}" method="post">
    1717        @csrf
    18         @if ($errors->any())
    19             <div class="alert alert-danger">
    20                 <ul class="m-0 pl-2">
    21                     @foreach ($errors->all() as $error)
    22                         <li>{{ $error }}</li>
    23                     @endforeach
    24                 </ul>
    25             </div>
    26         @endif
    2718
    28         @if(Session::has('forgotInfo'))
    29             <div class="alert alert-success fade show" role="alert">
    30                 <strong> {{ Session::get('forgotInfo') }} </strong>
    31                 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
    32                 </button>
    33             </div>
    34         @endif
    3519        <div class="form-group">
    36             <input type="email" name="email" class="form-control" id="" aria-describedby="emailHelp" placeholder="Username" required autofocus>
     20            <input type="email" name="email" class="form-control" id="" aria-describedby="emailHelp" placeholder="Email" required autofocus>
    3721        </div>
    3822        <button type="submit" class="btn btn-primary btn-block">Submit</button>
    3923        <hr>
    40         <p class="text-muted">Take a different action.</p>
    41         <a href="{{ route("auth.loginShow") }}" class="btn btn-sm btn-outline-light ml-1">Login!</a>
     24        <p class="text-muted">I remember my password</p>
     25        <a href="{{ route("auth.loginShow") }}" class="btn btn-sm btn-outline-light ml-1">Login</a>
    4226    </form>
    4327    <!-- ./ form -->

  • resources/views/auth/login.blade.php

    r05e57e2 r1c25bcf  
    77    <!-- logo -->
    88    <div id="logo">
    9         <img class="logo" src="{{ url('assets/media/images/logo.png') }}" alt="image">
     9        <img class="logo" width="150" src="{{ url('assets/media/images/logo.png') }}" alt="image">
    1010     </div>
    1111    <!-- ./ logo -->
    … …  
    1515    <!-- form -->
    1616    <form action="{{ route("auth.login") }}" method="post" accept-charset="utf-8">
     17
    1718        @csrf
    18         @if(Session::has('isActiveError'))
    19             <div class="alert alert-danger alert-dismissible fade show" role="alert">
    20                 <strong> {{ Session::get('isActiveError') }} </strong>
    21                 <button type="button" class="close" data-dismiss="alert" aria-label="Close"></button>
    22             </div>
    23         @endif
    2419
    25         @if(Session::has('loginError'))
    2620            <div class="alert alert-error fade show" role="alert">
    27                 <strong> {{ Session::get('loginError') }} </strong>
    2821                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
    2922                </button>
    3023            </div>
    31         @endif
    3224        <div class="form-group">
    33             <input id="username" type="text" tabindex="1" class="form-control{{ Session::has('usernameError') ? ' is-invalid' : '' }}" value="{{ old('username') }}" name="username" placeholder="Username" autocomplete="off" required autofocus>
    34             @if(Session::has('usernameError'))
     25            <input id="username" type="text" tabindex="1" class="form-control" value="{{ old('username') }}" name="username" placeholder="Username" autocomplete="off" required autofocus>
    3526                <span class="invalid-feedback" role="alert">
    36                     <strong>{{ Session::get('usernameError') }}</strong>
    3727                </span>
    38             @endif
    3928        </div>
    4029
    4130        <div class="form-group">
    42             <input id="password" type="password" tabindex="2" class="form-control{{ Session::has('passwordError') ? ' is-invalid' : '' }}" name="password" autocomplete="off" placeholder="Password" required>
    43             @if(Session::has('passwordError'))
     31            <input id="password" type="password" tabindex="2" class="form-control" name="password" autocomplete="off" placeholder="Password" required>
    4432                <span class="invalid-feedback" role="alert">
    45                     <strong>{{ Session::get('passwordError') }}</strong>
    4633                </span>
    47             @endif
    4834        </div>
    4935

  • resources/views/dashboard/users/index.blade.php

    r05e57e2 r1c25bcf  
    9898                                    </td>
    9999                                    @if(auth()->user()->hasPermission('manage_all_users'))
    100                                     @if($user->hasRole("Referent") && $user->is_confirmed)
     100                                    @if($user->hasRole("Referent") || $user->hasRole("Viewer") && $user->is_confirmed)
    101101                                        <td>
    102102                                            <a href="javascript:void(0)" class="text-secondary" data-toggle="modal" data-target="#editModal_{{$user->id}}" title="Edit">

  • resources/views/layouts/app.blade.php

    r05e57e2 r1c25bcf  
    9393            <div class="header-logo">
    9494                <a href="{{ url('dashboard') }}">
    95                     <img class="logo" src="{{ url('assets/media/images/logo-small.png') }}" alt="logo">
     95                    <img class="logo" width="80" src="{{ url('assets/media/images/logo.png') }}" alt="logo">
    9696                </a>
    9797            </div>
    … …  
    160160                        </a>
    161161                    </li>
    162                     @if(auth()->user()->hasPermission("manage_all_users"))
     162                    @if(auth()->user()->hasPermission("view_all_users"))
    163163                        <li>
    164164                            <a href="{{ route("dashboard.users.index") }}" class="nav-link {{ request()->is(['dashboard/users', 'dashboard/users/*']) ? 'active' : '' }}" data-toggle="tooltip"
Note: See TracChangeset for help on using the changeset viewer.