Skip to content

Back end master #26

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

Open
hamilbrian wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Back end master #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3bb23d1
Updated add event is working as well as authentication
deibele1 Apr 15, 2020
2b52b02
Update
deibele1 Apr 15, 2020
7025bd1
gets all events at event/all
John-Aye Apr 15, 2020
ed8a9c3
auth and userController throwing errors for not having the same file …
John-Aye Apr 15, 2020
48850aa
changed /event/all to / with get method
John-Aye Apr 15, 2020
db3ea05
added event filtering by 30days, 60days, and 90days, at /30day /60day…
John-Aye Apr 15, 2020
e86876b
Merge pull request #17 from deibele1/JohnBranch
deibele1 Apr 16, 2020
006d09f
No real changes, I just removed the consumes attribute from the get e…
deibele1 Apr 16, 2020
75f6de9
30day, 60day, and 90day now list in order of which event is coming ne…
John-Aye Apr 16, 2020
3dc876a
backend only returns basic event info for security purposes
John-Aye Apr 16, 2020
6e6075e
event controllers now include category
John-Aye Apr 16, 2020
649fefd
Merge branch 'BackEndMaster' into JohnBranch
John-Aye Apr 16, 2020
b7dbd9f
output for basic event info is now in the correct order
John-Aye Apr 16, 2020
0ee2190
Merge branch 'JohnBranch' of https://github.com/deibele1/TeamDeathSta…
John-Aye Apr 16, 2020
5a11c0a
get events by category now works at /1 for politics, /2 for economics…
John-Aye Apr 16, 2020
e817b00
Merge pull request #18 from deibele1/JohnBranch
deibele1 Apr 17, 2020
49ab077
Fixed null description
Apr 17, 2020
45d9e41
Changed to update
Apr 17, 2020
b20179a
added prediction controller
Apr 17, 2020
ff644f0
clean up
hamilbrian Apr 18, 2020
9400684
cleanup
hamilbrian Apr 18, 2020
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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/.DS_Store
View file
Open in desktop
Binary file not shown.
49 changes: 0 additions & 49 deletions BackEnd 2/.classpath
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions BackEnd 2/.project
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions BackEnd 2/.settings/org.eclipse.core.resources.prefs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions BackEnd 2/.settings/org.eclipse.jdt.apt.core.prefs
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions BackEnd 2/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions BackEnd 2/.settings/org.eclipse.m2e.core.prefs
View file
Open in desktop

This file was deleted.

Binary file removed BackEnd 2/src/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/src/main/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/src/main/java/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/src/main/java/death/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/src/main/java/death/star/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/src/main/java/death/star/reactor/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/src/main/java/death/star/reactor/beans/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/target/classes/.DS_Store
View file
Open in desktop
Binary file not shown.
6 changes: 0 additions & 6 deletions BackEnd 2/target/classes/application 2.properties
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions BackEnd 2/target/classes/application.properties
View file
Open in desktop

This file was deleted.

Binary file removed BackEnd 2/target/classes/com/example/demo/BackEndApplication 2.class
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/target/classes/com/example/demo/BackEndApplication.class
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/target/classes/death/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/target/classes/death/star/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/target/classes/death/star/reactor/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/target/classes/death/star/reactor/beans/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/target/classes/death/star/reactor/beans/User 2.class
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/target/classes/death/star/reactor/beans/User.class
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/target/test-classes/com/example/demo/BackEndApplicationTests 2.class
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd 2/target/test-classes/com/example/demo/BackEndApplicationTests.class
View file
Open in desktop
Binary file not shown.
117 changes: 0 additions & 117 deletions BackEnd/.mvn/wrapper/MavenWrapperDownloader.java
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions BackEnd/bin/.gitignore
View file
Open in desktop

This file was deleted.

Binary file removed BackEnd/bin/.mvn/wrapper/maven-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions BackEnd/bin/.mvn/wrapper/maven-wrapper.properties
View file
Open in desktop

This file was deleted.

124 changes: 0 additions & 124 deletions BackEnd/bin/pom.xml
View file
Open in desktop

This file was deleted.

Binary file removed BackEnd/bin/src/main/java/com/example/demo/BackEndApplication.class
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd/bin/src/main/java/death/star/reactor/beans/Category.class
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd/bin/src/main/java/death/star/reactor/beans/Description.class
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd/bin/src/main/java/death/star/reactor/beans/Event.class
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd/bin/src/main/java/death/star/reactor/beans/Login.class
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd/bin/src/main/java/death/star/reactor/beans/Name.class
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd/bin/src/main/java/death/star/reactor/beans/Prediction.class
View file
Open in desktop
Binary file not shown.
Binary file removed BackEnd/bin/src/main/java/death/star/reactor/beans/User.class
View file
Open in desktop
Binary file not shown.
6 changes: 0 additions & 6 deletions BackEnd/bin/src/main/resources/application.properties
View file
Open in desktop

This file was deleted.

Binary file removed BackEnd/bin/src/test/java/com/example/demo/BackEndApplicationTests.class
View file
Open in desktop
Binary file not shown.
Loading