Skip to content

GitLab

D
Doorcode
Commit 4d656fcc authored by Jacob Priddy's avatar Jacob Priddy 👌
Browse files
Options

hotfix to 500 error when it should be a 404

parent 084c8d72
Pipeline #12674 passed with stages
          in 4 minutes
          Hide whitespace changes
          Inline Side-by-side
          Showing with 63 additions and 58 deletions
          src/backend/resources/views/layouts/app.blade.php
          View file @ 4d656fcc
          <!DOCTYPE html>
          <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
          <head>
          <meta charset="utf-8">
          <meta name="viewport" content="width=device-width, initial-scale=1">
          {{-- <link rel="icon" href="/docs/4.1/assets/img/favicons/favicon.ico">--}}
          <title>E-Lock - @yield('title')</title>
          <link rel="stylesheet" href="{{ asset('css/app.css') }}">
          <link href="{{ asset('vendor/fontawesome-free/css/all.min.css') }}" rel="stylesheet">
          </head>
          <body>
          <nav class="navbar navbar-expand-md navbar-dark bg-dark mb-4">
          <a class="navbar-brand" href="/">E-Lock</a>
          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
          aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
          <span class="navbar-toggler-icon"></span>
          </button>
          <div class="collapse navbar-collapse" id="navbarCollapse">
          <ul class="navbar-nav mr-auto">
          @can('view-admin-panel')
          @extends('layouts.base')
          @section('main-header')
          <nav class="navbar navbar-expand-md navbar-dark bg-dark mb-4">
          <a class="navbar-brand" href="/">E-Lock</a>
          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
          aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
          <span class="navbar-toggler-icon"></span>
          </button>
          <div class="collapse navbar-collapse" id="navbarCollapse">
          <ul class="navbar-nav mr-auto">
          @can('view-admin-panel')
          <li class="nav-item mr-2">
          <a class="nav-link" href="{{ route('web.admin.home') }}">Admin Panel</a>
          </li>
          @endauth
          <li class="nav-item mr-2">
          <a class="nav-link" href="{{ route('web.admin.home') }}">Admin Panel</a>
          <a class="nav-link" href="{{ route('web.about') }}">About</a>
          </li>
          <li class="nav-item">
          <a class="nav-link" href="/api/docs/">Api Docs</a>
          </li>
          @endauth
          <li class="nav-item mr-2">
          <a class="nav-link" href="{{ route('web.about') }}">About</a>
          </li>
          <li class="nav-item">
          <a class="nav-link" href="/api/docs/">Api Docs</a>
          </li>
          </ul>
          <div class="dropdown mr-5">
          <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
          Hello, {{ user()->getFirstName() }}
          </button>
          <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
          <a class="dropdown-item" href="{{ route('web.access') }}">Access</a>
          <a class="dropdown-item" href="{{ route('web.doorcode') }}">Change Doorcode</a>
          <a class="dropdown-item" href="{{ route('web.requests') }}">Requests</a>
          <a class="dropdown-item" href="{{ route('web.password') }}">Change Password</a>
          <a class="dropdown-item" href="{{ route('web.tokens') }}">API Tokens</a>
          <a class="dropdown-item" href="{{ route('saml.logout') }}">Logout</a>
          </ul>
          <div class="dropdown mr-5">
          <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
          Hello, {{ user()->getFirstName() }}
          </button>
          <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
          <a class="dropdown-item" href="{{ route('web.access') }}">Access</a>
          <a class="dropdown-item" href="{{ route('web.doorcode') }}">Change Doorcode</a>
          <a class="dropdown-item" href="{{ route('web.requests') }}">Requests</a>
          <a class="dropdown-item" href="{{ route('web.password') }}">Change Password</a>
          <a class="dropdown-item" href="{{ route('web.tokens') }}">API Tokens</a>
          <a class="dropdown-item" href="{{ route('saml.logout') }}">Logout</a>
          </div>
          </div>
          </div>
          </div>
          </nav>
          <main role="main" class="container">
          <div class="mb-5">
          <div class="page-header text-center">
          <h1> @yield('title') </h1>
          </div>
          <hr>
          @yield('content')
          </div>
          </main>
          <script src="{{ asset('js/app.js') }}"></script>
          @yield('script')
          </body>
          </html>
          </nav>
          @endsection
          src/backend/resources/views/layouts/base.blade.php 0 → 100644
          View file @ 4d656fcc
          <!DOCTYPE html>
          <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
          <head>
          <meta charset="utf-8">
          <meta name="viewport" content="width=device-width, initial-scale=1">
          {{-- <link rel="icon" href="/docs/4.1/assets/img/favicons/favicon.ico">--}}
          <title>E-Lock - @yield('title')</title>
          <link rel="stylesheet" href="{{ asset('css/app.css') }}">
          <link href="{{ asset('vendor/fontawesome-free/css/all.min.css') }}" rel="stylesheet">
          </head>
          <body>
          @yield('main-header')
          <main role="main" class="container">
          <div class="mb-5">
          <div class="page-header text-center">
          <h1> @yield('title') </h1>
          </div>
          <hr>
          @yield('content')
          </div>
          </main>
          <script src="{{ asset('js/app.js') }}"></script>
          @yield('script')
          </body>
          </html>
          src/backend/resources/views/layouts/error.blade.php
          View file @ 4d656fcc
          @extends('layouts.app')
          @extends('layouts.base')
          @section('content')
          <div class="row justify-content-center">
          ......
          Markdown is supported
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment