diff options
| author | Mateja Marić <mail@matejamaric.com> | 2021-03-08 17:42:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-08 17:42:48 +0100 |
| commit | 21e9e94e76a21516edc3d1e4d0462a0ba75aafa4 (patch) | |
| tree | a8a6ca630da99586bccbcb30258ba770eedc560e /resources/views | |
| parent | 99780d02d2e0db0dc677f87ff236b0b867e270cb (diff) | |
| parent | e3e00c1fce9e40b279a509c129d4cc65d88cd9c3 (diff) | |
| download | yota-laravel-21e9e94e76a21516edc3d1e4d0462a0ba75aafa4.tar.gz yota-laravel-21e9e94e76a21516edc3d1e4d0462a0ba75aafa4.zip | |
Merge pull request #3 from MatejaMaric/use-laravel-mixv1.2.0
Use Laravel Mix.
Diffstat (limited to 'resources/views')
| -rw-r--r-- | resources/views/inc/special_navbar.blade.php | 31 | ||||
| -rw-r--r-- | resources/views/layouts/app.blade.php | 11 |
2 files changed, 4 insertions, 38 deletions
diff --git a/resources/views/inc/special_navbar.blade.php b/resources/views/inc/special_navbar.blade.php deleted file mode 100644 index 69ec1e8..0000000 --- a/resources/views/inc/special_navbar.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -<nav class="navbar navbar-expand-md navbar-dark bg-dark"> - <div class="container"> - <a href="{{ route('home') }}" class="navbar-brand">YOTA</a> - <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbarCollapse"> - <span class="navbar-toggler-icon"></span> - </button> - - <div class="collapse navbar-collapse" id="navbarCollapse"> - <div class="navbar-nav"> - <a href="{{ route('activities') }}" class="nav-item nav-link {{ request()->routeIs('activities') ? 'active' : '' }}">Activities</a> - <a href="{{ route('reserve') }}" class="nav-item nav-link {{ request()->routeIs('reserve') ? 'active' : '' }}">Make reservation</a> - </div> - <div class="navbar-nav ml-auto"> - @if (Auth::check()) - <div class="nav-item dropdown"> - <span class="nav-link dropdown-toggle" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - Administration - </span> - <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink"> - <a class="dropdown-item" href="{{ route('addSign') }}">Callsigns</a> - <a class="dropdown-item" href="{{ route('reservations') }}">Reservations</a> - </div> - </div> - <a href="{{ route('logout') }}" class="nav-item nav-link">Logout</a> - @else - <a href="{{ route('login') }}" class="nav-item nav-link {{ request()->routeIs('login') ? 'active' : '' }}">Login</a> - @endif - </div> - </div> - </div> -</nav> diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 3cb8667..79235ac 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -3,11 +3,8 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> - - <link rel="stylesheet" href="{{ asset('css/app.css') }}" type="text/css"> - <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous"> + <link rel="stylesheet" href="{{ mix('css/app.css') }}" type="text/css"> @yield('styles') - <title>YOTA - @yield('title')</title> </head> <body> @@ -16,9 +13,9 @@ <div class="container pt-3"> @yield('content') </div> - <script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script> - <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script> - <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script> + <script src="{{ mix('js/manifest.js') }}"></script> + <script src="{{ mix('js/vendor.js') }}"></script> + <script src="{{ mix('js/app.js') }}"></script> @yield('scripts') </body> </html> |