Feat: Styling fixes, logo appearing and more fancy.

cathrkri · Apr 26, 2026 · 5b8b775 · 5b8b775
1 parent d96ea74
commit 5b8b775
Show file tree

Hide file tree

Showing 50 changed files with 248 additions and 123 deletions.
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
@@ -13,6 +13,7 @@
 import ntnu.systemutvikling.team6.database.DAO.UserDAO;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
 import ntnu.systemutvikling.team6.database.DatabaseSetup;
+import ntnu.systemutvikling.team6.models.registry.CharityRegistry;
 import ntnu.systemutvikling.team6.scraper.FullCharityScrape;
 import ntnu.systemutvikling.team6.service.APIToDatabaseService;
 import ntnu.systemutvikling.team6.service.AuthenticationService;
@@ -82,8 +83,8 @@ public void init() {
            */
 
         // Comment out the two below to use already generated database.
-        // CharityRegistry charityRegistry = scraper.getAPIAndURLCharityData();
-        // db.addAPIDataToTable(charityRegistry.getAllCharities());
+        //CharityRegistry charityRegistry = scraper.getAPIAndURLCharityData();
+        //db.addAPIDataToTable(charityRegistry.getAllCharities());
       }
     } catch (Exception e) {
       e.printStackTrace();

diff --git a/...ication/src/main/java/ntnu/systemutvikling/team6/controller/CreateUserPageController.java b/...ication/src/main/java/ntnu/systemutvikling/team6/controller/CreateUserPageController.java
@@ -3,8 +3,10 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
+import javafx.scene.input.MouseEvent;
 import ntnu.systemutvikling.team6.controller.components.BaseController;
 import ntnu.systemutvikling.team6.controller.components.FooterController;
 import ntnu.systemutvikling.team6.controller.components.LoaderScene;
@@ -83,4 +85,9 @@ private void switchToLoginPage(ActionEvent event) {
     System.out.println("Click!");
     LoaderScene.LoadScene("loginSite", event, null, null, authToken);
   }
+  // Button Styling
+  @FXML private void onHover(MouseEvent e)   { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); ((Button) e.getSource()).setOpacity(0.90); }
+  @FXML private void onExit(MouseEvent e)    { ((Button)e.getSource()).setScaleX(1.0);  ((Button)e.getSource()).setScaleY(1.0);((Button) e.getSource()).setOpacity(1.00);  }
+  @FXML private void onPress(MouseEvent e)   { ((Button)e.getSource()).setScaleX(0.97); ((Button)e.getSource()).setScaleY(0.97); }
+  @FXML private void onRelease(MouseEvent e) { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); }
 }
diff --git a/...papplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java b/...papplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java
@@ -9,8 +9,10 @@
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
+import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.FlowPane;
 import ntnu.systemutvikling.team6.controller.components.*;
 import ntnu.systemutvikling.team6.database.DAO.CategoryDAO;
@@ -212,4 +214,10 @@ private void displayCharities(List<Charity> charities) {
       }
     }
   }
+
+  // Button Styling
+  @FXML private void onHover(MouseEvent e)   { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); ((Button) e.getSource()).setOpacity(0.90); }
+  @FXML private void onExit(MouseEvent e)    { ((Button)e.getSource()).setScaleX(1.0);  ((Button)e.getSource()).setScaleY(1.0);((Button) e.getSource()).setOpacity(1.00);  }
+  @FXML private void onPress(MouseEvent e)   { ((Button)e.getSource()).setScaleX(0.97); ((Button)e.getSource()).setScaleY(0.97); }
+  @FXML private void onRelease(MouseEvent e) { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); }
 }
diff --git a/...papplication/src/main/java/ntnu/systemutvikling/team6/controller/LoginPageController.java b/...papplication/src/main/java/ntnu/systemutvikling/team6/controller/LoginPageController.java
@@ -4,8 +4,10 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
+import javafx.scene.input.MouseEvent;
 import ntnu.systemutvikling.team6.controller.components.BaseController;
 import ntnu.systemutvikling.team6.controller.components.FooterController;
 import ntnu.systemutvikling.team6.controller.components.LoaderScene;
@@ -68,4 +70,9 @@ private void switchToSignupPage(ActionEvent event) {
     System.out.println("Click!");
     LoaderScene.LoadScene("creater_user_site", event, null, null, authToken);
   }
+  // Button Styling
+  @FXML private void onHover(MouseEvent e)   { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); ((Button) e.getSource()).setOpacity(0.90); }
+  @FXML private void onExit(MouseEvent e)    { ((Button)e.getSource()).setScaleX(1.0);  ((Button)e.getSource()).setScaleY(1.0);((Button) e.getSource()).setOpacity(1.00);  }
+  @FXML private void onPress(MouseEvent e)   { ((Button)e.getSource()).setScaleX(0.97); ((Button)e.getSource()).setScaleY(0.97); }
+  @FXML private void onRelease(MouseEvent e) { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); }
 }
