Skip to content

Commit 6bde4ea

Browse files
Xarlifue360Xarlifue360
committed
Merge branch 'JuanFase3' of https://github.com/CodeURJC-DAW-2021-22/webapp9 into Carlos
2 parents 9d1db58 + c23f225 commit 6bde4ea

File tree

12 files changed

+308
-3
lines changed

12 files changed

+308
-3
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@ build/
5555

5656
### VS Code ###
5757
.vscode/
58+
backend/gamelink/docker-compose.yml

‎frontend/package-lock.json‎

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

‎frontend/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"@angular/platform-browser": "~13.3.0",
1919
"@angular/platform-browser-dynamic": "~13.3.0",
2020
"@angular/router": "~13.3.0",
21+
"bootstrap": "^5.1.3",
2122
"rxjs": "~7.5.0",
2223
"tslib": "^2.3.0",
2324
"zone.js": "~0.11.4"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ import { HttpClientModule } from '@angular/common/http';
66
import { AppComponent } from './app.component';
77
import { routing } from './app.routing';
88
import { LoginComponent } from './components/login/login.component';
9+
import { HeaderComponent } from './components/header/header.component';
10+
import { NewsComponent } from './components/news/news.component';
11+
import { NavBarComponent } from './components/navBar/navBar.component'
12+
913

1014
@NgModule({
11-
declarations: [AppComponent, LoginComponent],
15+
declarations: [AppComponent, LoginComponent, HeaderComponent, NewsComponent, NavBarComponent],
1216
imports: [BrowserModule, FormsModule, HttpClientModule, routing],
1317
bootstrap: [AppComponent]
1418
})

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<head>
2+
<meta charset="utf-8" />
3+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
4+
<meta name="description" content="" />
5+
<meta name="author" content="" />
6+
<title>GameLink</title>
7+
<!--Scripts-->
8+
<!--<script src="https://code.jquery.com/jquery-3.2.1.js"></script>-->
9+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
10+
<!-- Favicon-->
11+
<link rel="icon" type="image/x-icon" href="/assets/favicon.ico" />
12+
<!--PDF2-->
13+
<script src="/js/html2pdf.bundle.min.js"></script>
14+
<!-- Bootstrap icons-->
15+
<link href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css" rel="stylesheet" />
16+
<!-- Core theme CSS (includes Bootstrap)-->
17+
<link href="/css/styles.css" rel="stylesheet" />
18+
<!--Chart.js librarie-->
19+
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.7.1/chart.js"></script>
20+
</head>

‎frontend/src/app/components/header/header.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: 'header',
5+
templateUrl: './header.component.html'
6+
})
7+
8+
9+
export class HeaderComponent{
10+
11+
12+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ export class LoginComponent {
2020
this.loginService.logOut();
2121
}
2222

23-
}
23+
}

‎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: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { Component } from '@angular/core';
2+
import { LoginService } from 'src/app/services/login.service'
3+
4+
@Component({
5+
selector: 'navBar',
6+
templateUrl: './navBar.component.html'
7+
})
8+
9+
10+
export class NavBarComponent{
11+
12+
constructor(public loginService: LoginService){
13+
14+
}
15+
16+
}

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

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
5+
<body class="d-flex flex-column">
6+
<main class="flex-shrink-0">
7+
<section class="py-5">
8+
<div class="container px-5">
9+
<h1 class="fw-bolder fs-5 mb-4">Noticias destacadas</h1>
10+
<div class="card border-0 shadow rounded-3 overflow-hidden">
11+
<div class="card-body p-0">
12+
<div class="row gx-0">
13+
<div class="col-lg-6 col-xl-5 py-lg-5">
14+
<div class="p-4 p-md-5">
15+
<div class="badge bg-primary bg-gradient rounded-pill mb-2">Últimas novedades</div>
16+
<div class="h2 fw-bolder">Lanzamiento mundial de Lost Ark</div>
17+
<p>No seas el último en probar este maravilloso juego completamente gratuito. Aquí
18+
te contamos todo lo que debes saber.</p>
19+
</div>
20+
</div>
21+
<div class="col-lg-6 col-xl-7">
22+
<div class="bg-featured-blog"
23+
style="background-image: url('Photos/lostark.jpg')">
24+
</div>
25+
</div>
26+
</div>
27+
</div>
28+
</div>
29+
</div>
30+
</section>
31+
32+
<!--news list-->
33+
<section class="py-5">
34+
<div class="container px-5">
35+
<h2 class="fw-bolder fs-5 mb-4">Noticias que te pueden interesar.</h2>
36+
<div id ="moreImages" class="row gx-5">
37+
{{>newsTemplate}}
38+
</div>
39+
<div class="text-end mb-5 mb-xl-0">
40+
<a class="text-decoration-none" href="#!">
41+
<!--will show next-->
42+
<!-- puts the variable created in execution ?page and associates it with next page which is getNumber + 1 (that is, we add 1)-->
43+
<!--in request of we put (page, 3) and page will be equal to 1 for what I just explained above, this is how it is done-->
44+
<a id="moreImagesButton" class="btn btn-secondary button">
45+
<i class="fa fa-eye"></i> Más contenido
46+
</a>
47+
<div id="loader"></div>
48+
</a>
49+
</div>
50+
51+
52+
</div>
53+
</section>
54+
<!--Sección-->
55+
<section class="py-5 bg-light">
56+
<div class="container px-5">
57+
<div class="row gx-5">
58+
<div class="col-xl-8">
59+
<h2 class="fw-bolder fs-5 mb-4" style="color: white;">Actualidad</h2>
60+
<!-- News item-->
61+
<div class="mb-4">
62+
<div class="small text-muted"></div>
63+
<a class="link-dark" href="#!">
64+
<h3>No te pierdas las ultimas noticias de DayZ</h3>
65+
</a>
66+
</div>
67+
<!-- News item-->
68+
<div class="mb-5">
69+
<div class="small text-muted"></div>
70+
<a class="link-dark" href="#!">
71+
<h3>La última guía de Dark Souls ya está disponible</h3>
72+
</a>
73+
</div>
74+
<!-- News item-->
75+
<div class="mb-5">
76+
<div class="small text-muted"></div>
77+
<a class="link-dark" href="#!">
78+
<h3>Nuevas noticias sobre The Witcher 4</h3>
79+
</a>
80+
</div>
81+
<div class="text-end mb-5 mb-xl-0">
82+
<a class="text-decoration-none" href="#!">
83+
<!--More news
84+
<i class="bi bi-arrow-right"></i>-->
85+
</a>
86+
</div>
87+
</div>
88+
<div class="col-xl-4">
89+
<div class="py-5">
90+
<div class="col-lg-12 align-self-center">
91+
<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>
101+
102+
<!-- 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>
110+
</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>
117+
</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>
125+
</div>
126+
</div>
127+
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>
137+
</div>
138+
</div>
139+
</div>
140+
</div>
141+
<!--Fin de la prueba-->
142+
</div>
143+
</div>
144+
</div>
145+
</div>
146+
</section>
147+
148+
</main>
149+
<!-- Footer-->
150+
{{>footer}}
151+
<!-- Bootstrap core JS-->
152+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
153+
<!-- Core theme JS-->
154+
<script src="js/scripts.js"></script>
155+
</body>
156+
157+
</html>

0 commit comments

Comments
 (0)