Skip to content
This repository has been archived by the owner on Apr 12, 2020. It is now read-only.

Entrega Proyecto 1 #32

Open
wants to merge 53 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
f8a160c
probando cosas
AgusSuperi Apr 17, 2019
1f50545
cambios en las vistas
AgusSuperi Apr 19, 2019
8160228
tratando de hacer funcionar el editar
AgusSuperi Apr 22, 2019
24f7113
arreglando las listas
AgusSuperi Apr 30, 2019
8241af2
Procfile for Heroku
AgusSuperi Apr 30, 2019
af83bb9
Procfile for Heroku
AgusSuperi Apr 30, 2019
560cb03
probando heroku
AgusSuperi Apr 30, 2019
e2382fb
actualizando fotos
AgusSuperi Apr 30, 2019
3cdde7d
cambio inicio
AgusSuperi Apr 30, 2019
403548f
modificando url
AgusSuperi Apr 30, 2019
4ee152c
Update layout.blade.php
AgusSuperi Apr 30, 2019
d77ebcf
cambios en la url
AgusSuperi Apr 30, 2019
a728de2
Update editarPerfil.blade.php
AgusSuperi Apr 30, 2019
f47b6a6
Update editarPerfil.blade.php
AgusSuperi Apr 30, 2019
1993bae
Update editarPerfil.blade.php
AgusSuperi Apr 30, 2019
0bf0e50
Update editarPerfil.blade.php
AgusSuperi Apr 30, 2019
9c6e383
haciendo arreglos en el editar perfil
AgusSuperi Apr 30, 2019
394aab6
cambios en el validar email
AgusSuperi Apr 30, 2019
beafca2
cambiando el perfil publico
AgusSuperi Apr 30, 2019
2c82ee0
probando el asociar serie a una lista
AgusSuperi Apr 30, 2019
59de3ab
Update asociarLista.blade.php
AgusSuperi Apr 30, 2019
daeff98
Update miPerfil.blade.php
AgusSuperi May 1, 2019
c2b8b09
cambios en mi perfil
AgusSuperi May 1, 2019
3da6a08
Update miPerfil.css
AgusSuperi May 1, 2019
ccec29a
Update miPerfil.blade.php
AgusSuperi May 1, 2019
f502bb3
Update miPerfil.blade.php
AgusSuperi May 1, 2019
86c8390
Update miPerfil.css
AgusSuperi May 1, 2019
923b737
cambios en la vista
AgusSuperi May 1, 2019
b5c6606
cambios en perfil publico
AgusSuperi May 1, 2019
18710b1
Update perfilPublico.blade.php
AgusSuperi May 1, 2019
8c8571d
cambios en los botones
AgusSuperi May 1, 2019
73720fb
Update ControladorVistas.php
AgusSuperi May 1, 2019
96736bb
cambios en la vista mi perfil
AgusSuperi May 1, 2019
b6a160d
Update perfilPublico.blade.php
AgusSuperi May 1, 2019
6e2f5be
cambios miPerfil
AgusSuperi May 1, 2019
ce5d6cf
Cambios miPerfil
AgusSuperi May 1, 2019
7949a9f
Cambios asociarLista
AgusSuperi May 1, 2019
fdf11ac
cambios asociarLista
AgusSuperi May 1, 2019
20fe0a5
cambios asociarLista
AgusSuperi May 1, 2019
ec00c1e
cambios miPerfil
AgusSuperi May 1, 2019
7dca67a
cambios
AgusSuperi May 1, 2019
69a15f7
cambios
AgusSuperi May 1, 2019
7a90e91
cambios
AgusSuperi May 1, 2019
cd4cec5
cambios
AgusSuperi May 1, 2019
3060813
cambios
AgusSuperi May 1, 2019
e19d5e8
cambios
AgusSuperi May 1, 2019
db3e474
cambios miPerfil
AgusSuperi May 1, 2019
a5abdef
cambios
AgusSuperi May 1, 2019
39f06ed
cambios
AgusSuperi May 1, 2019
48282fe
cambios
AgusSuperi May 1, 2019
494c3ec
Update asociarLista.css
AgusSuperi May 1, 2019
2cb1325
cambios a la vista asociarLista
AgusSuperi May 1, 2019
9a9236f
ultimos cambios
AgusSuperi May 1, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: vendor/bin/heroku-php-apache2 public/
4 changes: 2 additions & 2 deletions app/Http/Controllers/Auth/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ class LoginController extends Controller
use AuthenticatesUsers;

/**
* Where to redirect users after login.
* Una vez logueado se redirecciona al perfil
*
* @var string
*/
protected $redirectTo = '/home';
protected $redirectTo = '/';

/**
* Create a new controller instance.
Expand Down
6 changes: 3 additions & 3 deletions app/Http/Controllers/Auth/RegisterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ class RegisterController extends Controller
use RegistersUsers;

/**
* Where to redirect users after registration.
* Una vez registrado se redirecciona al perfil
*
* @var string
*/
protected $redirectTo = '/home';
protected $redirectTo = '/';

