diff --git a/app/Http/Controllers/MembersController.php b/app/Http/Controllers/MembersController.php index 93708f5bbe59e7afef8500212fdc8228bb7d50f0..d45ddcebeb7b105390624a7fc26bc0b22682dcb4 100644 --- a/app/Http/Controllers/MembersController.php +++ b/app/Http/Controllers/MembersController.php @@ -32,10 +32,11 @@ class MembersController extends Controller if(!($isMember || $isAdmin)) return redirect('/'); - $members = Member::orderBy('nim','asc')->paginate(20); if ($isAdmin) { + $members = Member::orderBy('nim','asc')->paginate(20); return view('members.list')->with('members', $members); } else { + $members = Member::orderBy('nim','asc')->get(); return view('showmember')->with('members', $members); } diff --git a/public/css/style.css b/public/css/style.css index 26479c74e729c331c20dbe1f4e5680f6dec431fa..f79494672ec872412fe493eed47ed1ed2eef9cf2 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -87,9 +87,8 @@ div.row:before, div.row:after { } .navbar { - background-color: #003365 !important; + background-color: #003365 !important; border-radius: 0px !important; - height: 80px; } .navbar-brand { diff --git a/resources/views/inc/navbar.blade.php b/resources/views/inc/navbar.blade.php index ddd06ce243b03681612183a7821770fc11e6b1a3..3ed13cf8582b8bdcb7fe7fa4a261a0fe60da074d 100644 --- a/resources/views/inc/navbar.blade.php +++ b/resources/views/inc/navbar.blade.php @@ -5,11 +5,11 @@ <i style="font-weight: lighter; font-style: initial;" class="web-alumni">Web Alumni</i> <b class="stei">STEI</b> </a> - <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation"> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> </button> - <div class="collapse navbar-collapse" id="navbarSupportedContent"> + <div class="collapse navbar-collapse" style="margin-left:4%;" id="navbarSupportedContent"> <!-- Left Side Of Navbar --> <ul class="navbar-nav mr-auto"> @if(Auth::guard('member')->user() != null) diff --git a/resources/views/inc/navbarhome.blade.php b/resources/views/inc/navbarhome.blade.php index c938bad02041a4edfd8d0c9bf22fa3d6bf7d5436..30f9380337e3f13fee92fd966f1bad2463b2d60c 100644 --- a/resources/views/inc/navbarhome.blade.php +++ b/resources/views/inc/navbarhome.blade.php @@ -86,6 +86,21 @@ <a class="page-scroll" href="/about">About</a> </li> @endif + + @if(Auth::guard('member')->user() != null) + @if (Request::is('/')) + @else + @if (Request::is('members')) + <li class="on-page"> + <a href="#">Members</a> + </li> + @else + <li> + <a class="page-scroll" href="/members">Members</a> + </li> + @endif + @endif + @endif </ul> <!-- Login Dropdown -->