sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
670 Commits 4 Branches 6 Tags
367daa1efff74267e19af540a49fcb75e6672cf0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sem van der Hoeven f56a959720 Merge branch 'add/more_animations' into 'master' 
Add/more animations

See merge request cse1105/2018-2019/oopp-group-43/template!85
 2019-04-10 19:25:41 +00:00
Sem van der Hoeven 377db10f13 EDIT::changed color of register window button 2019-04-10 12:24:11 +02:00
Sem van der Hoeven 50fb2078b0 EDIT::fixed checkstyle import 2019-04-10 12:22:23 +02:00
Sem van der Hoeven 123a767a75 ADD::added style to button in register window 2019-04-10 12:19:31 +02:00
Sem van der Hoeven e0e6744c95 EDIT::removed lines from background of vegetarian meals achievement picture 2019-04-10 12:07:07 +02:00
Sem van der Hoeven cfc238af73 ADD::Added animations to switching panes in extra activities 2019-04-10 12:04:17 +02:00
Sem van der Hoeven 78e050751f ADD::added animations to buttons in login and register screen 2019-04-10 11:49:31 +02:00
Sem van der Hoeven c8cbb25f5d Merge branch 'update/notes_week9' into 'master' 
Update/notes week9

See merge request cse1105/2018-2019/oopp-group-43/template!81
 2019-04-08 14:19:03 +00:00
Sem van der Hoeven 5653800d47 ADD::Added notes for week 9 2019-04-08 16:15:44 +02:00
Sem van der Hoeven 6d7e73586f Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 
Sourcetree needed to merge this?
 2019-04-08 15:52:20 +02:00
Sem van der Hoeven 12ca633461 EDIT::suppressed some duplicate warnings 2019-04-08 15:51:44 +02:00
Sem van der Hoeven a715babcd9 ADD::added first part of notes week 9 2019-04-08 15:50:08 +02:00
Sem van der Hoeven 9fc42247da EDIT::added required values to saving co2 and using bike achievements 2019-04-08 15:33:18 +02:00
Sem van der Hoeven 3cc01e4f4a EDIT::added style to logout button 2019-04-08 15:02:15 +02:00
Sem van der Hoeven 83611c4ecc Merge branch 'add/activity_tooltips' into 'master' 
Add/activity tooltips

See merge request cse1105/2018-2019/oopp-group-43/template!75
 2019-04-08 12:36:45 +00:00
Sem van der Hoeven 3e7fbeae75 EDIT::Update .gitlab-ci.yml 
undid code coverage part
 2019-04-08 12:27:06 +00:00
Sem van der Hoeven 839292ad91 EDIT::Update .gitlab-ci.yml 
added code coverage
 2019-04-08 12:26:23 +00:00
Sem van der Hoeven 6ba21c331d FIX::fixed compileJava build failing 
the last merge undid the change of this line, this should fix it
 2019-04-08 14:21:20 +02:00
Sem van der Hoeven 0cda63cacb Merge branch 'add/activity_tooltips' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into add/activity_tooltips 
sourceTree needed to merge this?
 2019-04-08 14:19:06 +02:00
Sem van der Hoeven 79fd69503c FIX::fixed complieJava build failing 2019-04-08 14:17:06 +02:00
Sem van der Hoeven cbf15d9574 Merge branch 'master' into 'add/activity_tooltips' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java
 2019-04-08 12:13:44 +00:00
Sem van der Hoeven 18a0973af4 EDIT::added style to tooltips and reduced delay between hovering over the achievement and the tooltip appearing 
EDIT::fixed some checkstyle warnings
 2019-04-08 14:00:21 +02:00
Sem van der Hoeven 9e37421d6d ADD::added tooltip texts to all achievements 2019-04-08 13:08:20 +02:00
Sem van der Hoeven 31def99398 ADD::added buttons to apply tooltips to for the activities 
because you can't apply tooltips to imageviews, I added the achievement images to buttons to which you can add tooltips
 2019-04-08 12:55:32 +02:00
Sem van der Hoeven 2025fd02cc Merge branch 'feature/localProduce_and_publicTransport' into 'master' 
feature/buying local produce and using public transport

See merge request cse1105/2018-2019/oopp-group-43/template!70
 2019-04-07 17:57:01 +00:00
Sem van der Hoeven b05b0ecaf7 DELETE::deleted the confirm methods for the extra activities 
this should fix the build failing
 2019-04-07 17:55:57 +02:00
Sem van der Hoeven e9efdf5f24 Merge branch 'master' into 'feature/localProduce_and_publicTransport' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java
#   src/Client/src/main/resources/fxml/extraActivities.fxml
 2019-04-07 12:16:42 +00:00
Sem van der Hoeven c0e0063465 ADD::added animations to buttons in login and register window 2019-04-06 21:05:19 +02:00
Sem van der Hoeven 61a99d47d1 ADD::added local produce and public transport sections to the extra activities section 
added the panes and designated buttons

ADD::added placeholder methods for communicating adding the activities to the server
 2019-04-06 20:20:01 +02:00
Sem van der Hoeven 6cbabbdf8d Merge branch 'update/achievements' into 'master' 
Update/achievements

See merge request cse1105/2018-2019/oopp-group-43/template!68
 2019-04-06 17:20:49 +00:00
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
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
Sem van der Hoeven 86f1b724c7 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 2019-04-04 09:27:52 +02:00
Sem van der Hoeven 90d50624f6 EDIT::added imports to dashboard.fxml 2019-04-04 09:27:09 +02:00
Sem van der Hoeven c5f7cac9db Merge branch 'add_details_extra_activities' into 'master' 
add/added extra activities GUI

See merge request cse1105/2018-2019/oopp-group-43/template!62
 2019-04-03 19:15:46 +00: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
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
Sem van der Hoeven 54d0537f95 EDIT::changed miles to kilometres in calculator 2019-04-03 11:52:03 +02:00
Sem van der Hoeven d824a3b819 EDIT::changed activities textfields to labels 2019-03-31 19:28:29 +02:00
Sem van der Hoeven a9f63f6fab Merge branch 'Add_extras_to_calculator' into 'master' 
edit/edited back javafx imports for checkstyle

See merge request cse1105/2018-2019/oopp-group-43/template!52
 2019-03-31 13:31:08 +00:00
Sem van der Hoeven 9f3597124d EDIT::edited back javafx imports for checkstyle 2019-03-31 15:28:08 +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
Sem van der Hoeven 85412af2a6 ADD::added style to friends table 2019-03-31 12:41:45 +02:00
Sem van der Hoeven ebaeff9fad EDIT::changed colour scheme of 'add friend' button 2019-03-30 19:29:49 +01: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
Sem van der Hoeven a92a5b6e47 Merge branch 'finish_calculator_GUI' into 'master' 
Finished calculator GUI

See merge request cse1105/2018-2019/oopp-group-43/template!47
 2019-03-28 21:37:43 +00: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
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
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
Sem van der Hoeven 7a11e6260e EDIT::Update README.md 
updated location of pictures
 2019-03-25 15:52:52 +00:00
Sem van der Hoeven b0cdd9bff7 EDIT::Update 20190325_agenda.md 
checked presence and edited Daan leaving the study
 2019-03-25 15:34:47 +00: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
Sem van der Hoeven d5319fc973 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 
sourcetree needed to merge this
 2019-03-24 12:11:38 +01:00
Sem van der Hoeven 566af39b0d ADD::added Agenda for next meetinf (25-03-2019) 2019-03-24 12:10:58 +01:00
Sem van der Hoeven b3d4f573f8 ADD::added table to friends pane 2019-03-24 12:01:34 +01:00
Sem van der Hoeven ae000baba4 EDIT:::edited .gitignore 
files like .classpath and .project were commented out, they now should be ignored by git
 2019-03-22 09:25:48 +01:00
Sem van der Hoeven caf9e3e1d9 Merge branch 'cleanUp_files' into 'master' 
Merge cleanUp_files into master

See merge request cse1105/2018-2019/oopp-group-43/template!36
 2019-03-22 07:41:37 +00: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
Sem van der Hoeven 9d38e1e541 Merge branch 'fixMaster' into 'master' 
Merge fixMaster into master

See merge request cse1105/2018-2019/oopp-group-43/template!35
 2019-03-19 13:48:39 +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
Sem van der Hoeven ecdc9f3a4f ADD::Added hover effects 2019-03-18 15:48:10 +01:00
Sem van der Hoeven 2c32b7d65b Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 
SourceTree needed to merge this?
 2019-03-18 15:31:41 +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 baa681833e Merge branch 'Add_report' into 'master' 
Merge Add_report branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!33
 2019-03-18 13:40:02 +00: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
Sem van der Hoeven 6945eddf5d Merge branch 'Get_UserControllerTest_Working' 
# Conflicts:
#	src/Server/src/test/java/UserControllerTest.java
 2019-03-18 12:20:44 +01:00
Sem van der Hoeven 3e5957b807 EDIT::commented out usercontrollertest, as it is still not working, but want to merge this branch to get the gui properly 2019-03-18 12:10:43 +01:00
Sem van der Hoeven f66191f136 Merge branch 'Add_tests' into 'master' 
Merge Add_tests branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!28
 2019-03-17 23:39:20 +00:00
Sem van der Hoeven 3c5bc0a651 FIX::fixed the fxml Label names 
there were exceptions when trying to add a vegetarian meal, this was caused by the method not accessing the right label to change
 2019-03-17 22:14:27 +01:00
Sem van der Hoeven aa393da53b FIX::fixed FXML declarations under fields 2019-03-17 22:05:29 +01:00
Sem van der Hoeven 282d2026ba FIX::fixed UserDto names 
ADD::tried to add second test to see what was the problem, but no luck so far
 2019-03-17 21:42:52 +01:00
Sem van der Hoeven b0e2ad2903 ADD::added checkstyle file 
it somehow got deleted
 2019-03-17 19:25:50 +01:00
Sem van der Hoeven 8c13a8bf39 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 2019-03-17 19:23:32 +01:00
Sem van der Hoeven 01b4ac4287 FIX::Corrected the UserDto name change in Userservice of server 
the references were still to UserDTO instead of the new UserDto
 2019-03-17 19:22:59 +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
Sem van der Hoeven 2999359b01 Merge branch 'master' into 'AddFeatureClass' 
# Conflicts:
#   src/Server/src/main/java/greenify/server/data/model/User.java
#   src/Server/src/main/java/greenify/server/service/UserService.java
 2019-03-17 16:37:45 +00:00
Sem van der Hoeven ec63a64248 Merge branch 'checkstyle' into 'master' 
Merge checkstyle branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!24
 2019-03-17 16:33:48 +00:00