Commit Graph

342 Commits

Author SHA1 Message Date
Ceren Ugurlu
7fb44f6867 Delete ApplicationTest.java 2019-03-16 13:34:12 +00:00
Ceren Ugurlu
98df90b0b2 Delete UserJpaRepository.java 2019-03-16 13:27:07 +00:00
cugurlu
4b9e6fce66 Update changes 2019-03-16 14:21:38 +01:00
Sem van der Hoeven
9ff1eb6b09 ADD:: added image to add activity button 2019-03-16 14:20:40 +01: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
928c6f89a6 Edit common classes 2019-03-16 14:16:29 +01:00
cugurlu
20735380e5 Edit client classes 2019-03-16 14:14:17 +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
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
cugurlu
a5b4a2e8f0 Update build.gradle in common 2019-03-14 13:43:03 +01:00
cugurlu
f959ffc066 Fix fxml files 2019-03-14 13:41:32 +01:00
cugurlu
80bc87922c Update build.gradle in common 2019-03-14 12:05:41 +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
cugurlu
a9827b8573 Add client test 2019-03-12 10:18:34 +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
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
aabe922f8f ADD:: Added dashboard
added controller class and functionality to switch between sections
2019-03-11 14:05:26 +01:00
cugurlu
c15ba030bf Fix client test 2019-03-11 11:50:27 +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
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
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
mlwauben
dfc797fab2 DELETE: template files src 2019-03-04 17:03:08 +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
77aa7fbb58 made packages for server and client in src folder 2019-03-01 13:03:38 +01:00
Sem van der Hoeven
890dd979fc Added agenda for meeting 2 (25 feb) 2019-02-20 22:53:13 +01:00
OOP Project Team
d001b5ac26 OOP Project Template 2019-02-14 01:11:37 +01:00