Skip to content

Commit 911e51c

Browse files
Xarlifue360Xarlifue360
committed
Merge branch 'JuanFase3' of https://github.com/CodeURJC-DAW-2021-22/webapp9 into Carlos
2 parents c466689 + ac3e4cd commit 911e51c

38 files changed

+12607
-353
lines changed

‎backend/gamelink/Docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
environment:
88
- SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/gamelink
99
- SPRING_DATASOURCE_USERNAME=postgres
10-
- SPRING_DATASOURCE_PASSWORD=123456
10+
- SPRING_DATASOURCE_PASSWORD=password
1111
- SPRING_JPA_HIBERNATE_DLL_AUTO=update
1212
- SPRING_JPA_SHOW_SQL=true
1313
restart: on-failure
@@ -19,7 +19,7 @@ services:
1919
restart: always
2020
environment:
2121
- POSTGRES_USER=postgres
22-
- POSTGRES_PASSWORD=123456
22+
- POSTGRES_PASSWORD=Juanluis-123
2323
- POSTGRES_DB=gamelink
2424
volumes:
2525
- ./postgres:/var/lib/postgres

‎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=Juanluis-123
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<header></header>
22
<navBar></navBar>
33

4+
<home></home>
5+
46

57
<router-outlet></router-outlet>
6-
<footer></footer>
8+
<footer></footer>

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
import { BrowserModule } from '@angular/platform-browser';
22
import { FormsModule } from '@angular/forms';
3-
import { NgModule } from '@angular/core';
3+
import { NgModule, Component } from '@angular/core';
44
import { HttpClientModule } from '@angular/common/http';
5+
import { routing } from './app.routing';
56

67
import { AppComponent } from './app.component';
7-
import { routing } from './app.routing';
88
import { LoginComponent } from './components/login/login.component';
9-
import { HeaderComponent } from './components/header/header.component';
9+
import { HeadComponent } from './components/head/head.component';
1010
import { NewsComponent } from './components/news/news.component';
11-
import { NavBarComponent } from './components/navBar/navBar.component'
11+
import { NavBarComponent } from './components/navBar/navBar.component';
12+
import { FooterComponent } from './components/footer/footer.component';
13+
import { NewsTemplateComponent } from './components/news/newsTemplate.component';
14+
import { ShowNewsComponent } from './components/news/showNews.component';
15+
import { HomeComponent } from './components/home/home.component';
16+
import { UserProfile } from './components/user/userProfile.component';
17+
18+
1219

1320

1421
@NgModule({
15-
declarations: [AppComponent, LoginComponent, HeaderComponent, NewsComponent, NavBarComponent],
16-
imports: [BrowserModule, FormsModule, HttpClientModule, routing],
22+
declarations: [AppComponent, LoginComponent, HeadComponent, NewsComponent, NavBarComponent, FooterComponent, NewsTemplateComponent, ShowNewsComponent, HomeComponent, UserProfile],
23+
imports: [BrowserModule, FormsModule, HttpClientModule, routing, FormsModule],
1724
bootstrap: [AppComponent]
1825
})
1926
export class AppModule { }

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import { Routes, RouterModule } from '@angular/router';
22

3+
import { HomeComponent } from './components/home/home.component';
34

5+
//aquí tenemos que completar todo lo que queremos que se vaya cargando en el router-outlet
6+
//ojo, el template no debe llamar al servicio, hay que hacerlo a través del componente
47

58
const appRoutes = [
6-
{ path: '', redirectTo: 'books', pathMatch: 'full' }
9+
{ path: 'home', component: HomeComponent }
710
]
811

9-
export const routing = RouterModule.forRoot(appRoutes);
12+
export const routing = RouterModule.forRoot(appRoutes);

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<div class="container px-5">
2+
<div class="row align-items-center justify-content-between flex-column flex-sm-row">
3+
<div class="col-auto">
4+
<div class="small m-0 text-white">Copyright &copy; GameLink 2022</div>
5+
</div>
6+
<div class="col-auto">
7+
<a class="link-light small" [routerLink]="['/about']">Privacy</a>
8+
<span class="text-white mx-1">&middot;</span>
9+
<a class="link-light small" [routerLink]="['/about']">Terms</a>
10+
<span class="text-white mx-1">&middot;</span>
11+
<a class="link-light small" [routerLink]="['/about']">Contact</a>
12+
</div>
13+
</div>
14+
</div>

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

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

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

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

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

0 commit comments

Comments
 (0)