Skip to content

Commit 0a157e1

Browse files
andrecupaandrecupa
committed
Merge remote-tracking branch 'origin/Jhostin' into Andrea
2 parents fc2ca99 + d99504a commit 0a157e1

20 files changed

+156
-116
lines changed

‎backend/gamelink/src/main/resources/application.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spring.mustache.suffix=.html
1010

1111
spring.datasource.url=jdbc:postgresql://localhost:5432/gamelink
1212
spring.datasource.username=postgres
13-
spring.datasource.password=Nekowa10
13+
spring.datasource.password=password
1414
spring.jpa.hibernate.ddl-auto=create-drop
1515

1616
logging.level.org.springframework.security=DEBUG

‎backend/gamelink/target/classes/application.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spring.mustache.suffix=.html
1010

1111
spring.datasource.url=jdbc:postgresql://localhost:5432/gamelink
1212
spring.datasource.username=postgres
13-
spring.datasource.password=Nekowa10
13+
spring.datasource.password=password
1414
spring.jpa.hibernate.ddl-auto=create-drop
1515

1616
logging.level.org.springframework.security=DEBUG

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ import { VideogameCardComponent } from './components/videogame/videogame-card.co
2020
import { VideogameCatalogComponent } from './components/videogame/videogame-catalog.component';
2121
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
2222
import { CarouselComponent } from './components/carousel/carousel.component';
23+
import { AboutComponent } from './components/about/about.component';
2324

2425

2526

2627

2728
@NgModule({
28-
declarations: [UserProfile,AppComponent, LoginComponent, HeadComponent, NewsComponent, NavBarComponent, FooterComponent, NewsTemplateComponent,VideogameCatalogComponent, ShowNewsComponent, HomeComponent, UserProfile,VideogameCardComponent, CarouselComponent],
29+
declarations: [UserProfile,AppComponent, LoginComponent, HeadComponent, NewsComponent, NavBarComponent, FooterComponent, NewsTemplateComponent,VideogameCatalogComponent, ShowNewsComponent, HomeComponent, UserProfile,VideogameCardComponent, CarouselComponent, AboutComponent],
2930
imports: [BrowserModule, FormsModule, HttpClientModule, routing, FormsModule,RouterModule, NgbModule],
3031
bootstrap: [AppComponent]
3132
})

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import { HomeComponent } from './components/home/home.component';
66
import { NewsComponent } from './components/news/news.component';
77
import { ShowNewsComponent } from './components/news/showNews.component';
88
import { UserProfile } from './components/user/userProfile.component';
9+
import { AboutComponent } from './components/about/about.component';
910
import { LoginComponent } from './components/login/login.component';
11+
import { SignUpComponent } from './components/login/signUp.component';
1012

1113
//aquí tenemos que completar todo lo que queremos que se vaya cargando en el router-outlet
1214
//ojo, el template no debe llamar al servicio, hay que hacerlo a través del componente
@@ -18,7 +20,9 @@ const appRoutes = [
1820
{ path: 'userProfile/:id', component: UserProfile},
1921
{ path: 'videogamecatalog', component: VideogameCatalogComponent },
2022
{ path: 'videogame/:id', component: VideogameDetailComponent },
21-
{ path: 'login', component: LoginComponent},
23+
{ path: 'about', component: AboutComponent },
24+
{ path: 'login', component: LoginComponent },
25+
{ path: 'signUp', component: SignUpComponent },
2226
{ path: '', redirectTo: 'home', pathMatch: 'full' }
2327

2428
]

‎frontend/src/app/components/about/about.component.css‎

