From d14dc5979091225742e5687e10a6558f3be24ea8 Mon Sep 17 00:00:00 2001
From: Aditya Pratama <aditya.psantoso@gmail.com>
Date: Thu, 26 Apr 2018 00:51:15 +0700
Subject: [PATCH] Add view all members and fix responsive view
---
app/Http/Controllers/MembersController.php | 2 +-
public/storage/view-more-members.png | Bin 0 -> 3961 bytes
.../template/asset/css/bootstrap-custom.css | 7 +-
public/template/css/color/yellow.css | 1 +
resources/views/home.blade.php | 24 +++++-
resources/views/inc/navbarhome.blade.php | 48 ++++++-----
resources/views/layouts/apphome.blade.php | 6 +-
resources/views/showmember.blade.php | 75 ++++++++++--------
8 files changed, 102 insertions(+), 61 deletions(-)
create mode 100644 public/storage/view-more-members.png
diff --git a/app/Http/Controllers/MembersController.php b/app/Http/Controllers/MembersController.php
index d45ddce..0338b2c 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
GIT binary patch
literal 3961
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
TSJe4{00000NkvXXu0mjf^>u0n
literal 0
HcmV?d00001
diff --git a/public/template/asset/css/bootstrap-custom.css b/public/template/asset/css/bootstrap-custom.css
index 664f6c7..c8ab132 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 8895210..8e8a02b 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 50d0bb7..ebe35ef 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 83ee00b..01c0432 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 9e22efe..9670310 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 8b97821..2b47f70 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
--
GitLab