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

Final Project #48

Open
wants to merge 59 commits into
base: main
Choose a base branch
from
Open

Final Project #48

wants to merge 59 commits into from

Commits on Jan 7, 2022

  1. toggle on and off for login/register 

    .
    @remiimartinnn
    remiimartinnn committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    cfd5292 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2022

  1. Repositories Implemented 

    All Repositories have been implemented.
    @CharlesChaseIII
    CharlesChaseIII committed Jan 9, 2022
    Configuration menu
    Copy the full SHA
    ca2ab03 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from Revature-Q-Wiz/Charles-Chase-III 

    Repositories Implemented
    @CharlesChaseIII
    CharlesChaseIII committed Jan 9, 2022
    Configuration menu
    Copy the full SHA
    e426d6e View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2022

  1. added table columns in choices & question.java 

    also added validation to forms for login/register, as well as fixed color scheme and buttons
    @remiimartinnn
    remiimartinnn committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    87ed035 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #10 from Revature-Q-Wiz/frontend 

    Frontend
    @CharlesChaseIII
    CharlesChaseIII committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    cb93267 View commit details
    Browse the repository at this point in the history

  3. Modifications to entities 

    Here are modifications to two entities such as QuestionServices.
    @CharlesChaseIII
    CharlesChaseIII committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    04fcca6 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #11 from Revature-Q-Wiz/Charles-Chase-III 

    Charles chase iii
    @CharlesChaseIII
    CharlesChaseIII committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    c7db008 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #12 from Revature-Q-Wiz/Charles-Chase-III 

    Charles chase iii
    @CharlesChaseIII
    CharlesChaseIII committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    40d59e4 View commit details
    Browse the repository at this point in the history

  6. Revert "Modifications to entities" 

    This reverts commit 04fcca6.
    @CharlesChaseIII
    CharlesChaseIII committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    3a98996 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #13 from Revature-Q-Wiz/carlosbranch 

    Merge pull request #11 from Revature-Q-Wiz/Charles-Chase-III
    @carlosleongonzalez
    carlosleongonzalez committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    00dc4eb View commit details
    Browse the repository at this point in the history

  8. update to styling / routes

    @remiimartinnn
    remiimartinnn committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    fd0b87d View commit details
    Browse the repository at this point in the history

  9. changed styling 

    .
    @remiimartinnn
    remiimartinnn committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    ef8c2b0 View commit details
    Browse the repository at this point in the history

  10. edited entities in backend 

    types were incorrect and certain names were not same as table
    @remiimartinnn
    remiimartinnn committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    8de4d62 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2022

  1. Here I created a new project 

    I created a new backend project with all the existing folders from the old one copy and pasted in the new one. This is because my package paths from the old one got messed up and creating a new project was the only way to fix.
    @CharlesChaseIII
    CharlesChaseIII committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    eba80e3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #15 from Revature-Q-Wiz/Charles-Chase-III 

    Charles chase iii
    @CharlesChaseIII
    CharlesChaseIII committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    3eaea5f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #17 from Revature-Q-Wiz/Charles-Chase-III 

    Charles chase iii
    @CharlesChaseIII
    CharlesChaseIII committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    e5f1338 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #19 from Revature-Q-Wiz/Charles-Chase-III 

    Charles chase iii
    @CharlesChaseIII
    CharlesChaseIII committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    3c13528 View commit details
    Browse the repository at this point in the history

  5. fixed entities, added controller, service, and serviceImpl 

    .
    @remiimartinnn
    remiimartinnn committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    37e32ab View commit details
    Browse the repository at this point in the history

  6. deleted old backend and imported all new files into new backend 

    .
    @remiimartinnn
    remiimartinnn committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    9df7663 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #20 from Revature-Q-Wiz/frontend 

    Frontend
    @CharlesChaseIII
    CharlesChaseIII committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    b2b9f1e View commit details
    Browse the repository at this point in the history

  8. created controller and user_info service

    @jamalkhanNY
    jamalkhanNY committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    e0c8086 View commit details
    Browse the repository at this point in the history

  9. Revee's changes 

    Revee has made revisions to entity classes
    @CharlesChaseIII
    CharlesChaseIII committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    49613d8 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #22 from Revature-Q-Wiz/Charles-Chase-III 

    Changes to entity classes
    @CharlesChaseIII
    CharlesChaseIII committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    665f345 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #23 from Revature-Q-Wiz/Charles-Chase-III 

    Revee's entity revisions.
    @CharlesChaseIII
    CharlesChaseIII committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    ba02956 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'Jamal's-Branch' of https://github.com/Revature-Q-Wiz/Q-… 

    …Wiz-Project into Jamal's-Branch
    @jamalkhanNY
    jamalkhanNY committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    01e870f View commit details
    Browse the repository at this point in the history

  13. created quiz service, quiz service implementation and quiz controller 

    I developed a service, service implementation and controller for quiz
    @carlosleongonzalez
    carlosleongonzalez committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    eaed57c View commit details
    Browse the repository at this point in the history

  14. Merge branch 'carlosbranch' of https://github.com/Revature-Q-Wiz/Q-Wi… 

    …z-Project into carlosbranch
    @carlosleongonzalez
    carlosleongonzalez committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    813fc91 View commit details
    Browse the repository at this point in the history

  15. User_InfoController upadated

    @jamalkhanNY
    jamalkhanNY committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    eb5556b View commit details
    Browse the repository at this point in the history

  16. Merge pull request #24 from Revature-Q-Wiz/Jamal's-Branch 

    Jamal's branch
    @jamalkhanNY
    jamalkhanNY committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    8ca5e30 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #25 from Revature-Q-Wiz/Jamal's-Branch 

    Jamal's branch
    @jamalkhanNY
    jamalkhanNY committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    c92f70c View commit details
    Browse the repository at this point in the history

  18. edits to quiz controller, service, and service impl

    @remiimartinnn
    remiimartinnn committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    6eebadc View commit details
    Browse the repository at this point in the history

  19. Merge branch 'frontend' of https://github.com/Revature-Q-Wiz/Q-Wiz-Pr… 

    …oject into frontend
    @remiimartinnn
    remiimartinnn committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    4d5cde3 View commit details
    Browse the repository at this point in the history

  20. updated quiz controller

    @remiimartinnn
    remiimartinnn committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    d48f189 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #27 from Revature-Q-Wiz/Charles-Chase-III 

    Charles chase iii
    @CharlesChaseIII
    CharlesChaseIII committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    3473dfd View commit details
    Browse the repository at this point in the history

  22. Merge pull request #26 from Revature-Q-Wiz/frontend 

    Frontend
    @CharlesChaseIII
    CharlesChaseIII committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    f9c8e5c View commit details
    Browse the repository at this point in the history

  23. deleted old backend and fixed quiz service impl

    @remiimartinnn
    remiimartinnn committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    e040ae7 View commit details
    Browse the repository at this point in the history

  24. Quiz Service and Controller finshed 

    Quiz Service and Controller finshed along with QuestionServiceImpl revisions.
    @CharlesChaseIII
    CharlesChaseIII committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    7f73cd5 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #29 from Revature-Q-Wiz/frontend 

    Frontend
    @jamalkhanNY
    jamalkhanNY committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    bd0da0c View commit details
    Browse the repository at this point in the history

  26. updated changes

    @jamalkhanNY
    jamalkhanNY committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    c049385 View commit details
    Browse the repository at this point in the history

  27. updated quizservice.java 

    .
    @remiimartinnn
    remiimartinnn committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    2a8ed1b View commit details
    Browse the repository at this point in the history

  28. Merge pull request #31 from Revature-Q-Wiz/frontend 

    updated quizservice.java
    @remiimartinnn
    remiimartinnn committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    6380cf3 View commit details
    Browse the repository at this point in the history

  29. Merge branch 'carlosbranch' into Charles-Chase-III

    @CharlesChaseIII
    CharlesChaseIII committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    d1745c2 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2022

  1. Finished Question Controller and QuestionServiceImpl 

    Finished Question Controller and QuestionServiceImpl revisions.
    @CharlesChaseIII
    CharlesChaseIII committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    7289743 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'frontend' into Charles-Chase-III

    @CharlesChaseIII
    CharlesChaseIII committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    11ccd50 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #32 from Revature-Q-Wiz/Charles-Chase-III 

    Charles chase iii
    @CharlesChaseIII
    CharlesChaseIII committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    5d23d43 View commit details
    Browse the repository at this point in the history

  4. deleted replica quiz controller, edited services, controllers and app… 

    …lication.properties
    @remiimartinnn
    remiimartinnn committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    c8453c9 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'Jamal's-Branch' into Charles-Chase-III

    @CharlesChaseIII
    CharlesChaseIII committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    84f1138 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #33 from Revature-Q-Wiz/frontend 

    update
    @CharlesChaseIII
    CharlesChaseIII committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    64eff4f View commit details
    Browse the repository at this point in the history

  7. edits to backend and frontend

    @remiimartinnn
    remiimartinnn committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    021e4ad View commit details
    Browse the repository at this point in the history

  8. Merge pull request #38 from Revature-Q-Wiz/frontend 

    edits to backend and frontend
    @remiimartinnn
    remiimartinnn committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    d2c2df5 View commit details
    Browse the repository at this point in the history

  9. Entity and Question Controller Revisions 

    Correctly mapped forign columns and refernced them to their specific columns in other tables. Also commented out @GetMapping function in quiz controller because it is not working,
    @CharlesChaseIII
    CharlesChaseIII committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    0dc335d View commit details
    Browse the repository at this point in the history

  10. Question Get Mapping fixed 

    All endpoints are running and working.
    @CharlesChaseIII
    CharlesChaseIII committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    bfa5468 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #42 from Revature-Q-Wiz/Charles-Chase-III 

    Entity and Quiz Controller revision
    @remiimartinnn
    remiimartinnn committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    9de36b2 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2022

  1. fixed application.properties file. the driver link used is deprecated… 

    … so the new one is there

you guys will need to change the password in application.properties to whatever your password is in mysql.

i also commented out annotations in user-info and question details because constructors were already implemented
    @remiimartinnn
    remiimartinnn committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    722651e View commit details
    Browse the repository at this point in the history

  2. newest front end edits

    @remiimartinnn
    remiimartinnn committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    4ba0235 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #46 from Revature-Q-Wiz/frontend 

    Frontend
    @remiimartinnn
    remiimartinnn committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    ee748d6 View commit details
    Browse the repository at this point in the history

  4. updated frontend components

    @remiimartinnn
    remiimartinnn committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    dd048bd View commit details
    Browse the repository at this point in the history

  5. final frontend push

    @remiimartinnn
    remiimartinnn committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    e7ed0e7 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #47 from Revature-Q-Wiz/frontend 

    Frontend
    @remiimartinnn
    remiimartinnn committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    f037ab3 View commit details
    Browse the repository at this point in the history