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

141 Commits

Author SHA1 Message Date
Sem van der Hoeven
2b7d51a5ed EDIT::edited font size of random hints 2019-04-05 13:13:27 +02:00
Sem van der Hoeven
75faf4ae8c ADD:added nodes and methods to display random hints to on the GUI 
ADD::added refresh button to get a new hint

EDIT::edited hints to work with the GUI
 2019-04-05 13:11:17 +02:00
Sem van der Hoeven
06daa4776f ADD::added animations to buttons on dashboard screen 
EDIT::changed labels of distance in activities overview to km and km/L

EDIT::made firstCalculator.fxml have the right distance units and added the new extra activities screen
 2019-04-05 09:54:34 +02:00
Sem van der Hoeven
4b07aa8072 EDIT::changed achievement picture, removed trademark and added it into the code 2019-04-05 09:24:58 +02:00
Sem van der Hoeven
50c27cf420 FIX::fixed checkstyle errors 
Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template

# Conflicts:
#	src/Client/src/main/java/greenify/client/Hints.java
#	src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#	src/Server/src/main/java/greenify/server/service/CalculatorService.java
 2019-04-04 13:16:33 +02:00
Sem van der Hoeven
5526c8f467 FIX::fixed checkstyle errors 2019-04-04 13:14:03 +02:00
Mika Wauben
922a7d1fae Merge branch 'Feature/achievements' into 'master' 
Feature/achievements

See merge request cse1105/2018-2019/oopp-group-43/template!63
 2019-04-04 11:05:22 +00:00
Sem van der Hoeven
6ced05278b ADD::added animations to extra activities section 2019-04-04 10:43:32 +02:00
Sem van der Hoeven
9e6505dfa3 ADD::added animations to switching sections in calculator 2019-04-04 10:01:07 +02:00
mlwauben
82eb5575ee FIX:: checkstyle errors (except Cyclomatic Complexity ones) 2019-04-04 08:00:47 +02:00
Mika Wauben
84154fca3a Merge branch 'master' into 'Feature/achievements' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/Friend.java
#   src/Client/src/main/java/greenify/client/Hints.java
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Client/src/main/java/greenify/client/rest/UserService.java
#   src/Client/src/main/resources/fxml/dashboard.fxml
#   src/Client/src/test/java/UserServiceTest.java
#   src/Server/src/main/java/greenify/server/data/model/User.java
#   src/Server/src/main/java/greenify/server/rest/UserController.java
#   src/Server/src/main/java/greenify/server/service/UserService.java
#   src/Server/src/test/java/greenify/server/rest/UserControllerTest.java
#   src/Server/src/test/java/greenify/server/service/UserServiceTest.java
 2019-04-04 05:45:17 +00:00
mlwauben
3aad682394 FIX:: (possible) merge conficts 2019-04-03 22:05:48 +02:00
Sem van der Hoeven
19fef1d4c8 FIX::resolved merge conflict and this fixed the issue where it wouldn't set the children of the extra pane 
Merge branch 'master' into 'add_details_extra_activities'

# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/CalculatorController.java
 2019-04-03 19:11:51 +00:00
mlwauben
28f9f72f07 UPDATE:: achievement things, tests/checkstyle and it actually works now 2019-04-03 20:34:04 +02:00
Merel Steenbergen
f5250aa2a0 Merge branch 'Feature/hints' into 'master' 
Added some 'Green hints'

See merge request cse1105/2018-2019/oopp-group-43/template!61
 2019-04-03 18:08:09 +00:00
Sem van der Hoeven
d5af8816e9 ADD::added extra activities section to calculator 
added section to calculator, and buttons to activities and dashboard to open it seperately
 2019-04-03 19:32:40 +02:00
Merel Steenbergen
6a2eb27627 Merge branch 'Feature/delete_a_friend' into 'master' 
Feature/remove a friend

See merge request cse1105/2018-2019/oopp-group-43/template!60
 2019-04-03 14:29:36 +00:00
