Skip to content

Commit

Permalink
Merge pull request #22 from idindrakusuma/master
Browse files Browse the repository at this point in the history 
Rangers Dashboard
  • Loading branch information
@idindrakusuma
idindrakusuma authored Oct 25, 2017
2 parents b48e386 + a242d91 commit 82d1cdc
Show file tree
Hide file tree
Showing 9 changed files with 187 additions and 76 deletions.
36 changes: 32 additions & 4 deletions app/Http/Controllers/AdminController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

use Illuminate\Http\Request;

use User;
use App\User;
use App\KelasWorkshop;
use App\MenuMakan;

class AdminController extends Controller
{
Expand All @@ -13,9 +15,35 @@ public function __construct()
$this->middleware('auth');
}

public function index(Request $request)
/* ------------------------------------------------------------------ */
/* Dashboard for Rangers */
/* ------------------------------------------------------------------ */
public function index()
{
// kalau iya perbolehkan masuk...
return view('rangers.rangers_dashboard');
$user = new User();

return view('rangers.rangers_dashboard', ['user' => $user]);
}

/* ------------------------------------------------------------------ */
/* Controller Kelas Workshop */
/* ------------------------------------------------------------------ */
public function kelasWorkshop()
{
$kelas = KelasWorkshop::all();
$user = new User();

return view('rangers.kelas_workshop', ['kelas' => $kelas, 'user' => $user]);
}

/* ------------------------------------------------------------------ */
/* Controller Menu Makan */
/* ------------------------------------------------------------------ */
public function menuMakan()
{
$makan = MenuMakan::all();
$user = new User();

return view('rangers.menu_makan', ['makanan' => $makan, 'user' => $user]);
}
}
1 change: 1 addition & 0 deletions app/Http/Kernel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@ class Kernel extends HttpKernel
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'isDelegates' => \App\Http\Middleware\isDelegates::class,
'isRangers' => \App\Http\Middleware\isRangers::class,
];
}
1 change: 1 addition & 0 deletions app/Http/Middleware/isRangers.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Http\Middleware;

use Closure;
use Auth;

class isRangers
{
Expand Down
15 changes: 15 additions & 0 deletions app/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,30 @@ public function sumMakanan($id)
return $this->where('makan_id', $id)->count();
}

public function totalPemilihMakan()
{
return $this->whereNotNull('makan_id')->count();
}

// menghitung jumlah
public function sumKelas($id)
{
return $this->where('kelas_id', $id)->count();
}

public function totalPemilihKelas()
{
return $this->whereNotNull('kelas_id')->count();
}

// menghitung jumlah komunitas
public function sumKomunitas($id)
{
return $this->where('komunitas_id', $id)->count();
}

public function totalPemilihKomunitas()
{
return $this->whereNotNull('komunitas_id')->count();
}
}
8 changes: 4 additions & 4 deletions resources/views/layouts/partials/menu_rangers.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
<p>Dashboard</p>
</a>
</li>
<li>
<a href="{{ url('/') }}">
<li class="{{ Route::currentRouteName() == "kelas-workshop" ? "active" : "" }}">
<a href="{{ url('rangers/kelas-workshop') }}">
<i class="ti-agenda"></i>
<p>Kelas Workshop</p>
</a>
</li>
<li>
<a href="{{ url('/') }}">
<li class="{{ Route::currentRouteName() == "menu-makan" ? "active" : "" }}">
<a href="{{ url('rangers/menu-makan') }}">
<i class="ti-face-smile"></i>
<p>Daftar Makanan</p>
</a>
Expand Down
39 changes: 39 additions & 0 deletions resources/views/rangers/kelas_workshop.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
@extends('layouts.master')

@section('title','Informasi Kelas Workshop')

