sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
432 Commits 4 Branches 6 Tags
fcea76f0e93ce0cf7a6832a0ee58a868468e51b9
Commit Graph

91 Commits

Author SHA1 Message Date
Sem van der Hoeven
fcea76f0e9 FIX::fixed checkstyle import error 2019-03-28 22:34:54 +01:00
Sem van der Hoeven
6ab7141f64 ADD::finished GUI for calculator 
now only need to add animations
 2019-03-28 14:09:36 +01:00
Sem van der Hoeven
980e64657a EDIT::finished home section of calculator 2019-03-27 20:51:14 +01:00
Sem van der Hoeven
3dec44ada1 EDIT::Finished Travel GUI section of calculator 2019-03-27 13:10:21 +01:00
Sem van der Hoeven
1d10d1d54b ADD::almost completed travel pane of calculator 2019-03-27 09:44:34 +01:00
Merel Steenbergen
2abad808ad FIX: Checkstyle fixes after merge conflicts 2019-03-26 16:01:53 +01:00
Merel Steenbergen
a540b9e8f2 Resolve merge requests 2019-03-26 15:50:11 +01:00
mlwauben
08d46ea8f0 DELETE:: not used imports 2019-03-26 15:48:51 +01:00
mlwauben
e755107fa8 FIX:: checkstyle fixes 2019-03-26 15:48:50 +01:00
mlwauben
37d3e6c4a7 FIX:: checkstyle 'client' 2019-03-26 15:40:43 +01:00
mlwauben
81f58c86f9 FIX:: checkstyle 'client' tests 2019-03-26 15:39:15 +01:00
mlwauben
97a0e38c40 FIX:: application classes server+client 2019-03-26 15:34:50 +01:00
Merel Steenbergen
470a31889a Resolved the conflicts. We should check if the JavaDoc is still in the right place, because it looked a little weird while resolving the conflicts 
Merge branch 'master' into 'fix/checkstyleAndComments'

# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Server/src/main/java/greenify/server/data/model/User.java
#   src/Server/src/main/java/greenify/server/service/UserService.java
#   src/Server/src/test/java/greenify/server/data/model/UserTest.java
#   src/Server/src/test/java/greenify/server/service/UserServiceTest.java
 2019-03-26 14:33:05 +00:00
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
mlwauben
c6ff4862e6 DELETE:: not used imports 2019-03-26 15:21:23 +01: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
mlwauben
cf96ac30b8 FIX:: checkstyle fixes 2019-03-26 11:55:05 +01:00
Merel Steenbergen
4171b933dc FIX: Spelling error 2019-03-26 11:40:24 +01:00
mlwauben
8677ac94ef FIX:: checkstyle 'client' 2019-03-26 11:34:53 +01:00
mlwauben
bd21e30f26 FIX:: checkstyle 'client' tests 2019-03-26 11:00:24 +01:00
Merel Steenbergen
7a4a031b1d Added some tests for friend methods 2019-03-26 10:47:12 +01:00
mlwauben
f28a4ea924 FIX:: application classes server+client 2019-03-26 08:25:09 +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