sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
348 Commits 4 Branches 6 Tags
987acbad719f1a10c7094e53584056e40acd8078
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sem van der Hoeven b1ab9f4e8a Merge branch 'fix_userTest' into 'master' 
FIX:: fixed the userTest

See merge request cse1105/2018-2019/oopp-group-43/template!20
 2019-03-17 15:38:58 +00:00
Sem van der Hoeven b5defaa581 FIX:: fixed the userTest 
ADD:: added equals, tostring and hashcode methods

ADD:: added equals method test
 2019-03-17 16:23:52 +01:00
Sem van der Hoeven e1448055f5 ADD::Added checkstyle comments 
FIX::fixed some checkstyle warnings
 2019-03-17 15:58:55 +01:00
Sem van der Hoeven 4306372a61 Merge branch 'fix_master' into 'master' 
Merge fix_master branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!18
 2019-03-17 14:47:44 +00:00
Sem van der Hoeven e718e3859b removed .idea folder 2019-03-17 14:32:57 +01:00
Sem van der Hoeven 50c58da035 Update .gitignore 
added that it excludes the .idea directory from the src folder
 2019-03-17 13:31:26 +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
Sem van der Hoeven 5a62ef18dd Merge branch 'Add_registering_GUI' into 'master' 
merge registering GUI branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!15
 2019-03-16 19:35:55 +00: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
Sem van der Hoeven 592015b1cd ADD::Added GUI for the registering 
added a window to the sign up button, registering still gives an exception?
 2019-03-16 18:37:23 +01:00
Sem van der Hoeven 9a294930d8 Merge branch 'database_fixes' into 'master' 
Merge database_fixes branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!14
 2019-03-16 13:50:44 +00:00
Sem van der Hoeven 33c09581ec Merge branch 'fix_ci_building' into 'master' 
merge fix_ci_building into master

See merge request cse1105/2018-2019/oopp-group-43/template!13
 2019-03-16 13:50:29 +00:00
Sem van der Hoeven 9ff1eb6b09 ADD:: added image to add activity button 2019-03-16 14:20:40 +01:00
Sem van der Hoeven ad4e49f65c Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 
Sourcetree needed to merge this?
 2019-03-14 19:26:17 +01:00
Sem van der Hoeven e9bee87a38 FIX::edited correct names in fxml files 
changed the controller names to use the greenify packages

ADD::added button to add a vegetarian meal

only the button
 2019-03-14 19:23:30 +01:00
Sem van der Hoeven 0be9322f66 EDIT:: Update .gitignore 
it should keep the build directory in Client, as that's where the ci reports are saved
 2019-03-14 10:07:52 +00:00
Sem van der Hoeven 25758cfbd2 EDIT::Update .gitlab-ci.yml 
changed image to thijsray/java8-javafx-gradle
 2019-03-14 10:01:12 +00:00
Sem van der Hoeven a265c286eb FIX::fixed package names and imports 
changed gogreen to greenify

FIX::made user tostring test succeed

added toString method to user
 2019-03-12 22:53:43 +01:00
Sem van der Hoeven 5877e307d5 ADD:: added javadoc comments where needed for the checkstyle 
EDIT:: edited some lines to fit the checkstyle

fixed some indentation warnings and line length warnings
 2019-03-11 16:44:55 +01:00
Sem van der Hoeven ece58798f1 REMOVE::removed GoGreen folder 2019-03-11 16:11:09 +01:00
Sem van der Hoeven 7e529f5608 ADD::added meeting notes for meeting 5 2019-03-11 16:06:06 +01:00
Sem van der Hoeven 29229e457c Revert "Revert "MERGE::Merge branch 'fix_gradle_build_file'"" 
This reverts commit 7af5470a8e.
 2019-03-11 16:03:00 +01:00
Sem van der Hoeven 7af5470a8e Revert "MERGE::Merge branch 'fix_gradle_build_file'" 
This reverts commit 309337f26d, reversing
changes made to d902c7401d.
 2019-03-11 15:59:38 +01:00
Sem van der Hoeven 309337f26d MERGE::Merge branch 'fix_gradle_build_file' 
# Conflicts:
#	src/GoGreen/Client/src/test/java/UserServiceTest.java
resolved using 'Theirs'
 2019-03-11 15:48:58 +01:00
