Skip to content

Commit 5c6f130

Browse files
author
JLRR2019
committed
Intento de solucionar los errores
1 parent d4ea995 commit 5c6f130

13 files changed

+331
-326
lines changed

‎frontend/src/app/app.component.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
<header></header>
2-
1+
<head></head>
32
<navBar></navBar>
4-
<router-outlet></router-outlet>
3+
4+
<home></home>
5+
6+
<!--<router-outlet></router-outlet>-->
57
<footer></footer>

‎frontend/src/app/app.module.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,24 @@ import { BrowserModule } from '@angular/platform-browser';
22
import { FormsModule } from '@angular/forms';
33
import { NgModule, Component } from '@angular/core';
44
import { HttpClientModule } from '@angular/common/http';
5+
import { routing } from './app.routing';
56

67
import { AppComponent } from './app.component';
7-
import { routing } from './app.routing';
88
import { LoginComponent } from './components/login/login.component';
99
import { HeadComponent } from './components/head/head.component';
1010
import { NewsComponent } from './components/news/news.component';
1111
import { NavBarComponent } from './components/navBar/navBar.component';
1212
import { FooterComponent } from './components/footer/footer.component';
1313
import { NewsTemplateComponent } from './components/news/newsTemplate.component';
1414
import { ShowNewsComponent } from './components/news/showNews.component';
15+
import { HomeComponent } from './components/home/home.component';
1516

1617

