Renew

.gitignore

 /node_modules
 /public/storage
-/storage/*.key
 /.idea
 Homestead.json
 Homestead.yaml
-.env

app/Http/Controllers/AdminController.php

@@ -56,6 +56,24 @@ class AdminController extends Controller
 
     public function store(Request $request)
     {
+
+        $this->validate($request,[
+            'name' => 'required|min:5|max:35',
+            'username' => 'required|min:5|max:35',
+            'email' => 'required|email|unique:users',
+            'password' => 'required|min:6|max:20',
+            'password_confirmation' => 'required|min:3|max:20|same:password',
+        ],[
+            'name.required' => ' Nama Harus di isi',
+            'name.min' => ' Nama minimal 5 characters.',
+            'name.max' => ' Nama maksimal 35 characters.',
+            'username.required' => ' Username Harus di isi',
+            'username.min' => ' Usename minimal 5 characters.',
+            'username.max' => ' Username maksimal 35 characters.',
+            'password.required' => 'Password Harus di isi',
+            'password_confirmation.required' => 'Password Confirmasi Harus di isi',
+        ]);
+
         $data = $request->all();
         $user = new User();
         $user->name = $data['name'];

app/Http/Controllers/CobaController.php

+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Notifications\Messages\NexmoMessage;
+use SimpleSoftwareIO\SMS\Drivers\NexmoSMS;
+use Nexmo;
+use App\Feedback;
+use App\Homestay;
+use App\ListBook;
+use App\Room;
+use App\Transaksi;
+use Illuminate\Support\Facades\Auth;
+use App\User;
+use App\Customer;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Contracts\Auth\Guard;
+use DateTime;
+use PhpParser\Node\Stmt\Const_;
+use Psy\Command\ListCommand\ConstantEnumerator;
+
+
+class CobaController extends Controller
+{
+    public function route(){
+
+        Nexmo::message()->send([
+            'to' => '6282272194654',
+            'from' => 'ASDASD',
+            'text' => 'Hi ini hanya sebuah test no more'
+        ]);
+
+        return view('welcome');
+    }
+
+    public function detailhomestay($id){
+        $data = DB::table('homestay')
+            ->join('pemilikhomestay','homestay.idPemilik','=','pemilikhomestay.id')
+            ->select('pemilikhomestay.*','homestay.*')
+            ->where('homestay.id','=',$id)
+            ->get();
+
+
+        $daftarBook = DB::table('daftar_book')
+            ->select('daftar_book.*')
+            ->where('daftar_book.homestay','=',$id)
+            ->get();
+
+        $now = new DateTime();
+        $nowCurrent = $now->format('Y-m-d');
+        //dd($nowCurrent);
+
+        $dataJumlahKamar = ListBook::all()->where('tanggal_mulai',$nowCurrent);
+
+        $avilableRoom = 0;
+
+        if($dataJumlahKamar->count() == null){
+            //dd('disini aja');
+            $avilableRoom = $data[0]->jumlahKamar;
+        }else{
+            //dd($dataJumlahKamar);
+            $avilableRoom = $dataJumlahKamar[0]->jumlah_kamar;
+        }
+
+        $dataKamar = DB::table('kamar')
+            ->select('kamar.*')
+            ->where('kamar.idHomestay','=',$id)
+            ->get();
+
+        //dd("masuk agan",$id,$dataKamar);
+
+        return view('adminlte::layouts.pages.Homestay')->with('data',$data[0])->with('daftarBook',$daftarBook)->with('dataKamar',$dataKamar)->with('avilable',$avilableRoom);
+    }
+}

app/Http/Controllers/CustomerController.php

@@ -16,12 +16,16 @@ use Illuminate\Contracts\Auth\Guard;
 use DateTime;
 use PhpParser\Node\Stmt\Const_;
 use Psy\Command\ListCommand\ConstantEnumerator;
+use Illuminate\Notifications\Messages\NexmoMessage;
+use SimpleSoftwareIO\SMS\Drivers\NexmoSMS;
+use Nexmo\Laravel\Facade\Nexmo;
+
 
 class CustomerController extends Controller
 {
 
     public function __construct(){
-        $this->middleware('auth');
+        //$this->middleware('auth');
         $this->middleware('customer');
     }
 
@@ -168,45 +172,6 @@ class CustomerController extends Controller
         return view('adminlte::layouts.customers.editprofiles')->with('data',$data);
     }
 
-    public function detailhomestay($id){
-        $data = DB::table('homestay')
-                ->join('pemilikhomestay','homestay.idPemilik','=','pemilikhomestay.id')
-                ->select('pemilikhomestay.*','homestay.*')
-                ->where('homestay.id','=',$id)
-                ->get();
-
-
-        $daftarBook = DB::table('daftar_book')
-                    ->select('daftar_book.*')
-                    ->where('daftar_book.homestay','=',$id)
-                    ->get();
-
-        $now = new DateTime();
-        $nowCurrent = $now->format('Y-m-d');
-        //dd($nowCurrent);
-
-        $dataJumlahKamar = ListBook::all()->where('tanggal_mulai',$nowCurrent);
-
-        $avilableRoom = 0;
-
-        if($dataJumlahKamar->count() == null){
-            //dd('disini aja');
-            $avilableRoom = $data[0]->jumlahKamar;
-        }else{
-            //dd($dataJumlahKamar);
-            $avilableRoom = $dataJumlahKamar[0]->jumlah_kamar;
-        }
-
-        $dataKamar = DB::table('kamar')
-                     ->select('kamar.*')
-                     ->where('kamar.idHomestay','=',$id)
-                     ->get();
-
-        //dd("masuk agan",$id,$dataKamar);
-
-        return view('adminlte::layouts.pages.Homestay')->with('data',$data[0])->with('daftarBook',$daftarBook)->with('dataKamar',$dataKamar)->with('avilable',$avilableRoom);
-    }
-
     public function updateProfile(Request $request,$id){
         $cus = Customer::find($id);
         $dataUs = User::find(Auth::user()->id);
@@ -238,10 +203,23 @@ class CustomerController extends Controller
     }
 
     public function booking(Request $request){
+        $this->validate($request,[
+            'tanggal' => 'required',
+            'jumlah_hari' => 'required|numeric',
+            'jumlah_kamar' => 'required|numeric',
+
+        ],[
+            'tanggal.required' => 'Tanggal Harus di isi',
+            'jumlah_kamar.required' => ' Jumlah Kamar Harus di isi',
+            'jumlah_kamar.numeric' => ' Jumlah Kamr harus berupa Angka',
+            'jumlah_hari.required' => ' Lama menginap harus Diisi',
+            'jumlah_hari.numeric' => ' Lama menginap harus berupa Angka',
+        ]);
 
         if(Auth::guest()){
             return view('adminlte::errors.Account');
         }
+
         $lb = new ListBook();
 
         $dataHomestay = DB::table('homestay')
@@ -250,6 +228,14 @@ class CustomerController extends Controller
             ->where('homestay.id','=',$request['id'])
             ->get();
 
+        $dataPemilik = DB::table('homestay')
+            ->join('pemilikhomestay','homestay.idPemilik','pemilikhomestay.id')
+            ->select('pemilikhomestay.noTelepon')
+            ->where('homestay.id','=',$request['id'])
+            ->get();
+
+        //dd("masuk dis ");
+
         $homestayJumlahKamar = DB::table('homestay')->select('homestay.jumlahKamar')->where('homestay.id','=',$request['id'])->get();
 
         $dataBookingMulai = DB::table('daftar_book')
@@ -350,8 +336,9 @@ class CustomerController extends Controller
                      ->where('transaksi.tanggal_mulai','=',$request['tanggal'])
                      ->where('transaksi.tanggal_berakhir','=',$baru)
                      ->get();
-
-
+		
+		
+		
         //Insert Table Daftar Booking
         $lb->homestay = $request['id'];
         $lb->id_transaksi = $dataTrans[0]->id;
@@ -364,8 +351,16 @@ class CustomerController extends Controller
 
         $lb->save();
 
-        return redirect()->action('CustomerController@detailhomestay', ['id' => $request['id']]);
+        Nexmo::message()->send([
+            'to' => $dataPemilik[0]->noTelepon,
+            'from' => 'ASDASD',
+            'text' => 'Hi ini hanya sebuah test no more'
+        ]);
+
+
+        return redirect()->action('CobaController@detailhomestay', ['id' => $request['id']]);
 
     }
 
+
 }

app/Http/Controllers/OwnerController.php

@@ -71,14 +71,10 @@ class OwnerController extends Controller
     }
 
     public function profile(){
-        $users = User::find(Auth::user()->id);
-        //dd($users->name);
-        //$data = Owner::where('nama',$users->name);
 
+        $users = User::find(Auth::user()->id);
         $data = DB::table('pemilikhomestay')->where('nama', $users->name)->first();
 
-        //dd($data);
-
         return view('adminlte::layouts.owner.profil')->with('data',$data);
     }
 
@@ -99,6 +95,19 @@ class OwnerController extends Controller
     }
 
     public function updateHomestay(Request $request,$id){
+
+        $this->validate($request,[
+            'namaUpdate' => 'required|string',
+            'alamatUpdate' => 'required|string',
+            'hargaUpdate' => 'required|numeric',
+        ],[
+            'namaUpdate.required' => ' Nama Homestay Harus di isi',
+            'alamatUpdate.required' => 'Alamat Harus Diisi',
+            'hargaUpdate.required' => ' Harga Harus di isi',
+            'hargaUpdate.numeric' => ' Harga Harus Berupa Angka',
+        ]);
+
+
         $updateHomestay = Homestay::find($id);
 
         $updateHomestay->namaHomestay = $request['namaUpdate'];
@@ -188,6 +197,21 @@ class OwnerController extends Controller
 
         $lb = new ListBook();
 
+        $this->validate($request,[
+            'nama' => 'required|string',
+            'jumlah_kamar' => 'required|numeric',
+            'tanggal_mulai' => 'required',
+            'lama_menginap' => 'required|numeric',
+
+        ],[
+            'nama.required' => 'Nama Harus di isi',
+            'jumlah_kamar.required' => ' Jumlah Kamar Harus di isi',
+            'jumlah_kamar.numeric' => ' Jumlah Bed harus berupa Angka',
+            'tanggal_mulai.required' => ' Jumlah Bed harus Diis',
+            'lama_menginap.required' => ' Lama menginap harus Diisi',
+            'lama_menginap.numeric' => ' Lama menginap harus berupa Angka',
+        ]);
+
         $dataPemilik = DB::table('pemilikhomestay')
                        ->select('pemilikhomestay.id')
                        ->where('pemilikhomestay.id_Akun','=',Auth::user()->id)
@@ -215,6 +239,14 @@ class OwnerController extends Controller
     }
 
     public function updateRoom(Request $request, $id){
+
+        $this->validate($request,[
+            'jumlah_bed' => 'required|numeric',
+        ],[
+            'jumlah_bed.required' => ' Jumlah Bed Harus di isi',
+            'jumlah_bed.numeric' => ' Jumlah Bed harus berupa Angka',
+        ]);
+
         $dataKamar = Room::find($id);
 
         $dataKamar->jumlah_bed = $request['jumlah_bed'];
@@ -281,6 +313,17 @@ class OwnerController extends Controller
 
     public function storeRequest(Request $request){
 
+        $this->validate($request,[
+            'namaRequestFasilitas' => 'required|string',
+            'deskripsi' => 'required|string',
+            'jumlah' => 'required|numeric',
+        ],[
+            'namaRequestFasilitas.required' => ' Nama Fasilitas Harus di isi',
+            'deskripsi.required' => 'Deskripsi Harus Diisi',
+            'jumlah.required' => ' Jumlah Harus di isi',
+            'jumlah.numeric' => ' Harus Angka',
+        ]);
+
         $idPemilik = DB::table('users')
                     ->join('pemilikhomestay','users.id','=','pemilikhomestay.id_Akun')
                     ->select('pemilikhomestay.id')
@@ -315,6 +358,15 @@ class OwnerController extends Controller
 
     public function storePengajuan(Request $request){
 
+        $this->validate($request,[
+            'namaHomestay' => 'required',
+            'jumlahKamar' => 'required|numeric',
+        ],[
+            'namaHomestay.required' => ' Nama Homestay Harus Diisi Harus di isi',
+            'jumlahKamar.required' => ' Jumlah Kamar harus di isi.',
+            'jumlahKamar.numeric' => ' Jumlah Kamar Harus Berupa angka',
+        ]);
+
         $idPemilik = DB::table('users')
             ->join('pemilikhomestay','users.id','=','pemilikhomestay.id_Akun')
             ->select('pemilikhomestay.id')

composer.json

@@ -6,7 +6,11 @@
     "type": "project",
     "require": {
         "php": ">=5.6.4",
-        "laravel/framework": "5.3.*"
+        "laravel/framework": "5.3.*",
+		"simplesoftwareio/simple-sms": "~2",
+        "nexmo/client": "@beta",
+        "nexmo/laravel": "1.0.0-beta3",
+        "acacha/admin-lte-template-laravel": "3.*"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
@@ -45,7 +49,6 @@
         ]
     },
     "config": {
-        "preferred-install": "dist",
-        "sort-packages": true
+        "preferred-install": "dist"
     }
 }

config/app.php

@@ -162,12 +162,13 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
-        Acacha\AdminLTETemplateLaravel\Providers\AdminLTETemplateServiceProvider::class,
+		
 
         /*
          * Package Service Providers...
          */