Sem van der Hoeven cd7f5b390b ADD::added titles to the pages from the GUI 
the different pages now have titles indicating on what page you are, and switching between pages works now
 2019-03-11 15:40:16 +01:00
Sem van der Hoeven 6df15465e7 Merge branch 'changeDoc' into 'master' 
Add some CO2 emmission scores and good sources to find information to score schema

See merge request cse1105/2018-2019/oopp-group-43/template!11
 2019-03-11 13:52:35 +00:00
Sem van der Hoeven a231b7374d ADD::tried to add application plugin to build.gradle 2019-03-11 14:42:06 +01:00
Sem van der Hoeven aabe922f8f ADD:: Added dashboard 
added controller class and functionality to switch between sections
 2019-03-11 14:05:26 +01:00
Sem van der Hoeven 2e1becbe32 REMOVE::removed settings.gradle file in src folder 
this messed with the paths for the main settings.gradle file
 2019-03-09 14:12:44 +01:00
Sem van der Hoeven 803b0c2064 EDIT:: edited gitignore file to include the .gradle and .idea directories, and to include the classpath and project files. 
maybe this fixes the pipline build failure
 2019-03-09 13:40:19 +01:00
Sem van der Hoeven fa73f6fb4d EDIT:: Reimported project 
reimported project to fix the errors in client application

FIX:: fixed the "location is not set" error in client application when loading fxml file

reimporting the project made it work, as it now has a submodule folder structure

EDIT:: edited settings.gradle file to include the modules in the new structure

EDIT: edited client build.gradle and server build.gradle files to pick the right common folder
(changed complie(:Common) to compile(:src:Common))
 2019-03-09 13:33:15 +01:00
Sem van der Hoeven cab6d9aeeb FIX:: fixed Client application class 
The class was not seeing some imports from the same package, and some getters and setters for User.java were not written, so I wrote those and fixed the imports

FIX:: fixed packages

Everything now isn't in several subpackages in the Client, Common and Server package anymore, but straight in their respectable packages. Also fixed the package names

BUG FIX: fixed Client Application class not being able to see GetBean method

Don't really know how it got fixed, but resolving the import issues also fixed this bug.

EDIT::changed main class in build.gradle file to Client.Application

---------------
I now only get a bug where the fxmlloader can't see the fxml files, and thus I can't start the application. I get the error message "location not set" although I used fxmlloader.setLocation.
 2019-03-07 20:46:51 +01:00
Sem van der Hoeven aa79365784 apparently the changes that were supposed to be made weren't committed in my previous commit, so here is the right one 
REMOVE:: removed the .gradle and build folders from the Client, Server and Common folders, also moved the contents that was in the src folders of these folders, to the folders themselves and deleted the src folders

EDIT:: edited the build.gradle file, build should now work

combined the build.gradle files in the Client, Server and Common folders into the build.gradle file in the root
 2019-03-06 21:22:29 +01:00
Sem van der Hoeven 7a60ecb60f REMOVE:: removed the .gradle and build folders from the Client, Server and Common folders, also moved the contents that was in the src folders of these folders, to the folders themselves and deleted the src folders 
EDIT:: edited the build.gradle file, build should now work

combined the build.gradle files in the Client, Server and Common folders into the build.gradle file in the root

Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into fix_gradle_build_file
 2019-03-06 21:20:09 +01:00
Sem van der Hoeven 7b1dc88653 REMOVE:: removed the .idea and .gradle files from the GoGreen subfolders 
REMOVE:: removed the Client and Server folders from the src folder

they were no longer necessary since everything now is in the GoGreen folder

EDIT:: edited .gitignore file

.gitignore file should now exclude the .idea and .gradle directories

FIX:: fixed the gradle build file.

had to set the main class, for testing purposes I set the GUI.logincontroller class as main class, but this will change
 2019-03-06 16:07:26 +01:00
Sem van der Hoeven 7bdd47ba90 ADD::added .gitlab-ci.yml 
added because it was deleted with merge of branch 'cleanUpRepository', but we need it for the ci
 2019-03-06 14:06:08 +00:00
