Skip to content

Commit b0fb440

Browse files
ultramaniultramani
committed
Merge branch 'Andrea' into mani
2 parents 9246af5 + 10b3cb5 commit b0fb440

33 files changed

+569
-393
lines changed

‎backend/gamelink/src/main/java/urjc/gamelink/Controllers/UserRestController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public ResponseEntity<Usero> createUser(Usero user, @RequestParam String passwor
8686

8787
// Modifies a user
8888
@PutMapping("/{id}")
89-
public ResponseEntity<Usero> updateUser(@PathVariable long id, Usero updatedUser)
89+
public ResponseEntity<Usero> updateUser(@PathVariable long id, @RequestParam Usero updatedUser)
9090
throws SQLException {
9191

9292
if (us.exist(id)) {

‎frontend/angular.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"src/assets"
2828
],
2929
"styles": [
30+
"node_modules/bootstrap/dist/css/bootstrap.min.css",
3031
"src/styles.css"
3132
],
3233
"scripts": []

‎frontend/package-lock.json‎

Lines changed: 290 additions & 256 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@
1515
"@angular/compiler": "~13.3.0",
1616
"@angular/core": "~13.3.0",
1717
"@angular/forms": "~13.3.0",
18+
"@angular/localize": "~13.3.0",
1819
"@angular/platform-browser": "~13.3.0",
1920
"@angular/platform-browser-dynamic": "~13.3.0",
2021
"@angular/router": "~13.3.0",
22+
"@ng-bootstrap/ng-bootstrap": "^12.1.1",
23+
"@popperjs/core": "^2.10.2",
2124
"bootstrap": "^5.1.3",
2225
"rxjs": "~7.5.0",
2326
"tslib": "^2.3.0",
@@ -37,4 +40,4 @@
3740
"karma-jasmine-html-reporter": "~1.7.0",
3841
"typescript": "~4.6.2"
3942
}
40-
}
43+
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
<!--AQUÍ NO HACE FALTA LA ETIQUETA HEAD, YA ESTÁ EN EL INDEX.HTML,
2-
O LA QUITAMOS DEL INDEX O LA QUITAMOS DE AQUÍ-->
3-
<!--head></head-->
41

52
<navBar></navBar>
63

7-
<!--tampoco hace falta <home></home>, porque ya el router-outlet ya lo muestra-->
84

95
<router-outlet></router-outlet>
106

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { HttpClientModule } from '@angular/common/http';
55
import {RouterModule} from '@angular/router';
66
import { routing } from './app.routing';
77

8+
89
import { AppComponent } from './app.component';
910
import { LoginComponent } from './components/login/login.component';
1011
import { HeadComponent } from './components/head/head.component';
@@ -20,13 +21,16 @@ import { VideogameCatalogComponent } from './components/videogame/videogame-cata
2021
import { VideogameEditFormComponent } from './components/videogame/videogame-edit-form.component';
2122
import { VideogamePurchaseComponent } from './components/videogame/videogame-purchase.component';
2223

24+
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
25+
import { CarouselComponent } from './components/carousel/carousel.component';
26+
import { AboutComponent } from './components/about/about.component';
2327

2428

2529

2630

2731
@NgModule({
28-
declarations: [AppComponent,VideogamePurchaseComponent,VideogameEditFormComponent, LoginComponent, HeadComponent, NewsComponent, NavBarComponent, FooterComponent, NewsTemplateComponent,VideogameCatalogComponent, ShowNewsComponent, HomeComponent, UserProfile,VideogameCardComponent],
29-
imports: [BrowserModule, FormsModule, HttpClientModule, routing, FormsModule,RouterModule],
32+
declarations: [AboutComponent,CarouselComponent,AppComponent,VideogamePurchaseComponent,VideogameEditFormComponent, LoginComponent, HeadComponent, NewsComponent, NavBarComponent, FooterComponent, NewsTemplateComponent,VideogameCatalogComponent, ShowNewsComponent, HomeComponent, UserProfile,VideogameCardComponent],
33+
imports: [BrowserModule,NgbModule, FormsModule, HttpClientModule, routing, FormsModule,RouterModule],
3034
bootstrap: [AppComponent]
3135
})
3236
export class AppModule { }

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import { HomeComponent } from './components/home/home.component';
88
import { NewsComponent } from './components/news/news.component';
99
import { ShowNewsComponent } from './components/news/showNews.component';
1010
import { UserProfile } from './components/user/userProfile.component';
11+
import { AboutComponent } from './components/about/about.component';
12+
import { LoginComponent } from './components/login/login.component';
13+
import { SignUpComponent } from './components/login/signUp.component';
1114

1215
//aquí tenemos que completar todo lo que queremos que se vaya cargando en el router-outlet
1316
//ojo, el template no debe llamar al servicio, hay que hacerlo a través del componente
@@ -21,6 +24,9 @@ const appRoutes = [
2124
{ path: 'videogame/:id', component: VideogameDetailComponent },
2225
{ path: 'videogame/edit/:id', component: VideogameEditFormComponent },
2326
{ path: 'videogame/:id/purchase/:id2', component: VideogamePurchaseComponent },
27+
{ path: 'about', component: AboutComponent },
28+
{ path: 'login', component: LoginComponent },
29+
{ path: 'signUp', component: SignUpComponent },
2430
{ path: '**', redirectTo: 'home', pathMatch: 'full' }
2531

2632
]

‎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+
}

0 commit comments

Comments
 (0)