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

255 Commits

Author SHA1 Message Date
Merel Steenbergen
b3a0ddaa68 Retry adding friends. Server down again 2019-03-20 15:44:47 +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
cugurlu
166945871d Fix UserService and UserServiceTest 2019-03-18 14:35:30 +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
f76a6827f7 Fix tests 2019-03-18 12:15:00 +01:00
cugurlu
a2e432d453 Add totalVeganMeal property and fix checkstyle errors 2019-03-18 12:14:30 +01:00
cugurlu
711b16449c Add RestExceptionHandler test 2019-03-18 00:35:29 +01:00
cugurlu
d7960103ee Add UserRepository test 2019-03-18 00:34:51 +01:00
cugurlu
2546355eba Add UserController test 2019-03-18 00:34:26 +01:00
cugurlu
8864320832 Add tests 2019-03-18 00:33:59 +01:00
Ceren Ugurlu
76ebd018bd Delete UserControllerTest.java 2019-03-17 20:50:20 +00:00
Ceren Ugurlu
88e7afb8fb Update the location of ActivityTest.java 2019-03-17 20:49:01 +00:00
Ceren Ugurlu
e92dd0ba2b Delete UserTest.java 2019-03-17 20:47:53 +00:00
Ceren Ugurlu
e0f0e38241 Delete MainController.java 2019-03-17 20:45:22 +00:00
cugurlu
1da7f62c95 Fix the branch and add a test 2019-03-17 18:58:56 +01:00
Merel Steenbergen
0c042daa1c DTO changed to Dto. Still some errors 2019-03-17 18:31:55 +01:00
Merel Steenbergen
bfc9595d21 Changed DTO files to Dto because of checkstyle 2019-03-17 18:23:18 +01:00
Merel Steenbergen
dd74a97c47 Merge branch 'AddFeatureClass' into 'master' 
Add feature class

See merge request cse1105/2018-2019/oopp-group-43/template!25
 2019-03-17 17:10:37 +00: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
Merel Steenbergen
018a164723 Fixed tests 2019-03-17 18:01:59 +01:00
Merel Steenbergen
061a6fc957 Delete useless file 2019-03-17 17:57:18 +01:00
Merel Steenbergen
ba98b30776 Fix merge conflicts 2019-03-17 17:54:24 +01:00
Merel Steenbergen
ed35c77262 Finish activity class and add tests 2019-03-17 17:53:00 +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
Merel Steenbergen
e79280e470 Some more work done on the feature object 2019-03-17 17:50:56 +01:00
Merel Steenbergen
5f4069fcad Add outline of activity class, has bugs 2019-03-17 17:50:21 +01:00
Merel Steenbergen
dc6682d7fa Finish activity class and add tests 2019-03-17 17:46:53 +01:00
Merel Steenbergen
922f8b2657 Some more work done on the feature object 2019-03-17 17:43:45 +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
Ceren Ugurlu
5b13f26dee Update UserDTOTest.java 2019-03-17 16:30:41 +00:00
Ceren Ugurlu
561cca7f5a Update UserDTO.java 2019-03-17 16:29:56 +00:00
cugurlu
20b6e89781 Fix checkstyle errors 2019-03-17 17:27:29 +01:00
Merel Steenbergen
249b40572e Add outline of activity class, has bugs 2019-03-17 17:26:31 +01:00
Merel Steenbergen
a80aaf3a59 Finish activity class and add tests 2019-03-17 17:15:41 +01:00
Merel Steenbergen
454a0ec1a3 Some more work done on the feature object 2019-03-17 17:15:41 +01:00
Merel Steenbergen
82d3f08e2d Fix bugs. Feature abstract class added 2019-03-17 17:15:41 +01:00
Merel Steenbergen
72c8a213a1 Add outline of activity class, has bugs 2019-03-17 17:15:41 +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