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

Commits on Feb 22, 2024

  1. Added first navbar prototype

    @alagoconde
    alagoconde committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    f928913 View commit details
    Browse the repository at this point in the history

  2. Added a footer example

    @alagoconde
    alagoconde committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    de9beff View commit details
    Browse the repository at this point in the history

  3. Changed the format of the homepage and the navbar

    @alagoconde
    alagoconde committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    d4d1b62 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Change in the user-model.js class to use MariaDB instead of Mongo

    @uo289689
    uo289689 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    5be9e05 View commit details
    Browse the repository at this point in the history

  2. Modification in the docker-compose.yml file to add MariaDB as the dat… 

    …abase, and adaptation of the AuthService and UserService modules
    @uo289689
    uo289689 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    2bb4c48 View commit details
    Browse the repository at this point in the history

  3. Added environment variables for the database and fixed the user-model… 

    ….js and docker-compose.yml classes
    @uo289689
    uo289689 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    2ba2b78 View commit details
    Browse the repository at this point in the history

  4. Fix of the userSchema of user-model.js

    @uo289689
    uo289689 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    38d7232 View commit details
    Browse the repository at this point in the history

  5. Changed auth-model to use MariaDB

    @alagoconde
    alagoconde committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    172763a View commit details
    Browse the repository at this point in the history

  6. Adapted user-service.js class to MariaDB database and to User-model.js

    @uo289689
    uo289689 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    e2cffcb View commit details
    Browse the repository at this point in the history

  7. Changing dependency from mongoose to mysql2 in package.json

    @uo289689
    uo289689 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    176d7e2 View commit details
    Browse the repository at this point in the history

  8. Changed auth-service to use MariaDB

    @alagoconde
    alagoconde committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    b5af196 View commit details
    Browse the repository at this point in the history

  9. Added MariaDB in the users package.json

    @alagoconde
    alagoconde committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    794fac1 View commit details
    Browse the repository at this point in the history

  10. Fix userservice

    @uo289689
    uo289689 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    ecbc5ac View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop-users' of https://github.com/Arquisoft/wiq_es04a … 

    …into develop-users
    @uo289689
    uo289689 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    28089f1 View commit details
    Browse the repository at this point in the history

  12. Fixing userservice

    @uo289689
    uo289689 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    793d9e4 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Fixing the userService

    @uo289689
    uo289689 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    40f294b View commit details
    Browse the repository at this point in the history

  2. Fixed errors in the user service. Using a Sequelize to manage the dat… 

    …abase connection.
    @uo289689
    uo289689 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    5eb0fc8 View commit details
    Browse the repository at this point in the history

  3. Fix of the dabase_name

    @uo289689
    uo289689 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    158aa73 View commit details
    Browse the repository at this point in the history

  4. Proposed final version for NavBar Component (Having there's no sessio… 

    …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
    PabloGOP committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    28dff75 View commit details
    Browse the repository at this point in the history

  5. Moved home & footer fragments to components

    @PabloGOP
    PabloGOP committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a7d96c0 View commit details
    Browse the repository at this point in the history

  6. Updated directory structure according to React best practices & solve… 

    …d nav links problems
    @PabloGOP
    PabloGOP committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    14c8212 View commit details
    Browse the repository at this point in the history

  7. Edited AddUser and Login to include the links between them.

    @alagoconde
    alagoconde committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    9126edf View commit details
    Browse the repository at this point in the history

  8. Modified the color theme.

    @alagoconde
    alagoconde committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    58efe57 View commit details
    Browse the repository at this point in the history

  9. Added new fields to the user registration window

    @uo289689
    uo289689 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    c13d221 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/develop-webapp' into develop-users

    @uo289689
    uo289689 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a1d7ee4 View commit details
    Browse the repository at this point in the history

  11. Merge with develop_webapp branch and fix of user_service.js to add ne… 

    …w fields to the user registration window
    @uo289689
    uo289689 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    afaf9ba View commit details
    Browse the repository at this point in the history

  12. Fix imageUrl error

    @uo289689
    uo289689 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    fabe07f View commit details
    Browse the repository at this point in the history

  13. Instruction page skeleton 

    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
    PBC003 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    8155e3c View commit details
    Browse the repository at this point in the history

  14. Created the dynamic part of the instructions section 

    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
    PBC003 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    f561d6f View commit details
    Browse the repository at this point in the history

  15. Centering elements in loginy register sections

    @PBC003
    PBC003 committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    155dd6e View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. Fix Logo Position in the NavBar 

    The logo was not well centered when resizing the app
    @PBC003
    PBC003 committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    1ed274c View commit details
    Browse the repository at this point in the history

  2. Revert "Fix Logo Position in the NavBar" 

    This reverts commit 1ed274c.

The issue was not intended to center the logo in desktop version.
    @PabloGOP
    PabloGOP committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    5a9920c View commit details
    Browse the repository at this point in the history

  3. Minor changes unifying format. Pendint to talk about weather to use "… 

    … or '
    @PabloGOP
    PabloGOP committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    31f8e24 View commit details
    Browse the repository at this point in the history

  4. Static position applied to footer too and changed min-height of pages… 

    … content for aesthetics.

Pending to look into the problem of the redimensions and/or the alignment of the elements in nav & footer as right now we are hard coding the value of screen usage.
    @PabloGOP
    PabloGOP committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    b8f0d1b View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Auth service and model changed but still don't work

    @alagoconde
    alagoconde committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    3fe1d3d View commit details
    Browse the repository at this point in the history

  2. Solved errors in the login

    @alagoconde
    alagoconde committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    76ab491 View commit details
    Browse the repository at this point in the history

  3. Defined the theme for the whole application

    @PabloGOP
    PabloGOP committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    7f0c515 View commit details
    Browse the repository at this point in the history

  4. First little implementation of game in the front-end

    @PabloGOP
    PabloGOP committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    4365b10 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Fixed Issue: Adjust Header & Footer position #73 

    I have implemented a possible solution to the problem raised in issue #73 where the footer was not placed at the bottom of the page. The possible solution is to use the 'flex:1' property so that the central component takes up all the available space.
    @PBC003
    PBC003 committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    01b9cd1 View commit details
    Browse the repository at this point in the history

  2. Quick refactor of questions placeholder json

    @PabloGOP
    PabloGOP committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    0834d5d View commit details
    Browse the repository at this point in the history

  3. Refactor of Instructions pages to properly code the grid generation, … 

    …pending to review styles and metainfo of the elements
    @PabloGOP
    PabloGOP committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    a0991ee View commit details
    Browse the repository at this point in the history

  4. Added server-side validation to the user service

    @uo289689
    uo289689 committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    9cd98cc View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Corrected de users service files structure. 

    Login system now works correctly but the register needs field validations (the previous ones didn't work).
    @alagoconde
    alagoconde committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    d447d1d View commit details
    Browse the repository at this point in the history

  2. Users api get all users

    @and1na
    and1na committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    3587191 View commit details
    Browse the repository at this point in the history

  3. I forgot adding new files XD

    @and1na
    and1na committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    eb5f822 View commit details
    Browse the repository at this point in the history

  4. Added functionality to /users/username api url

    @and1na
    and1na committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    7e73435 View commit details
    Browse the repository at this point in the history

  5. Added ranking url to user api

    @and1na
    and1na committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    a8cc676 View commit details
    Browse the repository at this point in the history

  6. Game functionality approach. Pending to review questions API

    @PabloGOP
    PabloGOP committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    374cd2d View commit details
    Browse the repository at this point in the history

  7. Changed the user image to an Avatar, solved position errors, and corr… 

    …ected and prettified forms.
    @alagoconde
    alagoconde committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    6e85ff9 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Provisional design for the home page 

    I have implemented a first functional design for the main page. The design includes the logo, name, a description and a slider with photos about the application.
    @PBC003
    PBC003 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    5be10dc View commit details
    Browse the repository at this point in the history

  2. Fix password validation and set username as primary key

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    6b24205 View commit details
    Browse the repository at this point in the history

  3. Fix service validation

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    f2bfc0a View commit details
    Browse the repository at this point in the history

  4. Established route for editing a user

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    26aedc2 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/develop-webapp' into develop-users

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    40e427b View commit details
    Browse the repository at this point in the history

  6. Rounds added to the game

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    6837553 View commit details
    Browse the repository at this point in the history

  7. Added redirection to / when the game is over

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    bc7cc83 View commit details
    Browse the repository at this point in the history

  8. Added circular loading

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    3cab576 View commit details
    Browse the repository at this point in the history

  9. Added Group and UserGroup database tables

    @alagoconde
    alagoconde committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    ba4e5da View commit details
    Browse the repository at this point in the history

  10. Adding user/edit post in game.js

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    353a13d View commit details
    Browse the repository at this point in the history

  11. Fix

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    b6950b7 View commit details
    Browse the repository at this point in the history

  12. fixing

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    86af3b6 View commit details
    Browse the repository at this point in the history

  13. Fixing Samu's unfixing fixes (It wasn't deployable)

    @alagoconde
    alagoconde committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    53d9b50 View commit details
    Browse the repository at this point in the history

  14. Fix the post

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    f61ec1d View commit details
    Browse the repository at this point in the history

  15. Merge branch 'develop-users' of https://github.com/Arquisoft/wiq_es04a … 

    …into develop-users
    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    1d6ab7a View commit details
    Browse the repository at this point in the history

  16. Fix post edit

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    84d18db View commit details
    Browse the repository at this point in the history

  17. Fix question transition

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    c8fa84d View commit details
    Browse the repository at this point in the history

  18. Fix username

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    e3f5889 View commit details
    Browse the repository at this point in the history

  19. Fix score

    @uo289689
    uo289689 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    875e589 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. Added server methods of the groups functionality

    @alagoconde
    alagoconde committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    f80dff1 View commit details
    Browse the repository at this point in the history

  2. Added the groups methods to the gateway; still need to build the weba… 

    …pp to test it.
    @alagoconde
    alagoconde committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    19daa65 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Groups api refactoring

    @and1na
    and1na committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    7d91796 View commit details
    Browse the repository at this point in the history

  2. Basic session implementation through jwt token

    @and1na
    and1na committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    e51dd0b View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Implementing sessions

    @and1na
    and1na committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    e6fd696 View commit details
    Browse the repository at this point in the history

  2. Progress in session context

    @and1na
    and1na committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    4e3ca7a View commit details
    Browse the repository at this point in the history

  3. Applied the session parameters into the navbar to test it. 

    Co-authored-by: Daniel Andina  <[email protected]>
    @alagoconde @and1na
    alagoconde and and1na committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    7e43391 View commit details
    Browse the repository at this point in the history