diff --git a/build.gradle b/build.gradle
index 420b1e4..e91d569 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,11 +21,9 @@ apply plugin: 'checkstyle'
apply plugin: 'application'
application {
- mainClassName = 'greenify.client.Application'
+ mainClassName = 'greenify.server.Application'
}
-//apply plugin: 'org.openjfx.javafxplugin'
-
tasks.withType(Checkstyle) {
reports {
html.destination rootProject.file("build/reports/checkstyle.html")
@@ -36,16 +34,32 @@ repositories {
mavenCentral()
}
-//client bootjar
-bootJar {
- baseName = 'gs-consuming-rest'
- version = '0.1.0'
+allprojects {
+ task hello {
+ doLast { task ->
+ println "I'm $task.project.name"
+ }
+ }
}
-//server bootjar
+////client bootjar
+//bootJar {
+// baseName = 'gs-consuming-rest'
+// version = '0.1.0'
+//}
+//
+////server bootjar
+//bootJar {
+// baseName = 'gs-rest-service'
+// version = '0.1.0'
+//}
+
bootJar {
- baseName = 'gs-rest-service'
- version = '0.1.0'
+ enabled = false
+}
+
+jar {
+ enabled = true
}
sourceCompatibility = 1.8
diff --git a/doc/reports/sprint-reviews/20190225_sprint_review.md b/doc/reports/sprint-reviews/20190225_sprint_review.md
deleted file mode 100644
index 6adcb33..0000000
--- a/doc/reports/sprint-reviews/20190225_sprint_review.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# Sprint Review
-
-## Main problems Encountered
-
-We have no problems so far. Everyone arrives on time and does the tasks assigned to them.
-
-## Adjustments from previous sprints
-Since this is the first review, there are no previous sprints yet
-
-## Adjustments for next sprint
- - Keep up the good work!
diff --git a/doc/reports/sprint-reviews/20190311_sprint_review.md b/doc/reports/sprint-reviews/20190311_sprint_review.md
deleted file mode 100644
index d4d255b..0000000
--- a/doc/reports/sprint-reviews/20190311_sprint_review.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Sprint Review
-
-## Main problems Encountered
-
-### Problem 1: Kristin left the group
-Kristin does not continue CSE and left our group. We'll work with five people from now on.
-
-## Adjustments from previous sprints
-We created the backlog before the sprint, which helps making clear what we're working on.
-
-## Adjustments for next sprint
- - Group made out of five
- - Backlogs ready on time
diff --git a/doc/sprints/sprint1/20190225_scrumboard.png b/doc/sprints/sprint1/20190403_scrumboard.png
similarity index 100%
rename from doc/sprints/sprint1/20190225_scrumboard.png
rename to doc/sprints/sprint1/20190403_scrumboard.png
diff --git a/doc/sprints/sprint2/20190311_scrumboard.png b/doc/sprints/sprint2/20191003_scrumboard.png
similarity index 100%
rename from doc/sprints/sprint2/20190311_scrumboard.png
rename to doc/sprints/sprint2/20191003_scrumboard.png
diff --git a/src/.idea/gradle.xml b/src/.idea/gradle.xml
index 6321230..fb07249 100644
--- a/src/.idea/gradle.xml
+++ b/src/.idea/gradle.xml
@@ -8,6 +8,7 @@
+
+
+
@@ -229,25 +343,81 @@
-
-
-
-
-
+
+
+
+
+
-
+
+
-
-
-
+
+
-
-
@@ -398,35 +590,35 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -440,66 +632,67 @@
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
@@ -510,53 +703,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -564,73 +711,209 @@
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
-
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -639,65 +922,57 @@
-
-
+
+
-
+
-
-
-
-
+
-
+
-
-
-
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/Client/src/main/java/greenify/client/Application.java b/src/Client/src/main/java/greenify/client/Application.java
index def73e6..a710131 100644
--- a/src/Client/src/main/java/greenify/client/Application.java
+++ b/src/Client/src/main/java/greenify/client/Application.java
@@ -21,11 +21,6 @@ public class Application extends javafx.application.Application {
launch(args);
}
- // @Bean
- // public RestTemplate restTemplate(RestTemplateBuilder builder) {
- // return builder.build();
- // }
-
@Override
public void init() throws Exception {
springContext = SpringApplication.run(Application.class);
@@ -50,14 +45,4 @@ public class Application extends javafx.application.Application {
public void stop() {
springContext.stop();
}
-
- // @Bean
- // public CommandLineRunner run(RestTemplate restTemplate) throws Exception {
- // return args -> {
- // User user = restTemplate.getForObject(
- // "http://localhost:8080/user", User.class);
- // log.info(user.toString());
- //
- // };
- // }
}
\ No newline at end of file
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 b291f89..390324f 100644
--- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
+++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
@@ -5,7 +5,6 @@ import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
-import javafx.scene.effect.DropShadow;
import javafx.scene.layout.AnchorPane;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +25,9 @@ public class DashBoardController {
public Button dashboardButton;
public Button activitiesButton;
public Button userButton;
+ public Label scoreField;
- DropShadow shadow = new DropShadow();
+// DropShadow shadow = new DropShadow();
/**
@@ -35,10 +35,13 @@ public class DashBoardController {
* @param event the event (clicking the button)
*/
public void displayDashboard(ActionEvent event) {
+
System.out.println("display dashboard");
dashboardPane.setVisible(true);
userPane.setVisible(false);
activitiesPane.setVisible(false);
+
+
// welcomebacktext.setText("Welcome back, " + UserController.getUsernameText() + "!");
}
@@ -63,6 +66,8 @@ public class DashBoardController {
userPane.setVisible(true);
activitiesPane.setVisible(false);
}
+
+
// public void addShadow(MouseEvent event) {
// userButton.setEffect(shadow);
// }
diff --git a/src/Client/src/main/java/greenify/client/controller/UserController.java b/src/Client/src/main/java/greenify/client/controller/UserController.java
index 2d2a956..b9c7419 100644
--- a/src/Client/src/main/java/greenify/client/controller/UserController.java
+++ b/src/Client/src/main/java/greenify/client/controller/UserController.java
@@ -34,21 +34,6 @@ public class UserController {
@FXML
private Button signupButton;
-
-
-
- // @Value("${my.url}")
- // private String myUrl;
-
- // @FXML
- // private void initialize(ActionEvent event) throws IOException {
- // Parent parent = FXMLLoader.load(getClass().getResource("sample.fxml"));
- // Scene scene = new Scene(parent);
- // Stage app_stage = (Stage)((Node) event.getSource()).getScene().getWindow();
- // app_stage.setScene(scene);
- // app_stage.show();
- // }
-
@FXML
protected void handleLoginButtonAction(ActionEvent event) throws IOException {
Window owner = loginButton.getScene().getWindow();
@@ -94,22 +79,18 @@ public class UserController {
* @author sem
*/
public void openDashboard() throws IOException {
+// Font.loadFont(getClass().getResourceAsStream("stylesheets/DesignioRegular.otf"), 21);
Parent dash = FXMLLoader.load(
this.getClass().getClassLoader().getResource("fxml/Dashboard.fxml")
);
Scene scene = new Scene(dash);
+ scene.getStylesheets().add(getClass().getClassLoader().getResource("stylesheets/dashboardStyle.css").toExternalForm());
Stage appStage = new Stage();
appStage.setScene(scene);
// app_stage.setFullScreen(true);
appStage.show();
}
-// public final String getUsernameText() {
-//
-// return user.getName();
-// }
-
-
public static class AlertHelper {
/**
* alerts for the login screen.
diff --git a/src/Client/src/main/resources/addActivity1.png b/src/Client/src/main/resources/addActivity1.png
new file mode 100644
index 0000000..85af03c
Binary files /dev/null and b/src/Client/src/main/resources/addActivity1.png differ
diff --git a/src/Client/src/main/resources/addActivity2.png b/src/Client/src/main/resources/addActivity2.png
new file mode 100644
index 0000000..48d85d9
Binary files /dev/null and b/src/Client/src/main/resources/addActivity2.png differ
diff --git a/src/Client/src/main/resources/fxml/dashboard.fxml b/src/Client/src/main/resources/fxml/dashboard.fxml
index fa5d290..bc3c83f 100644
--- a/src/Client/src/main/resources/fxml/dashboard.fxml
+++ b/src/Client/src/main/resources/fxml/dashboard.fxml
@@ -1,5 +1,7 @@
+
+
@@ -11,28 +13,30 @@
-
+
-
@@ -41,7 +45,7 @@
-
@@ -63,11 +81,19 @@
-