From 5b93da814805bf073888daa9559968fb557fede4 Mon Sep 17 00:00:00 2001
From: danieskj <danieskj@stud.ntnu.no>
Date: Thu, 14 May 2026 14:05:00 +0200
Subject: [PATCH 1/4] feat: Change latestPrice label to switch between colors

---
 .../edu/ntnu/idi/idatt/view/SceneFactory.java | 14 +++----
 .../elements/PlayerPortfolioComponent.java    | 10 +++--
 .../components/elements/ShareComponent.java   | 11 +++--
 .../portfolio/PortfolioController.java        |  2 +-
 .../portfolio/PortfolioModel.java             |  2 +-
 .../portfolio/PortfolioView.java              |  2 +-
 src/main/resources/themes/default.css         | 41 +++++++------------
 7 files changed, 37 insertions(+), 45 deletions(-)
 rename src/main/java/edu/ntnu/idi/idatt/view/{ => primary}/portfolio/PortfolioController.java (94%)
 rename src/main/java/edu/ntnu/idi/idatt/view/{ => primary}/portfolio/PortfolioModel.java (92%)
 rename src/main/java/edu/ntnu/idi/idatt/view/{ => primary}/portfolio/PortfolioView.java (98%)

diff --git a/src/main/java/edu/ntnu/idi/idatt/view/SceneFactory.java b/src/main/java/edu/ntnu/idi/idatt/view/SceneFactory.java
index 9a513f3..02d4d91 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/SceneFactory.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/SceneFactory.java
@@ -1,10 +1,14 @@
 package edu.ntnu.idi.idatt.view;
 
 import edu.ntnu.idi.idatt.model.market.Stock;
+import edu.ntnu.idi.idatt.model.portfolio.Share;
 import edu.ntnu.idi.idatt.session.UserSession;
 import edu.ntnu.idi.idatt.view.entry.StartController;
 import edu.ntnu.idi.idatt.view.entry.StartModel;
 import edu.ntnu.idi.idatt.view.entry.StartView;
+import edu.ntnu.idi.idatt.view.primary.portfolio.PortfolioController;
+import edu.ntnu.idi.idatt.view.primary.portfolio.PortfolioModel;
+import edu.ntnu.idi.idatt.view.primary.portfolio.PortfolioView;
 import edu.ntnu.idi.idatt.view.primary.exchange.ExchangeController;
 import edu.ntnu.idi.idatt.view.primary.exchange.ExchangeModel;
 import edu.ntnu.idi.idatt.view.primary.exchange.ExchangeView;
@@ -16,8 +20,10 @@
 import edu.ntnu.idi.idatt.view.primary.transactions.TransactionView;
 import javafx.scene.Parent;
 
+import java.math.BigDecimal;
 import java.util.ArrayDeque;
 import java.util.Deque;
+import java.util.List;
 
 public class SceneFactory {
 
@@ -67,14 +73,6 @@ public static Parent createStartView() {
 
   }
   public static Parent createPortfolioView(){
-    Stock stock = new Stock("int", "intel", List.of(new BigDecimal("100")));
-    Share share = new Share(stock, new BigDecimal("50"), new BigDecimal("100"));
-    UserSession.getInstance().getPlayer().getPortfolio().addShare(share);
-    UserSession.getInstance().getPlayer().getPortfolio().addShare(share);
-    UserSession.getInstance().getPlayer().getPortfolio().addShare(share);
-    UserSession.getInstance().getPlayer().getPortfolio().addShare(share);
-    UserSession.getInstance().getPlayer().getPortfolio().addShare(share);
-    UserSession.getInstance().getPlayer().getPortfolio().addShare(share);
     PortfolioModel model = new PortfolioModel();
     PortfolioView view = new PortfolioView();
     PortfolioController controller =  new PortfolioController(model);
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/PlayerPortfolioComponent.java b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/PlayerPortfolioComponent.java
index 0881593..f4f3a14 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/PlayerPortfolioComponent.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/PlayerPortfolioComponent.java
@@ -16,19 +16,21 @@ public PlayerPortfolioComponent(Portfolio portfolio){
         this.setMaxSize(Double.MAX_VALUE, 500);
         this.getStyleClass().add("light");
         Label userTitle = new Label("Name Title");
+        Label invisibleTitle = new Label(" ");
         Label netWorth = new Label("Total net worth: "+portfolio.getNetWorth().toString());
         Label percentageChange = new Label("Percentage change: ");
-        Label playerStatus = new Label("Novice");
+        Label playerStatus = new Label("Player status: ");
         Label portfolioWorth = new Label("Portfolio net worth: ");
         Label totalShares = new Label("Total shares owned: ");
 
         ArrayList<Label> labels = new ArrayList<>();
         Collections.addAll(labels, netWorth, percentageChange, playerStatus, portfolioWorth, totalShares);
-        labels.forEach(e -> e.getStyleClass().add("user-box-text"));
-        userTitle.getStyleClass().add("user-box-title");
+        labels.forEach(e -> e.getStyleClass().add("portfolio-box-text"));
+        userTitle.getStyleClass().add("portfolio-box-title");
+        invisibleTitle.getStyleClass().add("portfolio-box-title");
 
         VBox leftColumn = new VBox(userTitle, netWorth, percentageChange, playerStatus);
-        VBox rightColumn = new VBox(portfolioWorth, totalShares);
+        VBox rightColumn = new VBox(invisibleTitle, portfolioWorth, totalShares);
 
         UICompositor playerPortfolioComponent = new UICompositor.Builder()
                 .parent(new HBox())
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/ShareComponent.java b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/ShareComponent.java
index cdd7700..be298e2 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/ShareComponent.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/ShareComponent.java
@@ -2,6 +2,7 @@
 
 import edu.ntnu.idi.idatt.model.portfolio.Share;
 import edu.ntnu.idi.idatt.view.components.ui.UICompositor;
+import edu.ntnu.idi.idatt.view.util.CssUtils;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
@@ -20,11 +21,13 @@ public ShareComponent(Share share){
         Label ticker = new Label("("+share.getStock().getSymbol()+")");
         Label latestPrice = new Label("Latest price: "+share.getStock().getSalesPrice().toString());
         Button sellButton = new Button("Sell");
-        ticker.getStyleClass().add("portfolio-stock-names");
-        name.getStyleClass().add("portfolio-stock-names");
-        quantity.getStyleClass().add("portfolio-stock-names");
-        latestPrice.getStyleClass().add("portfolio-stock-names");
+        ticker.getStyleClass().add("portfolio-box-text");
+        name.getStyleClass().add("portfolio-box-text");
+        quantity.getStyleClass().add("portfolio-box-text");
+        latestPrice.getStyleClass().add("portfolio-box-text");
         sellButton.getStyleClass().add("button");
+        String color = CssUtils.generateValueColors(share.getProfit().doubleValue());
+        CssUtils.apply(latestPrice, color);
         UICompositor shareComponent = new UICompositor.Builder()
                 .parent(new HBox())
                 .growWithAlignment(Pos.CENTER)
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/portfolio/PortfolioController.java b/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioController.java
similarity index 94%
rename from src/main/java/edu/ntnu/idi/idatt/view/portfolio/PortfolioController.java
rename to src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioController.java
index 05464f6..e3ba06a 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/portfolio/PortfolioController.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioController.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.view.portfolio;
+package edu.ntnu.idi.idatt.view.primary.portfolio;
 
 import edu.ntnu.idi.idatt.model.portfolio.Share;
 import edu.ntnu.idi.idatt.session.UserSession;
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/portfolio/PortfolioModel.java b/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioModel.java
similarity index 92%
rename from src/main/java/edu/ntnu/idi/idatt/view/portfolio/PortfolioModel.java
rename to src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioModel.java
index abe7edf..cb8e66e 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/portfolio/PortfolioModel.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioModel.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.view.portfolio;
+package edu.ntnu.idi.idatt.view.primary.portfolio;
 
 import edu.ntnu.idi.idatt.model.portfolio.Portfolio;
 import edu.ntnu.idi.idatt.view.components.Model;
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/portfolio/PortfolioView.java b/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java
similarity index 98%
rename from src/main/java/edu/ntnu/idi/idatt/view/portfolio/PortfolioView.java
rename to src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java
index 8d8a679..4b9c49c 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/portfolio/PortfolioView.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt.view.portfolio;
+package edu.ntnu.idi.idatt.view.primary.portfolio;
 
 import edu.ntnu.idi.idatt.view.SceneFactory;
 import edu.ntnu.idi.idatt.view.SceneManager;
diff --git a/src/main/resources/themes/default.css b/src/main/resources/themes/default.css
index bf07501..db19b67 100644
--- a/src/main/resources/themes/default.css
+++ b/src/main/resources/themes/default.css
@@ -39,6 +39,21 @@
   -fx-text-fill: #EEEEEE;
 }
 
+.portfolio-box-text{
+    -fx-font-size: 20px;
+    -fx-font-weight: 700;
+    -fx-text-fill: #EEEEEE;
+    -fx-padding: 10;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.3), 10, 0.5, 0, 5);
+}
+.portfolio-box-title{
+    -fx-font-size: 32px;
+    -fx-font-weight: 700;
+    -fx-text-fill: #EEEEEE;
+    -fx-padding: 10;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.3), 10, 0.5, 0, 5);
+}
+
 .red {
   -fx-text-fill: #FF0000;
 }
@@ -72,10 +87,6 @@
   -fx-cursor: hand;
 }
 
-.portfolio-vbox {
-    -fx-background-color: #A9A9A9;
-}
-
 .viewport-colour > .viewport {
     -fx-background-color: #3B8C6E;
 }
@@ -85,14 +96,6 @@
     -fx-alignment: center;
 }
 
-.portfolio-stock-names {
-    -fx-font-size: 20px;
-    -fx-font-weight: 700;
-    -fx-text-fill: #EEEEEE;
-    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.3), 10, 0.5, 0, 5);
-    -fx-padding: 5;
-}
-
 .searchbar {
     -fx-background-color: #FFFFFF;
     -fx-background-radius: 20;
@@ -108,18 +111,4 @@
     -fx-border-radius: 20;
     -fx-cursor: hand;
 }
-.user-box-text{
-    -fx-font-size: 16px;
-    -fx-font-weight: 700;
-    -fx-text-fill: #EEEEEE;
-    -fx-padding: 10 10 10 10;
-    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.3), 10, 0.5, 0, 5);
-}
-.user-box-title{
-    -fx-font-size: 32px;
-    -fx-font-weight: 700;
-    -fx-text-fill: #EEEEEE;
-    -fx-padding: 10 10 0 10;
-    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.3), 10, 0.5, 0, 5);
-}
 

From 0af42f9026e312e8564cf981a1f5d289b6850559 Mon Sep 17 00:00:00 2001
From: danieskj <danieskj@stud.ntnu.no>
Date: Thu, 14 May 2026 14:18:38 +0200
Subject: [PATCH 2/4] feat(ShareComponent): Create for loop and arraylist for
 easier style setting

---
 .../idatt/view/components/elements/ShareComponent.java | 10 ++++++----
 src/main/resources/themes/default.css                  |  3 +--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/ShareComponent.java b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/ShareComponent.java
index be298e2..e33da72 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/ShareComponent.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/ShareComponent.java
@@ -9,6 +9,9 @@
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 
+import java.util.ArrayList;
+import java.util.Collections;
+
 
 public class ShareComponent extends HBox {
 
@@ -21,10 +24,9 @@ public ShareComponent(Share share){
         Label ticker = new Label("("+share.getStock().getSymbol()+")");
         Label latestPrice = new Label("Latest price: "+share.getStock().getSalesPrice().toString());
         Button sellButton = new Button("Sell");
-        ticker.getStyleClass().add("portfolio-box-text");
-        name.getStyleClass().add("portfolio-box-text");
-        quantity.getStyleClass().add("portfolio-box-text");
-        latestPrice.getStyleClass().add("portfolio-box-text");
+        ArrayList<Label> labels = new ArrayList<>();
+        Collections.addAll(labels, name, quantity, ticker, latestPrice);
+        labels.forEach(e -> e.getStyleClass().add("portfolio-box-text"));
         sellButton.getStyleClass().add("button");
         String color = CssUtils.generateValueColors(share.getProfit().doubleValue());
         CssUtils.apply(latestPrice, color);
diff --git a/src/main/resources/themes/default.css b/src/main/resources/themes/default.css
index db19b67..9ae42b7 100644
--- a/src/main/resources/themes/default.css
+++ b/src/main/resources/themes/default.css
@@ -10,7 +10,6 @@
   -fx-background-color: #3B8C6E;
 }
 
-
 .title {
   -fx-font-size: 56px;
   -fx-font-weight: 700;
@@ -92,7 +91,7 @@
 }
 
 .rowBox {
-    -fx-background-color: #A9A9A9;
+    -fx-background-color: #404950;
     -fx-alignment: center;
 }
 

From 98b3f06475ed14b55e2f7133537fdfbf2fd9befd Mon Sep 17 00:00:00 2001
From: danieskj <danieskj@stud.ntnu.no>
Date: Thu, 14 May 2026 15:34:09 +0200
Subject: [PATCH 3/4] fix(UICompositor): growWithAlignment logic

---
 .../elements/PlayerPortfolioComponent.java    | 20 ++++++++++++-------
 .../components/elements/ShareComponent.java   |  3 +++
 .../view/components/ui/UICompositor.java      | 17 ++++++++--------
 .../view/primary/portfolio/PortfolioView.java |  8 ++++----
 .../idatt/view/primary/stock/StockView.java   |  2 +-
 .../primary/transactions/TransactionView.java |  2 +-
 6 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/PlayerPortfolioComponent.java b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/PlayerPortfolioComponent.java
index f4f3a14..e4cfa9d 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/PlayerPortfolioComponent.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/PlayerPortfolioComponent.java
@@ -1,6 +1,7 @@
 package edu.ntnu.idi.idatt.view.components.elements;
 
 import edu.ntnu.idi.idatt.model.portfolio.Portfolio;
+import edu.ntnu.idi.idatt.session.UserSession;
 import edu.ntnu.idi.idatt.view.components.ui.UICompositor;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
@@ -15,11 +16,14 @@ public class PlayerPortfolioComponent extends HBox {
     public PlayerPortfolioComponent(Portfolio portfolio){
         this.setMaxSize(Double.MAX_VALUE, 500);
         this.getStyleClass().add("light");
+
         Label userTitle = new Label("Name Title");
         Label invisibleTitle = new Label(" ");
-        Label netWorth = new Label("Total net worth: "+portfolio.getNetWorth().toString());
+        Label netWorth = new Label();
+        netWorth.textProperty().bind(
+                UserSession.getInstance().netWorthProperty().asString("Net Worth: %.2f $"));
         Label percentageChange = new Label("Percentage change: ");
-        Label playerStatus = new Label("Player status: ");
+        Label playerStatus = new Label("Player status: "+ UserSession.getInstance().getPlayer().getStatus());
         Label portfolioWorth = new Label("Portfolio net worth: ");
         Label totalShares = new Label("Total shares owned: ");
 
@@ -29,15 +33,17 @@ public PlayerPortfolioComponent(Portfolio portfolio){
         userTitle.getStyleClass().add("portfolio-box-title");
         invisibleTitle.getStyleClass().add("portfolio-box-title");
 
-        VBox leftColumn = new VBox(userTitle, netWorth, percentageChange, playerStatus);
-        VBox rightColumn = new VBox(invisibleTitle, portfolioWorth, totalShares);
-
         UICompositor playerPortfolioComponent = new UICompositor.Builder()
                 .parent(new HBox())
                 .growWithAlignment(Pos.CENTER)
-                .addContent(leftColumn)
+                .wrap(new VBox())
+                .addAllContent(userTitle, netWorth, percentageChange, playerStatus)
+                .unwrap()
                 .filler()
-                .addContent(rightColumn)
+                .wrap(new VBox())
+                .growWithAlignment(Pos.CENTER)
+                .addAllContent(portfolioWorth, totalShares)
+                .unwrap()
                 .build();
 
         this.getChildren().add(playerPortfolioComponent.makeUI());
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/ShareComponent.java b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/ShareComponent.java
index e33da72..7546158 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/ShareComponent.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/ShareComponent.java
@@ -19,17 +19,20 @@ public ShareComponent(Share share){
         this.setMaxSize(Double.MAX_VALUE, 300);
         this.setPadding(new Insets(30));
         this.getStyleClass().add("rowBox");
+
         Label name = new Label(share.getStock().getCompany());
         Label quantity = new Label("Owned shares: "+share.getQuantity().toString());
         Label ticker = new Label("("+share.getStock().getSymbol()+")");
         Label latestPrice = new Label("Latest price: "+share.getStock().getSalesPrice().toString());
         Button sellButton = new Button("Sell");
+
         ArrayList<Label> labels = new ArrayList<>();
         Collections.addAll(labels, name, quantity, ticker, latestPrice);
         labels.forEach(e -> e.getStyleClass().add("portfolio-box-text"));
         sellButton.getStyleClass().add("button");
         String color = CssUtils.generateValueColors(share.getProfit().doubleValue());
         CssUtils.apply(latestPrice, color);
+
         UICompositor shareComponent = new UICompositor.Builder()
                 .parent(new HBox())
                 .growWithAlignment(Pos.CENTER)
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/components/ui/UICompositor.java b/src/main/java/edu/ntnu/idi/idatt/view/components/ui/UICompositor.java
index 410a9e1..ebf229c 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/components/ui/UICompositor.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/components/ui/UICompositor.java
@@ -35,15 +35,16 @@ public Builder parent(Pane parent) {
     }
 
     public Builder growWithAlignment(Pos position) {
-      if (parent instanceof HBox) {
-        ((HBox) parent).setAlignment(position);
-        parent.setMaxWidth(Double.MAX_VALUE);
-        HBox.setHgrow(parent, Priority.ALWAYS);
+      Pane root = getRoot();
+      if (root instanceof HBox) {
+        ((HBox) root).setAlignment(position);
+        root.setMaxWidth(Double.MAX_VALUE);
+        HBox.setHgrow(root, Priority.ALWAYS);
       }
-      if (parent instanceof VBox) {
-        ((VBox) parent).setAlignment(position);
-        parent.setMaxHeight(Double.MAX_VALUE);
-        VBox.setVgrow(parent, Priority.ALWAYS);
+      if (root instanceof VBox) {
+        ((VBox) root).setAlignment(position);
+        root.setMaxHeight(Double.MAX_VALUE);
+        VBox.setVgrow(root, Priority.ALWAYS);
       }
       return this;
     }
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java b/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java
index 4b9c49c..744fd96 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java
@@ -25,15 +25,15 @@ public Parent createContent() {
 
         VBox.setVgrow(userBox, Priority.ALWAYS);
         userBox.setPadding(new Insets(20));
-        root.setTop(userBox);
-
         ScrollPane stockBox = new ScrollPane();
         stockBox.setPadding(new Insets(10, 10, 20, 20));
-        root.setCenter(stockBox);
+        shareBox = new VBox(20);
+
         stockBox.setFitToWidth(true);
         stockBox.getStyleClass().add("viewport-colour");
         stockBox.getStyleClass().add("primary");
-        shareBox = new VBox(20);
+        root.setTop(userBox);
+        root.setCenter(stockBox);
         stockBox.setContent(shareBox);
         return root;
         }
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/primary/stock/StockView.java b/src/main/java/edu/ntnu/idi/idatt/view/primary/stock/StockView.java
index 3b43bf7..60a9c66 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/primary/stock/StockView.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/primary/stock/StockView.java
@@ -117,7 +117,7 @@ public Parent createToolbar() {
   public Parent createMenu() {
     return UIFactory.createMenu("Account",
         List.of(" • Portfolio", " • Transactions"),
-        () -> System.out.println("Portfolio clicked!"),
+        () -> SceneManager.switchTo(SceneFactory.createPortfolioView()),
         () -> SceneManager.switchTo(SceneFactory.createTransactionView()));
 
   }
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/primary/transactions/TransactionView.java b/src/main/java/edu/ntnu/idi/idatt/view/primary/transactions/TransactionView.java
index 33a5c10..932ccec 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/primary/transactions/TransactionView.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/primary/transactions/TransactionView.java
@@ -76,7 +76,7 @@ public Parent createToolbar() {
   public Parent createMenu() {
     return UIFactory.createMenu("Account",
         List.of(" • Portfolio", " • Transactions"),
-        () -> System.out.println("Portfolio clicked!"),
+        () -> SceneManager.switchTo(SceneFactory.createPortfolioView()),
         () -> {
         });
 

From 9336f0d71710304403a64c8361c0f4b8099bbac8 Mon Sep 17 00:00:00 2001
From: danieskj <danieskj@stud.ntnu.no>
Date: Thu, 14 May 2026 17:37:57 +0200
Subject: [PATCH 4/4] feat(PlayerPortfolioComponent): Change labels to show the
 right info

---
 .../edu/ntnu/idi/idatt/view/SceneFactory.java |  3 +++
 .../elements/PlayerPortfolioComponent.java    | 20 +++++++++----------
 .../idatt/view/components/ui/UIFactory.java   |  3 +--
 .../view/primary/portfolio/PortfolioView.java |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/edu/ntnu/idi/idatt/view/SceneFactory.java b/src/main/java/edu/ntnu/idi/idatt/view/SceneFactory.java
index 02d4d91..cd14152 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/SceneFactory.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/SceneFactory.java
@@ -73,6 +73,9 @@ public static Parent createStartView() {
 
   }
   public static Parent createPortfolioView(){
+
+    mark(() -> createPortfolioView());
+    
     PortfolioModel model = new PortfolioModel();
     PortfolioView view = new PortfolioView();
     PortfolioController controller =  new PortfolioController(model);
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/PlayerPortfolioComponent.java b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/PlayerPortfolioComponent.java
index e4cfa9d..7457d36 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/PlayerPortfolioComponent.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/PlayerPortfolioComponent.java
@@ -8,6 +8,8 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Collections;
 
@@ -17,32 +19,28 @@ public PlayerPortfolioComponent(Portfolio portfolio){
         this.setMaxSize(Double.MAX_VALUE, 500);
         this.getStyleClass().add("light");
 
-        Label userTitle = new Label("Name Title");
-        Label invisibleTitle = new Label(" ");
+        Label userTitle = new Label(String.format("%s's Portfolio", UserSession.getInstance().getPlayer().getName()));
         Label netWorth = new Label();
         netWorth.textProperty().bind(
                 UserSession.getInstance().netWorthProperty().asString("Net Worth: %.2f $"));
-        Label percentageChange = new Label("Percentage change: ");
+        Label percentageChange = new Label("Percentage change: "+ UserSession.getInstance().netWorthProperty().doubleValue());
         Label playerStatus = new Label("Player status: "+ UserSession.getInstance().getPlayer().getStatus());
-        Label portfolioWorth = new Label("Portfolio net worth: ");
-        Label totalShares = new Label("Total shares owned: ");
-
+        Label totalShares = new Label("Total shares owned: "+ UserSession.getInstance().getPlayer().getPortfolio().getShares().size());
         ArrayList<Label> labels = new ArrayList<>();
-        Collections.addAll(labels, netWorth, percentageChange, playerStatus, portfolioWorth, totalShares);
+        Collections.addAll(labels, netWorth, percentageChange, playerStatus, totalShares);
         labels.forEach(e -> e.getStyleClass().add("portfolio-box-text"));
         userTitle.getStyleClass().add("portfolio-box-title");
-        invisibleTitle.getStyleClass().add("portfolio-box-title");
 
         UICompositor playerPortfolioComponent = new UICompositor.Builder()
                 .parent(new HBox())
                 .growWithAlignment(Pos.CENTER)
                 .wrap(new VBox())
-                .addAllContent(userTitle, netWorth, percentageChange, playerStatus)
+                .addAllContent(userTitle, netWorth, percentageChange)
                 .unwrap()
                 .filler()
                 .wrap(new VBox())
-                .growWithAlignment(Pos.CENTER)
-                .addAllContent(portfolioWorth, totalShares)
+                .growWithAlignment(Pos.BOTTOM_CENTER)
+                .addAllContent(playerStatus, totalShares)
                 .unwrap()
                 .build();
 
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/components/ui/UIFactory.java b/src/main/java/edu/ntnu/idi/idatt/view/components/ui/UIFactory.java
index 6b1b3c7..ed6aeab 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/components/ui/UIFactory.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/components/ui/UIFactory.java
@@ -134,8 +134,7 @@ public static Parent createMenu(String title, List<String> buttonLables, ActionE
 
     UICompositor.Builder menuBuilder = new UICompositor.Builder()
         .parent(new VBox())
-        .growWithAlignment(Pos.TOP_CENTER)
-        .properties((menu) -> menu.setPrefSize(300, Double.MAX_VALUE))
+        .growWithAlignment(Pos.CENTER)
         .addContent(menuIcon);
 
     buttons.forEach(b -> menuBuilder.addContent(b));
diff --git a/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java b/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java
index 744fd96..184dd5b 100644
--- a/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java
+++ b/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java
@@ -26,7 +26,7 @@ public Parent createContent() {
         VBox.setVgrow(userBox, Priority.ALWAYS);
         userBox.setPadding(new Insets(20));
         ScrollPane stockBox = new ScrollPane();
-        stockBox.setPadding(new Insets(10, 10, 20, 20));
+        stockBox.setPadding(new Insets(0, 10, 0, 20));
         shareBox = new VBox(20);
 
         stockBox.setFitToWidth(true);