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 72e9be2..85f282b 100644 --- a/src/Client/src/main/java/greenify/client/controller/UserController.java +++ b/src/Client/src/main/java/greenify/client/controller/UserController.java @@ -91,10 +91,12 @@ 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); 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 c82eaae..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,37 +13,39 @@ - + - - + - + diff --git a/src/Client/src/main/resources/stylesheets/Big Designer.ttf b/src/Client/src/main/resources/stylesheets/Big Designer.ttf new file mode 100644 index 0000000..d833857 Binary files /dev/null and b/src/Client/src/main/resources/stylesheets/Big Designer.ttf differ diff --git a/src/Client/src/main/resources/stylesheets/DesignioRegular.otf b/src/Client/src/main/resources/stylesheets/DesignioRegular.otf new file mode 100644 index 0000000..4668fea Binary files /dev/null and b/src/Client/src/main/resources/stylesheets/DesignioRegular.otf differ diff --git a/src/Client/src/main/resources/stylesheets/dashboardStyle.css b/src/Client/src/main/resources/stylesheets/dashboardStyle.css index e10deb1..b0dabf2 100644 --- a/src/Client/src/main/resources/stylesheets/dashboardStyle.css +++ b/src/Client/src/main/resources/stylesheets/dashboardStyle.css @@ -1,5 +1,55 @@ -.button { - -fx-border-width: 0px 0px 1px 0px; - -fx-border-color: #f9f9f9; - -fx-border-radius: 0%; -} \ No newline at end of file +/*.button {*/ + /*-fx-border-width: 0px 0px 1px 0px;*/ + /*-fx-border-color: #f9f9f9;*/ + /*-fx-border-radius: 0%;*/ +/*}*/ + +/*@font-face {*/ + /*font-family: 'Nunito Sans';*/ + /*src: url('https://fonts.googleapis.com/css?family=Nunito+Sans:200');*/ +/*}*/ + +@font-face { + font-family: 'Designio Regular '; + src: url('stylesheets/DesignioRegular.otf'); +} + +/*@font-face {*/ + /*font-family: 'Big Designer';*/ + /*src: url('Big Designer.ttf');*/ +/*}*/ +/*test if fonts work*/ +/*@font-face {*/ + /*font-family: 'ConcertOne';*/ + /*src: url('https://fonts.googleapis.com/css?family=Concert+One');*/ +/*}*/ +.root { + -fx-background-color: #f9fffb; + -fx-font-family: "Big Designer"; + /*-fx-font-family: Designio;*/ + /*-fx-font-family: "Nunito Sans";*/ + /*-fx-font-family: "Concert One";*/ +} + +#dashboardButton { + -fx-background-color: #5a635c; + +} +#dashboardButton:pressed { + -fx-background-color: #b7e2c2; +} + +#userButton { + -fx-background-color: #5a635c; +} +#userButton:pressed { + -fx-background-color: #b7e2c2; +} + +#activitiesButton { + -fx-background-color: #5a635c; +} +#activitiesButton:pressed { + -fx-background-color: #b7e2c2; +} +