Whitespace-only changes.

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

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<!--body class="d-flex flex-column"-->
2+
<main class="flex-shrink-0">
3+
<!-- Header-->
4+
<div class="py-5">
5+
<div class="container px-5">
6+
<div class="row justify-content-center">
7+
<div class="col-lg-8 col-xxl-6">
8+
<div class="text-center my-5">
9+
<h1 class="fw-bolder mb-3">¡Nosotros nos encargamos de informarte!</h1>
10+
<p class="lead fw-normal text-black-75 mb-4">Nuestro objetivo es mantenerte dentro del mundo
11+
de los videojuegos con un solo click.</p>
12+
</div>
13+
</div>
14+
</div>
15+
</div>
16+
</div>
17+
<!-- About section one-->
18+
<section class="py-5 bg-light" id="scroll-target">
19+
<div class="container px-5 my-5">
20+
<div class="row gx-5 align-items-center">
21+
<div class="col-lg-6"><img class="img-fluid rounded mb-5 mb-lg-0" [src]="'/assets/images/AllAvatar.png'"
22+
alt="..." /></div>
23+
<div class="col-lg-6">
24+
<h2 class="fw-bolder text-white">¿Quienes somos?</h2>
25+
<p class="lead fw-normal text-white-75 mb-0">Somos un pequeño grupo de desarrollo software
26+
apasionados por los videojuegos. Al igual que todos nuestros lectores necesitábamos un sitio
27+
donde informarnos sobre videojuegos pero también poder comprarlos, y con las mejores
28+
ofertas...como no lo encontramos, ¡lo hicimos!</p>
29+
</div>
30+
</div>
31+
</div>
32+
</section>
33+
<!-- About section two-->
34+
<section class="py-5">
35+
<div class="container px-5 my-5">
36+
<div class="row gx-5 align-items-center">
37+
<div class="col-lg-6 order-first order-lg-last"><img class="img-fluid rounded mb-5 mb-lg-0"
38+
[src]="'/assets/images/rocketPhoto.png'" alt="..." /></div>
39+
<div class="col-lg-6">
40+
<h2 class="fw-bolder">Crecimiento &amp; Desarrollo</h2>
41+
<p class="lead fw-normal text-black-75 mb-0">Poco a poco hemos ido creciendo y con vuestra ayuda
42+
ya somos más de ¡10.000! usuarios. Gracias a esto hemos ido desarrollandonos desde una
43+
pequeña Web para visualizar noticias hasta ser los primeros en traer exclusivas noticias y
44+
jugosos descuentos. ¡GRACIAS!</p>
45+
</div>
46+
</div>
47+
</div>
48+
</section>
49+
<!-- Team members section-->
50+
<section class="py-5 bg-light">
51+
<div class="container px-5 my-5">
52+
<div class="text-center">
53+
<h2 class="fw-bolder text-white">Nuestro equipo</h2>
54+
<p class="lead fw-normal text-white-75 mb-5">Dedicados a la calidad y el éxito</p>
55+
</div>
56+
<div class="row gx-5 row-cols-1 row-cols-sm-2 row-cols-xl-4 justify-content-center">
57+
<div class="col mb-5 mb-5 mb-xl-0">
58+
<div class="text-center">
59+
<!-- FALTAN LAS CARICATURAS DE-->
60+
<img class="img-fluid rounded-circle mb-4 px-4" [src]="'/assets/images/AndreasAvatar.PNG'" alt="..." />
61+
<h5 class="fw-bolder text-white">Andrea Acuña</h5>
62+
<div class="fst-italic text-white-75">Desarrolladora &amp; CEO</div>
63+
</div>
64+
</div>
65+
<div class="col mb-5 mb-5 mb-xl-0">
66+
<div class="text-center">
67+
<img class="img-fluid rounded-circle mb-4 px-4" [src]="'/assets/images/JhostinsAvatar.PNG'" alt="..." />
68+
<h5 class="fw-bolder text-white">Jhostin Davis</h5>
69+
<div class="fst-italic text-white-75">Desarrollador &amp; CFO</div>
70+
</div>
71+
</div>
72+
<div class="col mb-5 mb-5 mb-sm-0">
73+
<div class="text-center">
74+
<img class="img-fluid rounded-circle mb-4 px-4" [src]="'/assets/images/ManisAvatar.png'" alt="..." />
75+
<h5 class="fw-bolder text-white">Mani Patel</h5>
76+
<div class="fst-italic text-white-75">Desarrollador &amp; Manager</div>
77+
</div>
78+
</div>
79+
<div class="col mb-5 mb-5 mb-sm-0">
80+
<div class="text-center">
81+
<img class="img-fluid rounded-circle mb-4 px-4" [src]="'/assets/images/JuansAvatar.PNG'" alt="..." />
82+
<h5 class="fw-bolder text-white">Juan Rico</h5>
83+
<div class="fst-italic text-white-75">Desarrollador &amp; Operations Manager</div>
84+
</div>
85+
</div>
86+
<div class="col mb-5">
87+
<div class="text-center">
88+
<img class="img-fluid rounded-circle mb-4 px-4" [src]="'/assets/images/CarlossAvatar.PNG'" alt="..." />
89+
<h5 class="fw-bolder text-white">Carlos Fuentes</h5>
90+
<div class="fst-italic text-white-75">Desarrollador &amp; CTO</div>
91+
</div>
92+
</div>
93+
</div>
94+
</div>
95+
</section>
96+
</main>
97+
<!--/body-->

