diff --git a/Procfile b/Procfile
new file mode 100644
index 00000000..68846b77
--- /dev/null
+++ b/Procfile
@@ -0,0 +1,2 @@
+
+web: vendor/bin/heroku-php-apache2 public/
\ No newline at end of file
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index b2ea669a..e72dd8a6 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -4,7 +4,8 @@
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
-
+use Socialite;//esti
+use App\User;
class LoginController extends Controller
{
/*
@@ -20,6 +21,42 @@ class LoginController extends Controller
use AuthenticatesUsers;
+ /** clase usada por socialite
+ * redirect (): se encarga de enviar al usuario al proveedor de OAuth
+ *
+ * @return \Illuminate\Http\Response
+ */
+ public function redirectToProvider($provider)
+ {
+ return Socialite::driver($provider)->redirect();
+ }
+
+ /**
+ *
+ * user () : leerá la solicitud entrante y recuperará la información del usuario del proveedor.
+ * @return \Illuminate\Http\Response
+ */
+ public function handleProviderCallback($provider)
+ {
+
+ $user = Socialite::driver($provider)->user();
+
+ $createUser = User::FirstOrCreate(
+ [
+ 'email' => $user->getEmail()
+ ],
+ [
+ 'name' => $user->getName()
+
+ ]);
+ auth()->login($createUser);
+ return redirect('/home');
+
+
+
+
+ }
+
/**
* Where to redirect users after login.
*
diff --git a/app/Http/Controllers/CategoriaController.php b/app/Http/Controllers/CategoriaController.php
new file mode 100644
index 00000000..6b6bee1e
--- /dev/null
+++ b/app/Http/Controllers/CategoriaController.php
@@ -0,0 +1,127 @@
+id=Auth::id();
+ if(!empty($request->input('name')) and !empty($request->input('cv')))
+ {
+ $Auto->auto=$request->input('name');
+ $Auto->categoria=$request->input('categoria');
+ $Auto->cv=$request->input('cv');
+ $Auto->publico=false;
+ $Auto->save();
+ }
+ }
+ else
+ abort(403,"403 usuario no autorizado");
+ return redirect('/home');
+
+ }
+
+ /**
+ * Display the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function BuscarPorCategoria($name)
+ {
+ return $name;
+ }
+
+ /**
+ * Show the form for editing the specified resource.
+ *Compruebo si esta publico lo hago privado y si esta privado lo hago publico
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function edit($nom,$id)
+ {
+ $idAuto= DB::select('select id from autos where auto=:nom and id=:id', ['nom' => $nom,'id'=>$id]);
+
+ if(Auth::user()->id==$idAuto[0]->id)
+ {
+ $publico=DB::select ('select publico from autos where auto =:nom and id =:id',['nom'=>$nom,'id'=> Auth::id(),]);
+
+ if($publico[0]->publico==0)
+ $caters = DB::select('update autos Set publico = :dat where id = :id and auto = :nom', ['dat' => true,'nom'=>$nom,'id'=> Auth::id()]);
+ else
+ $caters = DB::select('update autos Set publico = :dat where id = :id and auto = :nom', ['dat' => false,'nom'=>$nom,'id'=> Auth::id()]);
+ }
+ else
+ abort(403,"403 usuario no autorizado");
+
+ return redirect('home');
+
+ }
+
+ /**
+ * Update the specified resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function update(Request $request, $id)
+ {
+ //no
+ }
+
+ /**
+ * Remove the specified resource from storage.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function destroy($nom,$cate,$id)
+ {
+
+ $idAuto= DB::select('select id from autos where categoria= :cate and auto=:nom and id=:id', ['nom' => $nom,'cate'=>$cate,'id'=>$id]);
+
+ if(Auth::user()->id==$idAuto[0]->id)
+ $caters = DB::select('delete from autos where categoria= :cate and auto=:nom and id=:id', ['nom' => $nom,'cate'=>$cate,'id'=>$id]);
+ else
+ abort(403,"403 usuario no autorizado");
+ return redirect('home');
+
+ }
+}
diff --git a/app/Http/Controllers/ColeccionController.php b/app/Http/Controllers/ColeccionController.php
new file mode 100644
index 00000000..eba0c7ba
--- /dev/null
+++ b/app/Http/Controllers/ColeccionController.php
@@ -0,0 +1,105 @@
+ $id, 'dat' => true]);
+ return view('Coleccion', ['caters' => $caters ,'autos' => $autos ]);
+
+ }
+
+ /**
+ * Show the form for creating a new resource.
+ *
+ * @return \Illuminate\Http\Response
+ */
+ public function create()
+ {
+ //
+ }
+
+ /**
+ * Store a newly created resource in storage.
+ * quedo la implementacion para agregar las categorias pero
+ * por decision de implementacion se estrablecieron 3 categorias por defecto
+ * por lo que no se realizan los chequeos de autenticacion
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\Response
+ */
+ public function store(Request $request)
+ {
+ if(!empty($request->input('name')))
+ {
+ $categoria=new categoria();//nuestro modelo
+ $categoria->categoria=$request->input('name');
+ $categoria->save();
+ }
+ return redirect('/home');
+ }
+
+ /**
+ * Display the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function show($id)
+ {
+ //
+ }
+
+ /**
+ * Show the form for editing the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function edit($id)
+ {
+ //
+ }
+
+ /**
+ * Update the specified resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function update(Request $request, $id)
+ {
+ //
+ }
+
+ /**
+ * Remove the specified resource from storage.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function destroy($id)
+ {
+ //
+ }
+}
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
new file mode 100644
index 00000000..77cd3ae7
--- /dev/null
+++ b/app/Http/Controllers/HomeController.php
@@ -0,0 +1,36 @@
+middleware('auth');
+ }
+
+ /**
+ * Show the application dashboard.
+ *
+ * @return \Illuminate\Contracts\Support\Renderable
+ */
+ public function index()
+ {
+ //$caters = DB::select('select categoria from categorias where id='Auth::id()'', [1]);
+ $caters = DB::select('select categoria from categorias ');
+ $autos = DB::select('select auto ,categoria,cv,publico from autos where id = :id', ['id' => Auth::id()]);
+ return view('home', ['caters' => $caters ,'autos' => $autos ]);
+ //return view('home', ['caters' => $caters ]);
+ // return view('home');
+ }
+}
diff --git a/app/Http/Controllers/PersonalController.php b/app/Http/Controllers/PersonalController.php
new file mode 100644
index 00000000..d7ada591
--- /dev/null
+++ b/app/Http/Controllers/PersonalController.php
@@ -0,0 +1,18 @@
+ paginate(5);
+ * Display a listing of the resource.
+ *
+ * @return \Illuminate\Http\Response
+ */
+ public function index()
+ {
+ /* $users= User::all();
+ return view('ListasPublicas')->with('users',$users);*/
+ $users = DB::select('select * from users', [1]);
+
+ return view('ListasPublicas', ['users' => $users]);
+ }
+
+ /**
+ * Show the form for creating a new resource.
+ *
+ * @return \Illuminate\Http\Response
+ */
+ public function create()
+ {
+ //
+ }
+
+ /**
+ * Store a newly created resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\Response
+ */
+ public function store(Request $request)
+ {
+ //
+ }
+
+ /**
+ * Display the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function show(Request $request, $id)
+ {
+ //
+
+ }
+
+ /**
+ * Show the form for editing the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function edit($id)
+ {
+ $user=User::find($id);
+ return view('/auth/edit')->with('user',$user);
+ }
+
+ /**
+ * Update the specified resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function update(Request $request, $id)
+ {
+ $user=User::find($id);
+ if($user->id ==Auth::id())
+ {
+ $nomB=true;
+ $emailB=true;
+ $nombreUsados = DB::select('select name from users where id != :id ', ['id'=> $id]);
+ $mailUsados = DB::select('select email from users where id != :id ', ['id'=> $id]);
+ $nombreNuevo=$request->name;
+ $emailNuevo=$request->email;
+ foreach ($nombreUsados as $nombre)
+ {
+ if(strcmp($nombre->name, $nombreNuevo) === 0)
+ $nomB=false;
+ }
+ foreach ($mailUsados as $email)
+ {
+ if(strcmp($email->email, $emailNuevo) === 0)
+ $emailB=false;
+ }
+
+ if($nomB==true && $emailB==true)
+ {
+ $user->name=$request->name;
+ $user->email=$request->email;
+ $user->save();
+ }
+ }
+ else
+ abort(403,"403 usuario no autorizado");
+
+ return redirect('/home');
+ }
+
+ /**
+ * Remove the specified resource from storage.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function destroy($id)
+ {
+ //
+ }
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index ee8ca5bc..9242dee7 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -3,6 +3,7 @@
namespace App\Providers;
use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Schema;
class AppServiceProvider extends ServiceProvider
{
@@ -23,6 +24,6 @@ public function register()
*/
public function boot()
{
- //
+ Schema::defaultStringLength(191);
}
}
diff --git a/app/User.php b/app/User.php
index faa03c3b..eb0a71ca 100644
--- a/app/User.php
+++ b/app/User.php
@@ -16,7 +16,7 @@ class User extends Authenticatable
* @var array
*/
protected $fillable = [
- 'name', 'email', 'password',
+ 'name', 'email','password',
];
/**
diff --git a/app/auto.php b/app/auto.php
new file mode 100644
index 00000000..70db9e9f
--- /dev/null
+++ b/app/auto.php
@@ -0,0 +1,10 @@
+=5.5"
+ },
+ "require-dev": {
+ "ext-curl": "*",
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+ "psr/log": "^1.0"
+ },
+ "suggest": {
+ "psr/log": "Required for using the Log middleware"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "6.3-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/functions_include.php"
+ ],
+ "psr-4": {
+ "GuzzleHttp\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Guzzle is a PHP HTTP client library",
+ "homepage": "http://guzzlephp.org/",
+ "keywords": [
+ "client",
+ "curl",
+ "framework",
+ "http",
+ "http client",
+ "rest",
+ "web service"
+ ],
+ "time": "2018-04-22T15:46:56+00:00"
+ },
+ {
+ "name": "guzzlehttp/promises",
+ "version": "v1.3.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/promises.git",
+ "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+ "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.4-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Promise\\": "src/"
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Guzzle promises library",
+ "keywords": [
+ "promise"
+ ],
+ "time": "2016-12-20T10:07:11+00:00"
+ },
+ {
+ "name": "guzzlehttp/psr7",
+ "version": "1.5.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/psr7.git",
+ "reference": "9f83dded91781a01c63574e387eaa769be769115"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
+ "reference": "9f83dded91781a01c63574e387eaa769be769115",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0",
+ "psr/http-message": "~1.0",
+ "ralouphie/getallheaders": "^2.0.5"
+ },
+ "provide": {
+ "psr/http-message-implementation": "1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.5-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Psr7\\": "src/"
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Tobias Schultze",
+ "homepage": "https://github.com/Tobion"
+ }
+ ],
+ "description": "PSR-7 message implementation that also provides common utility methods",
+ "keywords": [
+ "http",
+ "message",
+ "psr-7",
+ "request",
+ "response",
+ "stream",
+ "uri",
+ "url"
+ ],
+ "time": "2018-12-04T20:46:45+00:00"
+ },
{
"name": "jakub-onderka/php-console-color",
"version": "v0.2",
@@ -459,18 +642,72 @@
"description": "Highlight PHP code in terminal",
"time": "2018-09-29T18:48:56+00:00"
},
+ {
+ "name": "laracasts/flash",
+ "version": "3.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laracasts/flash.git",
+ "reference": "10cd420ab63fd0796bf5e1e5b99f87636d2f4333"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laracasts/flash/zipball/10cd420ab63fd0796bf5e1e5b99f87636d2f4333",
+ "reference": "10cd420ab63fd0796bf5e1e5b99f87636d2f4333",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/support": "~5.0",
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "dev-master",
+ "phpunit/phpunit": "^6.1"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Laracasts\\Flash\\FlashServiceProvider"
+ ],
+ "aliases": {
+ "Flash": "Laracasts\\Flash\\Flash"
+ }
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Laracasts\\Flash": "src/"
+ },
+ "files": [
+ "src/Laracasts/Flash/functions.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jeffrey Way",
+ "email": "jeffrey@laracasts.com"
+ }
+ ],
+ "description": "Easy flash notifications",
+ "time": "2017-06-22T19:01:19+00:00"
+ },
{
"name": "laravel/framework",
- "version": "v5.8.10",
+ "version": "v5.8.15",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "505325b4577968750e622d7a5a271cf8785a7a1a"
+ "reference": "8a34004aed6ff0aa4072360e3e5bd875edebc223"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/505325b4577968750e622d7a5a271cf8785a7a1a",
- "reference": "505325b4577968750e622d7a5a271cf8785a7a1a",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/8a34004aed6ff0aa4072360e3e5bd875edebc223",
+ "reference": "8a34004aed6ff0aa4072360e3e5bd875edebc223",
"shasum": ""
},
"require": {
@@ -604,7 +841,71 @@
"framework",
"laravel"
],
- "time": "2019-04-04T13:39:49+00:00"
+ "time": "2019-04-30T14:05:03+00:00"
+ },
+ {
+ "name": "laravel/socialite",
+ "version": "v4.1.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laravel/socialite.git",
+ "reference": "f92e15a8ba4dfd730cddc775a7c1ca2251f30cff"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laravel/socialite/zipball/f92e15a8ba4dfd730cddc775a7c1ca2251f30cff",
+ "reference": "f92e15a8ba4dfd730cddc775a7c1ca2251f30cff",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "guzzlehttp/guzzle": "~6.0",
+ "illuminate/http": "~5.7.0|~5.8.0|~5.9.0",
+ "illuminate/support": "~5.7.0|~5.8.0|~5.9.0",
+ "league/oauth1-client": "~1.0",
+ "php": "^7.1.3"
+ },
+ "require-dev": {
+ "illuminate/contracts": "~5.7.0|~5.8.0|~5.9.0",
+ "mockery/mockery": "~1.0",
+ "phpunit/phpunit": "~7.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ },
+ "laravel": {
+ "providers": [
+ "Laravel\\Socialite\\SocialiteServiceProvider"
+ ],
+ "aliases": {
+ "Socialite": "Laravel\\Socialite\\Facades\\Socialite"
+ }
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laravel\\Socialite\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ }
+ ],
+ "description": "Laravel wrapper around OAuth 1 & OAuth 2 libraries.",
+ "homepage": "https://laravel.com",
+ "keywords": [
+ "laravel",
+ "oauth"
+ ],
+ "time": "2019-04-02T17:06:04+00:00"
},
{
"name": "laravel/tinker",
@@ -753,6 +1054,69 @@
],
"time": "2019-03-30T13:22:34+00:00"
},
+ {
+ "name": "league/oauth1-client",
+ "version": "1.7.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/oauth1-client.git",
+ "reference": "fca5f160650cb74d23fc11aa570dd61f86dcf647"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/fca5f160650cb74d23fc11aa570dd61f86dcf647",
+ "reference": "fca5f160650cb74d23fc11aa570dd61f86dcf647",
+ "shasum": ""
+ },
+ "require": {
+ "guzzlehttp/guzzle": "^6.0",
+ "php": ">=5.5.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "^0.9",
+ "phpunit/phpunit": "^4.0",
+ "squizlabs/php_codesniffer": "^2.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "League\\OAuth1\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ben Corlett",
+ "email": "bencorlett@me.com",
+ "homepage": "http://www.webcomm.com.au",
+ "role": "Developer"
+ }
+ ],
+ "description": "OAuth 1.0 Client Library",
+ "keywords": [
+ "Authentication",
+ "SSO",
+ "authorization",
+ "bitbucket",
+ "identity",
+ "idp",
+ "oauth",
+ "oauth1",
+ "single sign on",
+ "trello",
+ "tumblr",
+ "twitter"
+ ],
+ "time": "2016-08-17T00:36:58+00:00"
+ },
{
"name": "monolog/monolog",
"version": "1.24.0",
@@ -833,16 +1197,16 @@
},
{
"name": "nesbot/carbon",
- "version": "2.16.3",
+ "version": "2.17.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "373d9f0d58651af366435148c39beb702c2b7ef4"
+ "reference": "96acbc0c03782e8115156dd4dd8b736267155066"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/373d9f0d58651af366435148c39beb702c2b7ef4",
- "reference": "373d9f0d58651af366435148c39beb702c2b7ef4",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/96acbc0c03782e8115156dd4dd8b736267155066",
+ "reference": "96acbc0c03782e8115156dd4dd8b736267155066",
"shasum": ""
},
"require": {
@@ -852,9 +1216,9 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.14 || ^3.0",
- "kylekatarnls/multi-tester": "^0.1",
+ "kylekatarnls/multi-tester": "^1.1",
"phpmd/phpmd": "^2.6",
- "phpstan/phpstan": "^0.10.8",
+ "phpstan/phpstan": "^0.11",
"phpunit/phpunit": "^7.5 || ^8.0",
"squizlabs/php_codesniffer": "^3.4"
},
@@ -889,7 +1253,7 @@
"datetime",
"time"
],
- "time": "2019-04-06T17:09:23+00:00"
+ "time": "2019-04-27T18:04:27+00:00"
},
{
"name": "nikic/php-parser",
@@ -1147,6 +1511,56 @@
],
"time": "2017-02-14T16:28:37+00:00"
},
+ {
+ "name": "psr/http-message",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP messages",
+ "homepage": "https://github.com/php-fig/http-message",
+ "keywords": [
+ "http",
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "time": "2016-08-06T14:39:51+00:00"
+ },
{
"name": "psr/log",
"version": "1.1.0",
@@ -1316,6 +1730,46 @@
],
"time": "2018-10-13T15:16:03+00:00"
},
+ {
+ "name": "ralouphie/getallheaders",
+ "version": "2.0.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ralouphie/getallheaders.git",
+ "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+ "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~3.7.0",
+ "satooshi/php-coveralls": ">=1.0"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/getallheaders.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ralph Khattar",
+ "email": "ralph.khattar@gmail.com"
+ }
+ ],
+ "description": "A polyfill for getallheaders.",
+ "time": "2016-02-11T07:05:27+00:00"
+ },
{
"name": "ramsey/uuid",
"version": "3.8.0",
@@ -1400,16 +1854,16 @@
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v6.2.0",
+ "version": "v6.2.1",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707"
+ "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707",
- "reference": "6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a",
+ "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a",
"shasum": ""
},
"require": {
@@ -1458,20 +1912,20 @@
"mail",
"mailer"
],
- "time": "2019-03-10T07:52:41+00:00"
+ "time": "2019-04-21T09:21:45+00:00"
},
{
"name": "symfony/console",
- "version": "v4.2.5",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "24206aff3efe6962593297e57ef697ebb220e384"
+ "reference": "e2840bb38bddad7a0feaf85931e38fdcffdb2f81"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/24206aff3efe6962593297e57ef697ebb220e384",
- "reference": "24206aff3efe6962593297e57ef697ebb220e384",
+ "url": "https://api.github.com/repos/symfony/console/zipball/e2840bb38bddad7a0feaf85931e38fdcffdb2f81",
+ "reference": "e2840bb38bddad7a0feaf85931e38fdcffdb2f81",
"shasum": ""
},
"require": {
@@ -1530,7 +1984,7 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2019-04-01T07:32:59+00:00"
+ "time": "2019-04-08T14:23:48+00:00"
},
{
"name": "symfony/contracts",
@@ -1602,7 +2056,7 @@
},
{
"name": "symfony/css-selector",
- "version": "v4.2.5",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -1655,16 +2109,16 @@
},
{
"name": "symfony/debug",
- "version": "v4.2.5",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "43ce8ab34c734dcc8a4af576cb86711daab964c5"
+ "reference": "2d279b6bb1d582dd5740d4d3251ae8c18812ed37"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/43ce8ab34c734dcc8a4af576cb86711daab964c5",
- "reference": "43ce8ab34c734dcc8a4af576cb86711daab964c5",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/2d279b6bb1d582dd5740d4d3251ae8c18812ed37",
+ "reference": "2d279b6bb1d582dd5740d4d3251ae8c18812ed37",
"shasum": ""
},
"require": {
@@ -1707,20 +2161,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2019-03-10T17:09:50+00:00"
+ "time": "2019-04-11T11:27:41+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v4.2.5",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "ca5af306fbc37f3cf597e91bc9cfa0c7d3f33544"
+ "reference": "fbce53cd74ac509cbe74b6f227622650ab759b02"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ca5af306fbc37f3cf597e91bc9cfa0c7d3f33544",
- "reference": "ca5af306fbc37f3cf597e91bc9cfa0c7d3f33544",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fbce53cd74ac509cbe74b6f227622650ab759b02",
+ "reference": "fbce53cd74ac509cbe74b6f227622650ab759b02",
"shasum": ""
},
"require": {
@@ -1771,20 +2225,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2019-03-30T15:58:42+00:00"
+ "time": "2019-04-06T13:51:08+00:00"
},
{
"name": "symfony/finder",
- "version": "v4.2.5",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a"
+ "reference": "e45135658bd6c14b61850bf131c4f09a55133f69"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/267b7002c1b70ea80db0833c3afe05f0fbde580a",
- "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/e45135658bd6c14b61850bf131c4f09a55133f69",
+ "reference": "e45135658bd6c14b61850bf131c4f09a55133f69",
"shasum": ""
},
"require": {
@@ -1820,20 +2274,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2019-02-23T15:42:05+00:00"
+ "time": "2019-04-06T13:51:08+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v4.2.5",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1"
+ "reference": "1ea878bd3af18f934dedb8c0de60656a9a31a718"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1",
- "reference": "5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1ea878bd3af18f934dedb8c0de60656a9a31a718",
+ "reference": "1ea878bd3af18f934dedb8c0de60656a9a31a718",
"shasum": ""
},
"require": {
@@ -1874,20 +2328,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2019-03-30T15:58:42+00:00"
+ "time": "2019-05-01T08:36:31+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v4.2.5",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "e8b940bbeebf0f96789b5d17d9d77f8b2613960b"
+ "reference": "a7713bc522f1a1cdf0b39f809fa4542523fc3114"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e8b940bbeebf0f96789b5d17d9d77f8b2613960b",
- "reference": "e8b940bbeebf0f96789b5d17d9d77f8b2613960b",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a7713bc522f1a1cdf0b39f809fa4542523fc3114",
+ "reference": "a7713bc522f1a1cdf0b39f809fa4542523fc3114",
"shasum": ""
},
"require": {
@@ -1963,7 +2417,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2019-04-02T19:03:51+00:00"
+ "time": "2019-05-01T13:31:08+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -2260,16 +2714,16 @@
},
{
"name": "symfony/process",
- "version": "v4.2.5",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "1e6cbb41dadcaf29e0db034d6ad0d039a9df06e6"
+ "reference": "8cf39fb4ccff793340c258ee7760fd40bfe745fe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/1e6cbb41dadcaf29e0db034d6ad0d039a9df06e6",
- "reference": "1e6cbb41dadcaf29e0db034d6ad0d039a9df06e6",
+ "url": "https://api.github.com/repos/symfony/process/zipball/8cf39fb4ccff793340c258ee7760fd40bfe745fe",
+ "reference": "8cf39fb4ccff793340c258ee7760fd40bfe745fe",
"shasum": ""
},
"require": {
@@ -2305,20 +2759,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2019-03-10T20:07:02+00:00"
+ "time": "2019-04-10T16:20:36+00:00"
},
{
"name": "symfony/routing",
- "version": "v4.2.5",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "319f600c1ea0f981f6bdc2f042cfc1690957c0e0"
+ "reference": "f4e43bb0dff56f0f62fa056c82d7eadcdb391bab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/319f600c1ea0f981f6bdc2f042cfc1690957c0e0",
- "reference": "319f600c1ea0f981f6bdc2f042cfc1690957c0e0",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/f4e43bb0dff56f0f62fa056c82d7eadcdb391bab",
+ "reference": "f4e43bb0dff56f0f62fa056c82d7eadcdb391bab",
"shasum": ""
},
"require": {
@@ -2381,20 +2835,20 @@
"uri",
"url"
],
- "time": "2019-03-30T15:58:42+00:00"
+ "time": "2019-04-27T09:38:08+00:00"
},
{
"name": "symfony/translation",
- "version": "v4.2.5",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "e46933cc31b68f51f7fc5470fb55550407520f56"
+ "reference": "181a426dd129cb496f12d7e7555f6d0b37a7615b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/e46933cc31b68f51f7fc5470fb55550407520f56",
- "reference": "e46933cc31b68f51f7fc5470fb55550407520f56",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/181a426dd129cb496f12d7e7555f6d0b37a7615b",
+ "reference": "181a426dd129cb496f12d7e7555f6d0b37a7615b",
"shasum": ""
},
"require": {
@@ -2416,7 +2870,9 @@
"symfony/console": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/finder": "~2.8|~3.0|~4.0",
+ "symfony/http-kernel": "~3.4|~4.0",
"symfony/intl": "~3.4|~4.0",
+ "symfony/var-dumper": "~3.4|~4.0",
"symfony/yaml": "~3.4|~4.0"
},
"suggest": {
@@ -2454,20 +2910,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2019-04-01T14:13:08+00:00"
+ "time": "2019-05-01T12:55:36+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v4.2.5",
+ "version": "v4.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "9f87189ac10b42edf7fb8edc846f1937c6d157cf"
+ "reference": "3c4084cb1537c0e2ad41aad622bbf55a44a5c9ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9f87189ac10b42edf7fb8edc846f1937c6d157cf",
- "reference": "9f87189ac10b42edf7fb8edc846f1937c6d157cf",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3c4084cb1537c0e2ad41aad622bbf55a44a5c9ce",
+ "reference": "3c4084cb1537c0e2ad41aad622bbf55a44a5c9ce",
"shasum": ""
},
"require": {
@@ -2530,7 +2986,7 @@
"debug",
"dump"
],
- "time": "2019-02-23T15:17:42+00:00"
+ "time": "2019-05-01T12:55:36+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -2976,16 +3432,16 @@
},
{
"name": "myclabs/deep-copy",
- "version": "1.8.1",
+ "version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
+ "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
- "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
+ "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
"shasum": ""
},
"require": {
@@ -3020,7 +3476,7 @@
"object",
"object graph"
],
- "time": "2018-06-11T23:09:50+00:00"
+ "time": "2019-04-07T13:18:21+00:00"
},
{
"name": "nunomaduro/collision",
@@ -3244,16 +3700,16 @@
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "4.3.0",
+ "version": "4.3.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
+ "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
- "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
+ "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
"shasum": ""
},
"require": {
@@ -3291,7 +3747,7 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2017-11-30T07:14:17+00:00"
+ "time": "2019-04-30T17:48:53+00:00"
},
{
"name": "phpdocumentor/type-resolver",
@@ -3657,16 +4113,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "7.5.8",
+ "version": "7.5.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "c29c0525cf4572c11efe1db49a8b8aee9dfac58a"
+ "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c29c0525cf4572c11efe1db49a8b8aee9dfac58a",
- "reference": "c29c0525cf4572c11efe1db49a8b8aee9dfac58a",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/134669cf0eeac3f79bc7f0c793efbc158bffc160",
+ "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160",
"shasum": ""
},
"require": {
@@ -3737,7 +4193,7 @@
"testing",
"xunit"
],
- "time": "2019-03-26T13:23:54+00:00"
+ "time": "2019-04-19T15:50:46+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -3906,16 +4362,16 @@
},
{
"name": "sebastian/environment",
- "version": "4.1.0",
+ "version": "4.2.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656"
+ "reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6fda8ce1974b62b14935adc02a9ed38252eca656",
- "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/3095910f0f0fb155ac4021fc51a4a7a39ac04e8a",
+ "reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a",
"shasum": ""
},
"require": {
@@ -3930,7 +4386,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.1-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -3955,7 +4411,7 @@
"environment",
"hhvm"
],
- "time": "2019-02-01T05:27:49+00:00"
+ "time": "2019-04-25T07:55:20+00:00"
},
{
"name": "sebastian/exporter",
diff --git a/config/app.php b/config/app.php
index c9960cde..be0993e7 100644
--- a/config/app.php
+++ b/config/app.php
@@ -162,6 +162,7 @@
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
+
/*
* Package Service Providers...
*/
diff --git a/config/database.php b/config/database.php
index 9b30dc1f..be2fade5 100644
--- a/config/database.php
+++ b/config/database.php
@@ -46,12 +46,12 @@
'driver' => 'mysql',
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
- 'database' => env('DB_DATABASE', 'forge'),
- 'username' => env('DB_USERNAME', 'forge'),
+ 'database' => env('DB_DATABASE', 'sistemas'),
+ 'username' => env('DB_USERNAME', 'root'),
'password' => env('DB_PASSWORD', ''),
'unix_socket' => env('DB_SOCKET', ''),
- 'charset' => 'utf8mb4',
- 'collation' => 'utf8mb4_unicode_ci',
+ 'charset' => 'utf8',
+ 'collation' => 'utf8_unicode_ci',
'prefix' => '',
'prefix_indexes' => true,
'strict' => true,
diff --git a/config/services.php b/config/services.php
index f026b2c7..49246add 100644
--- a/config/services.php
+++ b/config/services.php
@@ -44,4 +44,13 @@
],
],
+ 'github' => [
+ 'client_id' => env('GITHUB_CLIENT_ID'),
+ 'client_secret' => env('GITHUB_CLIENT_SECRET'),
+ 'redirect' => env('GITHUB_URL'),
+],
+
+
+
+
];
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 4a3ba472..a21efd5e 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -18,7 +18,7 @@ public function up()
$table->string('name');
$table->string('email')->unique();
$table->timestamp('email_verified_at')->nullable();
- $table->string('password');
+ $table->string('password')->nullable();
$table->rememberToken();
$table->timestamps();
});
diff --git a/database/migrations/2019_04_29_161704_create_categorias_table.php b/database/migrations/2019_04_29_161704_create_categorias_table.php
new file mode 100644
index 00000000..b85edf0e
--- /dev/null
+++ b/database/migrations/2019_04_29_161704_create_categorias_table.php
@@ -0,0 +1,32 @@
+bigIncrements('id');
+ $table->string('categoria');
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('categorias');
+ }
+}
diff --git a/database/migrations/2019_04_29_170257_create_autos_table.php b/database/migrations/2019_04_29_170257_create_autos_table.php
new file mode 100644
index 00000000..2cb58521
--- /dev/null
+++ b/database/migrations/2019_04_29_170257_create_autos_table.php
@@ -0,0 +1,36 @@
+bigInteger('id');
+ $table->string('auto');
+ $table->string('categoria');
+ $table->integer('cv');
+ $table->boolean('publico');
+ $table->timestamps();
+ });
+
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('autos');
+ }
+}
diff --git a/database/migrations/2019_05_07_193029_datos_c.php b/database/migrations/2019_05_07_193029_datos_c.php
new file mode 100644
index 00000000..dd2e192f
--- /dev/null
+++ b/database/migrations/2019_05_07_193029_datos_c.php
@@ -0,0 +1,30 @@
+'Deportivos']);
+ App\categoria::create(['categoria'=>'Coleccion']);
+ App\categoria::create(['categoria'=>'Estandar']);
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ //
+ }
+}
diff --git a/public/css/estilo.css b/public/css/estilo.css
new file mode 100644
index 00000000..dc104e9e
--- /dev/null
+++ b/public/css/estilo.css
@@ -0,0 +1,35 @@
+.fondo{
+background-image: url(viper6.jpg);
+background-repeat: no-repeat;
+ width:auto;
+ height:auto;
+
+
+
+}
+.titulo{
+ text-align: center;
+
+ font-style: oblique;
+ font-weight: normal;
+ font-variant: small-caps;
+
+
+ font-family: "Arial", Times, serif;
+}
+
+.boton{
+
+ position: relative;
+
+ top: 150px;
+
+}
+
+.personal{
+
+ text-align: center;
+ font-family: "Arial", Times, serif;
+ font-style: oblique;
+
+}
\ No newline at end of file
diff --git a/public/css/stylecss.css b/public/css/stylecss.css
new file mode 100644
index 00000000..adb911d0
--- /dev/null
+++ b/public/css/stylecss.css
@@ -0,0 +1,50 @@
+ html, body {
+ background-color: #fff;
+ color: #636b6f;
+ font-family: 'Nunito', sans-serif;
+ font-weight: 200;
+ height: 100vh;
+ margin: 0;
+ }
+
+ .full-height {
+ height: 100vh;
+ }
+
+ .flex-center {
+ align-items: center;
+ display: flex;
+ justify-content: center;
+ }
+
+ .position-ref {
+ position: relative;
+ }
+
+ .top-right {
+ position: absolute;
+ right: 10px;
+ top: 18px;
+ }
+
+ .content {
+ text-align: center;
+ }
+
+ .title {
+ font-size: 84px;
+ }
+
+ .links > a {
+ color: #636b6f;
+ padding: 0 25px;
+ font-size: 13px;
+ font-weight: 600;
+ letter-spacing: .1rem;
+ text-decoration: none;
+ text-transform: uppercase;
+ }
+
+ .m-b-md {
+ margin-bottom: 30px;
+ }
\ No newline at end of file
diff --git a/public/css/viper6.jpg b/public/css/viper6.jpg
new file mode 100644
index 00000000..d4160268
Binary files /dev/null and b/public/css/viper6.jpg differ
diff --git a/resources/views/Coleccion.blade.php b/resources/views/Coleccion.blade.php
new file mode 100644
index 00000000..2ed06736
--- /dev/null
+++ b/resources/views/Coleccion.blade.php
@@ -0,0 +1,60 @@
+@extends('layouts.app')
+
+@section('content')
+
+
+
+
+ @foreach ($caters as $cater)
+
+
+
+
+
+
+
+ @foreach ($autos as $auto)
+ @if($auto->categoria==$cater->categoria)
+
+
+
+
+ Vehiculo
+ Potencia
+
+
+
+
+
+
+
+
+ {{$auto->auto}}
+ {{$auto->cv}}
+
+
+
+
+
+
+
+
+
+
+
+
+ @endif
+ @endforeach
+
+
+
+
+ @endforeach
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/Insertar.blade.php b/resources/views/Insertar.blade.php
new file mode 100644
index 00000000..6c6282b8
--- /dev/null
+++ b/resources/views/Insertar.blade.php
@@ -0,0 +1,19 @@
+@extends('layouts.app')
+
+@section('form')
+
+
+
+
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/ListasPublicas.blade.php b/resources/views/ListasPublicas.blade.php
new file mode 100644
index 00000000..6742fea4
--- /dev/null
+++ b/resources/views/ListasPublicas.blade.php
@@ -0,0 +1,28 @@
+
+@extends('layouts.app')
+
+
Coleccion
+@section('content')
+
+
+
+
+ #
+ Nombre
+ Email
+ Coleccion
+
+
+
+
+ @foreach ($users as $user)
+
+ {{$user->id}}
+ {{$user->name}}
+ {{$user->email}}
+ Obtener
+
+ @endforeach
+
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/Persona.blade.php b/resources/views/Persona.blade.php
new file mode 100644
index 00000000..c1d39494
--- /dev/null
+++ b/resources/views/Persona.blade.php
@@ -0,0 +1,17 @@
+@extends('layouts.app')
+
Inicio | About
+
+@section('content')
+
+
+
Informacion personal:
+
+ Integrantes: Gaston reyes
+ LU: 106878
+ Materia: INGENIERÍA DE APLICACIONES WEB
+ Año: 2019
+
+Esta pagina esta realizada con Laravel (Framework server) ,Bootstrap (Framework estilo ) y Socialite para el login
+
+
+@endsection
diff --git a/resources/views/auth/edit.blade.php b/resources/views/auth/edit.blade.php
new file mode 100644
index 00000000..6779d284
--- /dev/null
+++ b/resources/views/auth/edit.blade.php
@@ -0,0 +1,62 @@
+
+
+@extends('layouts.app')
+
Editar
+@section('content')
+
+@endsection
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
new file mode 100644
index 00000000..71886187
--- /dev/null
+++ b/resources/views/auth/login.blade.php
@@ -0,0 +1,79 @@
+@extends('layouts.app')
+
Login
+@section('content')
+
+@endsection
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
new file mode 100644
index 00000000..ccbee595
--- /dev/null
+++ b/resources/views/auth/passwords/email.blade.php
@@ -0,0 +1,47 @@
+@extends('layouts.app')
+
+@section('content')
+
+
+
+
+
+
+
+ @if (session('status'))
+
+ {{ session('status') }}
+
+ @endif
+
+
+
+
+
+
+
+@endsection
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
new file mode 100644
index 00000000..bf27f4c8
--- /dev/null
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -0,0 +1,65 @@
+@extends('layouts.app')
+
+@section('content')
+
+@endsection
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
new file mode 100644
index 00000000..66b6eb2f
--- /dev/null
+++ b/resources/views/auth/register.blade.php
@@ -0,0 +1,77 @@
+@extends('layouts.app')
+
Registro
+@section('content')
+
+@endsection
diff --git a/resources/views/auth/verify.blade.php b/resources/views/auth/verify.blade.php
new file mode 100644
index 00000000..71dc6b69
--- /dev/null
+++ b/resources/views/auth/verify.blade.php
@@ -0,0 +1,24 @@
+@extends('layouts.app')
+
Verificar Usuario
+@section('content')
+
+
+
+
+
+
+
+ @if (session('resent'))
+
+ {{ __('A fresh verification link has been sent to your email address.') }}
+
+ @endif
+
+ {{ __('Before proceeding, please check your email for a verification link.') }}
+ {{ __('If you did not receive the email') }},
{{ __('click here to request another') }} .
+
+
+
+
+
+@endsection
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
new file mode 100644
index 00000000..0e095b91
--- /dev/null
+++ b/resources/views/home.blade.php
@@ -0,0 +1,121 @@
+@extends('layouts.app')
+
+
+
Home | Tus vehiculos
+
+@section('content')
+
+
+
+
+
+
+
+
+
+
+ @foreach ($caters as $cater)
+
+
+
+
+
+
+
+ @foreach ($autos as $auto)
+ @if($auto->categoria==$cater->categoria)
+
+
+
+
+ Vehiculo
+ Potencia
+ Acciones
+
+
+
+
+
+
+
+ {{$auto->auto}}
+ {{$auto->cv}}
+
+
+ @if($auto->publico=='false')
+
+ @else
+
+ @endif
+
+
+
+
+
+
+ @endif
+ @endforeach
+
+
+
+ @endforeach
+
+
+
+
+
+@endsection
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
new file mode 100644
index 00000000..dd0096e6
--- /dev/null
+++ b/resources/views/layouts/app.blade.php
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @yield('content')
+
+
+
+
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 044b874c..868db495 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -4,94 +4,44 @@
-
Laravel
+
Inicio | bienvenido
+
+
-
-
+
+
-
-
+
+
+
@if (Route::has('login'))
@endif
+
+
+
+
diff --git a/routes/web.php b/routes/web.php
index 810aa349..67336e77 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -14,3 +14,31 @@
Route::get('/', function () {
return view('welcome');
});
+
+Auth::routes();
+
+Route::get('/home', 'HomeController@index')->name('home');
+
+Route::get('/ListasPublicas', 'UserController@index')->name('ListasPublicas');
+Route::get('/Coleccion/{id}', 'ColeccionController@index')->name('Coleccion');
+//Route::resource('Categorias','CategoriaController');
+Route::post('/Categorias/{id}', 'CategoriaController@store')->name('Categorias');
+//Route::get('/home/{nom}/{cate}','CategoriaController@destroy')->name('home')->middleware('auth');
+Route::delete('/home/{nom}/{cate}/{id}','CategoriaController@destroy')->middleware('auth');
+Route::put('/home/{nom}/{id}','CategoriaController@edit')->middleware('auth');
+Route::get('/Persona','PersonalController@index');
+
+//Route::get('/login{provider}','SocialAuthController@redirectToProvider');
+//Route::get('login/facebook', 'Auth\LoginController@redirectToProvider');
+//Route::get('login/facebook/callback', 'Auth\LoginController@handleProviderCallback');
+
+//Route::get('login/{provider}', 'Auth\LoginController@redirectToProvider');
+//Route::get('login/{provider}/callback', 'Auth\LoginController@handleProviderCallback');
+//PARA AGREGAR UNA CATEGORIA:
+Route::post('/Coleccion', 'ColeccionController@store')->name('Coleccion');
+//Route::post('/Coleccion/{nom}', 'ColeccionController@destroy')->name('Coleccion');
+
+Route::resource('users', 'UserController')->middleware('auth');
+
+
+
diff --git a/server.php b/server.php
deleted file mode 100644
index 5fb6379e..00000000
--- a/server.php
+++ /dev/null
@@ -1,21 +0,0 @@
-
- */
-
-$uri = urldecode(
- parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
-);
-
-// This file allows us to emulate Apache's "mod_rewrite" functionality from the
-// built-in PHP web server. This provides a convenient way to test a Laravel
-// application without having installed a "real" web server software here.
-if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
- return false;
-}
-
-require_once __DIR__.'/public/index.php';