Merge branch 'Andrea' of https://github.com/CodeURJC-DAW-2021-22/webapp9 into Andrea

Author: ultramani

frontend/src/app/app.routing.ts

@@ -6,6 +6,7 @@ import { HomeComponent } from './components/home/home.component';
 import { NewsComponent } from './components/news/news.component';
 import { ShowNewsComponent } from './components/news/showNews.component';
 import { UserProfile } from './components/user/userProfile.component';
+import { LoginComponent } from './components/login/login.component';
 
 //aquí tenemos que completar todo lo que queremos que se vaya cargando en el router-outlet
 //ojo, el template no debe llamar al servicio, hay que hacerlo a través del componente
@@ -14,9 +15,10 @@ const appRoutes = [
     { path: 'home', component: HomeComponent },
     { path: 'news', component: NewsComponent },
     { path: 'showNews/:id', component: ShowNewsComponent},
-    { path: 'userProfile', component: UserProfile},
+    { path: 'userProfile/:id', component: UserProfile},
     { path: 'videogamecatalog', component: VideogameCatalogComponent },
     { path: 'videogame/:id', component: VideogameDetailComponent },
+    { path: 'login', component: LoginComponent},
     { path: '**', redirectTo: 'home', pathMatch: 'full' }
 
 ]

frontend/src/app/components/carousel/carousel.component.css

@@ -1,4 +1,5 @@
-<div *ngIf="user" class="container rounded bg-white mt-5 mb-5">
+<a>hola kk</a>
+<div class="container rounded bg-white mt-5 mb-5">
   <div class="row">
     <div class="col-md-3 border-right">
       <div class="d-flex flex-column align-items-center text-center p-3 py-5"><img class="rounded-circle mt-5"
@@ -12,7 +13,7 @@
 
     <div class="col-md-5 border-right">
       <div class="p-3 py-5">
-        <form *ngIf="user">
+        <form>
           <div class="d-flex justify-content-between align-items-center mb-3">
             <h4 class="text-right">Mi perfil: "{{user.nick}}"</h4>
           </div>
@@ -35,7 +36,6 @@ <h3>"{{user.lastName}}"</h3>
                 [(ngModel)]="user.email">
             </div>
 
-
             <div class="col-md-12"><label class="labels">Número de tarjeta</label>
               <input *ngIf="user.creditCard" name="creditCard" type="text" class="form-control" placeholder="123456789A"
                 [(ngModel)]="user.creditCard">