sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
401 Commits 4 Branches 6 Tags
90bf334c1954b82a2fb25406688d65d608e6bf8b
Commit Graph
73 Commits
Author SHA1 Message Date
Merel Steenbergen 90bf334c19 Merge branch 'AddFriends' into 'master' 
Add methods and tests for friends.

See merge request cse1105/2018-2019/oopp-group-43/template!43
 2019-03-26 14:29:14 +00:00
Sem van der Hoeven bc6e8cd89d Merge branch 'master' into 'Add_Calculator_to_GUI' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Client/src/main/resources/fxml/dashboard.fxml

the conflicts were only empty lines on the master
 2019-03-26 14:04:49 +00:00
Merel Steenbergen b1f3725f71 Change wrong url (setInput to addFriend) on Client userService 2019-03-26 13:52:13 +00:00
Merel Steenbergen 4171b933dc FIX: Spelling error 2019-03-26 11:40:24 +01:00
Merel Steenbergen 7a4a031b1d Added some tests for friend methods 2019-03-26 10:47:12 +01:00
Sem van der Hoeven 71fc659c79 ADD::added javadoc comments to calculatorController class 2019-03-25 16:25:13 +01:00
Sem van der Hoeven 4cb256a30a FIX::deleted onAction of 'addVeganMeal' button, as this method was deleted 2019-03-25 15:58:34 +01:00
Sem van der Hoeven 521426ac16 ADD::added style to some buttons 
EDIT::changed travel pane from anchor pane to scroll pane
 2019-03-25 15:45:31 +01:00
Sem van der Hoeven 987acbad71 ADD::added calculator window to GUI 
ADD::added button to open calculator to main window
 2019-03-25 14:51:25 +01:00
cugurlu 99143a8f20 Fix error 2019-03-25 13:30:25 +01:00
cugurlu 34e010f62d Fix client errors 2019-03-25 13:18:48 +01:00
cugurlu e8108498ad Update UserDto and delete addVeganMealProperty 2019-03-25 13:07:03 +01:00
Ceren Ugurlu eb3326481a Merge branch 'Add_friends_to_GUI' into 'master' 
merge Add_friends_to_gui into master

See merge request cse1105/2018-2019/oopp-group-43/template!39
 2019-03-24 11:05:11 +00:00
Sem van der Hoeven b3d4f573f8 ADD::added table to friends pane 2019-03-24 12:01:34 +01:00
Merel Steenbergen e494b5294d Revert "Merge branch 'AddFriends' into 'master'" 
This reverts merge request !37
 2019-03-23 17:31:00 +00:00
Mika Wauben 5b3896d310 Merge branch 'AddFriends' into 'master' 
Add basic friends

See merge request cse1105/2018-2019/oopp-group-43/template!37
 2019-03-23 12:09:33 +00:00
Merel Steenbergen e69e08ad15 EDIT: Try to fix server, again 2019-03-22 18:44:59 +01:00
cugurlu bddf984438 Clean up all unnecessary files 2019-03-21 18:07:14 +01:00
Sem van der Hoeven dfdbc8d5a9 ADD::added friends pane and button to dashboard 
ADD::added load animations to register window
 2019-03-21 10:45:54 +01:00
Sem van der Hoeven 93aaf19f13 DEBUG/FIX::fixed bug where total amount of vegetarian meals wouldn't update 
fixed the bug where totalVeganMeals wouldn't update on clicking the activities button if you were already on the activities screen

ADD::added id to 'add activity' button on dashboard

for adding a color change when clicking it, still need to implement it completely
 2019-03-20 13:15:12 +01:00
Sem van der Hoeven 8345b6c06f ADD::Added slide-in transition for the menu bar 
it gets played on load, right now it sometimes is a bit laggy but not sure if that is JavaFX or just everything getting loaded
 2019-03-20 08:08:32 +01:00
Sem van der Hoeven 292035498c Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 
SourceTree needed to merge this?
 2019-03-19 14:52:19 +01:00
Sem van der Hoeven 1f78805f9b EDIT::Changed Login screen name from Go Green to Greenify 2019-03-19 14:49:47 +01:00
Ceren Ugurlu 121b86a73e Merge branch 'master' into 'fixMaster' 2019-03-19 13:09:13 +00:00
Sem van der Hoeven 920c7c798d ADD::added more comments 2019-03-18 20:47:34 +01:00
Sem van der Hoeven b8f4415825 ADD::added comments to most classes to make it more understandable 2019-03-18 17:07:38 +01:00
cugurlu 563c72ffec Update branch 2019-03-18 16:56:44 +01:00
Sem van der Hoeven ecdc9f3a4f ADD::Added hover effects 2019-03-18 15:48:10 +01:00
Sem van der Hoeven 8dd8ae28d4 ADD::added animations 
added animations for switching between panes in the main stage
 2019-03-18 15:30:55 +01:00
