parent
a2fac20921
commit
4af9e7ca26
|
@ -16,7 +16,8 @@ class UserPageController extends Controller
|
||||||
{
|
{
|
||||||
$user = Auth::user();
|
$user = Auth::user();
|
||||||
$vehicles = Vehicle::join('vehicles', 'vehicle.id', 'vehicles.vehicle_id')->join('users', 'users.id', 'vehicles.user_id')->where('users.email', $user->email)->get();
|
$vehicles = Vehicle::join('vehicles', 'vehicle.id', 'vehicles.vehicle_id')->join('users', 'users.id', 'vehicles.user_id')->where('users.email', $user->email)->get();
|
||||||
|
/*$vehicles = DB::table('vehicle')->join('vehicles', 'vehicle.id', 'vehicles.vehicle_id')->join('users', 'users.id', 'vehicles.user_id')->where('users.email', $user->email)->get();
|
||||||
|
*/
|
||||||
return view('user_page', ['name'=>$user->name, 'vehicles' => $vehicles]);
|
return view('user_page', ['name'=>$user->name, 'vehicles' => $vehicles]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,29 +25,39 @@ class UserPageController extends Controller
|
||||||
{
|
{
|
||||||
|
|
||||||
$data = ['brand' => $request->brand, 'model' => $request->model, 'fuel' => $request->fuel, 'consumption' => $request->consumption];
|
$data = ['brand' => $request->brand, 'model' => $request->model, 'fuel' => $request->fuel, 'consumption' => $request->consumption];
|
||||||
|
//DB::table('vehicle')->insert($data);
|
||||||
Vehicle::insert($data);
|
Vehicle::insert($data);
|
||||||
|
|
||||||
$vehicle = Vehicle::orderBy('id', 'desc')->first();
|
$vehicle = Vehicle::orderBy('id', 'desc')->first();
|
||||||
$vehicles = ['user_id'=>Auth::user()->id, 'vehicle_id'=>$vehicle->id];
|
$vehicles = ['user_id'=>Auth::user()->id, 'vehicle_id'=>$vehicle->id];
|
||||||
Vehicles::insert($vehicles);
|
Vehicles::insert($vehicles);
|
||||||
|
|
||||||
|
/*$vehicle = DB::table('vehicle')->orderBy('id', 'desc')->first();
|
||||||
|
$data2 = ['user_id'=>Auth::user()->id, 'vehicle_id'=>$vehicle->id];
|
||||||
|
DB::table('vehicles')->insert($data2);*/
|
||||||
|
$vehiclesId = Vehicle::orderBy('id', 'desc')->first();
|
||||||
if ($request->favoriteVehicle) {
|
if ($request->favoriteVehicle) {
|
||||||
$vehiclesId = Vehicle::orderBy('id', 'desc')->first();
|
User::where('id', Auth::user()->id)->update(['preferredVehicle' => $vehiclesId->id]);
|
||||||
User::where('id', Auth::user()->id)->update(['preferredVehicle' => $vehiclesId->id]);
|
|
||||||
}
|
}
|
||||||
|
//$vehiclesId = DB::table('vehicle')->orderBy('id', 'desc')->first();
|
||||||
|
//DB::table('users')->where('email', Auth::user()->email)->update(['vehiclesid' => $vehiclesId->id]);
|
||||||
return redirect('userpage');
|
return redirect('userpage');
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function remove()
|
public function edit($id)
|
||||||
{
|
{
|
||||||
|
$user = Auth::user();
|
||||||
|
$vehicles = Vehicle::join('vehicles', 'vehicle.id', 'vehicles.vehicle_id')->join('users', 'users.id', 'vehicles.user_id')->where('users.email', $user->email)->get();
|
||||||
|
$vehicle=Vehicle::where('id', $id)->get();
|
||||||
|
$preferredVehicle = User::where('id', Auth::user()->id)->get();
|
||||||
|
return view('user_page', ['name'=>$user->name, 'vehicle' => $vehicle, 'vehicles' => $vehicles]);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function remove(Request $request)
|
||||||
|
{
|
||||||
|
Auth::user()->vehicles()->where('id', $request->$data)->delete();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,13 +10,6 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$('#percurso').click(function() {
|
|
||||||
$('#divVeiculos').hide();
|
|
||||||
$('#divInfo').hide();
|
|
||||||
$('#divPercurso').toggle('slow', function() {
|
|
||||||
// Animation complete.
|
|
||||||
});
|
|
||||||
});
|
|
||||||
$('#veiculos').click(function() {
|
$('#veiculos').click(function() {
|
||||||
$('#divPercurso').hide();
|
$('#divPercurso').hide();
|
||||||
$('#divInfo').hide();
|
$('#divInfo').hide();
|
||||||
|
@ -24,6 +17,13 @@
|
||||||
// Animation complete.
|
// Animation complete.
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
$('#percurso').click(function() {
|
||||||
|
$('#divVeiculos').hide();
|
||||||
|
$('#divInfo').hide();
|
||||||
|
$('#divPercurso').toggle('slow', function() {
|
||||||
|
// Animation complete.
|
||||||
|
});
|
||||||
|
});
|
||||||
$('#info').click(function() {
|
$('#info').click(function() {
|
||||||
$('#divVeiculos').hide();
|
$('#divVeiculos').hide();
|
||||||
$('#divPercurso').hide();
|
$('#divPercurso').hide();
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<br><br><br>
|
<br><br><br>
|
||||||
|
<!--
|
||||||
<div id="divPercurso">
|
<div id="divPercurso">
|
||||||
<div id="map" class="col-sm-6"></div>
|
<div id="map" class="col-sm-6"></div>
|
||||||
<script>
|
<script>
|
||||||
|
@ -79,14 +79,15 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
-->
|
||||||
<div id="divVeiculos" style="display:none">
|
<div id="divVeiculos">
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<div class="list-group" id="vehicleList">
|
<div class="list-group" id="vehicleList">
|
||||||
|
@if($vehicles)
|
||||||
@foreach($vehicles as $vehicle)
|
@foreach($vehicles as $vehicle)
|
||||||
<a href="#" class="list-group-item {{Auth::user()->preferredVehicle==$vehicle->vehicle_id ? 'active': ''}}" value="{{$vehicle->id}}" onclick="var brand={{$vehicle->brand}}, {{$vehicle->model}}, {{$vehicle->fuel}}, {{$vehicle->consumption}}, {{Auth::user()->preferredVehicle==$vehicle->id? 1 : 0}};updateVehiclePage(brand)">{{$vehicle->brand}} - {{$vehicle->model}}</a>
|
<a href="{{ route('editVehicle',$vehicle->id)}}"class="list-group-item {{Auth::user()->preferredVehicle==$vehicle->vehicle_id ? 'active': ''}}" value="{{$vehicle->id}}" onclick="var brand={{$vehicle->brand}}, {{$vehicle->model}}, {{$vehicle->fuel}}, {{$vehicle->consumption}}, {{Auth::user()->preferredVehicle==$vehicle->id? 1 : 0}};updateVehiclePage(brand)">{{$vehicle->brand}} - {{$vehicle->model}}</a>
|
||||||
@endforeach
|
@endforeach
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -54,3 +54,4 @@ Route::post('/showGpsCoordinates', 'LandingController@index');
|
||||||
//API
|
//API
|
||||||
Route::get('/api/districts', 'LandingController@apiDistricts')->name('apidistricts');
|
Route::get('/api/districts', 'LandingController@apiDistricts')->name('apidistricts');
|
||||||
Route::get('/api/stations/{district}/{brand}/{fuelType}', 'LandingController@apiStations')->name('apistations');
|
Route::get('/api/stations/{district}/{brand}/{fuelType}', 'LandingController@apiStations')->name('apistations');
|
||||||
|
Route::get('/userpage/edit/{id}', 'UserPageController@edit')->name('editVehicle');
|
||||||
|
|
Loading…
Reference in New Issue