Sem van der Hoeven 8b94c80ca0 Merge branch 'cleanUpRepository' 
# Conflicts:
#	src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock
#	src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties

Conflicts resolved using 'Theirs'
 2019-03-06 15:01:11 +01:00
Sem van der Hoeven 5b802068ab MOVE::moved GoGreen folder into src folder 
because all our code is in the src folder, the gogreen folder should be here too
 2019-03-06 14:53:22 +01:00
Sem van der Hoeven 3dc679983a FIX:: changed project name in gradle settings from OOP Project to OOPP 
Merge branch 'cleanUpRepository' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template
 2019-03-06 11:08:02 +01:00
Sem van der Hoeven 7953d50409 ADD::Added build.gradle file in root 
combined the contents of the two gradle build files into one, and put it into the root directory.

DELETE::removed pom.xml

deleted the pom.xml file, since it was used for maven and we use gradle in our project
 2019-03-06 10:53:59 +01:00
Sem van der Hoeven ccf71de156 Sem van der Hoeven estimated hours filled in 2019-03-04 12:47:10 +01:00
Sem van der Hoeven 302a7d8d9e Merge branch 'Development' 2019-03-04 11:57:15 +01:00
Sem van der Hoeven f92f436bf7 Added some javadoc comments to GUI 2019-03-04 10:54:55 +01:00
Sem van der Hoeven 30e421d367 Added GUI backbone (login and redirect to main stage) 2019-03-04 09:37:21 +01:00
Sem van der Hoeven 97fb18f6af Add LICENSE 2019-03-01 12:21:25 +00:00
Sem van der Hoeven 77aa7fbb58 made packages for server and client in src folder 2019-03-01 13:03:38 +01:00
Sem van der Hoeven 40d1b04caf updated gitignore, Merge branch 'updateCientServer' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 2019-02-27 09:51:09 +01:00
Sem van der Hoeven 3f333fa420 manually removed the directories that were to be ignored 2019-02-27 09:47:03 +01:00
Sem van der Hoeven 992dadce97 Delete .classpath 2019-02-27 08:28:17 +00:00
Sem van der Hoeven 5b84f43c72 Delete .project 2019-02-27 08:27:15 +00:00
Sem van der Hoeven 9e5a90215b Add .gitlab-ci.yml 2019-02-27 08:22:12 +00:00
Sem van der Hoeven 651dd6cf39 Update 20190225_agenda.md 2019-02-25 15:22:34 +00:00
Sem van der Hoeven b52319380b small update to gitignore, it should now exclude the .gradle and .idea folders in the client and server folder 2019-02-25 16:02:04 +01:00
Sem van der Hoeven 10cbf84cde Update 20190225_agenda.md 2019-02-25 14:59:00 +00:00
Sem van der Hoeven f0d30fa3e8 Update 20190225_agenda.md 2019-02-25 14:47:47 +00:00
Sem van der Hoeven 42b493c9ea Update 20190225_agenda.md 2019-02-25 14:25:18 +00:00
Sem van der Hoeven 09f5492e57 Update 20190225_agenda.md 2019-02-25 14:17:32 +00:00
Sem van der Hoeven d7da1944fb Update 20190225_agenda.md 2019-02-25 14:14:58 +00:00
Sem van der Hoeven 115402896a Added a few comments to server java files 2019-02-25 07:59:10 +01:00
Sem van der Hoeven bbaa0c4ada Added a general overview of the API's and frameworks we've come across 2019-02-25 07:52:56 +01:00
Sem van der Hoeven 05d5a5495b added gitignore to server folder 2019-02-24 13:22:54 +01:00
Sem van der Hoeven 62a64c5b2a Updated agenda with points from meetup on 22-2-2019 2019-02-22 13:30:44 +01:00
Sem van der Hoeven 3b63b33643 Updated the agenda for meeting 25-02 2019-02-22 07:27:15 +01:00
Sem van der Hoeven 56c7eda8c6 Merge branch 'Hello_World_Testing' 2019-02-20 22:56:24 +01:00
Sem van der Hoeven 890dd979fc Added agenda for meeting 2 (25 feb) 2019-02-20 22:53:13 +01:00