Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #75

Closed
wants to merge 75 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
37ec942
04. Solution strategy first approach
UO289930 Feb 11, 2024
ca18f29
5 Block View Initial
Alberto-Guerra Feb 12, 2024
252ab3b
Question Generator <-> Wikidata API interface added
Alberto-Guerra Feb 12, 2024
9954d5b
Extra documentation and one glossary term
UO289930 Feb 12, 2024
a1b13c3
Typo
UO289930 Feb 12, 2024
027dfcd
Merge pull request #12 from Arquisoft/documentation_sergiot
Alberto-Guerra Feb 12, 2024
a58a536
plantuml and graphviz installed on the repo
Alberto-Guerra Feb 12, 2024
e579764
Merge pull request #11 from Arquisoft/documentation_alberto
plg22 Feb 13, 2024
fbf443b
Section 6 and bug corrected
plg22 Feb 13, 2024
827689d
Merge pull request #14 from Arquisoft/Docu_Pedro
sergiollende Feb 13, 2024
d20e8c8
Deleting <> on titles
plg22 Feb 13, 2024
89f6596
Merge pull request #15 from Arquisoft/Docu_Pedro
sergiollende Feb 13, 2024
50915e6
business diagram image
uo284185 Feb 13, 2024
b0c1788
business diagram image
uo284185 Feb 13, 2024
d5c66c6
business diagram table
uo284185 Feb 13, 2024
b242371
Merge pull request #17 from Arquisoft/documentation_rita
sergiollende Feb 14, 2024
77d88f9
Merge pull request #21 from Arquisoft/documentation_ángel
UO289930 Feb 14, 2024
af86f9f
Pushing example
viraterletska Feb 15, 2024
b626ce1
First appraoch introduction and goals
viraterletska Feb 15, 2024
59623ad
changes to point 2
sergiollende Feb 15, 2024
36eade1
Merge pull request #22 from Arquisoft/documentation_vira
Alberto-Guerra Feb 15, 2024
e063aba
glossary table finished
uo284185 Feb 17, 2024
962318b
Improvements_Read.Me
viraterletska Feb 17, 2024
f28ac72
Merge branch 'develop' into documentation_rita
UO289930 Feb 17, 2024
105b85b
Merge pull request #31 from Arquisoft/documentation_rita
UO289930 Feb 17, 2024
4893461
Merge pull request #32 from Arquisoft/documentation_vira
Alberto-Guerra Feb 18, 2024
28bbbf1
Restoring help section
UO289930 Feb 18, 2024
c4b3969
Deployment quick guide
UO289930 Feb 18, 2024
ce85250
Adding separated commands
UO289930 Feb 18, 2024
c63d77c
Deployment infrastructure levels
UO289930 Feb 18, 2024
e58fa6d
Changes on section 2
sergiollende Feb 18, 2024
d41cdc7
Merge pull request #33 from Arquisoft/documentation_sergiot
sergiollende Feb 18, 2024
95f910e
First approach of section 9
sergiollende Feb 18, 2024
048bff9
Fix bug Runtime View. General View now is Level 1. Added General View.
Alberto-Guerra Feb 19, 2024
dd255a2
Section 11
plg22 Feb 19, 2024
3a6eee9
Merge pull request #35 from Arquisoft/Docu_Pedro
Alberto-Guerra Feb 19, 2024
1dcf96d
Improvements in section 2 and 9 of documentation
sergiollende Feb 19, 2024
5c47e2c
Merge pull request #23 from Arquisoft/doc_sergiollende
Alberto-Guerra Feb 19, 2024
dde6d29
Merge pull request #34 from Arquisoft/documentation_alberto
sergiollende Feb 19, 2024
1bf7cad
small adding level 2 block view
Alberto-Guerra Feb 19, 2024
3e8dcb4
Merge pull request #36 from Arquisoft/documentation_alberto
UO289930 Feb 19, 2024
94fcad0
Level 1 Diagram Enchanced
Alberto-Guerra Feb 19, 2024
fa23e56
Merge pull request #37 from Arquisoft/documentation_alberto
angelmaciasr Feb 19, 2024
7894db3
Infrastructure diagrams
UO289930 Feb 19, 2024
b275b58
Fixing diagrams
UO289930 Feb 19, 2024
f55807a
Quality requirements documentation first version
angelmaciasr Feb 19, 2024
a1ff907
Merge branch 'develop' of https://github.com/Arquisoft/wiq_en3a into …
angelmaciasr Feb 19, 2024
726580f
Merge pull request #38 from Arquisoft/documentation_sergiot
Alberto-Guerra Feb 19, 2024
ce7b848
Merge pull request #39 from Arquisoft/documentation_ángel
Alberto-Guerra Feb 19, 2024
7f2054e
Fixed error position DB
plg22 Feb 23, 2024
b27b942
Deployment diagram error fixed
UO289930 Feb 24, 2024
d5925d5
New retrieval diagram
plg22 Feb 24, 2024
de2450d
Merge branch 'develop' into Docu_Pedro
UO289930 Feb 24, 2024
ec66d51
Runtime view documentation
UO289930 Feb 24, 2024
bdf9efd
Fixing minor sintax error
UO289930 Feb 24, 2024
06fc901
Merge branch 'develop' into documentation_sergiot
UO289930 Feb 24, 2024
c49b907
Merge pull request #56 from Arquisoft/documentation_sergiot
plg22 Feb 24, 2024
103edfa
Badges in ReadMe
viraterletska Feb 24, 2024
7cb10f2
Merge pull request #57 from Arquisoft/documentation_vira
ritacatuxo Feb 25, 2024
ff157af
points 3.2 and 10 slighty corrected
angelmaciasr Feb 26, 2024
62bd262
Initial Frontend Typescript
Alberto-Guerra Feb 26, 2024
ee0f356
Fixed forms
Alberto-Guerra Feb 26, 2024
99ecc29
test fixed
Alberto-Guerra Feb 26, 2024
d4d47dc
Merge pull request #64 from Arquisoft/Initial_Frontend
angelmaciasr Feb 26, 2024
0a8dbbe
Merge branch 'develop' of https://github.com/Arquisoft/wiq_en3a into …
angelmaciasr Feb 28, 2024
d7634fa
Technical context diagram added in section 3.2
angelmaciasr Feb 28, 2024
f23392a
Merge pull request #68 from Arquisoft/documentation_ángel
Alberto-Guerra Feb 29, 2024
b1db55d
Adding professors to the stakeholders
viraterletska Feb 29, 2024
2ec25c5
Adding the professors to the Stakeholders
viraterletska Feb 29, 2024
0a5042f
Improvement stakeholders
viraterletska Feb 29, 2024
5b4f994
Initial template for the game interaction
angelmaciasr Feb 29, 2024
a39861c
Merge pull request #70 from Arquisoft/documentation_vira
Alberto-Guerra Feb 29, 2024
acfa1e8
Adapted frontend into typescript and organizing of components
Alberto-Guerra Feb 29, 2024
c57da35
commit test fix
Alberto-Guerra Feb 29, 2024
3fbb07e
Merge pull request #74 from Arquisoft/Initial_Frontend
UO289930 Feb 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
50 changes: 33 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
# wiq_en3a

