From 9644ffe3b79d0da9eb5ab8eef668ec97e0ddeaa3 Mon Sep 17 00:00:00 2001
From: Rachel Sidney <13515124@std.stei.itb.ac.id>
Date: Wed, 25 Apr 2018 18:36:09 +0700
Subject: [PATCH] fix navbar admin and add list of members in member view
---
app/Http/Controllers/MembersController.php | 3 ++-
public/css/style.css | 3 +--
resources/views/inc/navbar.blade.php | 4 ++--
resources/views/inc/navbarhome.blade.php | 15 +++++++++++++++
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/app/Http/Controllers/MembersController.php b/app/Http/Controllers/MembersController.php
index 93708f5..d45ddce 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 26479c7..f794946 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 ddd06ce..3ed13cf 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 c938bad..30f9380 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 -->
--
GitLab