diff --git a/app/Http/Controllers/MembersController.php b/app/Http/Controllers/MembersController.php
index d45ddcebeb7b105390624a7fc26bc0b22682dcb4..0338b2c905f5d333de101f1300a7de4145616d06 100644
--- a/app/Http/Controllers/MembersController.php
+++ b/app/Http/Controllers/MembersController.php
@@ -36,7 +36,7 @@ class MembersController extends Controller
$members = Member::orderBy('nim','asc')->paginate(20);
return view('members.list')->with('members', $members);
} else {
- $members = Member::orderBy('nim','asc')->get();
+ $members = Member::orderBy('nim','asc')->paginate(12);
return view('showmember')->with('members', $members);
}
diff --git a/public/storage/view-more-members.png b/public/storage/view-more-members.png
new file mode 100644
index 0000000000000000000000000000000000000000..74ab2b6ad26192f1f62db094ac4f51cff382b8e5
Binary files /dev/null and b/public/storage/view-more-members.png differ
diff --git a/public/template/asset/css/bootstrap-custom.css b/public/template/asset/css/bootstrap-custom.css
index 664f6c726babb4a67940c8ae8ac629fe05c39070..c8ab1323ef88fbca16c28c6d7f0b54cd61cc3bd9 100644
--- a/public/template/asset/css/bootstrap-custom.css
+++ b/public/template/asset/css/bootstrap-custom.css
@@ -38,7 +38,7 @@
}
.navbar-default .navbar-nav>.on-page>a:hover,
-.navbar-default .navbar-nav>.on-page>a:focus {
+.navbar-default .navbar-nav>.on-page>a:focus, {
color: #fff;
}
@@ -245,4 +245,9 @@ div.overlay {
.footer-left-position {
text-align: center;
}
+}
+
+.dropdown-home {
+ margin-left: 5%;
+ padding-bottom: 2%;
}
\ No newline at end of file
diff --git a/public/template/css/color/yellow.css b/public/template/css/color/yellow.css
index 8895210ec7270928e493e83071aaace974d6d348..8e8a02b6015281f73fc61dc5d057fcd04d3e3097 100644
--- a/public/template/css/color/yellow.css
+++ b/public/template/css/color/yellow.css
@@ -327,6 +327,7 @@ footer.style-1 {
color: #FED136;
}
+
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
color: #FED136;
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 50d0bb763cecd406f4b0a2bfadfbe2deaf52201d..ebe35ef6b1bea1964c36857fd3d7822e74bb8f1c 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -315,7 +315,7 @@
</div>
@endif
- @if (count($homedata[1]) > 3)
+ {{-- @if (count($homedata[1]) > 3)
<div class="team-member">
<img src="/storage/profile_image/{{$homedata[1][3]->profile_image}}" class="img-responsive" alt="">
<div class="team-details">
@@ -351,7 +351,27 @@
</ul>
</div>
</div>
- @endif
+ @endif --}}
+
+ <div class="team-member">
+ <img src="/storage/view-more-members.png" class="img-responsive" alt="">
+ <div class="team-details">
+ <h4>VIEW MORE</h4>
+ <ul>
+ @if ((Auth::user() != null) || (Auth::guard('member')->user() != null))
+ <li style="padding-top: 5px">
+ <a href="/members" style="background: none; border: none; color: white">
+ <i class="fa fa-search-plus fa-5x"></i>
+ </a>
+ </li>
+ @else
+ <li class="popup" onclick="myFunction5()" style="padding-top: 5px">
+ <span class="popuptext" id="myPopup5" style="bottom: 115%">You must login first <a href="/login"><u>(LOGIN)</u></a></span>
+ <i class="fa fa-search-plus fa-5x" style="background: none; border: none; color: white"></i></li>
+ @endif
+ </ul>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/resources/views/inc/navbarhome.blade.php b/resources/views/inc/navbarhome.blade.php
index 83ee00b52f136a1fbebd01234098ac5f7aa8e221..01c04328a27e23959d0214b92aae89ff8876eecd 100644
--- a/resources/views/inc/navbarhome.blade.php
+++ b/resources/views/inc/navbarhome.blade.php
@@ -30,16 +30,20 @@
@if(Request::is('/'))
<li class="on-page" id="home-navbar">
- <a class="dropdown-toggle" data-toggle="dropdown" href="/">Home
+ <a class="dropdown-toggle" data-toggle="dropdown" href="/" style="color:white">Home
<span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a class="page-scroll" href="#page-top">Introduction</a>
+ <li class="dropdown-home">
+ <a class="page-scroll" href="#page-top">Introduction</a>
</li>
- <li><a class="page-scroll" href="#service">Services</a>
+ <li class="dropdown-home">
+ <a class="page-scroll" href="#service">Services</a>
</li>
- <li><a class="page-scroll" href="#team">New Member</a>
+ <li class="dropdown-home">
+ <a class="page-scroll" href="#team">New Member</a>
</li>
- <li><a class="page-scroll" href="#contact">Contact</a>
+ <li class="dropdown-home">
+ <a class="page-scroll" href="#contact">Contact</a>
</li>
</ul>
</li>
@@ -48,13 +52,17 @@
<a class="dropdown-toggle" data-toggle="dropdown" href="/">Home
<span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a class="page-scroll on-page" href="/#page-top">Introduction</a>
+ <li class="dropdown-home">
+ <a class="page-scroll on-page" href="/#page-top">Introduction</a>
</li>
- <li><a class="page-scroll" href="/#service">Services</a>
+ <li class="dropdown-home">
+ <a class="page-scroll" href="/#service">Services</a>
</li>
- <li><a class="page-scroll" href="/#team">New Member</a>
+ <li class="dropdown-home">
+ <a class="page-scroll" href="/#team">New Member</a>
</li>
- <li><a class="page-scroll" href="/#contact">Contact</a>
+ <li class="dropdown-home">
+ <a class="page-scroll" href="/#contact">Contact</a>
</li>
</ul>
</li>
@@ -82,17 +90,6 @@
@endif
@endif
- {{-- About --}}
- @if (Request::is('about'))
- <li class="on-page">
- <a href="#">About</a>
- </li>
- @else
- <li>
- <a class="page-scroll" href="/about">About</a>
- </li>
- @endif
-
{{-- Members --}}
@if(Auth::guard('member')->user() != null)
@if (Request::is('members'))
@@ -105,6 +102,17 @@
</li>
@endif
@endif
+
+ {{-- About --}}
+ @if (Request::is('about'))
+ <li class="on-page">
+ <a href="#">About</a>
+ </li>
+ @else
+ <li>
+ <a class="page-scroll" href="/about">About</a>
+ </li>
+ @endif
</ul>
<!-- Login Dropdown -->
diff --git a/resources/views/layouts/apphome.blade.php b/resources/views/layouts/apphome.blade.php
index 9e22efe100201ba72039e74cb1686d49ccfb1e14..9670310eb57b084220897bcffc501bab99f7ac33 100644
--- a/resources/views/layouts/apphome.blade.php
+++ b/resources/views/layouts/apphome.blade.php
@@ -56,7 +56,7 @@
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
</head>
-<body class="index" onscroll="scrollDetector()">
+<body class="index">
@include('inc.navbarhome')
<div id="loader">
<div class="spinner">
@@ -99,10 +99,10 @@
<!-- Custom Theme JavaScript -->
<script src="{{ asset('template/js/script.js') }}"></script>
- <script>
+ {{-- <script>
function scrollDetector() {
document.getElementById("home-navbar").classList.remove('on-page');
}
- </script>
+ </script> --}}
</body>
</html>
\ No newline at end of file
diff --git a/resources/views/showmember.blade.php b/resources/views/showmember.blade.php
index 8b9782167c676e8d2a75c2fd878461326ec78af2..2b47f704df63602c1ecaa1c401ae4e12bd6a0995 100644
--- a/resources/views/showmember.blade.php
+++ b/resources/views/showmember.blade.php
@@ -1,45 +1,52 @@
@extends('layouts.apphome')
-@section('title', 'Show Members')
+@section('title', 'Members List')
@section('content')
-<div class="container" style="min-height: 800px">
-<!-- Start Team Member Section -->
-<section id="team" class="team-member-section">
- <div class="container">
- <div class="row">
+<!--<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
+ <img src="{{URL::asset('storage/banner.jpg')}}" id="bannerMember">
+</div>-->
+<div class="col-10 col-xs-offset-1 col-sm-offset-1 col-md-offset-1 showmember-table" style="min-height: 60em; overflow-x: auto">
+ <div class="row" style="margin-top: 1%">
<div class="col-md-12 col-sm-12">
<div class="section-title text-center">
<h3>Our Members</h3>
- <p>Meet all members of Web Alumni STEI ITB!</p>
+ <p style="padding-bottom: 5%">Meet all members of Web Alumni STEI ITB!</p>
</div>
</div>
</div>
-
- <div class="row">
- <div class="col-md-12">
- <div id="team-section">
- <div class="our-team">
- @if (count($members) > 0)
- @foreach ($members as $member)
- <div class="team-member">
- <img src="/storage/profile_image/{{$member->profile_image}}" class="img-responsive" alt="">
- <div class="team-details">
- <h4>{{$member->name}}</h4>
- <p>Alumni of STEI</p>
- <ul>
- <li><a href="/members/{{$member->id}}"><i class="fa fa-user"></i></a></li>
- </ul>
- </div>
- </div>
- @endforeach
- @endif
- </div>
- </div>
- </div>
- </div>
- </div>
+ @if(count($members) > 0)
+ <table class="table table-bordered">
+ <thead class="thead-light custom-thread">
+ <tr class="table-text">
+ <th scope="col-3">Student ID</th>
+ <th scope="col-6">Name</th>
+ <th scope="col-3">Email Address</th>
+ <th scope="col-3">Status</th>
+ </tr>
+ </thead>
+ <tbody>
+ @foreach($members as $member)
+ <tr class="table-text">
+ <td>{{$member->nim}}</td>
+ <td><a href="/admin/members/{{$member->id}}">{{$member->name}}</a></td>
+ <td>{{$member->email}}</td>
+ @if ($member->verified == 0)
+ <td style="color:red;">not verified</td>
+ @else
+ <td>verified</td>
+ @endif
+ </tr>
+ @endforeach
+ </tbody>
+ </table>
+ <ul class="pagination text-center" style="display: block">{{$members->links()}}</ul>
+ @else
+ <p>No member.</p>
+ @endif
</div>
-</section>
- <!-- End Team Member Section -->
-@endsection
\ No newline at end of file
+<script>
+ document.getElementById("nav-two").classList.add("active");
+ document.getElementById("text-nav-two").classList.add("color-active");
+</script>
+ @endsection
\ No newline at end of file