diff --git a/.classpath b/.classpath
deleted file mode 100644
index f3a1f5f..0000000
--- a/.classpath
+++ /dev/null
@@ -1,420 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.project b/.project
deleted file mode 100644
index dd47242..0000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- OOPP
-
-
-
- org.eclipse.jdt.core.javanature
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
-
diff --git a/CSE1105.checkstyle.xml b/CSE1105.checkstyle.xml
deleted file mode 100644
index d0fe4b0..0000000
--- a/CSE1105.checkstyle.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/classes/production/OOPP/META-INF/OOPP.kotlin_module b/classes/production/OOPP/META-INF/OOPP.kotlin_module
deleted file mode 100644
index 8fb6019..0000000
Binary files a/classes/production/OOPP/META-INF/OOPP.kotlin_module and /dev/null differ
diff --git a/src/Client/src/main/java/greenify/client/Application.java b/src/Client/src/main/java/greenify/client/Application.java
index a8e7d4f..f484329 100644
--- a/src/Client/src/main/java/greenify/client/Application.java
+++ b/src/Client/src/main/java/greenify/client/Application.java
@@ -53,10 +53,6 @@ public class Application extends javafx.application.Application {
primaryStage.setTitle("Greenify");
//set the scene
Scene scene = new Scene(rootNode);
- //add the stylesheet
- scene.getStylesheets()
- .add(getClass().getClassLoader().getResource("stylesheets/LoginWindowStyle.css")
- .toExternalForm());
primaryStage.setScene(scene);
primaryStage.show();
}
diff --git a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
index f9e34fa..8113fb9 100644
--- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
+++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
@@ -39,7 +39,7 @@ public class DashBoardController {
@FXML
private Label welcomebacktext;
- FadeTransition fadeTrans; //transition for switching between the different panels
+ private FadeTransition fadeTrans;
/**
* loads the 'welcome back' text before anything else.
@@ -60,7 +60,6 @@ public class DashBoardController {
fadeTrans.play();
}
-
/**
* displays the dashboard pane.
* @param event the event (clicking the button)
@@ -81,7 +80,6 @@ public class DashBoardController {
*/
public void displayActivities(ActionEvent event) {
addFadeTransition(activitiesPane);
-
totalVeganMealCounter.setText("" + userService.currentUser.getVeganMeal());
System.out.println("display activities");
dashboardPane.setVisible(false);
@@ -100,8 +98,6 @@ public class DashBoardController {
dashboardPane.setVisible(false);
userPane.setVisible(true);
activitiesPane.setVisible(false);
-
-
}
/**
@@ -109,8 +105,6 @@ public class DashBoardController {
* @param event the event (clicking the button)
*/
public void addVeganMeal(ActionEvent event) {
- FadeTransition updateTrans = new FadeTransition(Duration.millis(200), totalVeganMealCounter);
-
count++;
int net = userService.currentUser.getVeganMeal() + count;
totalVeganMealCounter.setText("" + net);
@@ -120,4 +114,4 @@ public class DashBoardController {
userService.currentUser.getName());
System.out.println("Vegetarian meal is added");
}
-}
\ No newline at end of file
+}
diff --git a/src/Client/src/main/resources/fxml/dashboard.fxml b/src/Client/src/main/resources/fxml/dashboard.fxml
index d0ec88a..9c82caf 100644
--- a/src/Client/src/main/resources/fxml/dashboard.fxml
+++ b/src/Client/src/main/resources/fxml/dashboard.fxml
@@ -216,3 +216,4 @@
+
diff --git a/src/Client/src/main/resources/fxml/sample.fxml b/src/Client/src/main/resources/fxml/sample.fxml
index 9087fc3..ea80989 100644
--- a/src/Client/src/main/resources/fxml/sample.fxml
+++ b/src/Client/src/main/resources/fxml/sample.fxml
@@ -1,14 +1,10 @@
-
-
-
-
@@ -17,15 +13,15 @@
-
+
-
+
-
+
diff --git a/src/Client/src/main/resources/stylesheets/dashboardStyle.css b/src/Client/src/main/resources/stylesheets/dashboardStyle.css
index 1cc0944..2cdebe8 100644
--- a/src/Client/src/main/resources/stylesheets/dashboardStyle.css
+++ b/src/Client/src/main/resources/stylesheets/dashboardStyle.css
@@ -12,9 +12,6 @@
#dashboardButton {
-fx-background-color: #5a635c;
}
-#dashboardButton:hover {
- -fx-background-color: #677069;
-}
#dashboardButton:pressed {
-fx-background-color: #b7e2c2;
}
@@ -22,9 +19,6 @@
#userButton {
-fx-background-color: #5a635c;
}
-#userButton:hover {
- -fx-background-color: #677069;
-}
#userButton:pressed {
-fx-background-color: #b7e2c2;
}
@@ -32,9 +26,6 @@
#activitiesButton {
-fx-background-color: #5a635c;
}
-#activitiesButton:hover {
- -fx-background-color: #677069;
-}
#activitiesButton:pressed {
-fx-background-color: #b7e2c2;
}
diff --git a/src/Server/src/main/java/greenify/server/rest/UserController.java b/src/Server/src/main/java/greenify/server/rest/UserController.java
index 2922737..3236f39 100644
--- a/src/Server/src/main/java/greenify/server/rest/UserController.java
+++ b/src/Server/src/main/java/greenify/server/rest/UserController.java
@@ -1,11 +1,11 @@
package greenify.server.rest;
import greenify.common.UserDto;
+import greenify.server.data.model.User;
+import greenify.server.data.repository.UserRepository;
import greenify.server.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
//class that controls the user with regards to the server and sending data between them
//this class kind of 'redirects' the requests from the client to the server
diff --git a/src/Server/src/test/java/ApplicationTest.java b/src/Server/src/test/java/ApplicationTest.java
index 4e28ace..3e39948 100644
--- a/src/Server/src/test/java/ApplicationTest.java
+++ b/src/Server/src/test/java/ApplicationTest.java
@@ -10,3 +10,4 @@ public class ApplicationTest {
@Test
public void contextLoads() throws Exception{ }
}
+
diff --git a/src/Server/src/test/java/greenify/server/service/UserServiceTest.java b/src/Server/src/test/java/greenify/server/service/UserServiceTest.java
index a1ed76c..c707756 100644
--- a/src/Server/src/test/java/greenify/server/service/UserServiceTest.java
+++ b/src/Server/src/test/java/greenify/server/service/UserServiceTest.java
@@ -11,7 +11,6 @@ import greenify.server.data.repository.UserRepository;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.test.mock.mockito.MockBean;