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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
cfd5292
toggle on and off for login/register
remiimartinnn Jan 7, 2022
ca2ab03
Repositories Implemented
CharlesChaseIII Jan 9, 2022
e426d6e
Merge pull request #7 from Revature-Q-Wiz/Charles-Chase-III
CharlesChaseIII Jan 9, 2022
87ed035
added table columns in choices & question.java
remiimartinnn Jan 10, 2022
cb93267
Merge pull request #10 from Revature-Q-Wiz/frontend
CharlesChaseIII Jan 10, 2022
04fcca6
Modifications to entities
CharlesChaseIII Jan 10, 2022
c7db008
Merge pull request #11 from Revature-Q-Wiz/Charles-Chase-III
CharlesChaseIII Jan 10, 2022
40d59e4
Merge pull request #12 from Revature-Q-Wiz/Charles-Chase-III
CharlesChaseIII Jan 10, 2022
3a98996
Revert "Modifications to entities"
CharlesChaseIII Jan 10, 2022
00dc4eb
Merge pull request #13 from Revature-Q-Wiz/carlosbranch
carlosleongonzalez Jan 10, 2022
fd0b87d
update to styling / routes
remiimartinnn Jan 10, 2022
ef8c2b0
changed styling
remiimartinnn Jan 10, 2022
8de4d62
edited entities in backend
remiimartinnn Jan 10, 2022
eba80e3
Here I created a new project
CharlesChaseIII Jan 11, 2022
3eaea5f
Merge pull request #15 from Revature-Q-Wiz/Charles-Chase-III
CharlesChaseIII Jan 11, 2022
e5f1338
Merge pull request #17 from Revature-Q-Wiz/Charles-Chase-III
CharlesChaseIII Jan 11, 2022
3c13528
Merge pull request #19 from Revature-Q-Wiz/Charles-Chase-III
CharlesChaseIII Jan 11, 2022
37e32ab
fixed entities, added controller, service, and serviceImpl
remiimartinnn Jan 11, 2022
9df7663
deleted old backend and imported all new files into new backend
remiimartinnn Jan 11, 2022
b2b9f1e
Merge pull request #20 from Revature-Q-Wiz/frontend
CharlesChaseIII Jan 11, 2022
e0c8086
created controller and user_info service
jamalkhanNY Jan 11, 2022
49613d8
Revee's changes
CharlesChaseIII Jan 11, 2022
665f345
Merge pull request #22 from Revature-Q-Wiz/Charles-Chase-III
CharlesChaseIII Jan 11, 2022
ba02956
Merge pull request #23 from Revature-Q-Wiz/Charles-Chase-III
CharlesChaseIII Jan 11, 2022
01e870f
Merge branch 'Jamal's-Branch' of https://github.com/Revature-Q-Wiz/Q-…
jamalkhanNY Jan 11, 2022
eaed57c
created quiz service, quiz service implementation and quiz controller
carlosleongonzalez Jan 11, 2022
813fc91
Merge branch 'carlosbranch' of https://github.com/Revature-Q-Wiz/Q-Wi…
carlosleongonzalez Jan 11, 2022
eb5556b
User_InfoController upadated
jamalkhanNY Jan 11, 2022
8ca5e30
Merge pull request #24 from Revature-Q-Wiz/Jamal's-Branch
jamalkhanNY Jan 11, 2022
c92f70c
Merge pull request #25 from Revature-Q-Wiz/Jamal's-Branch
jamalkhanNY Jan 11, 2022
6eebadc
edits to quiz controller, service, and service impl
remiimartinnn Jan 11, 2022
4d5cde3
Merge branch 'frontend' of https://github.com/Revature-Q-Wiz/Q-Wiz-Pr…
remiimartinnn Jan 11, 2022
d48f189
updated quiz controller
remiimartinnn Jan 11, 2022
3473dfd
Merge pull request #27 from Revature-Q-Wiz/Charles-Chase-III
CharlesChaseIII Jan 11, 2022
f9c8e5c
Merge pull request #26 from Revature-Q-Wiz/frontend
CharlesChaseIII Jan 11, 2022
e040ae7
deleted old backend and fixed quiz service impl
remiimartinnn Jan 11, 2022
7f73cd5
Quiz Service and Controller finshed
CharlesChaseIII Jan 11, 2022
bd0da0c
Merge pull request #29 from Revature-Q-Wiz/frontend
jamalkhanNY Jan 11, 2022
c049385
updated changes
jamalkhanNY Jan 11, 2022
2a8ed1b
updated quizservice.java
remiimartinnn Jan 11, 2022
6380cf3
Merge pull request #31 from Revature-Q-Wiz/frontend
remiimartinnn Jan 11, 2022
d1745c2
Merge branch 'carlosbranch' into Charles-Chase-III
CharlesChaseIII Jan 11, 2022
7289743
Finished Question Controller and QuestionServiceImpl
CharlesChaseIII Jan 12, 2022
11ccd50
Merge branch 'frontend' into Charles-Chase-III
CharlesChaseIII Jan 12, 2022
5d23d43
Merge pull request #32 from Revature-Q-Wiz/Charles-Chase-III
CharlesChaseIII Jan 12, 2022
c8453c9
deleted replica quiz controller, edited services, controllers and app…
remiimartinnn Jan 12, 2022
84f1138
Merge branch 'Jamal's-Branch' into Charles-Chase-III
CharlesChaseIII Jan 12, 2022
64eff4f
Merge pull request #33 from Revature-Q-Wiz/frontend
CharlesChaseIII Jan 12, 2022
021e4ad
edits to backend and frontend
remiimartinnn Jan 12, 2022
d2c2df5
Merge pull request #38 from Revature-Q-Wiz/frontend
remiimartinnn Jan 12, 2022
0dc335d
Entity and Question Controller Revisions
CharlesChaseIII Jan 12, 2022
bfa5468
Question Get Mapping fixed
CharlesChaseIII Jan 12, 2022
9de36b2
Merge pull request #42 from Revature-Q-Wiz/Charles-Chase-III
remiimartinnn Jan 12, 2022
722651e
fixed application.properties file. the driver link used is deprecated…
remiimartinnn Jan 13, 2022
4ba0235
newest front end edits
remiimartinnn Jan 13, 2022
ee748d6
Merge pull request #46 from Revature-Q-Wiz/frontend
remiimartinnn Jan 13, 2022
dd048bd
updated frontend components
remiimartinnn Jan 13, 2022
e7ed0e7
final frontend push
remiimartinnn Jan 13, 2022
f037ab3
Merge pull request #47 from Revature-Q-Wiz/frontend
remiimartinnn Jan 13, 2022
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
3 changes: 3 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/Q-Wiz-Project.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__antlr_antlr_2_7_7.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_9.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_9.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_13_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions ...a/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_12.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__io_github_classgraph_classgraph_4_8_117.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__io_github_toolfactory_jvm_driver_4_0_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__io_github_toolfactory_narcissus_1_0_1.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_12.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__io_swagger_core_v3_swagger_core_2_1_12.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__io_swagger_core_v3_swagger_integration_2_1_12.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading