Merge branch 'master' of https://gitlab.del.ac.id/juliper19/pa2d4ti06

resources/views/vendor/adminlte/layouts/pages/Homestay.blade.php

@@ -13,6 +13,32 @@
 		<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}}">
+
+				<div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
+					<input class="date agileits w3layouts" id="datepicker1" 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 class="date agileits w3layouts" id="datepicker2" type="text" value="	Tanggal out" onfocus="this.value = '';" onblur="if (this.value == '') {this.value = '';}" required="">
+				</div>
+
+				<div class="col-md-2 col-sm-2 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-2 col-sm-2 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-2 col-sm-2 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
+					<a href="" id="book" >
+						<input type="button" class="more_btn wow agileits w3layouts slideInLeft" value="Book Now">
+					</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">
@@ -28,6 +54,7 @@
                     <input type="submit" class="more_btn wow agileits w3layouts slideInLeft" value="Book Now">
                 </div>
             </form>
+>>>>>>> 70875f94bbc7d19947e16e1b35c430c4bceddcca
 		</div>
 	</div>
 </div>
@@ -137,6 +164,17 @@
 			<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="">
+				<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>
+=======
 			<h2 style="margin-bottom: 10px;"> Kritik dan Saran </h2>
 			<form action ="#" method="post" style="margin-bottom: 25px;"></form>
 
@@ -154,6 +192,7 @@
                 </form>
 	    <div>
     </div>
+>>>>>>> 70875f94bbc7d19947e16e1b35c430c4bceddcca
 </div>
 
 
@@ -162,6 +201,12 @@
 <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");};
@@ -210,3 +255,4 @@
 </div>
 	@endsection
 
+>>>>>>> 70875f94bbc7d19947e16e1b35c430c4bceddcca

resources/views/vendor/adminlte/layouts/partialweb/htmlheader.blade.php

@@ -21,7 +21,7 @@
 		<link rel="stylesheet" href="{{asset('css/jquery-ui.css')}}" 	type="text/css" media="all">
 		<!-- Popup -->
 		<link rel="stylesheet" href="{{asset('css/sweet-alert.css')}}" 	type="text/css" media="all">
-<!-- 	<!-- All css --> <!-- <link href="{{ asset('/css/all.css') }}" rel="stylesheet" type="text/css" /> -->
+
 	<!-- //Custom-Stylesheet-Links -->
 						
 

resources/views/vendor/adminlte/layouts/partialweb/mainheader.blade.php

@@ -35,6 +35,9 @@
                                 <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">
@@ -45,6 +48,7 @@
                                     <!-- <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 -->
@@ -52,11 +56,14 @@
                                     {{--<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>
                                 <!-- Menu Body -->
+<<<<<<< HEAD
+
+=======
+>>>>>>> 70875f94bbc7d19947e16e1b35c430c4bceddcca
 
                                 <!-- Menu Footer-->
                                 <li class="user-footer">

resources/views/vendor/adminlte/layouts/partialweb/scripts.blade.php

@@ -2,6 +2,7 @@
 
 		<!-- Default-JavaScript -->	  
 		<script type="text/javascript" src="{{asset('js/jquery-2.1.4.min.js')}}"></script>
+		<script type="text/javascript" src="{{asset('js/jquery-ui.js')}}"></script>
 		<!-- Bootstrap-JavaScript --> 
 		<script type="text/javascript" src="{{asset('js/bootstrap.min.js')}}"></script>
 		<!-- Sweealert-JavaScript -->
@@ -77,7 +78,8 @@
 		<!-- //Booking-Popup-Box-JavaScript -->
 
 		<!-- Date-Picker-JavaScript -->
-		<script>
+			<script src="{{asset('js/jquery-ui.js')}}"></script>
+			<script>
 				$('#datepicker2').datepicker({
 					dateFormat: "dd-M-yy" 
 				});
@@ -95,6 +97,6 @@
 					}
 				});
 			</script>
-			<!-- //new date picker -->
+		
 
 	<!-- //Custom-JavaScript-File-Links -->
\ No newline at end of file