17-
@NgModule({
18-
declarations: [AppComponent, LoginComponent, HeadComponent, NewsComponent, NavBarComponent, FooterComponent, NewsTemplateComponent, ShowNewsComponent],
19-
import { NavBarComponent } from './components/navBar/navBar.component'
20-
import { HomeComponent } from './components/home/home.component';
2118

2219

2320
@NgModule({
24-
declarations: [AppComponent, LoginComponent, HeaderComponent, NewsComponent, NavBarComponent, HomeComponent],
25-
imports: [BrowserModule, FormsModule, HttpClientModule, routing],
21+
declarations: [AppComponent, LoginComponent, HeadComponent, NewsComponent, NavBarComponent, FooterComponent, NewsTemplateComponent, ShowNewsComponent, HomeComponent],
22+
imports: [BrowserModule, FormsModule, HttpClientModule, routing, FormsModule],
2623
bootstrap: [AppComponent]
2724
})
2825
export class AppModule { }

‎frontend/src/app/app.routing.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Routes, RouterModule } from '@angular/router';
22

3-
import { NewsComponent } from './components/news/news.component';
3+
import { HomeComponent } from './components/home/home.component';
44

55
//aquí tenemos que completar todo lo que queremos que se vaya cargando en el router-outlet
66
//ojo, el template no debe llamar al servicio, hay que hacerlo a través del componente
77

88
const appRoutes = [
9-
{ path: 'news', component: NewsComponent }
9+
{ path: 'home', component: HomeComponent }
1010
]
1111

1212
export const routing = RouterModule.forRoot(appRoutes);

‎frontend/src/app/components/login/login.component.html‎

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,47 @@
1-
<section class="bg-light py-5">
2-
<div class="container px-5 my-5">
3-
<div class="text-center mb-5">
4-
<h1 class="fw-bolder text-white">Inicio de sesión</h1>
5-
<p class="lead fw-normal text-white-75 mb-0">Bienvenido cliente, ¡te estábamos esperando!</p>
6-
</div>
7-
<div class="row gx-10 justify-content-center">
8-
<div class="col-lg-12">
9-
<div class="card mb-5 mb-xl-0">
10-
<div class="card-body p-5">
11-
<div class="global-container">
12-
<div class="card login-form">
13-
<div class="card-body">
14-
<h3 class="card-title text-center">Login</h3>
15-
<div class="card-text">
16-
<form *ngIf="!loginService.isLogged()">
17-
<!-- to error: add class "has-danger" -->
18-
<div class="form-group">
19-
<label>Nombre Usuario:</label>
20-
<input #user type="text" name="username" class="form-control form-control-sm" placeholder="Username" id="exampleInputEmail1"><br />
21-
</div>
22-
<div class="form-group">
23-
<label>Contraseña</label>
24-
<input #pass type="password" name="password" class="form-control form-control-sm" placeholder="Password" id="exampleInputPassword1">
25-
<br />
26-
<a href="login" style="float:right;font-size:12px;">¿Olvidaste tu contraseña?</a>
27-
<br />
28-
</div>
29-
<!-- button to send the information-->
30-
<button type="submit" (click)="logIn($event, user.value, pass.value)" class="btn btn-default">Login</button>
31-
<div class="sign-up">
32-
¿No tienes cuenta? <a [routerLink]= "['/signup']">¡Créate una!</a>
33-
</div>
34-
</form>
35-
</div>
36-
</div>
37-
</div>
38-
</div>
39-
</div>
40-
</div>
41-
</div>
42-
</div>
1+
<section class="bg-light py-5">
2+
<div class="container px-5 my-5">
3+
<div class="text-center mb-5">
4+
<h1 class="fw-bolder text-white">Inicio de sesión</h1>
5+
<p class="lead fw-normal text-white-75 mb-0">Bienvenido cliente, ¡te estábamos esperando!</p>
6+
</div>
7+
<div class="row gx-10 justify-content-center">
8+
<div class="col-lg-12">
9+
<div class="card mb-5 mb-xl-0">
10+
<div class="card-body p-5">
11+
<div class="global-container">
12+
<div class="card login-form">
13+
<div class="card-body">
14+
<h3 class="card-title text-center">Login</h3>
15+
<div class="card-text">
16+
<form *ngIf="!loginService.isLogged()">
17+
<!-- to error: add class "has-danger" -->
18+
<div class="form-group">
19+
<label>Nombre Usuario:</label>
20+
<input #user type="text" name="username" class="form-control form-control-sm"
21+
placeholder="Username" id="exampleInputEmail1"><br />
22+
</div>
23+
<div class="form-group">
24+
<label>Contraseña</label>
25+
<input #pass type="password" name="password" class="form-control form-control-sm"
26+
placeholder="Password" id="exampleInputPassword1">
27+
<br />
28+
<a href="login" style="float:right;font-size:12px;">¿Olvidaste tu contraseña?</a>
29+
<br />
30+
</div>
31+
<!-- button to send the information-->
32+
<button type="submit" (click)="logIn($event, user.value, pass.value)"
33+
class="btn btn-default">Login</button>
34+
<div class="sign-up">
35+
¿No tienes cuenta? <a [routerLink]="['/signup']">¡Créate una!</a>
36+
</div>
37+
</form>
38+
</div>
4339
</div>
44-
</section>
40+
</div>
41+
</div>
42+
</div>
43+
</div>
44+
</div>
45+
</div>
46+
</div>
47+
</section>

‎frontend/src/app/components/login/signUp.component.html‎

Lines changed: 62 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,63 @@
1-
<section class="bg-light py-5">
2-
<div class="container px-5 my-5">
3-
<div class="text-center mb-5">
4-
<h1 class="fw-bolder text-white">Registrate gratis</h1>
5-
<p class="lead fw-normal text-white-75 mb-0">¿No estás registrado todavía? Rellena los formularios y disfruta de una experiencia personalizada en nuestra web.</p>
6-
</div>
7-
<div class="row gx-10 justify-content-center">
8-
9-
<div class="col-lg-12">
10-
<div class="card mb-5 mb-xl-0">
11-
<div class="card-body p-5">
12-
<div class="global-container">
13-
<div class="card login-form">
14-
<div class="card-body">
15-
<h3 class="card-title text-center">Registro</h3>
16-
<div class="card-text">
17-
<form *ngIf="!loginService.isLogged()">
18-
<div class="form-group">
19-
<label for="exampleInputEmail1">Nick</label>
20-
<input #nick name="nick" type="text" class="form-control form-control-sm" id="exampleInputEmail1" required>
21-
</div>
22-
<div class="form-group">
23-
<label for="exampleInputEmail1">Nombre</label>
24-
<input #name name="name" type="text" class="form-control form-control-sm" id="exampleInputEmail1" aria-describedby="emailHelp" required>
25-
</div>
26-
<div class="form-group">
27-
<label for="exampleInputEmail1">Apellidos</label>
28-
<input #lastName name="lastName" type="text" class="form-control form-control-sm" id="exampleInputEmail1" aria-describedby="emailHelp" required>
29-
</div>
30-
<div class="form-group">
31-
<label for="exampleInputEmail1">Correo electrónico</label>
32-
<input #email name="email" type="email" class="form-control form-control-sm" id="exampleInputEmail1" required>
33-
</div>
34-
<div class="form-group">
35-
<label for="exampleInputPassword1">Contraseña</label>
36-
<input #pass name="password" type="password" class="form-control form-control-sm" id="inputPassword1" onkeyup="check()" required>
37-
</div>
38-
<div class="form-group">
39-
<label for="exampleInputPassword1">Confirmación contraseña</label>
40-
<input #pass type="password" class="form-control form-control-sm" id="inputPassword2" onkeyup="check()" required>
41-
<span id="passwordMessage"></span>
42-
</div>
43-
<button type="submit" (click)="createUser($event, nick.value, name.value, lastName.value, email.value,
44-
pass.value)" class="btn btn-default">registrarse</button>
45-
</form>
46-
</div>
47-
</div>
48-
</div>
49-
</div>
50-
</div>
51-
</div>
52-
</div>
53-
</div>
1+
<section class="bg-light py-5">
2+
<div class="container px-5 my-5">
3+
<div class="text-center mb-5">
4+
<h1 class="fw-bolder text-white">Registrate gratis</h1>
5+
<p class="lead fw-normal text-white-75 mb-0">¿No estás registrado todavía? Rellena los formularios y disfruta de
6+
una experiencia personalizada en nuestra web.</p>
7+
</div>
8+
<div class="row gx-10 justify-content-center">
9+
10+
<div class="col-lg-12">
11+
<div class="card mb-5 mb-xl-0">
12+
<div class="card-body p-5">
13+
<div class="global-container">
14+
<div class="card login-form">
15+
<div class="card-body">
16+
<h3 class="card-title text-center">Registro</h3>
17+
<div class="card-text">
18+
<form *ngIf="!loginService.isLogged()">
19+
<div class="form-group">
20+
<label for="exampleInputEmail1">Nick</label>
21+
<input #nick name="nick" type="text" class="form-control form-control-sm"
22+
id="exampleInputEmail1" required>
23+
</div>
24+
<div class="form-group">
25+
<label for="exampleInputEmail1">Nombre</label>
26+
<input #name name="name" type="text" class="form-control form-control-sm"
27+
id="exampleInputEmail1" aria-describedby="emailHelp" required>
28+
</div>
29+
<div class="form-group">
30+
<label for="exampleInputEmail1">Apellidos</label>
31+
<input #lastName name="lastName" type="text" class="form-control form-control-sm"
32+
id="exampleInputEmail1" aria-describedby="emailHelp" required>
33+
</div>
34+
<div class="form-group">
35+
<label for="exampleInputEmail1">Correo electrónico</label>
36+
<input #email name="email" type="email" class="form-control form-control-sm"
37+
id="exampleInputEmail1" required>
38+
</div>
39+
<div class="form-group">
40+
<label for="exampleInputPassword1">Contraseña</label>
41+
<input #pass name="password" type="password" class="form-control form-control-sm"
42+
id="inputPassword1" onkeyup="check()" required>
43+
</div>
44+
<div class="form-group">
45+
<label for="exampleInputPassword1">Confirmación contraseña</label>
46+
<input #pass type="password" class="form-control form-control-sm" id="inputPassword2"
47+
onkeyup="check()" required>
48+
<span id="passwordMessage"></span>
49+
</div>
50+
<button type="submit" (click)="createUser($event, nick.value, name.value, lastName.value, email.value,
51+
pass.value)"
52+
class="btn btn-default">registrarse</button>
53+
</form>
54+
</div>
5455
</div>
55-
</section>
56+
</div>
57+
</div>
58+
</div>
59+
</div>
60+
</div>
61+
</div>
62+
</div>
63+
</section>

0 commit comments

Comments
 (0)