-
+        Nexmo\Laravel\NexmoServiceProvider::class,
+		Acacha\AdminLTETemplateLaravel\Providers\AdminLTETemplateServiceProvider::class,
         //
 
         /*
@@ -226,7 +227,9 @@ return [
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
-        'AdminLTE' => Acacha\AdminLTETemplateLaravel\Facades\AdminLTE::class,
+		'AdminLTE' => Acacha\AdminLTETemplateLaravel\Facades\AdminLTE::class,
+        'Nexmo' => \Nexmo\Laravel\Facade\Nexmo::class,
+		
 
     ],
 

config/nexmo.php

+<?php
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | API Credentials
+    |--------------------------------------------------------------------------
+    |
+    | If you're using API credentials, change these settings. Get your
+    | credentials from https://dashboard.nexmo.com | 'Settings'.
+    |
+    */
+
+    'api_key' => '30f1d367',
+    'api_secret' => '4db245505ec9c5fe',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Signature Secret
+    |--------------------------------------------------------------------------
+    |
+    | If you're using a signature secret, use this section.
+    |
+    */
+
+    //'api_key' => 'API_KEY',
+    //'signature_secret' => 'SECRET'
+
+];
\ No newline at end of file

gulpfile.js

@@ -8,12 +8,32 @@ require('laravel-elixir-vue-2');
  |--------------------------------------------------------------------------
  |
  | Elixir provides a clean, fluent API for defining some basic Gulp tasks
