Skip to content

P
pa2d4ti06
Commit 3ebac740 by Juliper
Options

pelanggan onggoing

parent d23344dd
Showing with 131 additions and 118 deletions
app/Http/Controllers/AdminController.php
...@@ -119,7 +119,7 @@ class AdminController extends Controller ...@@ -119,7 +119,7 @@ class AdminController extends Controller
->join('requestfasilitas','pemilikhomestay.id','=','requestfasilitas.id_pemilik_homestay') ->join('requestfasilitas','pemilikhomestay.id','=','requestfasilitas.id_pemilik_homestay')
->select('pemilikhomestay.nama','requestfasilitas.*') ->select('pemilikhomestay.nama','requestfasilitas.*')
->get(); ->get();
//dd('masuk agan');
$count = $data->count(); $count = $data->count();
return view('adminlte::layouts.admin.listRequestFasilitas')->with('data',$data)->with('count',$count); return view('adminlte::layouts.admin.listRequestFasilitas')->with('data',$data)->with('count',$count);
......
app/Http/Controllers/Auth/LoginController.php
...@@ -60,6 +60,10 @@ class LoginController extends Controller ...@@ -60,6 +60,10 @@ class LoginController extends Controller
else if(Auth::user()->role == 'Owner'){ else if(Auth::user()->role == 'Owner'){
return redirect()->intended('/owner'); return redirect()->intended('/owner');
} }
else if(Auth::user()->role=='Customer'){
//dd("masuk gan");
return redirect('/');
}
else { else {
$validator->errors()->add('password', 'Password tidak benar'); $validator->errors()->add('password', 'Password tidak benar');
return redirect('/login') return redirect('/login')
......
app/Http/Controllers/Auth/RegisterController.php
...@@ -82,7 +82,7 @@ class RegisterController extends Controller ...@@ -82,7 +82,7 @@ class RegisterController extends Controller
'username' => $data['username'], 'username' => $data['username'],
'email' => $data['email'], 'email' => $data['email'],
'password' => bcrypt($data['password']), 'password' => bcrypt($data['password']),
'role' => $data['role'], 'role' => 'Customer',
]); ]);
} }
} }
app/User.php
...@@ -17,7 +17,7 @@ class User extends Authenticatable ...@@ -17,7 +17,7 @@ class User extends Authenticatable
*/ */
protected $fillable = [ protected $fillable = [
'name', 'email', 'password', 'name', 'email', 'password','username','role'
]; ];
/** /**
......
public/css/all.css
...@@ -3128,117 +3128,6 @@ tbody.collapse.in { ...@@ -3128,117 +3128,6 @@ tbody.collapse.in {
.dropdown-toggle:focus { .dropdown-toggle:focus {
outline: 0; } outline: 0; }
.dropdown-menu {
position: absolute;
top: 100%;
left: 0;
z-index: 1000;
display: none;
float: left;
min-width: 160px;
padding: 5px 0;
margin: 2px 0 0;
list-style: none;
font-size: 14px;
text-align: left;
background-color: #fff;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 4px;
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
background-clip: padding-box; }
.dropdown-menu.pull-right {
right: 0;
left: auto; }
.dropdown-menu .divider {
height: 1px;
margin: 10px 0;
overflow: hidden;
background-color: #e5e5e5; }
.dropdown-menu > li > a {
display: block;
padding: 3px 20px;
clear: both;
font-weight: normal;
line-height: 1.6;
color: #333333;
white-space: nowrap; }
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
text-decoration: none;
color: #262626;
background-color: #f5f5f5; }
.dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus {
color: #fff;
text-decoration: none;
outline: 0;
background-color: #3097D1; }
.dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus {
color: #777777; }
.dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus {
text-decoration: none;
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
cursor: not-allowed; }
.open > .dropdown-menu {
display: block; }
.open > a {
outline: 0; }
.dropdown-menu-right {
left: auto;
right: 0; }
.dropdown-menu-left {
left: 0;
right: auto; }
.dropdown-header {
display: block;
padding: 3px 20px;
font-size: 12px;
line-height: 1.6;
color: #777777;
white-space: nowrap; }
.dropdown-backdrop {
position: fixed;
left: 0;
right: 0;
bottom: 0;
top: 0;
z-index: 990; }
.pull-right > .dropdown-menu {
right: 0;
left: auto; }
.dropup .caret,
.navbar-fixed-bottom .dropdown .caret {
border-top: 0;
border-bottom: 4px dashed;
border-bottom: 4px solid \9;
content: ""; }
.dropup .dropdown-menu,
.navbar-fixed-bottom .dropdown .dropdown-menu {
top: auto;
bottom: 100%;
margin-bottom: 2px; }
@media (min-width: 768px) {
.navbar-right .dropdown-menu {
right: 0;
left: auto; }
.navbar-right .dropdown-menu-left {
left: 0;
right: auto; } }
.btn-group, .btn-group,
.btn-group-vertical { .btn-group-vertical {
......
public/css/style.css
...@@ -387,6 +387,119 @@ ul.callbacks_tabs li { ...@@ -387,6 +387,119 @@ ul.callbacks_tabs li {
/*-- //Services --*/ /*-- //Services --*/
.dropdown-menu {
position: absolute;
top: 100%;
left: 0;
z-index: 1000;
display: none;
float: left;
min-width: 160px;
padding: 5px 0;
margin: 2px 0 0;
list-style: none;
font-size: 14px;
text-align: left;
background-color: #23c8d9;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 4px;
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
background-clip: padding-box; }
.dropdown-menu.pull-right {
right: 0;
left: auto; }
.dropdown-menu .divider {
height: 1px;
margin: 10px 0;
overflow: hidden;
background-color: #e5e5e5; }
.dropdown-menu > li > a {
display: block;
padding: 3px 20px;
clear: both;
font-weight: normal;
line-height: 1.6;
color: #333333;
white-space: nowrap; }
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
text-decoration: none;
color: #262626;
background-color: #f5f5f5; }
.dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus {
color: #fff;
text-decoration: none;
outline: 0;
background-color: #3097D1; }
.dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus {
color: #777777; }
.dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus {
text-decoration: none;
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
cursor: not-allowed; }
.open > .dropdown-menu {
display: block; }
.open > a {
outline: 0; }
.dropdown-menu-right {
left: auto;
right: 0; }
.dropdown-menu-left {
left: 0;
right: auto; }
.dropdown-header {
display: block;
padding: 3px 20px;
font-size: 12px;
line-height: 1.6;
color: #777777;
white-space: nowrap; }
.dropdown-backdrop {
position: fixed;
left: 0;
right: 0;
bottom: 0;
top: 0;
z-index: 990; }
.pull-right > .dropdown-menu {
right: 0;
left: auto; }
.dropup .caret,
.navbar-fixed-bottom .dropdown .caret {
border-top: 0;
border-bottom: 4px dashed;
border-bottom: 4px solid \9;
content: ""; }
.dropup .dropdown-menu,
.navbar-fixed-bottom .dropdown .dropdown-menu {
top: auto;
bottom: 100%;
margin-bottom: 2px; }
@media (min-width: 768px) {
.navbar-right .dropdown-menu {
right: 0;
left: auto; }
.navbar-right .dropdown-menu-left {
left: 0;
right: auto; }
}
/*-- Awards --*/ /*-- Awards --*/
...@@ -4581,4 +4694,5 @@ p.contact-p { ...@@ -4581,4 +4694,5 @@ p.contact-p {
/*-- //Responsive Code --*/ /*-- //Responsive Code --*/
\ No newline at end of file
resources/views/vendor/adminlte/auth/register.blade.php
...@@ -33,6 +33,10 @@ ...@@ -33,6 +33,10 @@
<span class="glyphicon glyphicon-user form-control-feedback"></span> <span class="glyphicon glyphicon-user form-control-feedback"></span>
</div> </div>
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<input type="text" class="form-control" placeholder="username" name="username" value="{{ old('username') }}"/>
<span class="glyphicon glyphicon-user form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<input type="email" class="form-control" placeholder="{{ trans('adminlte_lang::message.email') }}" name="email" value="{{ old('email') }}"/> <input type="email" class="form-control" placeholder="{{ trans('adminlte_lang::message.email') }}" name="email" value="{{ old('email') }}"/>
<span class="glyphicon glyphicon-envelope form-control-feedback"></span> <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div> </div>
......
resources/views/vendor/adminlte/layouts/master.blade.php
...@@ -11,7 +11,7 @@ scratch. This page gets rid of all links and provides the needed markup only. ...@@ -11,7 +11,7 @@ scratch. This page gets rid of all links and provides the needed markup only.
<body> <body>
@include('adminlte::layouts.partialweb..mainheader') @include('adminlte::layouts.partialweb.mainheader')
@yield('main-content') @yield('main-content')
......
resources/views/vendor/adminlte/layouts/partialweb/htmlheader.blade.php
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<!-- Index-Page-CSS --> <link rel="stylesheet" href="css/style.css" type="text/css" media="all"> <!-- Index-Page-CSS --> <link rel="stylesheet" href="css/style.css" type="text/css" media="all">
<!-- Animate.CSS --> <link rel="stylesheet" href="css/animate.css" type="text/css" media="all"> <!-- Animate.CSS --> <link rel="stylesheet" href="css/animate.css" type="text/css" media="all">
<!-- Tanggal --> <link rel="stylesheet" href="css/jquery-ui.css" type="text/css" media="all"> <!-- Tanggal --> <link rel="stylesheet" href="css/jquery-ui.css" type="text/css" media="all">
<!-- All css --> <link href="{{ asset('/css/all.css') }}" rel="stylesheet" type="text/css" />
<!-- //Custom-Stylesheet-Links --> <!-- //Custom-Stylesheet-Links -->
<!-- Fonts --> <!-- Fonts -->
......
resources/views/vendor/adminlte/layouts/partialweb/mainheader.blade.php
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
<!-- Menu Toggle Button --> <!-- Menu Toggle Button -->
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
<!-- The user image in the navbar--> <!-- The user image in the navbar-->
<img src="{{ Gravatar::get($user->email) }}" class="user-image" alt="User Image"/> {{--<img src="{{ Gravatar::get($user->email) }}" class="user-image" alt="User Image"/>--}}
<!-- hidden-xs hides the username on small devices so only the image appears. --> <!-- hidden-xs hides the username on small devices so only the image appears. -->
<span class="hidden-xs">{{ Auth::user()->name }}</span> <span class="hidden-xs">{{ Auth::user()->name }}</span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<!-- The user image in the menu --> <!-- The user image in the menu -->
<li class="user-header"> <li class="user-header">
<img src="{{ Gravatar::get($user->email) }}" class="img-circle" alt="User Image" /> {{--<img src="{{ Gravatar::get($user->email) }}" class="img-circle" alt="User Image" />--}}
<p> <p>
{{ Auth::user()->name }} {{ Auth::user()->name }}
<small>{{ trans('adminlte_lang::message.login') }} </small> <small>{{ trans('adminlte_lang::message.login') }} </small>
......
routes/web.php
...@@ -56,7 +56,7 @@ Route::get('requestFasilitas','AdminController@RequestFasilitas'); ...@@ -56,7 +56,7 @@ Route::get('requestFasilitas','AdminController@RequestFasilitas');
Route::get('pengajuanHomestay','OwnerController@pengajuan'); Route::get('pengajuanHomestay','OwnerController@pengajuan');
Route::post('pengajuanHomestay','OwnerController@storePengajuan'); Route::post('pengajuanHomestay','OwnerController@storePengajuan');
Route::get('listPengajuan','OwnerController@listPengajuan'); Route::get('listPengajuan','OwnerController@listPengajuan');
Route::get('listPengajuanHomestay','OwnerController@listPengajuanFasilitas'); Route::get('listPengajuanFasilitas','OwnerController@listPengajuanFasilitas');
Route::put('requestFasilitas/{id}','AdminController@UpdateRequestFasilitas'); Route::put('requestFasilitas/{id}','AdminController@UpdateRequestFasilitas');
Route::put('requestFasilitass/{id}','AdminController@UpdateRequestFasilitass'); Route::put('requestFasilitass/{id}','AdminController@UpdateRequestFasilitass');
Route::put('listPengajuanHomestay/{id}','AdminController@AccPengajuanHomestay'); Route::put('listPengajuanHomestay/{id}','AdminController@AccPengajuanHomestay');
......
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