Merel Steenbergen
bb6d887036 Added class Hints, including tests 2019-04-03 15:33:26 +02:00
Sem van der Hoeven
54d0537f95 EDIT::changed miles to kilometres in calculator 2019-04-03 11:52:03 +02:00
Merel Steenbergen
12b05f3b73 ADD:: RemoveFriend method and test in client.userService 2019-04-01 16:46:01 +02:00
cugurlu
e78be7ac9f Add co2 saved property tables and tests 2019-04-01 13:59:54 +02:00
Mika Wauben
644f466696 Merge branch 'fix/checkstyle' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into fix/checkstyle 2019-04-01 11:38:23 +00:00
Sem van der Hoeven
d824a3b819 EDIT::changed activities textfields to labels 2019-03-31 19:28:29 +02:00
cugurlu
f4f79484fa Test all new methods 2019-03-31 15:27:07 +02:00
cugurlu
3b4add03ee Add new activity page properties 2019-03-31 15:26:48 +02:00
cugurlu
32c9713835 Add acitivitySummary to GUI 2019-03-31 15:26:06 +02:00
cugurlu
8e11ecbcf4 Add new methods for getInputMap from database 2019-03-31 15:25:40 +02:00
Sem van der Hoeven
c03538ff34 ADD::added section indicator bars to calculator 
Somehow they were deleted, so I added them again. Also added to the extra section
 2019-03-31 14:41:19 +02:00
Sem van der Hoeven
7805122c06 ADD::added 'extra' section to calculator 
added checkboxes to add extra activities
 2019-03-31 14:26:05 +02:00
Ceren Ugurlu
61ed9fc497 Merge branch 'fixBugs_addLeaderboard' into 'master' 
Fix bugs & add leaderboard

See merge request cse1105/2018-2019/oopp-group-43/template!50
 2019-03-31 11:07:47 +00:00
Sem van der Hoeven
85412af2a6 ADD::added style to friends table 2019-03-31 12:41:45 +02:00
cugurlu
cc236c46b6 Add tests for userService 2019-03-31 00:49:16 +01:00
cugurlu
ed695f941d Add leaderboard and fix friend bugs 2019-03-31 00:47:21 +01:00
cugurlu
a41b697510 Fix calculator bugs 2019-03-31 00:45:50 +01:00
Sem van der Hoeven
ebaeff9fad EDIT::changed colour scheme of 'add friend' button 2019-03-30 19:29:49 +01:00
Ceren Ugurlu
1437bbc1bc Merge branch 'connect_friends_GUI' into 'master' 
Edit GUI for friend property

See merge request cse1105/2018-2019/oopp-group-43/template!49
 2019-03-30 10:58:18 +00:00
Sem van der Hoeven
0b2677fd06 ADD:added section indicators to calculator 
Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template

# Conflicts:
#	src/Client/src/main/resources/fxml/calculator.fxml
 2019-03-30 11:18:50 +01:00
Sem van der Hoeven
336e56bb51 ADD:: added section indicator bars to calculator 2019-03-30 11:17:12 +01:00
Ceren Ugurlu
026cd15009 Update DashBoardController.java 2019-03-30 09:36:41 +00:00
cugurlu
a64b31001a Edit dashboard for new properties 2019-03-29 18:11:39 +01:00
cugurlu
704854e8b5 Add new controller friends 2019-03-29 18:11:16 +01:00
cugurlu
25c8951530 Add fxml file for add friend page 2019-03-29 18:10:55 +01:00
cugurlu
e41f434a28 Add new class for tableView 2019-03-29 18:10:01 +01:00
cugurlu
0530fc4ddb Add new icons 2019-03-29 18:09:31 +01:00
cugurlu
d0beb236ea Edit to connect calculator with GUI 2019-03-29 12:47:24 +01:00
mlwauben
c62e4719ea ADD:: test fxml+controller 2019-03-28 23:11:58 +01:00
Sem van der Hoeven
56bd05324c Merge branch 'finish_calculator_GUI' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into finish_calculator_GUI 
Sourcetree needed to merge this?
 2019-03-28 22:35:54 +01:00
Sem van der Hoeven
fcea76f0e9 FIX::fixed checkstyle import error 2019-03-28 22:34:54 +01:00
Sem van der Hoeven
6fd04b1d0a EDiT:: resolved merge conflicts, most were just empty lines in master 
Merge branch 'master' into 'finish_calculator_GUI'

# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/CalculatorController.java
#   src/Client/src/main/resources/fxml/calculator.fxml
 2019-03-28 19:44:01 +00: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