diff --git a/...src/main/java/ntnu/systemutvikling/team6/controller/components/CategoryTagController.java b/...src/main/java/ntnu/systemutvikling/team6/controller/components/CategoryTagController.java
@@ -2,6 +2,8 @@
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
 
 public class CategoryTagController extends BaseController {
   @FXML private Button button;
@@ -37,7 +39,9 @@ public void setCategory(String category) {
             + colors[1]
             + ";"
             + "-fx-background-radius: 20;"
-            + "-fx-font-size: 11px;"
+            + "-fx-font-size: 16px;"
             + "-fx-padding: 4 10 4 10;");
+    button.setMaxWidth(Double.MAX_VALUE);
+    HBox.setHgrow(button, Priority.ALWAYS);
   }
 }
diff --git a/...rc/main/java/ntnu/systemutvikling/team6/controller/components/InterestCardController.java b/...rc/main/java/ntnu/systemutvikling/team6/controller/components/InterestCardController.java
@@ -4,12 +4,18 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import ntnu.systemutvikling.team6.models.Charity;
 
+import java.io.ByteArrayInputStream;
+import java.util.Objects;
+
 public class InterestCardController extends BaseController {
   @FXML private Label charityDescription;
   @FXML private Label verifyLabel;
   @FXML private Label charityNameLabel;
+  @FXML private ImageView charityLogo;
 
   @FXML private Button detailsButton;
   @FXML private Button donateButton;
@@ -34,6 +40,17 @@ public void setOrganization(Charity charity) {
       detailsButton.setVisible(false);
       donateButton.setVisible(false);
     }
+    if (this.charity.getLogoBlob() != null) {
+      ByteArrayInputStream logoByteStream = new ByteArrayInputStream(this.charity.getLogoBlob());
+      Image CharityLogoImage = new Image(logoByteStream);
+      this.charityLogo.setImage(CharityLogoImage);
+    } else {
+      String placeholderImagePath =
+              Objects.requireNonNull(getClass().getResource("/images/leggTilBilde.jpg"))
+                      .toExternalForm();
+      Image placeholderImage = new Image(placeholderImagePath);
+      this.charityLogo.setImage(placeholderImage);
+    }
   }
 
   /* EVENTS */

diff --git a/...tion/src/main/java/ntnu/systemutvikling/team6/controller/components/NavbarController.java b/...tion/src/main/java/ntnu/systemutvikling/team6/controller/components/NavbarController.java
@@ -5,6 +5,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.TextField;
+import javafx.scene.input.MouseEvent;
 
 public class NavbarController extends BaseController {
   @FXML protected TextField frontSearchField;
@@ -70,4 +71,10 @@ private void switchToCharityUserPage(ActionEvent event) {
     System.out.println("Click!");
     LoaderScene.LoadScene("profile_org_settings", event, null, null, authToken);
   }
+
+  // CSS
+  @FXML private void onHover(MouseEvent e)   { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); ((Button) e.getSource()).setOpacity(0.90); }
+  @FXML private void onExit(MouseEvent e)    { ((Button)e.getSource()).setScaleX(1.0);  ((Button)e.getSource()).setScaleY(1.0);((Button) e.getSource()).setOpacity(1.00);  }
+  @FXML private void onPress(MouseEvent e)   { ((Button)e.getSource()).setScaleX(0.97); ((Button)e.getSource()).setScaleY(0.97); }
+  @FXML private void onRelease(MouseEvent e) { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); }
 }
diff --git a/...main/java/ntnu/systemutvikling/team6/controller/components/OrgDonationCardController.java b/...main/java/ntnu/systemutvikling/team6/controller/components/OrgDonationCardController.java
@@ -2,6 +2,7 @@
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.image.ImageView;
 import ntnu.systemutvikling.team6.models.Donation;
 
 public class OrgDonationCardController extends BaseController {
@@ -23,5 +24,6 @@ public void setDonation(Donation donation) {
     purchaseIDLabel.setText(donation.getDonationID().toString());
     dateLabel.setText(donation.getDate().toString());
     totalLabel.setText(String.valueOf(donation.getAmount()));
+
   }
 }
diff --git a/...ain/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java b/...ain/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java
@@ -2,9 +2,16 @@
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
 import ntnu.systemutvikling.team6.models.Charity;
 
