From 871c7ff1dfe41025430ab3c4b0cd41d46bd8f8dd Mon Sep 17 00:00:00 2001
From: Mateja <mail@matejamaric.com>
Date: Sat, 17 Oct 2020 01:16:57 +0200
Subject: Active navbar links with named routes.

---
 resources/views/inc/navbar.blade.php  | 49 +++--------------------------------
 resources/views/layouts/app.blade.php |  4 +--
 resources/views/pages/index.blade.php |  7 -----
 3 files changed, 4 insertions(+), 56 deletions(-)

(limited to 'resources')

diff --git a/resources/views/inc/navbar.blade.php b/resources/views/inc/navbar.blade.php
index ce88a2f..89492db 100644
--- a/resources/views/inc/navbar.blade.php
+++ b/resources/views/inc/navbar.blade.php
@@ -1,45 +1,3 @@
-<!--
-<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
-  <a class="navbar-brand" href="#">Navbar</a>
-
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
-
-  <div class="collapse navbar-collapse" id="navbarsExampleDefault">
-    <ul class="navbar-nav mr-auto">
-      <li class="nav-item active">
-        <a class="nav-link" href="/">Home<span class="sr-only">(current)</span></a>
-      </li>
-      <li class="nav-item">
-        <a class="nav-link" href="/services">Services</a>
-      </li>
-      <li class="nav-item">
-        <a class="nav-link" href="/about">About</a>
-      </li>
-      {{--<li class="nav-item">--}}
-        {{--<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>--}}
-      {{--</li>--}}
-
-      {{--<li class="nav-item dropdown">--}}
-        {{--<a class="nav-link dropdown-toggle" href="#" id="dropdown01" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown</a>--}}
-        {{--<div class="dropdown-menu" aria-labelledby="dropdown01">--}}
-          {{--<a class="dropdown-item" href="#">Action</a>--}}
-          {{--<a class="dropdown-item" href="#">Another action</a>--}}
-          {{--<a class="dropdown-item" href="#">Something else here</a>--}}
-        {{--</div>--}}
-      {{--</li>--}}
-
-    </ul>
-
-    {{--<form class="form-inline my-2 my-lg-0">--}}
-      {{--<input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search">--}}
-      {{--<button class="btn btn-secondary my-2 my-sm-0" type="submit">Search</button>--}}
-    {{--</form>--}}
-
-  </div>
-</nav>
--->
 <nav class="navbar navbar-expand-md navbar-light bg-light">
     <a href="http://yota.yu1srs.org.rs" class="navbar-brand">YOTA</a>
     <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbarCollapse">
@@ -48,10 +6,9 @@
 
     <div class="collapse navbar-collapse" id="navbarCollapse">
         <div class="navbar-nav">
-            {{--<a href="/" class="nav-item nav-link active">Home</a>--}}
-            <a href="/" class="nav-item nav-link">Home</a>
-            <a href="/services" class="nav-item nav-link">Services</a>
-            <a href="/about" class="nav-item nav-link">About</a>
+            <a href="/" class="nav-item nav-link {{ request()->routeIs('home') ? 'active' : '' }}">Home</a>
+            <a href="/services" class="nav-item nav-link {{ request()->routeIs('services') ? 'active' : '' }}">Services</a>
+            <a href="/about" class="nav-item nav-link {{ request()->routeIs('about') ? 'active' : '' }}">About</a>
         </div>
         <div class="navbar-nav ml-auto">
             <a href="#" class="nav-item nav-link">Login</a>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index a2def85..f839e4e 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -5,10 +5,8 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         <link rel="stylesheet" href="{{ asset('css/app.css') }}" type="text/css">
-        <!-- CSS only -->
-        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
 
-        <!-- JS, Popper.js, and jQuery -->
+        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
         <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" 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>
diff --git a/resources/views/pages/index.blade.php b/resources/views/pages/index.blade.php
index 0be22fc..568151b 100644
--- a/resources/views/pages/index.blade.php
+++ b/resources/views/pages/index.blade.php
@@ -3,11 +3,4 @@
 @section('content')
     <h1>{{ $title ?? 'Index'}}</h1>
     <p>Something...</p>
-    {{--@if(count($services) > 0)--}}
-    {{--<ul class="list-group">--}}
-        {{--@foreach($services as $service)--}}
-            {{--<li class="list-group-item">{{$service}}</li>--}}
-        {{--@endforeach--}}
-    {{--</ul>--}}
-    {{--@endif--}}
 @endsection
-- 
cgit v1.2.3