Sem van der Hoeven 6a71823885 ADD::added stylesheet for login window 
added style to the buttons, the same as in the register window
changed the font of the title
changed the font and color of the 'forgot password' link

ADD::added display of name on dashboard

added initialize method to set the 'welcome back' text to include the username of the user
 2019-03-18 14:43:15 +01:00
Sem van der Hoeven 874c6fba06 ADD::added title to main program stage 
now displays "Greenify - <username>"
 2019-03-18 13:34:34 +01:00
cugurlu 584e5bf90c Update GUI 2019-03-18 13:06:04 +01:00
cugurlu a2e432d453 Add totalVeganMeal property and fix checkstyle errors 2019-03-18 12:14:30 +01:00
cugurlu 8864320832 Add tests 2019-03-18 00:33:59 +01:00
cugurlu 1da7f62c95 Fix the branch and add a test 2019-03-17 18:58:56 +01:00
Merel Steenbergen bfc9595d21 Changed DTO files to Dto because of checkstyle 2019-03-17 18:23:18 +01:00
Sem van der Hoeven 4b77102205 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 
# Conflicts:
#	src/.idea/checkstyle-idea.xml
#	src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#	src/Client/src/main/java/greenify/client/controller/UserController.java
#	src/Client/src/main/java/greenify/client/rest/UserService.java
#	src/Server/src/main/java/greenify/server/data/repository/UserRepository.java
#	src/Server/src/main/java/greenify/server/rest/UserController.java
#	src/Server/src/main/java/greenify/server/service/UserService.java
 2019-03-17 18:02:30 +01:00
Sem van der Hoeven 09c7817eef Merge branch 'Develop_GUI_further' into master 
# Conflicts:
#	src/.idea/workspace.xml
#	src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#	src/Client/src/main/java/greenify/client/controller/UserController.java
#	src/Client/src/main/java/greenify/client/rest/UserService.java
#	src/Server/src/main/java/greenify/server/data/model/User.java
#	src/Server/src/main/java/greenify/server/data/repository/UserRepository.java
#	src/Server/src/main/java/greenify/server/rest/UserController.java
#	src/Server/src/main/java/greenify/server/service/UserService.java

resolved conflicts manually, used the ones from 'Develop_GUI_further'
 2019-03-17 17:52:25 +01:00
cugurlu 20b6e89781 Fix checkstyle errors 2019-03-17 17:27:29 +01:00
Ceren Ugurlu 0d0b78f6d0 Update Application.java 2019-03-17 16:13:05 +00:00
cugurlu 07c76dd385 Fix checkstyle errors 2019-03-17 17:08:46 +01:00
cugurlu f5fa03b104 Add checkstyle plugin 2019-03-17 17:06:50 +01:00
Sem van der Hoeven e1448055f5 ADD::Added checkstyle comments 
FIX::fixed some checkstyle warnings
 2019-03-17 15:58:55 +01:00
cugurlu a605e1a92e Update changes 2019-03-17 15:19:43 +01:00
Ceren Ugurlu c23344e8ef Revert "Merge branch 'master' into 'vegetarian_meal'" 
This reverts commit b3eeffdb32aa058f9f1aa6b9cbec3d05e2d07b8f
 2019-03-17 13:24:32 +00:00
Sem van der Hoeven a817d9118a ADD::added buttons and counters for the various activities 
they don't have functionality yet, but they are already placed

ADD::added methods to get the name of  the user
 2019-03-17 14:16:29 +01:00
Sem van der Hoeven fb6dfcdd20 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 2019-03-17 13:11:00 +01:00
Sem van der Hoeven 7539dd20f6 EDIT::changed GUI name to greenify 2019-03-17 13:09:27 +01:00
cugurlu 4b702bc63b Add configurations for basic authentication 2019-03-16 22:43:30 +01:00
Sem van der Hoeven 0fb1991240 Merge branch 'master' into 'Add_registering_GUI' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/Application.java
#   src/Client/src/main/java/greenify/client/controller/UserController.java
#   src/Client/src/main/resources/stylesheets/dashboardStyle.css
 2019-03-16 17:40:58 +00:00