@section('content')
{{-- menampilkan list dari kelas workshop --}}
<div class="col-lg-4 col-md-4 col-sm-6">
<div class="card">
<div class="header">
<h4 class="title">Daftar Kelas Workshop</h4>
</div>
<div class="content">
<ul class="list-unstyled team-members">
{{-- list kelas workshop --}}
@foreach ($kelas as $data)
<li>
<div class="row">
<div class="col-xs-3">
<div class="avatar">
<img src="{{ $data->gambar_logo }}" alt="{{ $data->nama_kelas }}" class="img-circle img-no-padding img-responsive">
</div>
</div>
<div class="col-xs-8">
{{ $data->nama_kelas }}
<br>
<span class="text-success">
<small><i class="ti-location-pin"></i> {{ $data->ruang_kelas }} </small> <br>
<small><i class="ti-user"></i> {{ $user->sumKelas($data->id) }} delegates mimilih ini.</small><br>
<small><i class="ti-receipt"></i> Masih tersedia {{ 49-$user->sumKelas($data->id) }} tiket.</small>
</span>
</div>
</div>
</li>
@endforeach
</ul>
</div>
</div>
</div>
@endsection
38 changes: 38 additions & 0 deletions resources/views/rangers/menu_makan.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
@extends('layouts.master')

@section('title','Informasi Menu Makan')

@section('content')
{{-- menampilkan list dari kelas workshop --}}
<div class="col-lg-4 col-md-4 col-sm-6">
<div class="card">
<div class="header">
<h4 class="title">Daftar Menu Makan</h4>
</div>
<div class="content">
<ul class="list-unstyled team-members">
{{-- list kelas workshop --}}
@foreach ($makanan as $data)
<li>
<div class="row">
<div class="col-xs-3">
<div class="">
<img src="{{ $data->foto }}" alt="{{ $data->nama }}" class="img-no-padding img-responsive">
</div>
</div>
<div class="col-xs-8">
{{ $data->nama }}
<br>
<span class="text-success">
<small><i class="ti-shopping-cart"></i> Masih tersisa {{ 100-$user->sumKelas($data->id) }} porsi </small> <br>
<small><i class="ti-user"></i> {{ $user->sumKelas($data->id) }} delegates pesan ini</small>
</span>
</div>
</div>
</li>
@endforeach
</ul>
</div>
</div>
</div>
@endsection
113 changes: 46 additions & 67 deletions resources/views/rangers/rangers_dashboard.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,81 +5,60 @@
@section('content')
<div class="container-fluid">
<div class="row">
{{-- informasi kelas workshop --}}
<div class="col-md-4 col-sm-6">
<div class="card">
<!-- kelas workshop -->
<div class="content">
<div class="row">
<div class="col-xs-5">
<img class="img-voting" src="https://user-images.githubusercontent.com/10141928/29959371-2acadc44-8f21-11e7-9f87-659f1a6f8387.png" alt="Kabar Workshop">
</div>
<div class="col-xs-7">
<div class="numbers">
0
<p>Delegates</p>
</div>
</div>
</div>
<div class="footer">
<hr />
<div class="stats">
<i class="ti-reload"></i> sudah memilih <strong>workshop</strong>
<b>(- 240)</b>
</div>
</div>
</div>
<!-- end of kelas workshop -->
</div>
<div class="card card-user">
<div class="image">
<img src="https://user-images.githubusercontent.com/10141928/29747006-4ddf9562-8b16-11e7-8c67-6046135e827d.png" alt="#DaretoCreate">
</div>
<div class="author">
<img class="avatar border-gray" src="https://user-images.githubusercontent.com/10141928/29959371-2acadc44-8f21-11e7-9f87-659f1a6f8387.png" alt="Kabar Kelas Workshop">
<h4 class="title">Info Kelas Workshop<br>
</h4><hr>
</div>
<p class="description text-left" style="padding:0.3em 2em 0.3em 2em;">
<i class="ti-user"></i> <strong>240</strong> total Delegates. <br>
<i class="ti-check-box"></i> <strong>{{ $user->totalPemilihKelas() }}</strong> Delegates sudah menvote. <br>
<i class="ti-info-alt"></i> <strong>{{ 240-$user->totalPemilihKelas() }}</strong> Delegates belum menvote.
</p><br>
</div>
</div>

