diff --git a/resources/views/vendor/adminlte/layouts/pages/Homestay.blade.php b/resources/views/vendor/adminlte/layouts/pages/Homestay.blade.php
index 9c851da..a24e539 100644
--- a/resources/views/vendor/adminlte/layouts/pages/Homestay.blade.php
+++ b/resources/views/vendor/adminlte/layouts/pages/Homestay.blade.php
@@ -13,7 +13,7 @@
<br><br>
<div class="col-md-12 col-sm-12 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
<form action="{{url('book')}}" method="post">
-<<<<<<< HEAD
+
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<input type="hidden" name="id" value="{{$data->id}}">
@@ -38,29 +38,13 @@
</a>
</div>
</form>
-=======
- <input type="hidden" name="_token" value="{{ csrf_token() }}">
- <input type="hidden" name="id" value="{{$data->id}}">
- <div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
- <input class="date agileits w3layouts" id="datepicker1" name="tanggal" type="text" value=" Tanggal Check in" onfocus="this.value = '';" onblur="if (this.value == '') {this.value = '';}" required="">
- </div>
- <div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
- <input type="text" class="text wow agileits w3layouts slideInLeft" name="jumlah_hari" placeholder="Lama Menginap" required="" style="background-color: white; color: black">
- </div>
- <div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
- <input type="text" class="text wow agileits w3layouts slideInLeft" name="jumlah_kamar" placeholder="Jumlah Kamar" required="" style="background-color: white; color: black">
- </div>
- <div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
- <input type="submit" class="more_btn wow agileits w3layouts slideInLeft" value="Book Now">
- </div>
- </form>
->>>>>>> 70875f94bbc7d19947e16e1b35c430c4bceddcca
+
</div>
</div>
</div>
<!-- Booking -->
-<div class="details agilets w3layouts" >
+<div class="details agilets w3layouts">
<div class="container">
<div class="cuisines agileits w3layouts">
<div class="container">
@@ -163,7 +147,7 @@
<h2 style="margin-bottom: 10px;"> Kritik dan Saran</h2>
<form action="#" method="post" style="margin-bottom: 25px;"></form>
-<<<<<<< HEAD
+
<input type="text" class="text wow agileits w3layouts slideInLeft" name="Name" placeholder="Name" required="">
<input type="text" class="text wow agileits w3layouts slideInLeft" name="Email" placeholder="Email" required="">
@@ -173,25 +157,6 @@
</form>
</div>
</div>
-=======
- <h2 style="margin-bottom: 10px;"> Kritik dan Saran </h2>
- <form action ="#" method="post" style="margin-bottom: 25px;"></form>
-
- <h2 style="margin-bottom: 10px;"> Kritik dan Saran</h2>
- <form action="#" method="post" style="margin-bottom: 25px;">
- <h2 style="margin-bottom: 10px;"> Kritik dan Saran </h2>
- </form>
- <form action ="#" method="post" style="margin-bottom: 25px;">
-
- <input type="text" class="text wow agileits w3layouts slideInLeft" name="Name" placeholder="Name" required="">
- <input type="text" class="text wow agileits w3layouts slideInLeft" name="Email" placeholder="Email" required="">
- <textarea name="Message" class="wow agileits w3layouts slideInLeft" placeholder="Message" required=""></textarea>
- <input type="submit" class="more_btn wow agileits w3layouts slideInLeft" value="Send Message">
- </button>
- </form>
- <div>
- </div>
->>>>>>> 70875f94bbc7d19947e16e1b35c430c4bceddcca
</div>
@@ -200,23 +165,16 @@
<script>
$('#myModal').modal('');
</script>
-<<<<<<< HEAD
+
<!-- Date-Picker-JavaScript -->
<script src="{{asset('js/jquery-ui.js')}}"></script>
-@endsection
-=======
+
<script>
document.getElementById('book').onclick = function(){
swal("Good job!", "You clicked the button!", "success");};
</script>
-
-
-
-
-
-
<script>
document.querySelector(' ').onclick = function(){
swal("Good job!", "You clicked the button!", "success");};
@@ -253,5 +211,3 @@
</div>
</div>
@endsection
-
->>>>>>> 70875f94bbc7d19947e16e1b35c430c4bceddcca
diff --git a/resources/views/vendor/adminlte/layouts/partialweb/mainheader.blade.php b/resources/views/vendor/adminlte/layouts/partialweb/mainheader.blade.php
index 36beaa3..4387bcd 100644
--- a/resources/views/vendor/adminlte/layouts/partialweb/mainheader.blade.php
+++ b/resources/views/vendor/adminlte/layouts/partialweb/mainheader.blade.php
@@ -35,20 +35,8 @@
<li><a href="{{url('home')}}">{{Auth::user()->name}}</a></li>
@endif
</a>
-<<<<<<< HEAD
-=======
- <ul class="dropdown-menu">
- <!-- The user image in the menu -->
- <li class="user-header">
- {{--<img src="{{ Gravatar::get($user->email) }}" class="img-circle" alt="User Image" />--}}
- <p>
- <img src="img/{{ Auth::user()->foto }}" class="img-circle" alt="User Image" />
- <!-- {{ Auth::user()->name }} -->
- <!-- <small>{{ trans('adminlte_lang::message.login') }} </small> -->
- </p>
- </li>
->>>>>>> 70875f94bbc7d19947e16e1b35c430c4bceddcca
+
@if(Auth::user()->role=="Customer")
<ul class="dropdown-menu">
<!-- The user image in the menu -->
@@ -60,10 +48,6 @@
</p>
</li>
<!-- Menu Body -->
-<<<<<<< HEAD
-
-=======
->>>>>>> 70875f94bbc7d19947e16e1b35c430c4bceddcca
<!-- Menu Footer-->
<li class="user-footer">