Skip to content

Commit 8fb5d79

Browse files
author
juanl
committed
navBar Realizado
1 parent 269435b commit 8fb5d79

File tree

4 files changed

+59
-13
lines changed

4 files changed

+59
-13
lines changed

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
2+
<div class="container px-5">
3+
<a class="navbar-brand" href="/">GameLink</a>
4+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
5+
<div class="collapse navbar-collapse" id="navbarSupportedContent">
6+
<ul class="navbar-nav ms-auto mb-2 mb-lg-0">
7+
<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" href="/videogame">Descubrir</a></li>
12+
<li><a class="dropdown-item" href="/videogameStatistics/0">Top Juegos</a></li>
13+
</ul>
14+
</li>
15+
<li class="nav-item"><a class="nav-link" href="/news">Noticias</a></li>
16+
<li class="nav-item"><a class="nav-link" href="/about">About</a></li>
17+
18+
<p *ngIf="!loginService.isLogged()"></p>
19+
<li class="nav-item dropdown">
20+
<a class="nav-link dropdown-toggle" id="navbarDropdownBlog" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">Sesión</a>
21+
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownBlog">
22+
<li><a class="dropdown-item" href="/login">Iniciar sesión</a></li>
23+
<li><a class="dropdown-item" href="/signin">Registrarse</a></li>
24+
</ul>
25+
</li>
26+
</p>
27+
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>
34+
</ul>
35+
</div>
36+
</div>
37+
</nav>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { Component } from '@angular/core';
2+
3+
@Component({
4+
selector: 'navBar',
5+
templateUrl: './navBar.component.html'
6+
})
7+
8+
9+
export class HeaderComponent{
10+
11+
12+
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44

55
<body class="d-flex flex-column">
66
<main class="flex-shrink-0">
7-
<!-- Navigation-->
8-
{{>navBar}}
9-
<!-- Page Content-->
107
<section class="py-5">
118
<div class="container px-5">
129
<h1 class="fw-bolder fs-5 mb-4">Noticias destacadas</h1>

‎frontend/src/app/services/news.service.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class NewsService {
2121

2222
getNews(): Observable<News[]> {
2323
return this.httpClient.get(URL).pipe(
24-
//catchError(error => this.handleError(error))
24+
catchError((error: any) => this.handleError(error))
2525
) as Observable<News[]>;
2626
}
2727

@@ -53,7 +53,7 @@ export class NewsService {
5353
//getNewById
5454
getNew(id: number): Observable<News> {
5555
return this.httpClient.get(URL + id).pipe(
56-
//catchError(error => this.handleError(error))
56+
catchError((error: any) => this.handleError(error))
5757
) as Observable<News>;
5858
}
5959

@@ -80,7 +80,7 @@ export class NewsService {
8080
);
8181
} else { //else, if exists, this method update the existing book
8282
return this.httpClient.put(URL + news.id, news).pipe( //put(location, object to be located in the location) (en lo primero mete lo segundo, vamos)
83-
//catchError(error => this.handleError(error))
83+
catchError((error: any) => this.handleError(error))
8484
);
8585
}
8686
}
@@ -111,7 +111,7 @@ export class NewsService {
111111

112112
updateNew(news: News){
113113
return this.httpClient.put(URL + news.id, news).pipe(
114-
//catchError(error => this.handleError(error))
114+
catchError((error: any) => this.handleError(error))
115115
);
116116
}
117117

@@ -132,7 +132,7 @@ export class NewsService {
132132

133133
deleteNew(news: News) {
134134
return this.httpClient.delete(URL + news.id).pipe(
135-
//catchError(error => this.handleError(error))
135+
catchError((error: any) => this.handleError(error))
136136
);
137137
}
138138

@@ -158,7 +158,7 @@ export class NewsService {
158158
uploadNewImage(news: News, formData: FormData) {
159159
return this.httpClient.post(URL + news.id + '/image', formData)
160160
.pipe(
161-
//catchError(error => this.handleError(error))
161+
catchError((error: any) => this.handleError(error))
162162
);
163163
}
164164

@@ -185,7 +185,7 @@ export class NewsService {
185185
downloadNewImage(news: News) {
186186
return this.httpClient.get(URL + news.id + '/image')
187187
.pipe(
188-
//catchError(error => this.handleError(error))
188+
catchError((error: any) => this.handleError(error))
189189
);
190190
}
191191

@@ -208,7 +208,7 @@ export class NewsService {
208208
deleteNewImage(news: News) {
209209
return this.httpClient.delete(URL + news.id + '/image')
210210
.pipe(
211-
//catchError(error => this.handleError(error))
211+
catchError((error: any) => this.handleError(error)) //en esta versión de angular tenemos que definir todas las variables
212212
);
213213
}
214214

@@ -237,10 +237,10 @@ export class NewsService {
237237
}
238238
*/
239239

240-
/*private handleError(error: any) {
240+
private handleError(error: any) {
241241
console.log("ERROR:");
242242
console.error(error);
243243
return throwError("Server error (" + error.status + "): " + error.text())
244-
}*/
244+
}
245245

246246
}

0 commit comments

Comments
 (0)