Skip to content

Commit 648706a

Browse files
JhostinDJhostinD
committed
fixed news component html (app compilable)
1 parent f1ae815 commit 648706a

File tree

6 files changed

+11771
-60
lines changed

6 files changed

+11771
-60
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=123456
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=123456
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.component.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<header></header>
2-
<navBar></navBar>
2+
<!--navBar></navBar-->
33

4+
<home></home>
45

5-
<router-outlet></router-outlet>
6+
<!--router-outlet></router-outlet-->
67
<footer></footer>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<li class="nav-item"><a class="nav-link" href="/news">Noticias</a></li>
1616
<li class="nav-item"><a class="nav-link" href="/about">About</a></li>
1717

18-
<p *ngIf="!loginService.isLogged()"></p>
18+
<p *ngIf="!loginService.isLogged()"><!--/p-->
1919
<li class="nav-item dropdown">
2020
<a class="nav-link dropdown-toggle" id="navbarDropdownBlog" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">Sesión</a>
2121
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownBlog">
@@ -25,12 +25,12 @@
2525
</li>
2626
</p>
2727

28-
<p ngIf="loginService.isLogged()">
29-
<p ngIf="loginService.isAdmin()"></p>
30-
<li class="nav-item"><a class="nav-link" href="/admin">Administrador</a></li>
31-
</p>
32-
<li class="nav-item"><a class="nav-link" href="/userProfile">Perfil</a></li>
33-
</p>
28+
<a ngIf="loginService.isLogged()">
29+
<p ngIf="loginService.isAdmin()"><!--/p-->
30+
<li class="nav-item"><a class="nav-link" href="/admin">Administrador</a></li>
31+
</p>
32+
<li class="nav-item"><a class="nav-link" href="/userProfile">Perfil</a></li>
33+
</a>
3434
</ul>
3535
</div>
3636
</div>

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

Lines changed: 31 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1 class="fw-bolder fs-5 mb-4">Noticias destacadas</h1>
3434
<div class="container px-5">
3535
<h2 class="fw-bolder fs-5 mb-4">Noticias que te pueden interesar.</h2>
3636
<div id ="moreImages" class="row gx-5">
37-
{{>newsTemplate}}
37+
<!--newsTemplate></newsTemplate-->
3838
</div>
3939
<div class="text-end mb-5 mb-xl-0">
4040
<a class="text-decoration-none" href="#!">
@@ -51,7 +51,7 @@ <h2 class="fw-bolder fs-5 mb-4">Noticias que te pueden interesar.</h2>
5151

5252
</div>
5353
</section>
54-
<!--Sección-->
54+
<!--Section-->
5555
<section class="py-5 bg-light">
5656
<div class="container px-5">
5757
<div class="row gx-5">
@@ -89,69 +89,52 @@ <h3>Nuevas noticias sobre The Witcher 4</h3>
8989
<div class="py-5">
9090
<div class="col-lg-12 align-self-center">
9191
<div id="gamesDisplay" class="carousel slide" data-bs-ride="carousel">
92-
<!-- Indicators/dots -->
93-
<div class="carousel-indicators">
94-
<button type="button" data-bs-target="#gamesDisplay" data-bs-slide-to="0"
95-
class="active"></button>
96-
<button type="button" data-bs-target="#gamesDisplay"
97-
data-bs-slide-to="1"></button>
98-
<button type="button" data-bs-target="#gamesDisplay"
99-
data-bs-slide-to="2"></button>
100-
</div>
10192

10293
<!-- The slideshow/carousel -->
103-
<div class="carousel-inner">
104-
<div class="carousel-item active">
105-
<img src="Photos/diabloIV.jpg" alt="D4" class="d-block" style="width:100%">
106-
<div class="carousel-caption">
107-
<h3>Diablo 4</h3>
108-
<p>Fecha de lanzamiento revelada</p>
109-
</div>
94+
95+
<!--news *ngIf="imagesCarousel">
96+
<ng-template ngbSlide>
97+
<div class="picsum-img-wrapper">
98+
<img [src]="imagesCarousel[0]" alt="Random first slide">
99+
</div>
100+
<div class="carousel-caption">
101+
<h3>Diablo 4</h3>
102+
<p>Fecha de lanzamiento revelada</p>
103+
</div>
104+
</ng-template>
105+
<ng-template ngbSlide>
106+
<div class="picsum-img-wrapper">
107+
<img [src]="imagesCarousel[1]" alt="Random second slide">
110108
</div>
111-
<div class="carousel-item">
112-
<img src="Photos/overwatch2.jpg" alt="OVW2" class="d-block" style="width:100%">
113-
<div class="carousel-caption">
114-
<h3>Overwatch 2</h3>
115-
<p>Se cancela definitivamente</p>
116-
</div>
109+
<div class="carousel-caption">
110+
<h3>Overwatch 2</h3>
111+
<p>Se cancela definitivamente</p>
117112
</div>
118-
<div class="carousel-item">
119-
<img src="Photos/marioKart9.jpg"
120-
alt="MK9" class="d-block" style="width:100%">
121-
<div class="carousel-caption">
122-
<h3>Mario kart 9</h3>
123-
<p>Ya es una realidad, no te lo pierdas</p>
124-
</div>
113+
</ng-template>
114+
<ng-template ngbSlide>
115+
<div class="picsum-img-wrapper">
116+
<img [src]="imagesCarousel[2]" alt="Random third slide">
125117
</div>
126-
</div>
118+
<div class="carousel-caption">
119+
<h3>Mario kart 9</h3>
120+
<p>Ya es una realidad, no te lo pierdas</p>
121+
</div>
122+
</ng-template>
123+
</news-->
127124

128-
<!-- Left and right controls/icons -->
129-
<button class="carousel-control-prev" type="button"
130-
data-bs-target="#gamesDisplay" data-bs-slide="prev">
131-
<span class="carousel-control-prev-icon"></span>
132-
</button>
133-
<button class="carousel-control-next" type="button"
134-
data-bs-target="#gamesDisplay" data-bs-slide="next">
135-
<span class="carousel-control-next-icon"></span>
136-
</button>
137125
</div>
138126
</div>
139127
</div>
140128
</div>
141-
<!--Fin de la prueba-->
142129
</div>
143130
</div>
144-
</div>
145-
</div>
146131
</section>
147132

148-
</main>
149-
<!-- Footer-->
150-
{{>footer}}
133+
</main>-
151134
<!-- Bootstrap core JS-->
152135
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
153136
<!-- Core theme JS-->
154137
<script src="js/scripts.js"></script>
155138
</body>
156139

157-
</html>
140+
</html>

0 commit comments

Comments
 (0)