Commit Graph

85 Commits

Author SHA1 Message Date
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
cugurlu
07c76dd385 Fix checkstyle errors 2019-03-17 17:08:46 +01:00
cugurlu
f5fa03b104 Add checkstyle plugin 2019-03-17 17:06:50 +01: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
cugurlu
a605e1a92e Update changes 2019-03-17 15:19:43 +01:00
Ceren Ugurlu
c23344e8ef Revert "Merge branch 'master' into 'vegetarian_meal'"
This reverts commit b3eeffdb32aa058f9f1aa6b9cbec3d05e2d07b8f
2019-03-17 13:24:32 +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
cugurlu
4b702bc63b Add configurations for basic authentication 2019-03-16 22:43:30 +01:00
Ceren Ugurlu
98df90b0b2 Delete UserJpaRepository.java 2019-03-16 13:27:07 +00:00
cugurlu
479ed8e7f2 Add new tests 2019-03-16 14:18:40 +01:00
cugurlu
59c84f2c09 Add new classes for database 2019-03-16 14:17:35 +01:00
cugurlu
31499adc00 Add application.properties 2019-03-16 14:10:22 +01:00
cugurlu
2b04ce2306 Fix build.gradle files 2019-03-16 14:06:46 +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
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
cugurlu
d02393400e Fix names of directories 2019-03-12 10:27:30 +01:00
cugurlu
7548df160d Add tests for server 2019-03-12 10:22:07 +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
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
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
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
30e421d367 Added GUI backbone (login and redirect to main stage) 2019-03-04 09:37:21 +01:00
Sem van der Hoeven
77aa7fbb58 made packages for server and client in src folder 2019-03-01 13:03:38 +01:00