‎frontend/src/app/components/about/about.component.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { Component, OnInit } from '@angular/core';
2+
3+
@Component({
4+
selector: 'app-about',
5+
templateUrl: './about.component.html',
6+
styleUrls: ['./about.component.css']
7+
})
8+
export class AboutComponent implements OnInit {
9+
10+
constructor() { }
11+
12+
ngOnInit(): void {
13+
}
14+
15+
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ <h3 class="card-title text-center">Login</h3>
2525
<input #pass type="password" name="password" class="form-control form-control-sm"
2626
placeholder="Password" id="exampleInputPassword1">
2727
<br />
28-
<a href="login" style="float:right;font-size:12px;">¿Olvidaste tu contraseña?</a>
2928
<br />
3029
</div>
3130
<!-- button to send the information-->
32-
<button type="submit" (click)="logIn($event, user.value, pass.value)"
33-
class="btn btn-default">Login</button>
31+
<a class="btn btn-primary btn-lg px-4 me-sm-3" type="submit" (click)="logIn($event, user.value, pass.value)">Login</a>
3432
<div class="sign-up">
35-
¿No tienes cuenta? <a [routerLink]="['/signup']">¡Créate una!</a>
33+
¿No tienes cuenta? <a [routerLink]="['/signUp']">¡Créate una!</a>
3634
</div>
3735
</form>
3836
</div>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h1 class="fw-bolder text-white">Registrate gratis</h1>
1515
<div class="card-body">
1616
<h3 class="card-title text-center">Registro</h3>
1717
<div class="card-text">
18-
<form *ngIf="!loginService.isLogged()">
18+
<form>
1919
<div class="form-group">
2020
<label for="exampleInputEmail1">Nick</label>
2121
<input #nick name="nick" type="text" class="form-control form-control-sm"
@@ -47,9 +47,8 @@ <h3 class="card-title text-center">Registro</h3>
4747
onkeyup="check()" required>
4848
<span id="passwordMessage"></span>
4949
</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>
50+
<a type="submit" (click)="createUser($event, nick.value, name.value, lastName.value, email.value,
51+
pass.value)" class="btn btn-primary btn-lg px-4 me-sm-3">registrarse</a>
5352
</form>
5453
</div>
5554
</div>

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

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,14 @@
55
<div class="collapse navbar-collapse" id="navbarSupportedContent">
66
<ul class="navbar-nav ms-auto mb-2 mb-lg-0">
77
<li class="nav-item"><a class="nav-link" href="/">Inicio</a></li>
8-
<li class="nav-item dropdown">
9-
<a class="nav-link dropdown-toggle" id="navbarDropdownBlog" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">Videojuegos</a>
10-
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownBlog">
11-
<li><a class="dropdown-item" [routerLink]="['/videogame']">Descubrir</a></li>
12-
<li><a class="dropdown-item" [routerLink]="['/videogameStatistics/0']">Top Juegos</a></li>
13-
</ul>
14-
</li>
8+
<li class="nav-item"><a class="nav-link" [routerLink]="['/videogamecatalog']">Descubrir Juegos</a></li>
9+
<li class="nav-item"><a class="nav-link" [routerLink]="['/videogameStatistics/0']">Top Juegos</a></li>
1510
<li class="nav-item"><a class="nav-link" [routerLink]="['/news']">Noticias</a></li>
1611
<li class="nav-item"><a class="nav-link" [routerLink]="['/about']">About</a></li>
17-
18-
19-
20-
<li *ngIf="! loginService.isLogged()" class="nav-item dropdown">
21-
<a class="nav-link dropdown-toggle" id="navbarDropdownBlog" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">Sesión</a>
22-
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownBlog">
23-
<li><a class="dropdown-item" [routerLink]="['/login']">Iniciar sesión</a></li>
24-
<li><a class="dropdown-item" [routerLink]="['/signin']">Registrarse</a></li>
25-
</ul>
26-
</li>
27-
28-
<a *ngIf="loginService.isLogged()">
29-
<li class="nav-item"><a class="nav-link" [routerLink]="['/userProfile']">Perfil</a></li>
30-
<p *ngIf="loginService.isAdmin()">
31-
<li class="nav-item"><a class="nav-link" [routerLink]="['/admin']">Administrador</a></li>
32-
</p>
33-
34-
</a>
12+
<li *ngIf="! loginService.isLogged()" class="nav-item"><a class="nav-link" [routerLink]="['/login']">Iniciar sesión</a></li>
13+
<li *ngIf="! loginService.isLogged()" class="nav-item"><a class="nav-link" [routerLink]="['/signUp']">Registrarse</a></li>
14+
<li *ngIf="loginService.isLogged()" class="nav-item"><a class="nav-link" [routerLink]="['/userProfile']">Perfil</a></li>
15+
<li *ngIf="loginService.isAdmin() && loginService.isLogged()" class="nav-item"><a class="nav-link" [routerLink]="['/admin']">Administrador</a></li>
3516
</ul>
3617
</div>
3718
</div>

0 commit comments

Comments
 (0)