/**
* Create a new controller instance.
Expand All @@ -51,7 +51,7 @@ protected function validator(array $data)
return Validator::make($data, [
'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'string', 'min:8', 'confirmed'],
'password' => ['required', 'string', 'min:6', 'confirmed'],
]);
}

Expand Down
44 changes: 44 additions & 0 deletions app/Http/Controllers/ControladorVistas.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use App\Series;
use App\User;
use App\ListaUsuarios;

class ControladorVistas extends Controller
{
public function index()
{
$lista = ListaUsuarios::where('publica','Si')->get();
return view('generales.index', ['lista'=> $lista]);
}

public function miPerfil(Request $request)
{
$user=User::find($request -> id);
$serie=$user->series;
$lista = $user->listas;
return view('perfil.miPerfil', ['serie'=> $serie], ['lista'=> $lista]);
}

public function editarPerfil()
{
return view('perfil.editarPerfil');
}

public function perfilPublico(Request $request)
{
$user=User::find($request -> id);
$lista=$user->listas;
return view('perfil.perfilPublico', ['lista'=> $lista],['usuario'=> $user]);
}

public function asociarLista(Request $request)
{
$serie=Series::find($request->id);
$user=User::find($serie->id_usuario);
$lista=$user->listas;
return view ('series.asociarLista',['serie'=> $serie],['lista'=> $lista]);
}
}
28 changes: 28 additions & 0 deletions app/Http/Controllers/HomeController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

namespace App\Http\Controllers;

use Illuminate\Http\Request;

class HomeController extends Controller
{
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth');
}

/**
* Show the application dashboard.
*
* @return \Illuminate\Contracts\Support\Renderable
*/
public function index()
{
return view('home');
}
}
123 changes: 123 additions & 0 deletions app/Http/Controllers/ListaUsuariosController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?php

namespace App\Http\Controllers;

use App\ListaUsuarios;
use App\Series;
use App\User;
use Illuminate\Http\Request;

class ListaUsuariosController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
//
}

/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create(Request $request)
{
return view('listas.create');
}

/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
$this -> validate(request(), [
'nombre_lista'=> 'required',
'publica'=> 'required',
]);
echo $request;
$lista = new ListaUsuarios();

$lista->nombre_lista = $request->nombre_lista;
$lista->publica = $request->publica;
$lista->idUsuario= $request->id_usuario;;

$lista->save();
$redireccion='/miPerfil/'.$lista->idUsuario;
return redirect($redireccion);
}

/**
* Display the specified resource.
*
* @param \App\ListaUsuarios $lista
* @return \Illuminate\Http\Response
*/
public function show(ListaUsuarios $lista)
{
//
}

/**
* Show the form for editing the specified resource.
*
* @param \App\ListaUsuarios $lista
* @return \Illuminate\Http\Response
*/
public function edit(ListaUsuarios $lista)
{
$user=User::find($lista->idUsuario);
$serie = $user->series;
return view('listas.editar', ['serie'=> $serie], ['lista'=> $lista]);
}

/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\ListaUsuarios $lista
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
$this -> validate(request(), [
'nombre_lista'=> 'required',
'publica'=> 'required',
]);

$lista = ListaUsuarios::find($id);
$lista ->nombre_lista = $request->nombre_lista;
$lista ->publica = $request->publica;
$lista->idUsuario = $request->id_usuario;

$lista->save();

$redireccion='/miPerfil/'.$lista->idUsuario;
return redirect($redireccion);
}

/**
* Remove the specified resource from storage.
*
* @param \App\SeriesCompartidas $seriesCompartidas
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
$lista = ListaUsuarios::find($id);
foreach ($lista->seriesAsociadas as $series)
{
$series->id_lista=NULL;
$series->save();
}
$lista->delete();
$redireccion='/miPerfil/'.$lista->idUsuario;
return redirect($redireccion);
}
}
132 changes: 132 additions & 0 deletions app/Http/Controllers/SeriesController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
<?php

namespace App\Http\Controllers;

use App\Series;
use Illuminate\Http\Request;

class SeriesController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
//
}

/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
return view('series.create');
}

/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
$this -> validate(request(), [
'nombre'=> 'required',
'temporadas'=> 'required',
'puntuacion'=> 'required',
'comentarios'=> 'required'
]);

$serie = new Series();

$serie->nombre = $request->nombre;
$serie->temporadas = $request->temporadas;
$serie->puntuacion= $request->puntuacion;
$serie->comentarios = $request->comentarios;
$serie->id_usuario = $request->id_usuario;

$serie->save();
$redireccion='/miPerfil/'.$request->id_usuario;
return redirect($redireccion);
}

/**
* Display the specified resource.
*
* @param \App\Series $series
* @return \Illuminate\Http\Response
*/
public function show(Series $series)
{
//
}

/**
* Show the form for editing the specified resource.
*
* @param \App\Series $series
* @return \Illuminate\Http\Response
*/
public function edit(Series $serie)
{
return view('series.editar', compact('serie'));
}

/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Series $serie
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
$this -> validate(request(), [
'nombre'=> 'required',
'temporadas'=> 'required',
'puntuacion'=> 'required',
'comentarios'=> 'required'
]);

$serie = Series::find($id);
$serie ->nombre = $request->nombre;
$serie ->temporadas = $request->temporadas;
$serie ->comentarios = $request->comentarios;
$serie ->puntuacion = $request->puntuacion;
$serie->id_usuario = $request->id_usuario;

$serie->save();

$redireccion='/miPerfil/'.$serie->id_usuario;
return redirect($redireccion);
}

/**
* Remove the specified resource from storage.
*
* @param \App\Series $series
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
$serie = Series::find($id);
$serie->delete();
$redireccion='/miPerfil/'.$serie->id_usuario;
return redirect($redireccion);
}

public function actualizarIdLista(Request $request)
{
$serie = Series::find($request->id_serie);
$serie->id_lista=$request->idLista;
$serie->save();
$redireccion='/miPerfil/'.$serie->id_usuario;
return redirect($redireccion);
}

}
Loading