Members:
- Sergio Truébano Robles -> [email protected]
- Pedro Limeres Granado -> [email protected]
- Alberto Guerra Rodas -> [email protected]
- Ángel Macías Rodríguez -> [email protected]
- Rita Fernández-Catuxo Ortiz -> [email protected]
- Vira Terletska -> [email protected]
- Sergio Llenderrozos Piñera -> [email protected]

[![Deploy on release](https://github.com/Arquisoft/wiq_en3a/actions/workflows/release.yml/badge.svg)](https://github.com/Arquisoft/wiq_en3a/actions/workflows/release.yml)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Arquisoft_wiq_en3a&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Arquisoft_wiq_en3a)
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=Arquisoft_wiq_en3a&metric=coverage)](https://sonarcloud.io/summary/new_code?id=Arquisoft_wiq_en3a)

# wiq_en3a

## Welcome to WIQ👩‍🎓👨‍🎓

The WIQ is a web application where you can show off your knowledge.

Creat an account or log in if you are already a member and start the engaging quiz!
Enjoy the variaty of questions, which are automatically generated from a vast pool of data available in Wikidata🌎. Each question offers multiple-choice options, including correct answer and several distractors🔍. Choose a right answer and win the prize🏆. Stay sharp and focused, there are also the time limits, --> the clock is ticking🕐 ⏳.


The more you know the more you win 🥇!
Play with your friends and compare the scores. Who is the smartest❓

🤓Let the game begin!👀🧠



This is a base repo for the [Software Architecture course](http://arquisoft.github.io/) in [2023/2024 edition](https://arquisoft.github.io/course2324.html).

This repo is a basic application composed of several components.
This repo is a basic application composed of several components.

- **Gateway service**. Express service that is exposed to the public and serves as a proxy to the two previous ones.
- **User service**. Express service that handles the insertion of new users in the system.
Expand All @@ -24,7 +30,7 @@ This repo is a basic application composed of several components.

Both the user and auth service share a Mongo database that is accessed with mongoose.

## Quick start guide
## Quick start guide 🏁

### Using docker

Expand All @@ -40,7 +46,7 @@ and launch it with docker compose:
docker compose --profile dev up --build
```

### Starting Component by component
### Starting Component by component🔍

First, start the database. Either install and run Mongo or run it using docker:

Expand All @@ -54,7 +60,7 @@ Lastly, go to the webapp directory and launch this component with `npm install`

After all the components are launched, the app should be available in localhost in port 3000.

## Deployment
## Deployment

For the deployment, we have several options.

Expand All @@ -64,7 +70,7 @@ Other options include using the container services that most cloud services prov

We are going to use the first approach, creating a virtual machine in a cloud service and after installing docker and docker-compose, deploy our containers there using GitHub Actions and SSH.

### Machine requirements for deployment
### Machine requirements for deployment

The machine for deployment can be created in services like Microsoft Azure or Amazon AWS. These are in general the settings that it must have:

Expand All @@ -86,7 +92,7 @@ sudo curl -L "https://github.com/docker/compose/releases/download/1.28.5/docker-
sudo chmod +x /usr/local/bin/docker-compose
```

### Continuous delivery (GitHub Actions)
### Continuous delivery (GitHub Actions)🐱‍👤

Once we have our machine ready, we could deploy by hand the application, taking our docker-compose file and executing it in the remote machine.

Expand Down Expand Up @@ -121,3 +127,13 @@ This action uses three secrets that must be configured in the repository:
- DEPLOY_KEY: key to authenticate the user in the remote machine.

Note that this action logs in the remote machine and downloads the docker-compose file from the repository and launches it. Obviously, previous actions have been executed which have uploaded the docker images to the GitHub Packages repository.

## 👩‍💻Members:

- Sergio Truébano Robles -> [email protected]
- Pedro Limeres Granado -> [email protected]
- Alberto Guerra Rodas -> [email protected]
- Ángel Macías Rodríguez -> [email protected]
- Rita Fernández-Catuxo Ortiz -> [email protected]
- Vira Terletska -> [email protected]
- Sergio Llenderrozos Piñera -> [email protected]
Binary file added docs/images/03_business_context.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/10-Quality-Tree-EN.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading