diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java index 92c37b2..fe3787a 100644 --- 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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CreateUserPageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CreateUserPageController.java index ba29af7..20cab9e 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CreateUserPageController.java +++ b/helpmehelpapplication/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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java index aa7fa05..080b994 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java +++ b/helpmehelpapplication/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 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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/LoginPageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/LoginPageController.java index 99633da..98cc77b 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/LoginPageController.java +++ b/helpmehelpapplication/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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/CategoryTagController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/CategoryTagController.java index 1a4540a..7fa7ca2 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/CategoryTagController.java +++ b/helpmehelpapplication/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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/InterestCardController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/InterestCardController.java index 73dc1e5..b5fe5bd 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/InterestCardController.java +++ b/helpmehelpapplication/src/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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/NavbarController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/NavbarController.java index ceca589..2d39117 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/NavbarController.java +++ b/helpmehelpapplication/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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrgDonationCardController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrgDonationCardController.java index 00b144b..39ded3c 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrgDonationCardController.java +++ b/helpmehelpapplication/src/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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java index 24a7c52..a7bcac4 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java +++ b/helpmehelpapplication/src/main/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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java index 1828c3c..43230b8 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java +++ b/helpmehelpapplication/src/main/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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java index c0dd5db..6b57723 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java +++ b/helpmehelpapplication/src/main/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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgSettingsController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgSettingsController.java index c8c3824..0f01d0d 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgSettingsController.java +++ b/helpmehelpapplication/src/main/java/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 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 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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileUser/profileUserSettingsController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileUser/profileUserSettingsController.java index 7e92fea..b4e7f8f 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileUser/profileUserSettingsController.java +++ b/helpmehelpapplication/src/main/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 index 4c0678c..981bf07 100644 --- a/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml @@ -118,18 +118,6 @@ - - - - - - - - - - - - - diff --git a/helpmehelpapplication/src/main/resources/fxml/profile_org_Settings.fxml b/helpmehelpapplication/src/main/resources/fxml/profile_org_Settings.fxml index a38cb15..c7e7175 100644 --- a/helpmehelpapplication/src/main/resources/fxml/profile_org_Settings.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/profile_org_Settings.fxml @@ -14,6 +14,8 @@ + + @@ -111,12 +113,22 @@ - + + -