- | for your Laravel application. By default, we are compiling the Sass
- | file for your application as well as publishing vendor resources.
+ | for your Laravel application. By default, we are compiling the Less
+ | file for our application, as well as publishing vendor resources.
  |
  */
 
-elixir((mix) => {
+elixir(function(mix) {
+    //app.scss includes app css, Boostrap and Ionicons
     mix.sass('app.scss')
-       .webpack('app.js');
+        .less('./node_modules/admin-lte/build/less/AdminLTE.less', './public/css/adminlte-less.css')
+        .less('adminlte-app.less')
+        .less('./node_modules/toastr/toastr.less')
+        .styles([
+            './public/css/app.css',
+            './node_modules/admin-lte/dist/css/skins/_all-skins.css',
+            './public/css/adminlte-less.css',
+            './public/css/adminlte-app.css',
+            './node_modules/icheck/skins/square/blue.css',
+            './public/css/toastr.css',
+        ])
+        .copy('node_modules/font-awesome/fonts/*.*','public/fonts/')
+        .copy('node_modules/ionicons/dist/fonts/*.*','public/fonts/')
+        .copy('node_modules/admin-lte/bootstrap/fonts/*.*','public/fonts/bootstrap')
+        .copy('node_modules/admin-lte/dist/css/skins/*.*','public/css/skins')
+        .copy('node_modules/admin-lte/dist/img','public/img')
+        .copy('node_modules/admin-lte/plugins','public/plugins')
+        .copy('node_modules/icheck/skins/square/blue.png','public/css')
+        .copy('node_modules/icheck/skins/square/blue@2x.png','public/css')
+        .webpack('app.js');
 });

package.json

@@ -8,11 +8,17 @@
     "bootstrap-sass": "^3.3.7",
     "gulp": "^3.9.1",
     "jquery": "^3.1.0",
-    "laravel-elixir": "^6.0.0-14",
+    "laravel-elixir": "^6.0.0-9",
     "laravel-elixir-vue-2": "^0.2.0",
     "laravel-elixir-webpack-official": "^1.0.2",
     "lodash": "^4.16.2",
     "vue": "^2.0.1",
-    "vue-resource": "^1.0.3"
+    "vue-resource": "^1.0.3",
+    "admin-lte": "^2.3.6",
+    "bootstrap-less": "^3.3.8",
+    "font-awesome": "^4.6.3",
+    "icheck": "^1.0.2",
+    "ionicons": "^3.0.0",
+    "toastr": "^2.1.2"
   }
 }

