Skip to content

Commit 40d6af9

Browse files
committed
carrousel arreglado
1 parent 45b8364 commit 40d6af9

File tree

16 files changed

+414
-296
lines changed

16 files changed

+414
-296
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=Juanluis-123
13+
spring.datasource.password=Nekowa10
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=Juanluis-123
13+
spring.datasource.password=Nekowa10
1414
spring.jpa.hibernate.ddl-auto=create-drop
1515

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

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: 5 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';
@@ -17,14 +18,16 @@ import { HomeComponent } from './components/home/home.component';
1718
import { UserProfile } from './components/user/userProfile.component';
1819
import { VideogameCardComponent } from './components/videogame/videogame-card.component';
1920
import { VideogameCatalogComponent } from './components/videogame/videogame-catalog.component';
21+
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
22+
import { CarouselComponent } from './components/carousel/carousel.component';
2023

2124

2225

2326

2427

2528
@NgModule({
26-
declarations: [AppComponent, LoginComponent, HeadComponent, NewsComponent, NavBarComponent, FooterComponent, NewsTemplateComponent,VideogameCatalogComponent, ShowNewsComponent, HomeComponent, UserProfile,VideogameCardComponent],
27-
imports: [BrowserModule, FormsModule, HttpClientModule, routing, FormsModule,RouterModule],
29+
declarations: [AppComponent, LoginComponent, HeadComponent, NewsComponent, NavBarComponent, FooterComponent, NewsTemplateComponent,VideogameCatalogComponent, ShowNewsComponent, HomeComponent, UserProfile,VideogameCardComponent, CarouselComponent],
30+
imports: [BrowserModule, FormsModule, HttpClientModule, routing, FormsModule,RouterModule, NgbModule],
2831
bootstrap: [AppComponent]
2932
})
3033
export class AppModule { }

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

Whitespace-only changes.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<ngb-carousel>
2+
<ng-template ngbSlide>
3+
<div class="picsum-img-wrapper">
4+
<img [src]="images[0]" alt="Random first slide">
5+
</div>
6+
<div class="carousel-caption">
7+
<h3>Lost Ark</h3>
8+
<p>Adentrate a un mundo de fantasia con tus amigos y lucha por la paz de Arkadia</p>
9+
</div>
10+
</ng-template>
11+
<ng-template ngbSlide>
12+
<div class="picsum-img-wrapper">
13+
<img [src]="images[1]" alt="Random second slide">
14+
</div>
15+
<div class="carousel-caption">
16+
<h3>Archeage 2</h3>
17+
<p>Si te gustó Archeage, este es tu juego</p>
18+
</div>
19+
</ng-template>
20+
<ng-template ngbSlide>
21+
<div class="picsum-img-wrapper">
22+
<img [src]="images[2]" alt="Random third slide">
23+
</div>
24+
<div class="carousel-caption">
25+
<h3>Leyendas Pokemon Arceus</h3>
26+
<p>Pokemon + mundo abierto, no hay nada más que decir.</p>
27+
</div>
28+
</ng-template>
29+
</ngb-carousel>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { Component, OnInit } from '@angular/core';
2+
import { NgbCarouselConfig } from '@ng-bootstrap/ng-bootstrap';
3+
4+
@Component({
5+
selector: 'app-carousel',
6+
templateUrl: './carousel.component.html',
7+
styleUrls: ['./carousel.component.css']
8+
})
9+
export class CarouselComponent implements OnInit {
10+
11+
images = ["assets/images/lostark.jpg", "assets/images/archeAge.jpg", "assets/images/pokemonArceus.jpg"]
12+
13+
constructor(private _config : NgbCarouselConfig) { }
14+
15+
ngOnInit(): void {
16+
}
17+
18+
}

0 commit comments

Comments
 (0)