+import java.io.ByteArrayInputStream;
+import java.util.Objects;
+
 /**
  * This controller represents the organization card that is displayed on the front page and is
  * looped upon in FronpageController. It is used to display the name and description of a charity,
@@ -13,8 +20,9 @@
 public class OrganizationCardController extends BaseController {
 
   @FXML private Label organizationName;
-
   @FXML private Label organizationDescription;
+  @FXML private ImageView CharityLogo;
+
 
   private Charity charity;
 
@@ -26,6 +34,18 @@ public void setOrganization(Charity charity) {
 
     organizationName.setText(charity.getName());
     organizationDescription.setText(charity.getDescription());
+
+    if (this.charity.getLogoBlob() != null) {
+      ByteArrayInputStream logoByteStream = new ByteArrayInputStream(this.charity.getLogoBlob());
+      Image CharityLogoImage = new Image(logoByteStream);
+      this.CharityLogo.setImage(CharityLogoImage);
+    } else {
+      String placeholderImagePath =
+              Objects.requireNonNull(getClass().getResource("/images/leggTilBilde.jpg"))
+                      .toExternalForm();
+      Image placeholderImage = new Image(placeholderImagePath);
+      this.CharityLogo.setImage(placeholderImage);
+    }
   }
 
   /* EVENTS */
@@ -37,4 +57,9 @@ public void switchToDonationPage(ActionEvent event) {
     System.out.println(authToken.getCurrentUser().getId().toString());
     LoaderScene.LoadScene("DonationPage", event, charity, null, authToken);
   }
+  // Button Styling
+  @FXML private void onHover(MouseEvent e)   { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); ((Button) e.getSource()).setOpacity(0.90); }
+  @FXML private void onExit(MouseEvent e)    { ((Button)e.getSource()).setScaleX(1.0);  ((Button)e.getSource()).setScaleY(1.0);((Button) e.getSource()).setOpacity(1.00);  }
+  @FXML private void onPress(MouseEvent e)   { ((Button)e.getSource()).setScaleX(0.97); ((Button)e.getSource()).setScaleY(0.97); }
+  @FXML private void onRelease(MouseEvent e) { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); }
 }
diff --git a/...n/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java b/...n/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java
@@ -4,8 +4,10 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextArea;
+import javafx.scene.input.MouseEvent;
 import javafx.stage.Stage;
 import ntnu.systemutvikling.team6.controller.components.BaseController;
 import ntnu.systemutvikling.team6.controller.components.LoaderScene;
@@ -119,4 +121,9 @@ private void handleLogout(ActionEvent event) {
     showAlert(Alert.AlertType.INFORMATION, "Logging out", "Logging out...");
     LoaderScene.LoadScene("FrontPage", event, null, null, authToken);
   }
+  // Button Styling
+  @FXML private void onHover(MouseEvent e)   { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); ((Button) e.getSource()).setOpacity(0.90); }
+  @FXML private void onExit(MouseEvent e)    { ((Button)e.getSource()).setScaleX(1.0);  ((Button)e.getSource()).setScaleY(1.0);((Button) e.getSource()).setOpacity(1.00);  }
+  @FXML private void onPress(MouseEvent e)   { ((Button)e.getSource()).setScaleX(0.97); ((Button)e.getSource()).setScaleY(0.97); }
+  @FXML private void onRelease(MouseEvent e) { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); }
 }
diff --git a/.../java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java b/.../java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java
@@ -7,10 +7,8 @@
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.FlowPane;
 import javafx.stage.Stage;
 import ntnu.systemutvikling.team6.controller.components.*;
@@ -128,4 +126,9 @@ private void handleLogout(ActionEvent event) {
     showAlert(Alert.AlertType.INFORMATION, "Logging out", "Logging out...");
     LoaderScene.LoadScene("FrontPage", event, null, null, authToken);
   }
+  // Button Styling
+  @FXML private void onHover(MouseEvent e)   { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); ((Button) e.getSource()).setOpacity(0.90); }
+  @FXML private void onExit(MouseEvent e)    { ((Button)e.getSource()).setScaleX(1.0);  ((Button)e.getSource()).setScaleY(1.0);((Button) e.getSource()).setOpacity(1.00);  }
+  @FXML private void onPress(MouseEvent e)   { ((Button)e.getSource()).setScaleX(0.97); ((Button)e.getSource()).setScaleY(0.97); }
+  @FXML private void onRelease(MouseEvent e) { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); }
 }
diff --git a/...va/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgSettingsController.java b/...va/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgSettingsController.java
@@ -1,15 +1,23 @@
 package ntnu.systemutvikling.team6.controller.profileCharity;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
+
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.HBox;
 import javafx.stage.Stage;
 import ntnu.systemutvikling.team6.controller.components.*;
@@ -21,7 +29,8 @@ public class profileOrgSettingsController extends BaseController {
   @FXML private NavbarController navbarController;
   @FXML private Label charityNameLabel;
   @FXML private TextField organizationNameField;
-  @FXML private HBox tagContainer;
+  @FXML private FlowPane tagContainer;
+  @FXML private ImageView orgLogo;
 
   @Override
   protected void authTokenisSet() {
@@ -53,6 +62,17 @@ private void populateFields() {
     // Tags
     List<String> categories = usersCharity.getCategory();
     displayCategories(categories);
+    if (usersCharity.getLogoBlob() != null) {
+      ByteArrayInputStream logoByteStream = new ByteArrayInputStream(usersCharity.getLogoBlob());
+      Image CharityLogoImage = new Image(logoByteStream);
+      this.orgLogo.setImage(CharityLogoImage);
+    } else {
+      String placeholderImagePath =
+              Objects.requireNonNull(getClass().getResource("/images/leggTilBilde.jpg"))
+                      .toExternalForm();
+      Image placeholderImage = new Image(placeholderImagePath);
+      this.orgLogo.setImage(placeholderImage);
+    }
   }
 
   private void displayCategories(List<String> categories) {
@@ -144,4 +164,9 @@ private void handleLogout(ActionEvent event) {
     showAlert(Alert.AlertType.INFORMATION, "Logging out", "Logging out...");
     LoaderScene.LoadScene("FrontPage", event, null, null, authToken);
   }
+  // Button Styling
+  @FXML private void onHover(MouseEvent e)   { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); ((Button) e.getSource()).setOpacity(0.90); }
+  @FXML private void onExit(MouseEvent e)    { ((Button)e.getSource()).setScaleX(1.0);  ((Button)e.getSource()).setScaleY(1.0);((Button) e.getSource()).setOpacity(1.00);  }
+  @FXML private void onPress(MouseEvent e)   { ((Button)e.getSource()).setScaleX(0.97); ((Button)e.getSource()).setScaleY(0.97); }
+  @FXML private void onRelease(MouseEvent e) { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); }
 }
diff --git a/...java/ntnu/systemutvikling/team6/controller/profileUser/profileUserSettingsController.java b/...java/ntnu/systemutvikling/team6/controller/profileUser/profileUserSettingsController.java
@@ -4,6 +4,7 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
+import javafx.scene.input.MouseEvent;
 import javafx.stage.Stage;
 import ntnu.systemutvikling.team6.controller.components.BaseController;
 import ntnu.systemutvikling.team6.controller.components.LoaderScene;
@@ -226,4 +227,9 @@ private void switchToHistoryPage(ActionEvent event) {
   private void switchToInterestPage(ActionEvent event) {
     LoaderScene.LoadScene("profile_user_interests", event, null, null, authToken);
   }
+  // Button Styling
+  @FXML private void onHover(MouseEvent e)   { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); ((Button) e.getSource()).setOpacity(0.90); }
+  @FXML private void onExit(MouseEvent e)    { ((Button)e.getSource()).setScaleX(1.0);  ((Button)e.getSource()).setScaleY(1.0);((Button) e.getSource()).setOpacity(1.00);  }
+  @FXML private void onPress(MouseEvent e)   { ((Button)e.getSource()).setScaleX(0.97); ((Button)e.getSource()).setScaleY(0.97); }
+  @FXML private void onRelease(MouseEvent e) { ((Button)e.getSource()).setScaleX(1.04); ((Button)e.getSource()).setScaleY(1.04); }
 }
diff --git a/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml b/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
@@ -118,18 +118,6 @@
                      </font>
                   </Hyperlink>
 
-                  <Hyperlink text="Socials">
-                     <font>
-                        <Font name="System Bold" size="20.0" />
-                     </font>
-                  </Hyperlink>
-
-                  <Hyperlink text="Verification Report">
-                     <font>
-                        <Font name="System Bold" size="20.0" />
-                     </font>
-                  </Hyperlink>
-
                   <VBox alignment="CENTER" prefHeight="89.0" prefWidth="191.0" spacing="22.0">
                      <Button onAction="#switchToFeedbackPage" prefHeight="55.0" prefWidth="190.0" style="-fx-background-color:#E07400; -fx-background-radius:30; -fx-text-fill:white;" text="Feedbacks">
                         <cursor>

diff --git a/helpmehelpapplication/src/main/resources/fxml/components/categoryTag.fxml b/helpmehelpapplication/src/main/resources/fxml/components/categoryTag.fxml
@@ -6,8 +6,8 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<VBox alignment="CENTER" spacing="8" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ntnu.systemutvikling.team6.controller.components.CategoryTagController">
+<HBox alignment="CENTER" spacing="8" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ntnu.systemutvikling.team6.controller.components.CategoryTagController">
     <children>
-        <Button fx:id="Button" style="-fx-background-color: #E5F0D7; -fx-text-fill: #6E8A5C; -fx-font-size: 16px;" text="Non-profit" />
+        <Button fx:id="button"/>
     </children>
-</VBox>
+</HBox>