Add 1 vehicle per user

master
Goncalo Bras 2017-05-02 16:51:42 +01:00
parent aae3e16ac0
commit 81bd809da1
8 changed files with 121 additions and 28 deletions

View File

@ -42,12 +42,18 @@ class LoginController extends Controller
public function login(Request $request)
{
$user = DB::table('Users')->where('email', $request->input('email'))->where('password', $request->input('password'))->first();
$user = DB::table('users')->where('email', $request->input('email'))->where('password', $request->input('password'))->first();
if ($user) {
var_dump($user);
return view('user_page', ['name' => $user->name]);
}
}
public function logout(Request $request)
{
return view('landing_page');
}
public function index()
{
return View('login');

View File

@ -75,7 +75,7 @@ class RegisterController extends Controller
{
echo $request->input("email");
$data = ['name' => $request->name, 'email' => $request->email, 'password' => $request->password];
DB::table('Users')->insert($data);
DB::table('users')->insert($data);
}

View File

@ -0,0 +1,25 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Support\Facades\DB;
use Illuminate\Http\Request;
class UserPageController extends Controller
{
public function index()
{
return view('user_page');
}
public function add(Request $request)
{
$data = ['brand' => $request->brand, 'model' => $request->model, 'color' => $request->color, 'fuel' => $request->fuel, 'consumption' => $request->consumption];
DB::table('vehicle')->insert($data);
$vehicle = DB::table('vehicle')->orderBy('id', 'desc')->first();
#var_dump($vehicle);
DB::table('users')->where('email', 'goncalo@gmail.com')->update(['vehicleid'=>$vehicle->id]);
var_dump($vehicle);
}
}

View File

@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class VehicleTable extends Migration
class CreateVehicleTable extends Migration
{
/**
* Run the migrations.
@ -17,7 +17,9 @@ class VehicleTable extends Migration
$table->increments('id');
$table->string('brand');
$table->string('model');
$table->float('fuel_consumption');
$table->string('color');
$table->string('fuel');
$table->float('consumption');
});
}

View File

@ -1,15 +1,3 @@
<!DOCTYPE html>
<html>
<head>
<title>Login</title>
</head>
<body>
<input type="text" name="user" placeholder="Username">
<input type="password" name="password" placeholder="Password">
<input type="submit">
</body>
</html>
<!DOCTYPE html>
<html lang="en">
<head>

View File

@ -1,15 +1,3 @@
<!DOCTYPE html>
<html>
<head>
<title>Login</title>
</head>
<body>
<input type="text" name="user" placeholder="Username">
<input type="password" name="password" placeholder="Password">
<input type="submit">
</body>
</html>
<!DOCTYPE html>
<html lang="en">
<head>

View File

@ -0,0 +1,79 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>!GeoComb!</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<link rel="stylesheet" type="text/css" href="{{asset('css/style.css') }}">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head>
<body><nav class="navbar navbar-inverse">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Logo</a>
</div>
<div class="collapse navbar-collapse" id="myNavbar">
<ul class="nav navbar-nav">
<li class="active"><a href="{{action('LandingController@index')}}">Home</a></li>
<li><a href="#">About</a></li>
<li><a href="#">Contact</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="{{action('Auth\LoginController@index')}}"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
<li><a href="{{action('Auth\RegisterController@index')}}"><span class="glyphicon glyphicon-log-in"></span> Register</a></li>
<li><a href="{{action('Auth\LoginController@logout')}}"><span class="glyphicon glyphicon-log-in"></span> Logout</a></li>
</ul>
</div>
</div>
</nav>
<div class="container-fluid text-center">
<div class="row content">
<div class="col-sm-2 sidenav">
<!--<p><a href="#">Link</a></p>
<p><a href="#">Link</a></p>
<p><a href="#">Link</a></p>-->
</div>
<div class="col-sm-8 text-left">
<h1 class="center">Welcome {{$name}}</h1>
<p>Add vehicle</p>
<form method="POST" action="{{ url('/add_vehicle') }}" autocomplete="on">
{{ csrf_field() }}
<input type="text" name="brand" placeholder="Brand"><br>
<input type="text" name="model" placeholder="Model"><br>
<input type="text" name="color" placeholder="Color"><br>
<input type="text" name="fuel" placeholder="Fuel"><br>
<input type="number" step="0.1" name="consumption" placeholder="Consumption"><br>
<a href="{{action('UserPageController@add')}}"><button name="Add">Add</button></a>
</form>
</div>
<div class="col-sm-2 sidenav">
</div>
</div>
</div>
<footer class="container-fluid text-center">
<p>Footer Text</p>
</footer>
</body>
</html>

View File

@ -36,5 +36,10 @@ Route::get('/login', 'Auth\LoginController@index');
Route::post('/login', 'Auth\LoginController@login');
Route::get('/register', 'Auth\RegisterController@index');
Route::post('/register', 'Auth\RegisterController@register');
Route::get('/logout', 'Auth\LoginController@logout');
Route::post('/user_page', 'UserPageController@index');
Route::post('/add_vehicle', 'UserPageController@add');
Route::post('/maps', 'LandingController@receiveGPSCoordinates');