From 6c6d71c9bb929e4230fb4815a18e2a3a26c77ee9 Mon Sep 17 00:00:00 2001
From: rizky <if415003@students.del.ac.id>
Date: Wed, 24 May 2017 15:25:30 +0700
Subject: [PATCH] route, blade, fungsi
---
.gitignore | 1 +
app/Http/Controllers/RegistrationController.php | 18 +++++++-----------
public/image/Screenshot (1).png | Bin 0 -> 78506 bytes
public/img/portfolio/fullsize/1.jpg | Bin 139582 -> 0 bytes
public/img/portfolio/fullsize/10.jpg | Bin 52855 -> 0 bytes
public/img/portfolio/fullsize/11.jpg | Bin 59453 -> 0 bytes
public/img/portfolio/fullsize/12.jpg | Bin 63601 -> 0 bytes
public/img/portfolio/fullsize/13.jpg | Bin 75045 -> 0 bytes
public/img/portfolio/fullsize/14.jpg | Bin 73414 -> 0 bytes
public/img/portfolio/fullsize/15.jpg | Bin 80370 -> 0 bytes
public/img/portfolio/fullsize/2.jpg | Bin 79400 -> 0 bytes
public/img/portfolio/fullsize/3.jpg | Bin 86682 -> 0 bytes
public/img/portfolio/fullsize/4.jpg | Bin 110543 -> 0 bytes
public/img/portfolio/fullsize/5.jpg | Bin 82594 -> 0 bytes
public/img/portfolio/fullsize/6.jpg | Bin 58153 -> 0 bytes
public/img/portfolio/fullsize/7.jpg | Bin 84365 -> 0 bytes
public/img/portfolio/fullsize/8.jpg | Bin 69915 -> 0 bytes
public/img/portfolio/fullsize/9.jpg | Bin 67501 -> 0 bytes
resources/views/authentication/login.blade.php | 61 ++++++++-----------------------------------------------------
resources/views/authentication/register.blade.php | 84 +++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------
resources/views/customers/customer_home.blade.php | 2 +-
resources/views/customers/feedback.blade.php | 77 +++++++++++++++++++++++++++++++++++++++--------------------------------------
resources/views/customers/ticket/beli/index.blade.php | 10 +++++-----
resources/views/customers/ticket/ticket_home.blade.php | 70 ++++++++++++++++++++++++++++++++++++++++++++++++----------------------
resources/views/index.blade.php | 33 ++++++++++++---------------------
resources/views/layouts/master-customer.blade.php | 5 ++---
resources/views/layouts/master-manager.blade.php | 2 +-
resources/views/layouts/master-staff.blade.php | 2 +-
resources/views/layouts/top-menu.blade.php | 48 +++++-------------------------------------------
resources/views/staffs/pengunjung.blade.php | 2 +-
resources/views/staffs/staff_home.blade.php | 20 ++++++++++----------
31 files changed, 188 insertions(+), 247 deletions(-)
create mode 100644 public/image/Screenshot (1).png
delete mode 100644 public/img/portfolio/fullsize/1.jpg
delete mode 100644 public/img/portfolio/fullsize/10.jpg
delete mode 100644 public/img/portfolio/fullsize/11.jpg
delete mode 100644 public/img/portfolio/fullsize/12.jpg
delete mode 100644 public/img/portfolio/fullsize/13.jpg
delete mode 100644 public/img/portfolio/fullsize/14.jpg
delete mode 100644 public/img/portfolio/fullsize/15.jpg
delete mode 100644 public/img/portfolio/fullsize/2.jpg
delete mode 100644 public/img/portfolio/fullsize/3.jpg
delete mode 100644 public/img/portfolio/fullsize/4.jpg
delete mode 100644 public/img/portfolio/fullsize/5.jpg
delete mode 100644 public/img/portfolio/fullsize/6.jpg
delete mode 100644 public/img/portfolio/fullsize/7.jpg
delete mode 100644 public/img/portfolio/fullsize/8.jpg
delete mode 100644 public/img/portfolio/fullsize/9.jpg
diff --git a/.gitignore b/.gitignore
index 1247b71..a374dac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
/node_modules
/public/storage
+/vendor
/.idea
Homestead.json
Homestead.yaml
diff --git a/app/Http/Controllers/RegistrationController.php b/app/Http/Controllers/RegistrationController.php
index ae3ffc9..66760c4 100644
--- a/app/Http/Controllers/RegistrationController.php
+++ b/app/Http/Controllers/RegistrationController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use Validator;
use Illuminate\Http\Request;
use Sentinel;
+use App\User;
class RegistrationController extends Controller
{
@@ -15,6 +16,11 @@ class RegistrationController extends Controller
public function postRegister(Request $request)
{
+ $this->validate($request, [
+ 'first_name' => 'required|max:255',
+ 'last_name' => 'required|max:255',
+ 'password' => 'confirmed|required|min:6',
+ ]);
$user = Sentinel::registerAndActivate($request->all());
@@ -22,17 +28,7 @@ class RegistrationController extends Controller
$role->users()->attach($user);
- return redirect('/login');
- }
+ return redirect('/login')->with('alert-success', 'Akun anda telah terdaftar. Silahkan login.');
- protected function validator(array $data)
- {
- return Validator::make($data, [
- 'first_name' => 'required|max:255',
- 'name' => 'required|max:255',
- 'last_name' => 'required|max:255',
- 'email' => 'required|email|max:255|unique:users',
- 'password' => 'required|min:6|confirmed',
- ]);
}
}
diff --git a/public/image/Screenshot (1).png b/public/image/Screenshot (1).png
new file mode 100644
index 0000000..5f32230
Binary files /dev/null and b/public/image/Screenshot (1).png differ
diff --git a/public/img/portfolio/fullsize/1.jpg b/public/img/portfolio/fullsize/1.jpg
deleted file mode 100644
index 19258cf..0000000
Binary files a/public/img/portfolio/fullsize/1.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/10.jpg b/public/img/portfolio/fullsize/10.jpg
deleted file mode 100644
index 420e976..0000000
Binary files a/public/img/portfolio/fullsize/10.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/11.jpg b/public/img/portfolio/fullsize/11.jpg
deleted file mode 100644
index d7604a4..0000000
Binary files a/public/img/portfolio/fullsize/11.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/12.jpg b/public/img/portfolio/fullsize/12.jpg
deleted file mode 100644
index 237e8c3..0000000
Binary files a/public/img/portfolio/fullsize/12.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/13.jpg b/public/img/portfolio/fullsize/13.jpg
deleted file mode 100644
index 30e268b..0000000
Binary files a/public/img/portfolio/fullsize/13.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/14.jpg b/public/img/portfolio/fullsize/14.jpg
deleted file mode 100644
index a93f194..0000000
Binary files a/public/img/portfolio/fullsize/14.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/15.jpg b/public/img/portfolio/fullsize/15.jpg
deleted file mode 100644
index 93d7617..0000000
Binary files a/public/img/portfolio/fullsize/15.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/2.jpg b/public/img/portfolio/fullsize/2.jpg
deleted file mode 100644
index c7cea7e..0000000
Binary files a/public/img/portfolio/fullsize/2.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/3.jpg b/public/img/portfolio/fullsize/3.jpg
deleted file mode 100644
index 2461eba..0000000
Binary files a/public/img/portfolio/fullsize/3.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/4.jpg b/public/img/portfolio/fullsize/4.jpg
deleted file mode 100644
index 4bcfcd6..0000000
Binary files a/public/img/portfolio/fullsize/4.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/5.jpg b/public/img/portfolio/fullsize/5.jpg
deleted file mode 100644
index 1a96c9e..0000000
Binary files a/public/img/portfolio/fullsize/5.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/6.jpg b/public/img/portfolio/fullsize/6.jpg
deleted file mode 100644
index 598001f..0000000
Binary files a/public/img/portfolio/fullsize/6.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/7.jpg b/public/img/portfolio/fullsize/7.jpg
deleted file mode 100644
index 1425be3..0000000
Binary files a/public/img/portfolio/fullsize/7.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/8.jpg b/public/img/portfolio/fullsize/8.jpg
deleted file mode 100644
index ab455d7..0000000
Binary files a/public/img/portfolio/fullsize/8.jpg and /dev/null differ
diff --git a/public/img/portfolio/fullsize/9.jpg b/public/img/portfolio/fullsize/9.jpg
deleted file mode 100644
index 059a75f..0000000
Binary files a/public/img/portfolio/fullsize/9.jpg and /dev/null differ
diff --git a/resources/views/authentication/login.blade.php b/resources/views/authentication/login.blade.php
index 5d35940..f60fc21 100644
--- a/resources/views/authentication/login.blade.php
+++ b/resources/views/authentication/login.blade.php
@@ -4,9 +4,6 @@
<body class="login">
<div>
- <a class="hiddenanchor" id="signup"></a>
- <a class="hiddenanchor" id="signin"></a>
-
<div class="login_wrapper">
<div class="animate form login_form">
<section class="login_content">
@@ -15,6 +12,11 @@
<h1>Login Form</h1>
+ @if(Session::has('alert-success'))
+ <div class="alert alert-success">
+ {{ Session::get('alert-success') }}
+ </div>
+ @endif
@if (session('error'))
<div class="alert alert-danger">
{{ session('error') }}
@@ -38,62 +40,15 @@
<div class="separator">
<p class="change_link">New to site?
- <a href="#signup" class="to_register"> Create Account </a>
- </p>
-
- <div class="clearfix"></div>
- <br />
-
- <div>
- <a href="/"><h1><i class="fa fa-paw"></i> TB Silalahi Center</h1></a>
- <p>©2017 All Rights Reserved. Privacy and Terms</p>
- </div>
- </div>
- </form>
- </section>
- </div>
-
- <div id="register" class="animate form registration_form">
- <section class="login_content">
- <form action="{{url('/register')}}" method="POST">
- {{csrf_field()}}
- <h1>Create Account</h1>
- <div>
- <input type="text" name="first_name" class="form-control" placeholder="First Name" required="" />
- </div>
-
- <div>
- <input type="text" name="last_name" class="form-control" placeholder="Last Name" required="" />
- </div>
-
- <div>
- <input type="email" name="email" class="form-control" placeholder="example@example.com" required="" />
- </div>
- <div>
- <input type="password" name="password" class="form-control" placeholder="Password" required="" />
- </div>
-
- <div>
- <input type="password" name="password_confirmation" class="form-control" placeholder="Password Confirmation" required="" />
- </div>
-
- <div class="form-group">
- <input type="submit" value="Register" class="btn btn-success pull-right" >
- </div>
-
- <div class="clearfix"></div>
-
- <div class="separator">
- <p class="change_link">Already a member ?
- <a href="#signin" class="to_register"> Log in </a>
+ <a href="{{url('/register')}}" class="to_register"> Create Account </a>
</p>
<div class="clearfix"></div>
<br />
<div>
- <a href="/"><h1><i class="fa fa-paw"></i> TB Silalahi Center</h1></a>
- <p>©2017 All Rights Reserved. Privacy and Terms</p>
+ <a href="{{url('/')}}"><h1><i class="fa fa-paw"></i> TB Silalahi Center</h1></a>
+ <p>Copyright © 2017 - All Rights Reserved. Privacy and Terms</p>
</div>
</div>
</form>
diff --git a/resources/views/authentication/register.blade.php b/resources/views/authentication/register.blade.php
index af36a59..0a14099 100644
--- a/resources/views/authentication/register.blade.php
+++ b/resources/views/authentication/register.blade.php
@@ -3,53 +3,63 @@
<body class="login">
<div>
<div class="login_wrapper">
- {{--<div id="register" class="animate form registration_form">--}}
- <section class="login_content">
- <form action="{{url('/register')}}" method="POST">
- {{csrf_field()}}
- <h1>Create Account</h1>
- <div>
- <input type="text" name="first_name" class="form-control" placeholder="First Name" required="" />
+ <section class="login_content">
+ <form action="{{url('/register')}}" method="POST">
+ <h1>Create Account</h1>
+ @if (count($errors)>0)
+ <div class="alert alert-danger">
+ <ul>
+ @foreach($errors->all() as $error)
+ <li>
+ {{$error}}
+ </li>
+ @endforeach
+ </ul>
</div>
+ @endif
+ {{csrf_field()}}
- <div>
- <input type="text" name="last_name" class="form-control" placeholder="Last Name" required="" />
- </div>
+ <div>
+ <input type="text" name="first_name" class="form-control" placeholder="First Name" required="" />
+ </div>
- <div>
- <input type="email" name="email" class="form-control" placeholder="email@email.com" required="" />
- </div>
- <div>
- <input type="password" name="password" class="form-control" placeholder="Password" required="" />
- </div>
+ <div>
+ <input type="text" name="last_name" class="form-control" placeholder="Last Name" required="" />
+ </div>
- <div>
- <input type="password" name="password_confirmation" class="form-control" placeholder="Password Confirmation" required="" />
- </div>
+ <div>
+ <input type="email" name="email" class="form-control" placeholder="email@email.com" required="" />
+ </div>
+ <div>
+ <input type="password" name="password" class="form-control" placeholder="Password" required="required">
+ </div>
- <div class="form-group">
- <input type="submit" value="Register" class="btn btn-success pull-right" >
- </div>
+ <div>
+ <input type="password" name="password_confirmation" class="form-control" placeholder="Password Confirmation" required="required">
+ </div>
- <div class="clearfix"></div>
+ <div class="form-group">
+ <input type="submit" value="Register" class="btn btn-success pull-right" >
+ </div>
- <div class="separator">
- <p class="change_link">Already a member ?
- <a href="{{url('/login')}}" class="to_register"> Log in </a>
- </p>
+ <div class="clearfix"></div>
- <div class="clearfix"></div>
- <br />
+ <div class="separator">
+ <p class="change_link">Already a member ?
+ <a href="{{url('/register')}}" class="to_register"> Log in </a>
+ </p>
- <div>
- <a href="{{url('/')}}"><h1><i class="fa fa-paw"></i> TB Silalahi Center</h1></a>
- <p>©2017 All Rights Reserved. Privacy and Terms</p>
- </div>
+ <div class="clearfix"></div>
+ <br />
+
+ <div>
+ <a href="{{url('/')}}"><h1><i class="fa fa-paw"></i> TB Silalahi Center</h1></a>
+ <p>Copyright © 2017 - All Rights Reserved. Privacy and Terms</p>
</div>
- </form>
- </section>
- </div>
- {{--</div>--}}
+ </div>
+ </form>
+ </section>
+ </div>
</div>
</body>
@endsection
diff --git a/resources/views/customers/customer_home.blade.php b/resources/views/customers/customer_home.blade.php
index 84607da..db1589f 100644
--- a/resources/views/customers/customer_home.blade.php
+++ b/resources/views/customers/customer_home.blade.php
@@ -7,7 +7,7 @@
<div class="">
<div class="page-title">
<div class="title_left">
- <h4> <a href="{{url('/staff')}}" class="fa fa-home"> Home</a> </h4>
+ <h4> <a href="{{url('/customer')}}" class="fa fa-home"> Home</a> </h4>
</div>
</div>
diff --git a/resources/views/customers/feedback.blade.php b/resources/views/customers/feedback.blade.php
index dc7d792..636213b 100644
--- a/resources/views/customers/feedback.blade.php
+++ b/resources/views/customers/feedback.blade.php
@@ -36,54 +36,55 @@
@if(!empty($errors->first()))
<div class='alert alert-warning'>{!! $errors->first() !!}</div>
@endif
- <form action="{{url('/feedback/store')}}" method="post" data-parsley-validate class="form-horizontal form-label-left">
- {{csrf_field()}}
+ <form action="{{url('/feedback/store')}}" method="post" data-parsley-validate class="form-horizontal form-label-left">
+ {{csrf_field()}}
- <div class="form-group{{ $errors->has('user_id') ? ' has-error' : '' }}">
- <label class="control-label col-md-3 col-sm-3 col-xs-12" for="first-name" required >User ID
- </label>
- <div class="col-md-6 col-sm-6 col-xs-12">
- <input type="text" name="user_id" value="{{Sentinel::getUser()->id}}" class="form-control col-md-7 col-xs-12" readonly>
- {!! $errors->first('user_id', '<p class="help-block">:message</p>') !!}
+ <div class="form-group{{ $errors->has('user_id') ? ' has-error' : '' }}">
+ <label class="control-label col-md-3 col-sm-3 col-xs-12" for="first-name" required >User ID
+ </label>
+ <div class="col-md-6 col-sm-6 col-xs-12">
+ <input type="text" name="user_id" value="{{Sentinel::getUser()->id}}" class="form-control col-md-7 col-xs-12" readonly>
+ {!! $errors->first('user_id', '<p class="help-block">:message</p>') !!}
+ </div>
</div>
- </div>
- <div class="form-group{{ $errors->has('first_name') ? ' has-error' : '' }}">
- <label class="control-label col-md-3 col-sm-3 col-xs-12" for="first-name" required >Customer Name
- </label>
- <div class="col-md-6 col-sm-6 col-xs-12">
- <input type="text" name="first_name" value="{{Sentinel::getUser()->first_name}}" class="form-control col-md-7 col-xs-12" readonly>
- {!! $errors->first('first_name', '<p class="help-block">:message</p>') !!}
+ <div class="form-group{{ $errors->has('first_name') ? ' has-error' : '' }}">
+ <label class="control-label col-md-3 col-sm-3 col-xs-12" for="first-name" required >Customer Name
+ </label>
+ <div class="col-md-6 col-sm-6 col-xs-12">
+ <input type="text" name="first_name" value="{{Sentinel::getUser()->first_name}}" class="form-control col-md-7 col-xs-12" readonly>
+ {!! $errors->first('first_name', '<p class="help-block">:message</p>') !!}
+ </div>
</div>
- </div>
- <div class="form-group{{ $errors->has('subjects') ? ' has-error' : '' }}">
- <label class="control-label col-md-3 col-sm-3 col-xs-12" for="first-name" required >Subjects
- <span class="required">*</span>
- </label>
- <div class="col-md-6 col-sm-6 col-xs-12">
- <input type="text" name="subjects" required="required" class="form-control col-md-7 col-xs-12">
- {!! $errors->first('subjects', '<p class="help-block">:message</p>') !!}
+ <div class="form-group{{ $errors->has('subjects') ? ' has-error' : '' }}">
+ <label class="control-label col-md-3 col-sm-3 col-xs-12" for="first-name" required >Subjects
+ <span class="required">*</span>
+ </label>
+ <div class="col-md-6 col-sm-6 col-xs-12">
+ <input type="text" name="subjects" required="required" class="form-control col-md-7 col-xs-12">
+ {!! $errors->first('subjects', '<p class="help-block">:message</p>') !!}
+ </div>
</div>
- </div>
- <div class="form-group{{ $errors->has('description') ? ' has-error' : '' }}">
- <label class="control-label col-md-3 col-sm-3 col-xs-12" for="first-name" required >Description
- <span class="required">*</span>
- </label>
- <div class="col-md-6 col-sm-6 col-xs-12">
- <textarea id="textarea" name="description" required="required" class="form-control col-md-7 col-xs-12"></textarea>
- {!! $errors->first('description', '<p class="help-block">:message</p>') !!}
+ <div class="form-group{{ $errors->has('description') ? ' has-error' : '' }}">
+ <label class="control-label col-md-3 col-sm-3 col-xs-12" for="first-name" required >Description
+ <span class="required">*</span>
+ </label>
+ <div class="col-md-6 col-sm-6 col-xs-12">
+ <textarea id="textarea" name="description" required="required" class="form-control col-md-7 col-xs-12"></textarea>
+ {!! $errors->first('description', '<p class="help-block">:message</p>') !!}
+ </div>
</div>
- </div>
- <div class="ln_solid"></div>
- <div class="form-group">
- <div class="col-md-6 col-sm-6 col-xs-12 col-md-offset-3">
- <button class="btn btn-primary" type="reset">Reset</button>
- <button type="submit" class="btn btn-success">Kirim</button>
+ <div class="ln_solid"></div>
+ <div class="form-group">
+ <div class="col-md-6 col-sm-6 col-xs-12 col-md-offset-3">
+ <button class="btn btn-primary" type="reset">Reset</button>
+ <button type="submit" class="btn btn-success">Kirim</button>
+ </div>
</div>
- </div>
+ </form>
</form>
</div>
</div>
diff --git a/resources/views/customers/ticket/beli/index.blade.php b/resources/views/customers/ticket/beli/index.blade.php
index 91fa6e1..f11d914 100644
--- a/resources/views/customers/ticket/beli/index.blade.php
+++ b/resources/views/customers/ticket/beli/index.blade.php
@@ -15,7 +15,7 @@
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
- <h2>Hover rows <small>Try hovering over the rows</small></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>
@@ -36,12 +36,12 @@
<input type="text" value="{{$tickets->id}}" class="form-control" name="id_ticket" readonly>
<label class="col-md-4 control-label">Nama Ticket</label>
<input type="text" value="{{$tickets->name}}" class="form-control" name="nama" readonly>
- <label class="col-md-4 control-label">Harga</label>
+ <label class="col-md-4 control-label">Harga (IDR)</label>
<input type="number" value="{{$tickets->price}}" class="form-control" name="harga" readonly>
<label class="col-md-4 control-label">Jumlah</label>
- <input type="number" onkeyup="Harga(this.value)" min="1" class="form-control" name="jumlah" required>
- <label class="col-md-4 control-label">Total Harga (Rp)</label><br>
- <span class="form-control" id="total"></span><br>
+ <input type="number" onkeyup="Harga(this.value)" min="1" class="form-control" name="jumlah" placeholder="masukkan jumlah tiket yang ingin dipesan" required>
+ <label class="col-md-4 control-label">Total Harga (IDR)</label><br>
+ <span class="form-control" id="total" readonly></span><br>
<button type="submit" class="btn btn-primary" onclick="return confirm('Continue Order??')">Order</button>
</form>
<script>function Harga(str)
diff --git a/resources/views/customers/ticket/ticket_home.blade.php b/resources/views/customers/ticket/ticket_home.blade.php
index d7bbcfd..37fa355 100644
--- a/resources/views/customers/ticket/ticket_home.blade.php
+++ b/resources/views/customers/ticket/ticket_home.blade.php
@@ -15,7 +15,7 @@
<div class="clearfix"></div>
- <div class="row"><CENTER>
+ <div class="row">
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
@@ -32,38 +32,64 @@
@endif
<!-- price element -->
- <div class="col-md-3 col-sm-6 col-xs-12">
+ <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 class="ui-ribbon">
- Available
- </div>
</div>
- @foreach($tickets as $ticket)
<div class="title">
- <h2>{{$ticket->name}}</h2>
- <h1>IDR{{$ticket->price}}</h1>
- <span>Once</span>
</div>
<div class="x_content">
- <div class="">
- <div class="pricing_features">
- <ul class="list-unstyled text-left">
- <img src="{{ asset('image/'. $ticket->images) }}" style="height: 150px; width: 350px; ">
- <li><i class="fa fa-check text-success"></i> One day enjoy<strong> museum</strong></li>
- </ul>
+ </div>
+ </div>
+ </div>
+ <!-- price element -->
+
+ <!-- price element -->
+ <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 class="ui-ribbon">
+ Available
</div>
</div>
- <div class="pricing_footer">
- <form method="POST" action="{{ route('ticket.store', $ticket->id) }}" accept-charset="UTF-8">
- <a href="{{url('/ticket/beli',$ticket->id)}}" class="btn btn-primary btn-block" >Order</a>
- </form>
+ @foreach($tickets as $ticket)
+ <div class="title">
+ <h2>{{$ticket->name}}</h2>
+ <h1>IDR{{$ticket->price}}</h1>
+ <span>Once</span>
+ </div>
+ <div class="x_content">
+ <div class="">
+ <div class="pricing_features">
+ <ul class="list-unstyled text-left">
+ <img src="{{ asset('image/'. $ticket->images) }}" style="height: 100%; width: 100%; ">
+ <li><i class="fa fa-check text-success"></i> One day enjoy<strong> in museum</strong></li>
+ </ul>
+ </div>
+ </div>
+ <div class="pricing_footer">
+ <form method="POST" action="{{ route('ticket.store', $ticket->id) }}" accept-charset="UTF-8">
+ <a href="{{url('/ticket/beli',$ticket->id)}}" class="btn btn-primary btn-block" >Order Now</a>
+ </form>
+ </div>
+ </div>
+ @endforeach
+ </div>
+ </div>
+ <!-- price element -->
+
+ <!-- price element -->
+ <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>
- @endforeach
</div>
- </div>
- <!-- price element -->
+ <!-- price element -->
{{--<a href="{{route('ticket.create')}}" class="btn btn-info pull-right">Add New Menu</a><br><br>--}}
</div>
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 8c991be..b5883a4 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -16,8 +16,8 @@
<!-- Custom Fonts -->
<link href="{{asset('vendor/font-awesome/css/font-awesome.min.css')}}" rel="stylesheet" type="text/css">
- <link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
- <link href='https://fonts.googleapis.com/css?family=Merriweather:400,300,300italic,400italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
+ <link href="{{asset('https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800')}}" rel='stylesheet' type='text/css'>
+ <link href={{asset('https://fonts.googleapis.com/css?family=Merriweather:400,300,300italic,400italic,700,700italic,900,900italic')}} rel='stylesheet' type='text/css'>
<!-- Plugin CSS -->
<link href="{{asset('vendor/magnific-popup/magnific-popup.css')}}" rel="stylesheet">
@@ -51,7 +51,7 @@
<ul class="nav navbar-nav navbar-right">
<li>
- <a class="page-scroll" href="{{ url('/login') }}">Login</a>
+ <a class="page-scroll" href="{{url('/login')}}">Login</a>
</li>
<li>
<a class="page-scroll" href="{{url('/register')}}">Register</a>
@@ -102,7 +102,7 @@
<div class="service-box">
<i class="fa fa-4x fa-user text-primary sr-icons"></i>
<h3>Create Account</h3>
- <p class="text-muted">Daftar dan miliki akun untuk pemesanan tiket</p>
+ <p class="text-muted">Daftar dan miliki akun dari menu <strong><a href="/register">Register</a></strong></p>
</div>
</div>
<div class="col-lg-3 col-md-6 text-center">
@@ -134,7 +134,7 @@
<div class="container-fluid">
<div class="row no-gutter popup-gallery">
<div class="col-lg-4 col-sm-6">
- <a href="img/portfolio/thumbnails/1.jpg" class="portfolio-box">
+ <a href="img/portfolio/thumbnails/.jpg" class="portfolio-box">
<img src="img/portfolio/thumbnails/1.jpg" class="img-responsive" alt="">
<div class="portfolio-box-caption">
<div class="portfolio-box-caption-content">
@@ -317,15 +317,6 @@
</div>
</section>
- {{--<aside class="bg-dark">--}}
- {{--<div class="container text-center">--}}
- {{--<div class="call-to-action">--}}
- {{--<h2>Museum Batak TB Silalahi Center Balige</h2>--}}
- {{--<a href="#" class="btn btn-default btn-xl sr-button">Visit now</a>--}}
- {{--</div>--}}
- {{--</div>--}}
- {{--</aside>--}}
-
<section id="contact">
<div class="container">
<div class="row">
@@ -340,7 +331,7 @@
</div>
<div class="col-lg-3 text-center">
<i class="fa fa-envelope-o fa-3x sr-contact"></i>
- <p><a href="{{url('/feedback')}}">museumtbsc@gmail.com</a></p>
+ <p><a href="#">museumtbsc@gmail.com</a></p>
</div>
<div class="col-lg-3 text-center">
<i class="fa fa-map-marker fa-3x sr-contact"></i>
@@ -359,18 +350,18 @@
</aside>
<!-- jQuery -->
- <script src="vendor/jquery/jquery.min.js"></script>
+ <script src="{{asset('vendor/jquery/jquery.min.js')}}"></script>
<!-- Bootstrap Core JavaScript -->
- <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+ <script src="{{asset('vendor/bootstrap/js/bootstrap.min.js')}}"></script>
<!-- Plugin JavaScript -->
- <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script>
- <script src="vendor/scrollreveal/scrollreveal.min.js"></script>
- <script src="vendor/magnific-popup/jquery.magnific-popup.min.js"></script>
+ <script src="{{asset('https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js')}}"></script>
+ <script src="{{asset('vendor/scrollreveal/scrollreveal.min.js')}}"></script>
+ <script src="{{asset('vendor/magnific-popup/jquery.magnific-popup.min.js')}}"></script>
<!-- Theme JavaScript -->
- <script src="js/creative.min.js"></script>
+ <script src="{{asset('js/creative.min.js')}}"></script>
</body>
diff --git a/resources/views/layouts/master-customer.blade.php b/resources/views/layouts/master-customer.blade.php
index df0ef71..4324ee4 100644
--- a/resources/views/layouts/master-customer.blade.php
+++ b/resources/views/layouts/master-customer.blade.php
@@ -61,7 +61,7 @@
<div class="menu_section">
<h3>General</h3>
<ul class="nav side-menu">
- <li><a href="{{url('/customer')}}"><i class="fa fa-home"></i> Home </a>
+ <li><a href="/customer"><i class="fa fa-home"></i> Home </a>
</li>
<li><a><i class="fa fa-table"></i> Order Tiket <span class="fa fa-chevron-down"></span></a>
@@ -78,7 +78,6 @@
<li><a href="{{url('/feedback')}}"> Give Feedback</a></li>
</ul>
</li>
-
</ul>
</div>
</div>
@@ -140,7 +139,7 @@
<!-- footer content -->
<footer>
<div class="pull-right">
- Copyright @ TB Silalahi Center 2017
+ Copyright © 2017 - TB Silalahi Center
</div>
<div class="clearfix"></div>
</footer>
diff --git a/resources/views/layouts/master-manager.blade.php b/resources/views/layouts/master-manager.blade.php
index 241136e..80e9fef 100644
--- a/resources/views/layouts/master-manager.blade.php
+++ b/resources/views/layouts/master-manager.blade.php
@@ -136,7 +136,7 @@
<!-- footer content -->
<footer>
<div class="pull-right">
- Copyright @ TB Silalahi Center 2017
+ Copyright © 2017 - TB Silalahi Center
</div>
<div class="clearfix"></div>
</footer>
diff --git a/resources/views/layouts/master-staff.blade.php b/resources/views/layouts/master-staff.blade.php
index 6eadb1b..aba66ff 100644
--- a/resources/views/layouts/master-staff.blade.php
+++ b/resources/views/layouts/master-staff.blade.php
@@ -141,7 +141,7 @@
<!-- footer content -->
<footer>
<div class="pull-right">
- Copyright @ TB Silalahi Center 2017
+ Copyright © 2017 - TB Silalahi Center
</div>
<div class="clearfix"></div>
</footer>
diff --git a/resources/views/layouts/top-menu.blade.php b/resources/views/layouts/top-menu.blade.php
index b418127..5aedc02 100644
--- a/resources/views/layouts/top-menu.blade.php
+++ b/resources/views/layouts/top-menu.blade.php
@@ -11,33 +11,20 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
- <!--
- <li>
- <a class="page-scroll" href="#about">About</a>
- </li>
- <li>
- <a class="page-scroll" href="#services">Services</a>
- </li>
- <li>
- <a class="page-scroll" href="#portfolio">Portfolio</a>
- </li>
- <li>
- <a class="page-scroll" href="#contact">Contact</a>
- </li>
- -->
+
@if(Sentinel::check())
<li role="presentation">
- <form action="/logout" method="POST" id="logout-form">
+ <form action="{{url('/logout')}}" method="POST" id="logout-form">
{{ csrf_field() }}
<a href="#" onclick="document.getElementById('logout-form').submit()">Logout</a>
</form>
</li>
@else
<li>
- <a class="page-scroll" href="/login">Login</a>
+ <a class="page-scroll" href="{{url('/login')}}">Login</a>
</li>
<li role="presentation">
- <a class="page-scroll" href="/register">Register</a>
+ <a class="page-scroll" href="{{url('/register')}}">Register</a>
</li>
@endif
@@ -46,29 +33,4 @@
<!-- /.navbar-collapse -->
</div>
<!-- /.container-fluid -->
- </nav>
-
-{{--<!-- <div class="header clearfix">--}}
- {{--<nav>--}}
- {{--<ul class="nav nav-pills pull-right">--}}
- {{--@if(Sentinel::check())--}}
- {{--<li role="presentation">--}}
- {{--<form action="/logout" method="POST" id="logout-form">--}}
- {{--{{ csrf_field() }}--}}
- {{--<a href="#" onclick="document.getElementById('logout-form').submit()">Logout</a>--}}
- {{--</form>--}}
- {{--</li>--}}
- {{--@else--}}
- {{--<li role="presentation"><a href="/login">Login</a></li>--}}
- {{--<li role="presentation"><a href="/register">Register</a></li>--}}
- {{--@endif--}}
- {{--</ul>--}}
- {{--</nav>--}}
- {{--<h3 class="text-muted">--}}
- {{--@if(Sentinel::check())--}}
- {{--Hello, {{Sentinel::getUser()->first_name }}--}}
- {{--@else--}}
- {{--Authentication--}}
- {{--@endif--}}
- {{--</h3>--}}
-{{--</div> -->--}}
\ No newline at end of file
+ </nav>
\ No newline at end of file
diff --git a/resources/views/staffs/pengunjung.blade.php b/resources/views/staffs/pengunjung.blade.php
index 6ec5c2f..d472175 100644
--- a/resources/views/staffs/pengunjung.blade.php
+++ b/resources/views/staffs/pengunjung.blade.php
@@ -48,7 +48,7 @@
</div>
</div>
- <div class="form-group{{ah $errors->has('juml') ? ' has-error' : '' }}">
+ <div class="form-group{{ $errors->has('jumlah') ? ' has-error' : '' }}">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="first-name">Jumlah Tiket<span class="required">*</span>
</label>
<div class="col-md-6 col-sm-6 col-xs-12">
diff --git a/resources/views/staffs/staff_home.blade.php b/resources/views/staffs/staff_home.blade.php
index b333743..de3e31e 100644
--- a/resources/views/staffs/staff_home.blade.php
+++ b/resources/views/staffs/staff_home.blade.php
@@ -2,7 +2,6 @@
@extends('layouts.master-staff')
@section('content')
-
<!-- page content -->
<div class="right_col" role="main">
<div class="">
@@ -10,9 +9,7 @@
<div class="title_left">
<h4> <a href="{{url('/staff')}}" class="fa fa-home"> Home</a> </h4>
</div>
-
</div>
-
<div class="clearfix"></div>
<div class="row">
<div class="col-md-12 col-sm-12 col-xs-12">
@@ -30,19 +27,22 @@
<p style="font-size: 15pt">Home : halaman awal sistem</p>
</li>
<li>
- <p style="font-size: 15pt">Order Tiket</p>
+ <p style="font-size: 15pt">Orders and Transaction</p>
<ul>
<li>
- <p style="font-size: 15pt">Pesan Tiket</p>
- </li>
- <li>
- <p style="font-size: 15pt">Data Pemesanan</p>
+ <p style="font-size: 15pt">Data Pemesanan Tiket</p>
</li>
<li>
- <p style="font-size: 15pt">Data Pemesanan Dikonfirmasi</p>
+ <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>
@@ -54,4 +54,4 @@
</div>
<!-- /page content -->
@endsection
-@endif
\ No newline at end of file
+@endif
--
libgit2 0.27.1