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.

Sign up for GitHub

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

Jump to bottom

Merging users services #100

Merged
merged 75 commits into from
Mar 5, 2024
Merged

Merging users services #100

merged 75 commits into from
Mar 5, 2024

Conversation

and1na
Copy link
Contributor

@and1na and1na commented Mar 5, 2024

No description provided.

alagoconde and others added 30 commits February 22, 2024 17:53
@alagoconde
Added first navbar prototype
f928913
@alagoconde
Added a footer example
de9beff
@alagoconde
Changed the format of the homepage and the navbar
d4d1b62
@uo289689
Change in the user-model.js class to use MariaDB instead of Mongo
5be9e05
@uo289689
Modification in the docker-compose.yml file to add MariaDB as the dat…
2bb4c48 
…abase, and adaptation of the AuthService and UserService modules
@uo289689
Added environment variables for the database and fixed the user-model…
2ba2b78 
….js and docker-compose.yml classes
@uo289689
Fix of the userSchema of user-model.js
38d7232
@alagoconde
Changed auth-model to use MariaDB
172763a
@uo289689
Adapted user-service.js class to MariaDB database and to User-model.js
e2cffcb
@uo289689
Changing dependency from mongoose to mysql2 in package.json
176d7e2
@alagoconde
Changed auth-service to use MariaDB
b5af196
@alagoconde
Added MariaDB in the users package.json
794fac1
@uo289689
Fix userservice
ecbc5ac
@uo289689
Merge branch 'develop-users' of https://github.com/Arquisoft/wiq_es04a …
28089f1 
…into develop-users
@uo289689
Fixing userservice
793d9e4
@uo289689
Fixing the userService
40f294b
@uo289689
Fixed errors in the user service. Using a Sequelize to manage the dat…
5eb0fc8 
…abase connection.
@uo289689
Fix of the dabase_name
158aa73
@PabloGOP
Proposed final version for NavBar Component (Having there's no sessio…
28dff75 
…n track)

- Responsive view of different pages
- No options being displayed for user management (obviously as there is no session)
- Comments and code understandable
- Display adjusted
- Fine styles proposal
@PabloGOP
Moved home & footer fragments to components
a7d96c0
@PabloGOP
Updated directory structure according to React best practices & solve…
14c8212 
…d nav links problems
@alagoconde
Edited AddUser and Login to include the links between them.
9126edf
@alagoconde
Modified the color theme.
58efe57
@uo289689
Added new fields to the user registration window
c13d221
@uo289689
Merge remote-tracking branch 'origin/develop-webapp' into develop-users
a1d7ee4
@uo289689
Merge with develop_webapp branch and fix of user_service.js to add ne…
afaf9ba 
…w fields to the user registration window
@uo289689
Fix imageUrl error
fabe07f
@PBC003
Instruction page skeleton
8155e3c 
Skeleton of the Instruction page that includes the initial layout and the game mode buttons. The dynamic information of the game modes remains to be added.
@PBC003
Created the dynamic part of the instructions section
f561d6f 
I have completed the instructions section by adding the dynamic part that was missing. Still, it remains to look for photos for the games and review the description text
@PBC003
Centering elements in loginy register sections
155dd6e
@and1na and1na self-assigned this Mar 5, 2024
@and1na and1na added this to the Deliverable II milestone Mar 5, 2024
@and1na and1na added the users service👨🏼 Related to the user's service label Mar 5, 2024
@and1na and1na changed the title Develop users Merging users services Mar 5, 2024
@uo288347 uo288347 merged commit 55bcb85 into develop Mar 5, 2024
1 check failed
@and1na and1na mentioned this pull request Mar 11, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PBC003 PBC003 PBC003 approved these changes

@uo288347 uo288347 uo288347 approved these changes

@uo289689 uo289689 uo289689 approved these changes

@alagoconde alagoconde alagoconde approved these changes

@uo288543 uo288543 uo288543 approved these changes

Assignees

@and1na and1na

Labels
users service👨🏼 Related to the user's service
Projects
None yet
Milestone
Deliverable II
Development

Successfully merging this pull request may close these issues.
7 participants
@and1na @PBC003 @uo288347 @uo289689 @alagoconde @uo288543 @PabloGOP