From 54624f7cd45951995bd4351dbf650c5cbd18cf87 Mon Sep 17 00:00:00 2001 From: jorge Date: Wed, 21 Feb 2024 16:17:50 +0100 Subject: [PATCH 1/7] Updated the Quality Goals with the professor's feedback --- docs/src/01_introduction_and_goals.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/01_introduction_and_goals.adoc b/docs/src/01_introduction_and_goals.adoc index 0eebb332..a1592923 100644 --- a/docs/src/01_introduction_and_goals.adoc +++ b/docs/src/01_introduction_and_goals.adoc @@ -53,7 +53,7 @@ See https://docs.arc42.org/section-1/[Introduction and Goals] in the arc42 docum |Quality attribute|Scenario | Usability | The user must be able to understand the function of the application before the minute mark. | Performance | The application will be able to operate within reasonable response times, taking into account the already present waiting times (time to answer, between questions, etc). -| Security | The information stored about a user can only be accessed by said user, never others. +| Security & Privacy | The information stored about a user can only be accessed by said user, never others. | Robustness | The application will be able to handle any user error that could happen at runtime. | Accessibility | The application will be accessible by all users, even if the suffer from visual impediments such as colorblindness. |=== From 1bbe2c3d7673b8191b770e94927348036598c641 Mon Sep 17 00:00:00 2001 From: jorge Date: Wed, 21 Feb 2024 16:36:02 +0100 Subject: [PATCH 2/7] Made some changes in the Requirements Overview of the Introduction following the professor's feedback --- docs/src/01_introduction_and_goals.adoc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/src/01_introduction_and_goals.adoc b/docs/src/01_introduction_and_goals.adoc index a1592923..1a9368d7 100644 --- a/docs/src/01_introduction_and_goals.adoc +++ b/docs/src/01_introduction_and_goals.adoc @@ -20,7 +20,10 @@ These include === Requirements Overview The system will follow the functionality of the "Saber y Ganar" TV program, and so it will allow the users to select an answer between some options. The questions and answers will be automatically generated using the WikiData API, that will also determine which of the answers is in fact the correct one. -The system will also store the historical data of the users and will be accessible through the web. +The system will also store the historical data of the users and will be accessible through the web, thanks to the login and registering service featured in the application. +The application will have at least English as available language. +Apart from being in GitHub the system will have an API responsible of handling the questions generated previously from WikiData. + [role="arc42help"] **** From 33f5d3de6e964a6ff95046d1012efe64b653e483 Mon Sep 17 00:00:00 2001 From: jorge Date: Sat, 24 Feb 2024 18:01:01 +0100 Subject: [PATCH 3/7] Fixed typo --- docs/src/01_introduction_and_goals.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/01_introduction_and_goals.adoc b/docs/src/01_introduction_and_goals.adoc index 1a9368d7..030b3184 100644 --- a/docs/src/01_introduction_and_goals.adoc +++ b/docs/src/01_introduction_and_goals.adoc @@ -22,7 +22,7 @@ The system will follow the functionality of the "Saber y Ganar" TV program, and The questions and answers will be automatically generated using the WikiData API, that will also determine which of the answers is in fact the correct one. The system will also store the historical data of the users and will be accessible through the web, thanks to the login and registering service featured in the application. The application will have at least English as available language. -Apart from being in GitHub the system will have an API responsible of handling the questions generated previously from WikiData. +Apart from being in GitHub, the system will have an API responsible of handling the questions generated previously from WikiData. [role="arc42help"] From ab9c02d18f3cc2ed1391904519dc406199404947 Mon Sep 17 00:00:00 2001 From: jorge Date: Sat, 24 Feb 2024 19:20:17 +0100 Subject: [PATCH 4/7] Fixed the requirements overview following the corrections made in the revision --- docs/src/01_introduction_and_goals.adoc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/src/01_introduction_and_goals.adoc b/docs/src/01_introduction_and_goals.adoc index 030b3184..4f06af2e 100644 --- a/docs/src/01_introduction_and_goals.adoc +++ b/docs/src/01_introduction_and_goals.adoc @@ -18,11 +18,12 @@ These include **** === Requirements Overview -The system will follow the functionality of the "Saber y Ganar" TV program, and so it will allow the users to select an answer between some options. -The questions and answers will be automatically generated using the WikiData API, that will also determine which of the answers is in fact the correct one. -The system will also store the historical data of the users and will be accessible through the web, thanks to the login and registering service featured in the application. -The application will have at least English as available language. -Apart from being in GitHub, the system will have an API responsible of handling the questions generated previously from WikiData. +The system will follow the functionality of the "Saber y Ganar" TV program, and so it will allow the users to select an answer between some options. + +The questions and answers will be automatically generated using the WikiData API, that will also determine which of the answers is in fact the correct one. + +In adition to this, the system will also store the historical data of the users, thanks to the login and registering service featured in the application, and users will be able to access their information. + +The application will have at least English as an available language. + +Moreover, the project will be stored and deployed through GitHub. + +Lastly, the system will give access to non sensitive user's information through a public API as well as another API for the questions generated. [role="arc42help"] From b62b1a143a17b3c31578a7b60d66863eaf40b6e6 Mon Sep 17 00:00:00 2001 From: sinne10 Date: Sun, 25 Feb 2024 19:46:16 +0100 Subject: [PATCH 5/7] Added time limit and changed Answer Question diagram --- docs/src/06_runtime_view.adoc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/src/06_runtime_view.adoc b/docs/src/06_runtime_view.adoc index bc687266..3bb2c56e 100644 --- a/docs/src/06_runtime_view.adoc +++ b/docs/src/06_runtime_view.adoc @@ -47,7 +47,7 @@ entity Backend as "Webapp Backend" database Wikidata User -> Frontend: next question Frontend -> Backend: get question -Backend -> Wikidata: request data +Backend -> Wikidata: request data\n(1s timeout) Wikidata -> Backend: receive data Backend -> Backend: generate question Backend -> Frontend: return question and answers @@ -63,10 +63,10 @@ entity Frontend as "Webapp Frontend" entity Backend as "Webapp Backend" database DB User -> Frontend: answer -Frontend -> Backend: forward answer -Backend -> Backend: process answer -Backend -> DB: store result -Backend -> Frontend: return correctness +Frontend -> Frontend: process answer +Frontend -> Backend: forward result +Backend -> DB: store result\n(1s timeout) +Backend -> Frontend: answer Frontend -> User: show correctness ---- @@ -80,7 +80,7 @@ entity Backend as "Webapp Backend" database DB User -> Frontend: send credentials Frontend -> Backend: forward credentials -Backend -> DB: query for username +Backend -> DB: query for username\n(1s timeout) DB -> Backend: retrieve user data Backend -> Backend: validate password Backend -> Frontend: login successful @@ -97,7 +97,7 @@ entity Backend as "Webapp Backend" database DB User -> Frontend: send credentials Frontend -> Backend: forward credentials -Backend -> DB: query for username +Backend -> DB: query for username\n(1s timeout) DB -> Backend: retrieve user data Backend-> Backend: validate password Backend -> Frontend: wrong password @@ -116,9 +116,9 @@ entity Backend as "Webapp Backend" database DB User -> Frontend: send signup form Frontend -> Backend: forward signup form -Backend -> DB: check if username exists +Backend -> DB: check if username exists\n(1s timeout) DB -> Backend: answer -Backend -> DB: insert data +Backend -> DB: insert data\n(1s timeout) Backend -> Frontend: signup successful Frontend -> User: signup successful ---- @@ -133,7 +133,7 @@ entity Backend as "Webapp Backend" database DB User -> Frontend: send signup form Frontend -> Backend: forward signup form -Backend -> DB: check if username exists +Backend -> DB: check if username exists\n(1s timeout) DB -> Backend: answer Backend -> Frontend: error: username in use Frontend -> User: username in use @@ -153,7 +153,7 @@ database Wikidata User -> Frontend: next question Frontend -> Backend: get question Backend -> Wikidata: request data -Wikidata -> Backend: error +Wikidata -> Backend: error/timeout Backend -> Backend: error handling Backend -> Frontend: wikidata error Frontend -> User: show error message @@ -170,7 +170,7 @@ database DB User -> Frontend: request Frontend -> Backend: request Backend -> DB: request -DB -> Backend: error +DB -> Backend: error/timeout Backend -> Backend: error handling Backend -> Frontend: DB error Frontend -> User: show error message From e421ba3e50129dfec8301367a189975a707e9c10 Mon Sep 17 00:00:00 2001 From: sinne10 Date: Sun, 25 Feb 2024 20:10:34 +0100 Subject: [PATCH 6/7] Added timelimit to answer questions --- docs/src/06_runtime_view.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/06_runtime_view.adoc b/docs/src/06_runtime_view.adoc index 3bb2c56e..d9f01a78 100644 --- a/docs/src/06_runtime_view.adoc +++ b/docs/src/06_runtime_view.adoc @@ -62,7 +62,7 @@ actor User entity Frontend as "Webapp Frontend" entity Backend as "Webapp Backend" database DB -User -> Frontend: answer +User -> Frontend: answer\n(30s timelimit) Frontend -> Frontend: process answer Frontend -> Backend: forward result Backend -> DB: store result\n(1s timeout) From 0c0c36ff2ad51e15625b2d7b03ec7f13ee9e93f7 Mon Sep 17 00:00:00 2001 From: uo289267 Date: Sat, 2 Mar 2024 18:04:13 +0100 Subject: [PATCH 7/7] Creation of a Game Menu with options Historical Data and the Option to create a new game --- webapp/src/components/GameMenu/GameMenu.css | 22 +++++++++++++++++ webapp/src/components/GameMenu/GameMenu.js | 27 +++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 webapp/src/components/GameMenu/GameMenu.css create mode 100644 webapp/src/components/GameMenu/GameMenu.js diff --git a/webapp/src/components/GameMenu/GameMenu.css b/webapp/src/components/GameMenu/GameMenu.css new file mode 100644 index 00000000..6d193db1 --- /dev/null +++ b/webapp/src/components/GameMenu/GameMenu.css @@ -0,0 +1,22 @@ +button{ + width: 100%; + height: 45px; + background: darkblue; + border: none; + outline: none; + border-radius: 40px; + box-shadow: 0 0 10px black; + cursor:pointer; + font-size: 16px; + color: white; + font-weight: 700; + margin: 0.5em; + } + +div{ + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 100vh; +} \ No newline at end of file diff --git a/webapp/src/components/GameMenu/GameMenu.js b/webapp/src/components/GameMenu/GameMenu.js new file mode 100644 index 00000000..587c6453 --- /dev/null +++ b/webapp/src/components/GameMenu/GameMenu.js @@ -0,0 +1,27 @@ +import './GameMenu.css'; +export default function GameMenu() { + return ( +
+

Game

+ + +
+ ); + } + + function ButtonHistoricalData() { + function handleClick() { + //ir a la vista de historical data + alert("Historical DAta"); + } + return ; + } + + function ButtonNewGame() { + function handleClick() { + //ir a la vista de la primera pregunta + alert("New game"); + } + return ; + } + \ No newline at end of file