{{-- Informasi Voting --}}
<div class="col-md-4 col-sm-6">
<div class="card">
<!-- voting -->
<div class="content">
<div class="row">
<div class="col-xs-5">
<img class="img-voting" src="https://user-images.githubusercontent.com/10141928/29959370-2ac6cfaa-8f21-11e7-908a-f400599369fe.png" alt="Kabar Komunitas">
</div>
<div class="col-xs-7">
<div class="numbers">
0
<p>Delegates</p>
</div>
</div>
</div>
<div class="footer">
<hr />
<div class="stats">
<i class="ti-reload"></i> sudah melakukan <strong>voting</strong>
<b>(- 240)</b>
</div>
</div>
</div>
<div class="card card-user">
<div class="image">
<img src="https://user-images.githubusercontent.com/10141928/29747006-4ddf9562-8b16-11e7-8c67-6046135e827d.png" alt="#DaretoCreate">
</div>
<div class="author">
<img class="avatar border-gray" src="https://user-images.githubusercontent.com/10141928/29959370-2ac6cfaa-8f21-11e7-908a-f400599369fe.png" alt="Kabar Voting">
<h4 class="title">Info Voting Komunitas<br>
</h4><hr>
</div>
<p class="description text-left" style="padding:0.3em 2em 0.3em 2em;">
<i class="ti-user"></i> <strong>240</strong> total Delegates. <br>
<i class="ti-check-box"></i> <strong>{{ $user->totalPemilihKomunitas() }}</strong> Delegates sudah menvote. <br>
<i class="ti-info-alt"></i> <strong>{{ 240-$user->totalPemilihKomunitas() }}</strong> Delegates belum menvote.
</p><br>
</div>
</div>

{{-- Informasi makanan --}}
<div class="col-md-4 col-sm-6">
<div class="card">
<!-- voting -->
<div class="content">
<div class="row">
<div class="col-xs-5">
<img class="img-voting" src="https://user-images.githubusercontent.com/10141928/30063933-798eca0a-927a-11e7-8fe6-8cea0eea64cc.png" alt="Kabar Makan">
</div>
<div class="col-xs-7">
<div class="numbers">
0
<p>Delegates</p>
</div>
</div>
</div>
<div class="footer">
<hr />
<div class="stats">
<i class="ti-reload"></i> sudah memilih <strong>menu makan</strong> (<b>- 240</b>)
</div>
</div>
</div>
<div class="card card-user">
<div class="image">
<img src="https://user-images.githubusercontent.com/10141928/29747006-4ddf9562-8b16-11e7-8c67-6046135e827d.png" alt="#DaretoCreate">
</div>
<div class="author">
<img class="avatar border-gray" src="https://user-images.githubusercontent.com/10141928/30063933-798eca0a-927a-11e7-8fe6-8cea0eea64cc.png" alt="Kabar Makan">
<h4 class="title">Info Makanan<br>
</h4><hr>
</div>
<p class="description text-left" style="padding:0.3em 2em 0.3em 2em;">
<i class="ti-user"></i> <strong>240</strong> total Delegates. <br>
<i class="ti-check-box"></i> <strong>{{ $user->totalPemilihMakan() }}</strong> Delegates sudah memilih. <br>
<i class="ti-info-alt"></i> <strong>{{ 240-$user->totalPemilihMakan() }}</strong> Delegates belum memilih.
</p><br>
</div>
</div>
</div>
Expand Down
12 changes: 11 additions & 1 deletion routes/web.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,17 @@
// Route::get('/home', 'HomeController@index')->name('home');
Route::get('/', 'HomeController@index');
Route::get('/homepage', 'HomeController@index')->name('homepage');
Route::get('/rangers', 'AdminController@index')->name('rangers');

// route group for rangers
Route::prefix('rangers')->group(function(){
Route::get('/', 'AdminController@index')->name('dashboard');

// with middleware isAdmin
Route::get('kelas-workshop', 'AdminController@kelasWorkshop')->name('kelas-workshop')
->middleware('isRangers');
Route::get('menu-makan', 'AdminController@menuMakan')->name('menu-makan')
->middleware('isRangers');
});

// route group for delegates
Route::prefix('delegates')->group(function(){
Expand Down

0 comments on commit 82d1cdc

Please sign in to comment.