phpunit.xml

@@ -15,7 +15,7 @@
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./app</directory>
+            <directory suffix=".php">app/</directory>
         </whitelist>
     </filter>
     <php>
@@ -23,5 +23,9 @@
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
+        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_DATABASE" value=":memory:"/>
+        <env name="MAIL_DRIVER" value="log"/>
+        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
     </php>
 </phpunit>

readme.md

-<p align="center"><img src="https://laravel.com/assets/img/components/logo-laravel.svg"></p>
+# Laravel PHP Framework
 
-<p align="center">
-<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/d/total.svg" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/v/stable.svg" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/license.svg" alt="License"></a>
-</p>
+[![Build Status](https://travis-ci.org/laravel/framework.svg)](https://travis-ci.org/laravel/framework)
+[![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.svg)](https://packagist.org/packages/laravel/framework)
+[![Latest Stable Version](https://poser.pugx.org/laravel/framework/v/stable.svg)](https://packagist.org/packages/laravel/framework)
+[![Latest Unstable Version](https://poser.pugx.org/laravel/framework/v/unstable.svg)](https://packagist.org/packages/laravel/framework)
+[![License](https://poser.pugx.org/laravel/framework/license.svg)](https://packagist.org/packages/laravel/framework)
 
-## About Laravel
+Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as authentication, routing, sessions, queueing, and caching.
 
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as:
+Laravel is accessible, yet powerful, providing tools needed for large, robust applications. A superb inversion of control container, expressive migration system, and tightly integrated unit testing support give you the tools you need to build any application with which you are tasked.
 
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
+## Official Documentation
 
-Laravel is accessible, yet powerful, providing tools needed for large, robust applications. A superb combination of simplicity, elegance, and innovation give you tools you need to build any application with which you are tasked.
-
-## Learning Laravel
-
-Laravel has the most extensive and thorough documentation and video tutorial library of any modern web application framework. The [Laravel documentation](https://laravel.com/docs) is thorough, complete, and makes it a breeze to get started learning the framework.
-
-If you're not in the mood to read, [Laracasts](https://laracasts.com) contains over 900 video tutorials on a range of topics including Laravel, modern PHP, unit testing, JavaScript, and more. Boost the skill level of yourself and your entire team by digging into our comprehensive video library.
+Documentation for the framework can be found on the [Laravel website](http://laravel.com/docs).
 
 ## Contributing
 

resources/views/auth/login.blade.php

+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Login</div>
+                <div class="panel-body">
+                    <form class="form-horizontal" role="form" method="POST" action="{{ url('/login') }}">
+                        {{ csrf_field() }}
+
+                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+
+                            <div class="col-md-6">
+                                <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required autofocus>
+
+                                @if ($errors->has('email'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+                            <label for="password" class="col-md-4 control-label">Password</label>
+
+                            <div class="col-md-6">
+                                <input id="password" type="password" class="form-control" name="password" required>
+
+                                @if ($errors->has('password'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-6 col-md-offset-4">
+                                <div class="checkbox">
+                                    <label>
+                                        <input type="checkbox" name="remember"> Remember Me
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-8 col-md-offset-4">
+                                <button type="submit" class="btn btn-primary">
+                                    Login
+                                </button>
+
+                                <a class="btn btn-link" href="{{ url('/password/reset') }}">
+                                    Forgot Your Password?
+                                </a>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/auth/passwords/email.blade.php

+@extends('layouts.app')
+
+<!-- Main Content -->
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Reset Password</div>
+                <div class="panel-body">
+                    @if (session('status'))
+                        <div class="alert alert-success">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    <form class="form-horizontal" role="form" method="POST" action="{{ url('/password/email') }}">
+                        {{ csrf_field() }}
+
+                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+
+                            <div class="col-md-6">
+                                <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
+
+                                @if ($errors->has('email'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-6 col-md-offset-4">
+                                <button type="submit" class="btn btn-primary">
+                                    Send Password Reset Link
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/auth/passwords/reset.blade.php

+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Reset Password</div>
+
+                <div class="panel-body">
+                    <form class="form-horizontal" role="form" method="POST" action="{{ url('/password/reset') }}">
+                        {{ csrf_field() }}
+
+                        <input type="hidden" name="token" value="{{ $token }}">
+
+                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+
+                            <div class="col-md-6">
+                                <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" required autofocus>
+
+                                @if ($errors->has('email'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+                            <label for="password" class="col-md-4 control-label">Password</label>
+
+                            <div class="col-md-6">
+                                <input id="password" type="password" class="form-control" name="password" required>
+
+                                @if ($errors->has('password'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
+                            <label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
+                            <div class="col-md-6">
+                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
+
+                                @if ($errors->has('password_confirmation'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password_confirmation') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-6 col-md-offset-4">
+                                <button type="submit" class="btn btn-primary">
+                                    Reset Password
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/auth/register.blade.php

+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Register</div>
+                <div class="panel-body">
+                    <form class="form-horizontal" role="form" method="POST" action="{{ url('/register') }}">
+                        {{ csrf_field() }}
+
+                        <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
+                            <label for="name" class="col-md-4 control-label">Name</label>
+
+                            <div class="col-md-6">
+                                <input id="name" type="text" class="form-control" name="name" value="{{ old('name') }}" required autofocus>
+
+                                @if ($errors->has('name'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('name') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+
+                            <div class="col-md-6">
+                                <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
+
+                                @if ($errors->has('email'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+                            <label for="password" class="col-md-4 control-label">Password</label>
+
+                            <div class="col-md-6">
+                                <input id="password" type="password" class="form-control" name="password" required>
+
+                                @if ($errors->has('password'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
+
+                            <div class="col-md-6">
+                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-6 col-md-offset-4">
+                                <button type="submit" class="btn btn-primary">
+                                    Register
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/home.blade.php

+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Dashboard</div>
+
+                <div class="panel-body">
+                    You are logged in!
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/layouts/app.blade.php

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <!-- CSRF Token -->
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+
+    <title>{{ config('app.name', 'Laravel') }}</title>
+
+    <!-- Styles -->
+    <link href="/css/app.css" rel="stylesheet">
+
+    <!-- Scripts -->
+    <script>
+        window.Laravel = <?php echo json_encode([
+            'csrfToken' => csrf_token(),
+        ]); ?>
+    </script>
+</head>
+<body>
+    <div id="app">
+        <nav class="navbar navbar-default navbar-static-top">
+            <div class="container">
+                <div class="navbar-header">
+
+                    <!-- Collapsed Hamburger -->
+                    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#app-navbar-collapse">
+                        <span class="sr-only">Toggle Navigation</span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+
+                    <!-- Branding Image -->
+                    <a class="navbar-brand" href="{{ url('/') }}">
+                        {{ config('app.name', 'Laravel') }}
+                    </a>
+                </div>
+
+                <div class="collapse navbar-collapse" id="app-navbar-collapse">
+                    <!-- Left Side Of Navbar -->
+                    <ul class="nav navbar-nav">
+                        &nbsp;
+                    </ul>
+
+                    <!-- Right Side Of Navbar -->
+                    <ul class="nav navbar-nav navbar-right">
+                        <!-- Authentication Links -->
+                        @if (Auth::guest())
+                            <li><a href="{{ url('/login') }}">Login</a></li>
+                            <li><a href="{{ url('/register') }}">Register</a></li>
+                        @else
+                            <li class="dropdown">
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
+                                    {{ Auth::user()->name }} <span class="caret"></span>
+                                </a>
+
+                                <ul class="dropdown-menu" role="menu">
+                                    <li>
+                                        <a href="{{ url('/logout') }}"
+                                            onclick="event.preventDefault();
+                                                     document.getElementById('logout-form').submit();">
+                                            Logout
+                                        </a>
+
+                                        <form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
+                                            {{ csrf_field() }}
+                                        </form>
+                                    </li>
+                                </ul>
+                            </li>
+                        @endif
+                    </ul>
+                </div>
+            </div>
+        </nav>
+
+        @yield('content')
+    </div>
+
+    <!-- Scripts -->
+    <script src="/js/app.js"></script>
+</body>
+</html>

resources/views/vendor/adminlte/layouts/admin/addOwner.blade.php

@@ -9,15 +9,16 @@
   </div>
   <div class="box-body">
       <div id="app">
-        @if (count($errors) > 0)
-        <div class="alert alert-danger">
-          <strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
-          <ul>
-            @foreach ($errors->all() as $error)
-            <li>{{ $error }}</li>
-            @endforeach
-          </ul>
-        </div>
+        @if(count($errors))
+          <div class="alert alert-danger">
+            <strong>Whoops!</strong> There were some problems with your input.
+            <br/>
+            <ul>
+              @foreach($errors->all() as $error)
+                <li>{{ $error }}</li>
+              @endforeach
+            </ul>
+          </div>
         @endif
         <div class="register-box-body ">
           <form action="{{ url('admin') }}" method="post">

resources/views/vendor/adminlte/layouts/owner/RequestFasilitas.blade.php

@@ -17,14 +17,14 @@
         @endforeach
       </ul>
     </div>
-
+    @endif
     @if(session()->has('message'))
       <div class="alert alert-info">
         {{session()->get('message')}}
       </div>
     @endif
 
-    @endif
+
   </div>
   <div class="box-body">
     <form action="{{ url('reqFasilitas') }}" method="post" enctype="multipart/form-data">

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

@@ -11,8 +11,20 @@
 
 <!-- Booking -->
 <div class="details agileits w3layouts" style="margin-top: 10px; padding:0px">
+	<br>
 	<div class="container">
-		<br>
+		@if (count($errors) > 0)
+			<div class="alert alert-danger">
+				<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
+				<ul>
+					@foreach ($errors->all() as $error)
+						<li>{{ $error }}</li>
+					@endforeach
+				</ul>
+			</div>
+		@endif
+	</div>
+	<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">
 
@@ -20,13 +32,13 @@
 				<input type="hidden" name="id" value="{{$data->id}}">
 				<div class="col-md-2 col-sm-2 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft"></div>
 				<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="">
+					<input class="date agileits w3layouts" id="datepicker1" name="tanggal" type="text" value="	Tanggal Check in" onfocus="this.value = '';" onblur="if (this.value == '') {this.value = '';}">
 				</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">
+					<input type="text" class="text wow agileits w3layouts slideInLeft" name="jumlah_hari" placeholder="Lama Menginap" 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">
+					<input type="text" class="text wow agileits w3layouts slideInLeft" name="jumlah_kamar" placeholder="Jumlah Kamar" style="background-color: white; color: black">
 				</div>
 				<div class="book">
 					<input type="submit" class="more_btn wow agileits w3layouts slideInLeft" value="Book Now">

resources/views/vendor/notifications/email-plain.blade.php

+<?php
+
+if (! empty($greeting)) {
+    echo $greeting, "\n\n";
+} else {
+    echo $level == 'error' ? 'Whoops!' : 'Hello!', "\n\n";
+}
+
+if (! empty($introLines)) {
+    echo implode("\n", $introLines), "\n\n";
+}
+
+if (isset($actionText)) {
+    echo "{$actionText}: {$actionUrl}", "\n\n";
+}
+
+if (! empty($outroLines)) {
+    echo implode("\n", $outroLines), "\n\n";
+}
+
+echo 'Regards,', "\n";
+echo config('app.name'), "\n";

resources/views/vendor/pagination/bootstrap-4.blade.php

+@if ($paginator->hasPages())
+    <ul class="pagination">
+        {{-- Previous Page Link --}}
+        @if ($paginator->onFirstPage())
+            <li class="page-item disabled"><span class="page-link">&laquo;</span></li>
+        @else
+            <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
+        @endif
+
+        {{-- Pagination Elements --}}
+        @foreach ($elements as $element)
+            {{-- "Three Dots" Separator --}}
+            @if (is_string($element))
+                <li class="page-item disabled"><span class="page-link">{{ $element }}</span></li>
+            @endif
+
+            {{-- Array Of Links --}}
+            @if (is_array($element))
+                @foreach ($element as $page => $url)
+                    @if ($page == $paginator->currentPage())
+                        <li class="page-item active"><span class="page-link">{{ $page }}</span></li>
+                    @else
+                        <li class="page-item"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li>
+                    @endif
+                @endforeach
+            @endif
+        @endforeach
+
+        {{-- Next Page Link --}}
+        @if ($paginator->hasMorePages())
+            <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
+        @else
+            <li class="page-item disabled"><span class="page-link">&raquo;</span></li>
+        @endif
+    </ul>
+@endif

resources/views/vendor/pagination/default.blade.php

+@if ($paginator->hasPages())
+    <ul class="pagination">
+        {{-- Previous Page Link --}}
+        @if ($paginator->onFirstPage())
+            <li class="disabled"><span>&laquo;</span></li>
+        @else
+            <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
+        @endif
+
+        {{-- Pagination Elements --}}
+        @foreach ($elements as $element)
+            {{-- "Three Dots" Separator --}}
+            @if (is_string($element))
+                <li class="disabled"><span>{{ $element }}</span></li>
+            @endif
+
+            {{-- Array Of Links --}}
+            @if (is_array($element))
+                @foreach ($element as $page => $url)
+                    @if ($page == $paginator->currentPage())
+                        <li class="active"><span>{{ $page }}</span></li>
+                    @else
+                        <li><a href="{{ $url }}">{{ $page }}</a></li>
+                    @endif
+                @endforeach
+            @endif
+        @endforeach
+
+        {{-- Next Page Link --}}
+        @if ($paginator->hasMorePages())
+            <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
+        @else
+            <li class="disabled"><span>&raquo;</span></li>
+        @endif
+    </ul>
+@endif

resources/views/vendor/pagination/simple-bootstrap-4.blade.php

+@if ($paginator->hasPages())
+    <ul class="pagination">
+        {{-- Previous Page Link --}}
+        @if ($paginator->onFirstPage())
+            <li class="page-item disabled"><span class="page-link">&laquo;</span></li>
+        @else
+            <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
+        @endif
+
+        {{-- Next Page Link --}}
+        @if ($paginator->hasMorePages())
+            <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
+        @else
+            <li class="page-item disabled"><span class="page-link">&raquo;</span></li>
+        @endif
+    </ul>
+@endif

resources/views/vendor/pagination/simple-default.blade.php

+@if ($paginator->hasPages())
+    <ul class="pagination">
+        {{-- Previous Page Link --}}
+        @if ($paginator->onFirstPage())
+            <li class="disabled"><span>&laquo;</span></li>
+        @else
+            <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
+        @endif
+
+        {{-- Next Page Link --}}
+        @if ($paginator->hasMorePages())
+            <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
+        @else
+            <li class="disabled"><span>&raquo;</span></li>
+        @endif
+    </ul>
+@endif

routes/web.php

@@ -18,30 +18,30 @@ Route::get('/', function () {
 });
 
 Route::get('test', function(){
-	return view('index');
+    return view('index');
 });
 
 //test saja
 Route::get('editprofiles', function(){
-	return view('editprofiles');
+    return view('editprofiles');
 });
 
 //web
 Route::get('history', function(){
-	return view('History');
+    return view('History');
 });
 
 
 
 Route::get('profiles', function(){
-	return view('profiles');
+    return view('profiles');
 });
 
 Route::group(['middleware' => 'auth'], function () {
 });
 
 Route::get('adminlte', function(){
-	return view('welcome');
+    return view('welcome');
 });
 
 //Coba cart
@@ -49,10 +49,10 @@ Route::get('chartjs', 'OwnerController@chartjs');
 //
 
 Route::get('AddBook', function(){
-	return view('adminlte::layouts.owner.AddBookManual');
+    return view('adminlte::layouts.owner.AddBookManual');
 });
 Route::get('DataPemesanan', function(){
-	return view('adminlte::layouts.admin.dataPemesanan');
+    return view('adminlte::layouts.admin.dataPemesanan');
 });
 
 Route::group(['middleware' => 'owner'], function () {
@@ -82,10 +82,10 @@ Route::group(['middleware' => 'owner'], function () {
     Route::get('listFeedback','OwnerController@feddback');
 });
 
+Route::get('detailhomestay/{id}','CobaController@detailhomestay');
 
 Route::group(['middleware' => 'customer'], function () {
     Route::put('upload/{id}','CustomerController@upload');
-    Route::get('detailhomestay/{id}','CustomerController@detailhomestay');
     Route::get('customerHistory','CustomerController@history');
     Route::get('daftar','CustomerController@register');
     Route::post('daftar','CustomerController@registerStore');

vendor/acacha/admin-lte-template-laravel/public/css/adminlte-app.css

@@ -1112,7 +1112,7 @@ img {
   height: auto;
 }
 .img-circle {
-  border-radius: 30%;
+  border-radius: 50%;
 }
 hr {
   margin-top: 20px;

vendor/acacha/admin-lte-template-laravel/resources/lang/en/message.php

@@ -127,15 +127,4 @@ return [
     'password'                => 'Password',
     'retrypepassword'         => 'Retype password',
     'fullname'                => 'Full Name',
-    'username'                => 'Username',
-    'addOwner'                => 'Add Owner Homestay',
-    'homestay' => 'Homestay',
-    'role' => 'Role',
-    'username' => 'Username',
-    'listOwner' => 'List Owner',
-    'profile' => 'Profile',
-    'namaHomestay' => 'Nama Homestay',
-    'addRoom' => 'Tambah Kamar',
-
-
 ];

vendor/acacha/admin-lte-template-laravel/resources/views/auth/login.blade.php

@@ -49,6 +49,8 @@
             </div>
         </form>
 
+        @include('adminlte::auth.partials.social_login')
+
         <a href="{{ url('/password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a><br>
         <a href="{{ url('/register') }}" class="text-center">{{ trans('adminlte_lang::message.registermember') }}</a>
 

vendor/composer/autoload_files.php

@@ -11,13 +11,13 @@ return array(
     '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
     '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
     '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
+    'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
+    'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
     'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
+    '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
     'e7223560d890eab89cda23685e711e2c' => $vendorDir . '/psy/psysh/src/Psy/functions.php',
     'f0906e6318348a765ffb6eb24e0d0938' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/helpers.php',
     '58571171fd5812e6e447dce228f52f4d' => $vendorDir . '/laravel/framework/src/Illuminate/Support/helpers.php',
-    'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
-    'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
-    '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
     'bccfaf6207f67190a92f35585e9a78b2' => $vendorDir . '/twilio/sdk/Services/Twilio.php',
     'a1944ad99b2c9dde1f8975eab6b29a40' => $vendorDir . '/acacha/helpers/src/helpers.php',
 );

vendor/composer/autoload_psr4.php

@@ -7,6 +7,7 @@ $baseDir = dirname($vendorDir);
 
 return array(
     'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-common/src', $vendorDir . '/phpdocumentor/type-resolver/src', $vendorDir . '/phpdocumentor/reflection-docblock/src'),
+    'Zend\\Diactoros\\' => array($vendorDir . '/zendframework/zend-diactoros/src'),
     'XdgBaseDir\\' => array($vendorDir . '/dnoegel/php-xdg-base-dir/src'),
     'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'),
     'Symfony\\Polyfill\\Util\\' => array($vendorDir . '/symfony/polyfill-util'),
@@ -31,9 +32,15 @@ return array(
     'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
     'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
     'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
+    'Nexmo\\Laravel\\' => array($vendorDir . '/nexmo/laravel/src'),
+    'Nexmo\\' => array($vendorDir . '/nexmo/client/src'),
     'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
     'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
+    'Lcobucci\\JWT\\' => array($vendorDir . '/lcobucci/jwt/src'),
     'Illuminate\\' => array($vendorDir . '/laravel/framework/src/Illuminate'),
+    'Http\\Promise\\' => array($vendorDir . '/php-http/promise/src'),
+    'Http\\Client\\' => array($vendorDir . '/php-http/httplug/src'),
+    'Http\\Adapter\\Guzzle6\\' => array($vendorDir . '/php-http/guzzle6-adapter/src'),
     'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
     'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
     'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),

vendor/guzzlehttp/psr7/CHANGELOG.md

 # CHANGELOG
 
-## 1.4.2 - 2017-03-20
-
-* Reverted BC break to `Uri::resolve` and `Uri::removeDotSegments` by removing 
-  calls to `trigger_error` when deprecated methods are invoked.
-
 ## 1.4.1 - 2017-02-27
 
 * Reverted BC break by reintroducing behavior to automagically fix a URI with a

vendor/guzzlehttp/psr7/src/Uri.php

@@ -265,6 +265,12 @@ class Uri implements UriInterface
      */
     public static function removeDotSegments($path)
     {
+        @trigger_error(
+            'GuzzleHttp\Psr7\Uri::removeDotSegments is deprecated since version 1.4. ' .
+            'Use GuzzleHttp\Psr7\UriResolver::removeDotSegments instead.',
+            E_USER_DEPRECATED
+        );
+
         return UriResolver::removeDotSegments($path);
     }
 
@@ -281,6 +287,11 @@ class Uri implements UriInterface
      */
     public static function resolve(UriInterface $base, $rel)
     {
+        @trigger_error(
+            'GuzzleHttp\Psr7\Uri::resolve is deprecated since version 1.4. Use GuzzleHttp\Psr7\UriResolver::resolve instead.',
+            E_USER_DEPRECATED
+        );
+
         if (!($rel instanceof UriInterface)) {
             $rel = new self($rel);
         }