Commit 2df78316 by rizky

update

parent 6c6d71c9
/node_modules /node_modules
/public/storage /public/storage
/vendor
/.idea /.idea
Homestead.json Homestead.json
Homestead.yaml Homestead.yaml
......
...@@ -5,6 +5,7 @@ namespace App\Exceptions; ...@@ -5,6 +5,7 @@ namespace App\Exceptions;
use Exception; use Exception;
use Illuminate\Auth\AuthenticationException; use Illuminate\Auth\AuthenticationException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class Handler extends ExceptionHandler class Handler extends ExceptionHandler
{ {
...@@ -44,6 +45,12 @@ class Handler extends ExceptionHandler ...@@ -44,6 +45,12 @@ class Handler extends ExceptionHandler
*/ */
public function render($request, Exception $exception) public function render($request, Exception $exception)
{ {
if($exception instanceof NotFoundHttpException)
{
return response()->view('errors.404', [], 404);
}
return parent::render($request, $exception); return parent::render($request, $exception);
} }
......
...@@ -20,6 +20,7 @@ class RegistrationController extends Controller ...@@ -20,6 +20,7 @@ class RegistrationController extends Controller
'first_name' => 'required|max:255', 'first_name' => 'required|max:255',
'last_name' => 'required|max:255', 'last_name' => 'required|max:255',
'password' => 'confirmed|required|min:6', 'password' => 'confirmed|required|min:6',
'password_confirmation' => 'confirmed|required|same:password'
]); ]);
$user = Sentinel::registerAndActivate($request->all()); $user = Sentinel::registerAndActivate($request->all());
......
...@@ -19,6 +19,6 @@ class CustomerMiddleware ...@@ -19,6 +19,6 @@ class CustomerMiddleware
if(Sentinel::check() && Sentinel::getUser()->roles()->first()->slug=='customer') if(Sentinel::check() && Sentinel::getUser()->roles()->first()->slug=='customer')
return $next($request); return $next($request);
else else
return redirect('/'); return redirect()->back();
} }
} }
...@@ -19,6 +19,6 @@ class ManagerMiddleware ...@@ -19,6 +19,6 @@ class ManagerMiddleware
if(Sentinel::check() && Sentinel::getUser()->roles()->first()->slug=='manager') if(Sentinel::check() && Sentinel::getUser()->roles()->first()->slug=='manager')
return $next($request); return $next($request);
else else
return redirect('/'); return redirect()->back();
} }
} }
...@@ -19,6 +19,6 @@ class StaffMiddleware ...@@ -19,6 +19,6 @@ class StaffMiddleware
if(Sentinel::check() && Sentinel::getUser()->roles()->first()->slug=='staff') if(Sentinel::check() && Sentinel::getUser()->roles()->first()->slug=='staff')
return $next($request); return $next($request);
else else
return redirect('/'); return redirect()->back();
} }
} }
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateKaryawansTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('karyawans', function (Blueprint $table) {
$table->increments('id');
$table->string('nama');
$table->string('pekerjaan');
$table->string('notlp');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('karyawans');
}
}
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<div class="separator"> <div class="separator">
<p class="change_link">Already a member ? <p class="change_link">Already a member ?
<a href="{{url('/register')}}" class="to_register"> Log in </a> <a href="{{url('/login')}}" class="to_register"> Log in </a>
</p> </p>
<div class="clearfix"></div> <div class="clearfix"></div>
......
...@@ -16,18 +16,13 @@ ...@@ -16,18 +16,13 @@
<div class="x_panel"> <div class="x_panel">
<div class="x_title"> <div class="x_title">
<h2>Jumlah Pesanan</h2> <h2>Jumlah Pesanan</h2>
<ul class="nav navbar-right panel_toolbox">
<li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>
</li>
</ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="x_content"> <div class="x_content">
<form action="{{url('/ticket/beli/')}}" method="post"> <form action="{{url('/ticket/beli/')}}" method="post">
{{ csrf_field() }} {{ csrf_field() }}
<label class="col-md-4 control-label">User ID</label> <label class="col-md-4 control-label">User ID</label>
<input type="text" value="{{Sentinel::getUser()->id}}" class="form-control" name="user_id" readonly> <input type="text" value="{{Sentinel::getUser()->id}}" class="form-control" name="user_id" readonly>
<label class="col-md-4 control-label">Name</label> <label class="col-md-4 control-label">Name</label>
......
...@@ -33,14 +33,7 @@ ...@@ -33,14 +33,7 @@
<!-- price element --> <!-- price element -->
<div class="col-md-4 col-sm-6 col-xs-12" style="align-content: center"> <div class="col-md-4 col-sm-6 col-xs-12" style="align-content: center">
<div class="pricing ui-ribbon-container">
<div class="ui-ribbon-wrapper">
</div>
<div class="title">
</div>
<div class="x_content">
</div>
</div>
</div> </div>
<!-- price element --> <!-- price element -->
...@@ -80,14 +73,7 @@ ...@@ -80,14 +73,7 @@
<!-- price element --> <!-- price element -->
<div class="col-md-4 col-sm-6 col-xs-12" style="align-content: center"> <div class="col-md-4 col-sm-6 col-xs-12" style="align-content: center">
<div class="pricing ui-ribbon-container">
<div class="ui-ribbon-wrapper">
</div>
<div class="title">
</div>
<div class="x_content">
</div>
</div>
</div> </div>
<!-- price element --> <!-- price element -->
......
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<!-- Meta, title, CSS, favicons, etc. -->
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>TB Silalahi Center</title>
<!-- Bootstrap -->
<link href="{{asset('../vendors/bootstrap/dist/css/bootstrap.min.css')}}" rel="stylesheet">
<!-- Font Awesome -->
<link href="{{asset('../vendors/font-awesome/css/font-awesome.min.css')}}" rel="stylesheet">
<!-- NProgress -->
<link href="{{asset('../vendors/nprogress/nprogress.css')}}" rel="stylesheet">
<!-- Custom Theme Style -->
<link href="{{asset('../build/css/custom.min.css')}}" rel="stylesheet">
</head>
<body class="nav-md">
<div class="container body">
<div class="main_container">
<!-- page content -->
<div class="col-md-12">
<div class="col-middle">
<div class="text-center text-center">
<h1 class="error-number">404</h1>
<h2>Sorry but we couldn't find this page</h2>
<p>This page you are looking for does not exist</p>
<h1>Halaman tidak ditemukan</h1>
</div>
</div>
</div>
<!-- /page content -->
</div>
</div>
<!-- jQuery -->
<script src="{{asset('../vendors/jquery/dist/jquery.min.js')}}"></script>
<!-- Bootstrap -->
<script src="{{asset('../vendors/bootstrap/dist/js/bootstrap.min.js')}}"></script>
<!-- FastClick -->
<script src="{{asset('../vendors/fastclick/lib/fastclick.js')}}"></script>
<!-- NProgress -->
<script src="{{asset('../vendors/nprogress/nprogress.js')}}"></script>
<!-- Custom Theme Scripts -->
<script src="{{asset('../build/js/custom.min.js')}}"></script>
</body>
</html>
...@@ -2,48 +2,20 @@ ...@@ -2,48 +2,20 @@
@extends('layouts.master-manager') @extends('layouts.master-manager')
@section('content') @section('content')
<!-- page content --> <!-- page content -->
<div class="right_col" role="main"> <div class="right_col" role="main">
<div class=""> <div class="">
<h4> <a href="{{url('/manager')}}" class="fa fa-home"> Home</a> </h4> <div class="page-title">
<div class="title_left">
<div class="row top_tiles"> <h4> <a href="{{url('/manager')}}" class="fa fa-home"> Home</a> </h4>
<div class="animated flipInY col-lg-3 col-md-3 col-sm-6 col-xs-12">
<div class="tile-stats">
<div class="icon"><i class="fa fa-caret-square-o-right"></i></div>
<div class="count">179</div>
<h3>New Sign ups</h3>
<p>Lorem ipsum psdea itgum rixt.</p>
</div>
</div>
<div class="animated flipInY col-lg-3 col-md-3 col-sm-6 col-xs-12">
<div class="tile-stats">
<div class="icon"><i class="fa fa-comments-o"></i></div>
<div class="count">179</div>
<h3>New Sign ups</h3>
<p>Lorem ipsum psdea itgum rixt.</p>
</div> </div>
</div> </div>
<div class="animated flipInY col-lg-3 col-md-3 col-sm-6 col-xs-12"> <div class="clearfix"></div>
<div class="tile-stats"> <div class="row">
<div class="icon"><i class="fa fa-sort-amount-desc"></i></div> <img src="{{ asset('img/front.jpg') }}" style="height: 100%; width: 100%; ">
<div class="count">179</div>
<h3>New Sign ups</h3>
<p>Lorem ipsum psdea itgum rixt.</p>
</div>
</div>
<div class="animated flipInY col-lg-3 col-md-3 col-sm-6 col-xs-12">
<div class="tile-stats">
<div class="icon"><i class="fa fa-check-square-o"></i></div>
<div class="count">179</div>
<h3>New Sign ups</h3>
<p>Lorem ipsum psdea itgum rixt.</p>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <!-- /page content -->
<!-- /page content -->
@endsection @endsection
@endif @endif
\ No newline at end of file
...@@ -12,43 +12,7 @@ ...@@ -12,43 +12,7 @@
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="row"> <div class="row">
<div class="col-md-12 col-sm-12 col-xs-12"> <img src="{{ asset('img/front.jpg') }}" style="height: 100%; width: 100%; ">
<div class="x_panel">
<div class="x_title">
<h2>Welcome, {{Sentinel::getUser()->first_name}} to system</h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
<ul>
<li>
<h2>Petunjuk Penggunaan System</h2>
<ul>
<li>
<p style="font-size: 15pt">Home : halaman awal sistem</p>
</li>
<li>
<p style="font-size: 15pt">Orders and Transaction</p>
<ul>
<li>
<p style="font-size: 15pt">Data Pemesanan Tiket</p>
</li>
<li>
<p style="font-size: 15pt">Data Tiket Dikonfirmasi</p>
</li>
</ul>
</li>
<li>
<p style="font-size: 15pt">Pengunjung</p>
</li>
<li>
<p style="font-size: 15pt">Member</p>
</li>
</ul>
</li>
</ul>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -17,15 +17,10 @@ Route::group(['middleware' => 'visitors'], function() ...@@ -17,15 +17,10 @@ Route::group(['middleware' => 'visitors'], function()
Route::post('/logout', 'LoginController@logout'); Route::post('/logout', 'LoginController@logout');
Route::group(['middleware' => 'admin'], function()
{
Route::get('/admin', 'AdminController@index');
Route::resource('/karyawan', 'KaryawanController');
});
Route::group(['middleware' => 'manager'], function() Route::group(['middleware' => 'manager'], function()
{ {
Route::get('/manager', 'ManagerController@index'); Route::get('/manager', 'ManagerController@index');
Route::get('/', 'ManagerController@index');
Route::get('/penjualan', 'ManagerController@penjualan'); Route::get('/penjualan', 'ManagerController@penjualan');
Route::get('/viewpengunjung', 'ManagerController@pengunjung'); Route::get('/viewpengunjung', 'ManagerController@pengunjung');
Route::get('/viewfeedback', 'ManagerController@viewFeedback'); Route::get('/viewfeedback', 'ManagerController@viewFeedback');
...@@ -34,6 +29,7 @@ Route::group(['middleware' => 'manager'], function() ...@@ -34,6 +29,7 @@ Route::group(['middleware' => 'manager'], function()
Route::group(['middleware' => 'staff'], function () Route::group(['middleware' => 'staff'], function ()
{ {
Route::get('/staff', 'StaffController@index'); Route::get('/staff', 'StaffController@index');
Route::get('/', 'StaffController@index');
// Route::resource('/ticket', 'TicketController'); // Route::resource('/ticket', 'TicketController');
Route::get('/pemesanan', 'TicketController@datapesanan'); Route::get('/pemesanan', 'TicketController@datapesanan');
Route::get('/lunas/{id}','TicketController@lunas'); Route::get('/lunas/{id}','TicketController@lunas');
...@@ -46,6 +42,7 @@ Route::group(['middleware' => 'staff'], function () ...@@ -46,6 +42,7 @@ Route::group(['middleware' => 'staff'], function ()
Route::group(['middleware' => 'customer'], function () Route::group(['middleware' => 'customer'], function ()
{ {
Route::get('/customer', 'CustomerController@index'); Route::get('/customer', 'CustomerController@index');
Route::get('/', 'CustomerController@index');
Route::resource('/ticket', 'TicketController'); Route::resource('/ticket', 'TicketController');
Route::get('/ticket/beli/{id}','TicketController@beli'); Route::get('/ticket/beli/{id}','TicketController@beli');
Route::post('/ticket/beli','TicketController@storeorder'); Route::post('/ticket/beli','TicketController@storeorder');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment