Skip to content

Commit ea084a0

Browse files
author
JLRR2019
committed
Merge branch 'main' of https://github.com/CodeURJC-DAW-2021-22/webapp9 into JuanFase3
2 parents 3c7222d + 399edcc commit ea084a0

File tree

13 files changed

+19450
-34
lines changed

13 files changed

+19450
-34
lines changed

README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Para proceder a la ejecución del programa, primero se debe abrir la pestaña ap
181181
![](CapturasPantallasWEB/diagramaClasesDAWFase2.png)
182182
# Modelo ER (Fase 2)
183183
![](CapturasPantallasWEB/modeloERDAWFase2.png)
184-
# Participación de miembros:
184+
# Participación de miembros (Fase 2):
185185

186186
### Andrea Patricia Acuña Padrón
187187
###### Descripción textual de las tareas realizadas en la fase:
@@ -292,3 +292,12 @@ Para proceder a la ejecución del programa, primero se debe abrir la pestaña ap
292292
4. [Videogame.java](https://github.com/CodeURJC-DAW-2021-22/webapp9/blob/main/backend/gamelink/src/main/java/urjc/gamelink/Model/Videogame.java)
293293
5. [VideogameRepository.java](https://github.com/CodeURJC-DAW-2021-22/webapp9/blame/main/backend/gamelink/src/main/java/urjc/gamelink/Repositories/VideogameRepository.java)
294294

295+
# Documentación de la API REST(Fase 3)
296+
297+
## Especificación openAPI
298+
- [archivo yaml](backend/gamelink/api-docs/api-docs.yaml)
299+
300+
## Documento HTML
301+
- [enlaze](https://rawcdn.githack.com/CodeURJC-DAW-2021-22/webapp9/7c9569b82c7b36f569e645f98066d7feb7ca2c81/backend/gamelink/api-docs/api-docs.html)
302+
303+

backend/gamelink/Docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
environment:
1010
- SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/gamelink
1111
- SPRING_DATASOURCE_USERNAME=postgres
12-
- SPRING_DATASOURCE_PASSWORD=Juanluis-123
12+
- SPRING_DATASOURCE_PASSWORD=password
1313
- SPRING_JPA_HIBERNATE_DLL_AUTO=update
1414
- SPRING_JPA_SHOW_SQL=true
1515
restart: on-failure
@@ -21,7 +21,7 @@ services:
2121
restart: always
2222
environment:
2323
- POSTGRES_USER=postgres
24-
- POSTGRES_PASSWORD=Juanluis-123
24+
- POSTGRES_PASSWORD=password
2525
- POSTGRES_DB=gamelink
2626
volumes:
2727
- ./postgres:/var/lib/postgres

backend/gamelink/Gamelink.postman_collection.json

Lines changed: 89 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"info": {
3-
"_postman_id": "43236aa3-c38e-41d8-8e30-ed4d88573fb4",
3+
"_postman_id": "ed2a4419-b49e-49ee-a127-79da0f2590ba",
44
"name": "Gamelink",
55
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
66
},
@@ -303,7 +303,7 @@
303303
"query": [
304304
{
305305
"key": "",
306-
"value": null,
306+
"value": "",
307307
"disabled": true
308308
}
309309
]
@@ -1068,6 +1068,93 @@
10681068
"response": []
10691069
}
10701070
]
1071+
},
1072+
{
1073+
"name": "Login",
1074+
"item": [
1075+
{
1076+
"name": "Login",
1077+
"request": {
1078+
"method": "POST",
1079+
"header": [],
1080+
"body": {
1081+
"mode": "raw",
1082+
"raw": "{\r\n \"username\":\"admin\",\r\n \"password\":\"123\"\r\n}",
1083+
"options": {
1084+
"raw": {
1085+
"language": "json"
1086+
}
1087+
}
1088+
},
1089+
"url": {
1090+
"raw": "https://localhost:8443/api/auth/login",
1091+
"protocol": "https",
1092+
"host": [
1093+
"localhost"
1094+
],
1095+
"port": "8443",
1096+
"path": [
1097+
"api",
1098+
"auth",
1099+
"login"
1100+
]
1101+
}
1102+
},
1103+
"response": []
1104+
},
1105+
{
1106+
"name": "Refresh",
1107+
"request": {
1108+
"method": "POST",
1109+
"header": [],
1110+
"body": {
1111+
"mode": "formdata",
1112+
"formdata": [
1113+
{
1114+
"key": "refreshToken",
1115+
"value": "refreshToken",
1116+
"type": "text"
1117+
}
1118+
]
1119+
},
1120+
"url": {
1121+
"raw": "https://localhost:8443/api/auth/refresh",
1122+
"protocol": "https",
1123+
"host": [
1124+
"localhost"
1125+
],
1126+
"port": "8443",
1127+
"path": [
1128+
"api",
1129+
"auth",
1130+
"refresh"
1131+
]
1132+
}
1133+
},
1134+
"response": []
1135+
},
1136+
{
1137+
"name": "Logout",
1138+
"request": {
1139+
"method": "POST",
1140+
"header": [],
1141+
"url": {
1142+
"raw": "https://localhost:8443/api/auth/logout",
1143+
"protocol": "https",
1144+
"host": [
1145+
"localhost"
1146+
],
1147+
"port": "8443",
1148+
"path": [
1149+
"api",
1150+
"auth",
1151+
"logout"
1152+
]
1153+
}
1154+
},
1155+
"response": []
1156+
}
1157+
]
10711158
}
10721159
]
10731160
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# OpenAPI Generator Ignore
2+
# Generated by openapi-generator https://github.com/openapitools/openapi-generator
3+
4+
# Use this file to prevent files from being overwritten by the generator.
5+
# The patterns follow closely to .gitignore or .dockerignore.
6+
7+
# As an example, the C# client generator defines ApiClient.cs.
8+
# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
9+
#ApiClient.cs
10+
11+
# You can match any string of characters against a directory, file or extension with a single asterisk (*):
12+
#foo/*/qux
13+
# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
14+
15+
# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
16+
#foo/**/qux
17+
# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
18+
19+
# You can also negate patterns with an exclamation (!).
20+
# For example, you can ignore all files in a docs folder with the file extension .md:
21+
#docs/*.md
22+
# Then explicitly reverse the ignore rule for a single file:
23+
#!docs/README.md
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
index.html
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5.3.0
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
87ea85fb832775502806432182623443d99bc017aa849fd75eb5b38032292741

backend/gamelink/api-docs/api-docs.html

Lines changed: 18202 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)