Merge conflict resolution and updates

2026-02-24 20:26:50 -07:00
parent 208aaae652
commit 13e8c01a28
38 changed files with 594 additions and 266 deletions
--- a/src/main/resources/org/example/petshopdesktop/dialogviews/adoption-dialog-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/dialogviews/adoption-dialog-view.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.AdoptionDialogController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.AdoptionDialogController">
    <children>
        <HBox alignment="CENTER_LEFT" prefHeight="79.0" prefWidth="727.0" spacing="20.0" style="-fx-background-color: #2C3E50; -fx-background-radius: 14;">
            <children>
--- a/src/main/resources/org/example/petshopdesktop/dialogviews/appointment-dialog-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/dialogviews/appointment-dialog-view.fxml
@@ -17,7 +17,7 @@

 <VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0"
      spacing="20.0" style="-fx-font-size: 14px;"
-      xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1"
+      xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
      fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.AppointmentDialogController">
    <children>
        <HBox alignment="CENTER_LEFT" prefHeight="79.0" prefWidth="727.0" spacing="20.0"
--- a/src/main/resources/org/example/petshopdesktop/dialogviews/inventory-dialog-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/dialogviews/inventory-dialog-view.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.InventoryDialogController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.InventoryDialogController">
    <children>
        <HBox alignment="CENTER_LEFT" prefHeight="79.0" prefWidth="727.0" spacing="20.0" style="-fx-background-color: #2C3E50; -fx-background-radius: 14;">
            <children>
--- a/src/main/resources/org/example/petshopdesktop/dialogviews/pet-dialog-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/dialogviews/pet-dialog-view.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.PetDialogController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.PetDialogController">
    <children>
        <HBox alignment="CENTER_LEFT" prefHeight="79.0" prefWidth="727.0" spacing="20.0" style="-fx-background-color: #2C3E50; -fx-background-radius: 14;">
            <children>
--- a/src/main/resources/org/example/petshopdesktop/dialogviews/product-dialog-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/dialogviews/product-dialog-view.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.ProductDialogController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.ProductDialogController">
   <children>
      <HBox alignment="CENTER_LEFT" prefHeight="79.0" prefWidth="727.0" spacing="20.0" style="-fx-background-color: #2C3E50; -fx-background-radius: 14;">
         <children>
--- a/src/main/resources/org/example/petshopdesktop/dialogviews/product-supplier-dialog-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/dialogviews/product-supplier-dialog-view.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.ProductSupplierDialogController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.ProductSupplierDialogController">
   <children>
      <HBox alignment="CENTER_LEFT" prefHeight="79.0" prefWidth="727.0" spacing="20.0" style="-fx-background-color: #2C3E50; -fx-background-radius: 14;">
         <children>
--- a/src/main/resources/org/example/petshopdesktop/dialogviews/service-dialog-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/dialogviews/service-dialog-view.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.control.ComboBox?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.ServiceDialogController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.ServiceDialogController">
    <children>
        <HBox alignment="CENTER_LEFT" prefHeight="79.0" prefWidth="727.0" spacing="20.0" style="-fx-background-color: #2C3E50; -fx-background-radius: 14;">
            <children>
--- a/src/main/resources/org/example/petshopdesktop/dialogviews/supplier-dialog-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/dialogviews/supplier-dialog-view.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.SupplierDialogController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="790.0" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.dialogcontrollers.SupplierDialogController">
   <children>
      <HBox alignment="CENTER_LEFT" prefHeight="79.0" prefWidth="727.0" spacing="20.0" style="-fx-background-color: #2C3E50; -fx-background-radius: 14;">
         <children>
--- a/src/main/resources/org/example/petshopdesktop/login-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/login-view.fxml
@@ -10,7 +10,7 @@

 <VBox alignment="CENTER" prefHeight="400.0" prefWidth="380.0" spacing="16.0"
      style="-fx-background-color: #2C3E50;"
-      xmlns="http://javafx.com/javafx/25"
+      xmlns="http://javafx.com/javafx/17"
      xmlns:fx="http://javafx.com/fxml/1"
      fx:controller="org.example.petshopdesktop.controllers.LoginController">
   <padding>
--- a/src/main/resources/org/example/petshopdesktop/main-layout-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/main-layout-view.fxml
@@ -5,131 +5,146 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="742.0" prefWidth="1069.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.MainLayoutController">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="742.0" prefWidth="1069.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.MainLayoutController">
   <left>
-      <VBox prefHeight="700.0" prefWidth="250.0" spacing="15.0" style="-fx-background-color: #2C3E50;" BorderPane.alignment="CENTER">
+      <VBox prefHeight="700.0" prefWidth="250.0" spacing="10.0" style="-fx-background-color: #2C3E50;" BorderPane.alignment="CENTER">
         <padding>
-            <Insets bottom="30.0" left="30.0" right="30.0" top="30.0" />
+            <Insets bottom="22.0" left="22.0" right="22.0" top="24.0" />
         </padding>
         <children>
            <Label fx:id="lblUsername" text="Name" textFill="WHITE">
               <font>
-                  <Font name="Comic Sans MS Bold" size="30.0" />
+                  <Font name="System Bold" size="24.0" />
               </font>
            </Label>
-            <Label fx:id="lblRole" text="Pet Store Manager" textFill="#ffe66d">
+            <Label fx:id="lblRole" text="Leon's Petstore" textFill="#ffe66d">
               <font>
-                  <Font name="Comic Sans MS Bold" size="16.0" />
+                  <Font name="System" size="14.0" />
               </font>
               <padding>
-                  <Insets bottom="20.0" />
+                  <Insets bottom="8.0" />
               </padding>
            </Label>
-            <Separator prefWidth="200.0" style="-fx-background-color: #444444;" />
-            <Button fx:id="btnPets" mnemonicParsing="false" onAction="#btnPetsClicked" prefWidth="250.0" style="-fx-background-color: #FF6b6b; -fx-background-radius: 8; -fx-cursor: hand;" text="🐾 Pets" textFill="WHITE">
-               <VBox.margin>
-                  <Insets />
-               </VBox.margin>
+            <Separator prefWidth="200.0" style="-fx-background-color: #444444; -fx-opacity: 0.35;" />
+
+            <Label text="PETS" textFill="#94a3b8">
+               <font>
+                  <Font name="System Bold" size="12.0" />
+               </font>
               <padding>
-                  <Insets bottom="12.0" left="12.0" right="110.0" top="12.0" />
+                  <Insets top="8.0" />
+               </padding>
+            </Label>
+
+            <Button fx:id="btnPets" alignment="CENTER_LEFT" mnemonicParsing="false" onAction="#btnPetsClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Pets" textFill="#cbd5e1">
+               <padding>
+                  <Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
               </padding>
               <font>
-                  <Font name="Comic Sans MS Bold" size="14.0" />
+                  <Font name="System" size="13.0" />
               </font>
            </Button>
-            <Button fx:id="btnAdoptions" layoutX="40.0" layoutY="234.0" mnemonicParsing="false" onAction="#btnAdoptionsClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 8; -fx-cursor: hand;" text="❤ Adoptions" textFill="#cccccc">
+            <Button fx:id="btnAdoptions" alignment="CENTER_LEFT" layoutX="40.0" layoutY="234.0" mnemonicParsing="false" onAction="#btnAdoptionsClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Adoptions" textFill="#cbd5e1">
               <font>
-                  <Font name="Comic Sans MS Bold" size="14.0" />
+                  <Font name="System" size="13.0" />
               </font>
               <padding>
-                  <Insets bottom="12.0" left="12.0" right="75.0" top="12.0" />
+                  <Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
               </padding>
            </Button>
-            <Button fx:id="btnAppointments" layoutX="40.0" layoutY="294.0" mnemonicParsing="false" onAction="#btnAppointmentsClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 8; -fx-cursor: hand;" text="📅 Appointments" textFill="#cccccc">
+            <Button fx:id="btnAppointments" alignment="CENTER_LEFT" layoutX="40.0" layoutY="294.0" mnemonicParsing="false" onAction="#btnAppointmentsClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Appointments" textFill="#cbd5e1">
               <font>
-                  <Font name="Comic Sans MS Bold" size="14.0" />
+                  <Font name="System" size="13.0" />
               </font>
               <padding>
-                  <Insets bottom="12.0" left="12.0" right="50.0" top="12.0" />
+                  <Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
               </padding>
            </Button>
-            <Button fx:id="btnServices" layoutX="40.0" layoutY="354.0" mnemonicParsing="false" onAction="#btnServicesClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 8; -fx-cursor: hand;" text="✂ Services" textFill="#cccccc">
+            <Button fx:id="btnServices" alignment="CENTER_LEFT" layoutX="40.0" layoutY="354.0" mnemonicParsing="false" onAction="#btnServicesClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Services" textFill="#cbd5e1">
               <font>
-                  <Font name="Comic Sans MS Bold" size="14.0" />
+                  <Font name="System" size="13.0" />
               </font>
               <padding>
-                  <Insets bottom="12.0" left="12.0" right="85.0" top="12.0" />
+                  <Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
               </padding>
            </Button>
-            <Separator layoutX="40.0" layoutY="156.0" prefWidth="200.0" style="-fx-background-color: #444444;" />
-            <Button fx:id="btnProducts" layoutX="40.0" layoutY="414.0" mnemonicParsing="false" onAction="#btnProductsClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 8; -fx-cursor: hand;" text="📦 Products" textFill="#cccccc">
+            <Separator layoutX="40.0" layoutY="156.0" prefWidth="200.0" style="-fx-background-color: #444444; -fx-opacity: 0.35;" />
+
+            <Label text="PRODUCTS" textFill="#94a3b8">
               <font>
-                  <Font name="Comic Sans MS Bold" size="14.0" />
+                  <Font name="System Bold" size="12.0" />
               </font>
               <padding>
-                  <Insets bottom="12.0" left="12.0" right="80.0" top="12.0" />
+                  <Insets top="8.0" />
+               </padding>
+            </Label>
+
+            <Button fx:id="btnProducts" alignment="CENTER_LEFT" layoutX="40.0" layoutY="414.0" mnemonicParsing="false" onAction="#btnProductsClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Products" textFill="#cbd5e1">
+               <font>
+                  <Font name="System" size="13.0" />
+               </font>
+               <padding>
+                  <Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
               </padding>
            </Button>
-            <Button fx:id="btnInventory" layoutX="40.0" layoutY="492.0" mnemonicParsing="false" onAction="#btnInventoryClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 8; -fx-cursor: hand;" text="📋 Inventory" textFill="#cccccc">
+            <Button fx:id="btnInventory" alignment="CENTER_LEFT" layoutX="40.0" layoutY="492.0" mnemonicParsing="false" onAction="#btnInventoryClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Inventory" textFill="#cbd5e1">
               <font>
-                  <Font name="Comic Sans MS Bold" size="14.0" />
+                  <Font name="System" size="13.0" />
               </font>
               <padding>
-                  <Insets bottom="12.0" left="12.0" right="74.0" top="12.0" />
+                  <Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
               </padding>
            </Button>
-            <Button fx:id="btnSuppliers" layoutX="40.0" layoutY="552.0" mnemonicParsing="false" onAction="#btnSuppliersClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 8; -fx-cursor: hand;" text="🏭 Suppliers" textFill="#cccccc">
+            <Button fx:id="btnSuppliers" alignment="CENTER_LEFT" layoutX="40.0" layoutY="552.0" mnemonicParsing="false" onAction="#btnSuppliersClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Suppliers" textFill="#cbd5e1">
               <font>
-                  <Font name="Comic Sans MS Bold" size="14.0" />
+                  <Font name="System" size="13.0" />
               </font>
               <padding>
-                  <Insets bottom="12.0" left="12.0" right="76.0" top="12.0" />
+                  <Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
               </padding>
            </Button>
-            <Button fx:id="btnProductSuppliers" layoutX="40.0" layoutY="612.0" mnemonicParsing="false" onAction="#btnProductSuppliersClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 8; -fx-cursor: hand;" text="🔗 Product-Suppliers" textFill="#cccccc">
+            <Button fx:id="btnProductSuppliers" alignment="CENTER_LEFT" layoutX="40.0" layoutY="612.0" mnemonicParsing="false" onAction="#btnProductSuppliersClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Product-Suppliers" textFill="#cbd5e1">
               <font>
-                  <Font name="Comic Sans MS Bold" size="14.0" />
+                  <Font name="System" size="13.0" />
               </font>
               <padding>
-                  <Insets bottom="12.0" left="12.0" right="18.0" top="12.0" />
+                  <Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
               </padding>
            </Button>
-            <Button fx:id="btnSalesHistory" layoutX="40.0" layoutY="672.0" mnemonicParsing="false" onAction="#btnSalesHistoryClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 8; -fx-cursor: hand;" text="📄 Sales History" textFill="#cccccc">
+            <Button fx:id="btnSalesHistory" alignment="CENTER_LEFT" layoutX="40.0" layoutY="672.0" mnemonicParsing="false" onAction="#btnSalesHistoryClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Sales History" textFill="#cbd5e1">
               <font>
-                  <Font name="Comic Sans MS Bold" size="14.0" />
+                  <Font name="System" size="13.0" />
               </font>
               <padding>
-                  <Insets bottom="12.0" left="12.0" right="45.0" top="12.0" />
+                  <Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
               </padding>
            </Button>

-            <Button fx:id="btnPurchaseOrders"
-                    mnemonicParsing="false"
-                    onAction="#btnPurchaseOrdersClicked"
-                    prefWidth="250.0"
-                    style="-fx-background-color: transparent; -fx-background-radius: 8; -fx-cursor: hand;"
-                    text="🧾 Purchase Orders"
-                    textFill="#cccccc">
+            <Button fx:id="btnPurchaseOrders" alignment="CENTER_LEFT" mnemonicParsing="false" onAction="#btnPurchaseOrdersClicked" prefWidth="250.0" style="-fx-background-color: transparent; -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Purchase Orders" textFill="#cbd5e1">
               <font>
-                  <Font name="Comic Sans MS Bold" size="14.0" />
+                  <Font name="System" size="13.0" />
               </font>
               <padding>
-                  <Insets bottom="12.0" left="12.0" right="40.0" top="12.0" />
+                  <Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
               </padding>
            </Button>
-            <Button fx:id="btnLogout" mnemonicParsing="false" onAction="#btnLogoutClicked" prefWidth="250.0" style="-fx-background-color: #34495E; -fx-background-radius: 8; -fx-cursor: hand;" text="🚪 Logout" textFill="#cccccc">
+
+            <Region VBox.vgrow="ALWAYS" />
+
+            <Button fx:id="btnLogout" alignment="CENTER_LEFT" mnemonicParsing="false" onAction="#btnLogoutClicked" prefWidth="250.0" style="-fx-background-color: rgba(255,255,255,0.08); -fx-background-radius: 10; -fx-cursor: hand; -fx-focus-color: transparent; -fx-faint-focus-color: transparent;" text="Logout" textFill="#e2e8f0">
               <font>
-                  <Font name="Comic Sans MS Bold" size="14.0" />
+                  <Font name="System" size="13.0" />
               </font>
               <padding>
-                  <Insets bottom="12.0" left="12.0" right="94.0" top="12.0" />
+                  <Insets bottom="10.0" left="14.0" right="14.0" top="10.0" />
               </padding>
               <VBox.margin>
-                  <Insets top="20.0" />
+                  <Insets top="12.0" />
               </VBox.margin>
            </Button>
         </children>
--- a/src/main/resources/org/example/petshopdesktop/modelviews/adoption-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/modelviews/adoption-view.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.AdoptionController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.AdoptionController">
   <padding>
      <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
   </padding>
--- a/src/main/resources/org/example/petshopdesktop/modelviews/appointment-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/modelviews/appointment-view.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.AppointmentController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.AppointmentController">
   <padding>
      <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
   </padding>
--- a/src/main/resources/org/example/petshopdesktop/modelviews/inventory-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/modelviews/inventory-view.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.InventoryController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.InventoryController">
   <padding>
      <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
   </padding>
--- a/src/main/resources/org/example/petshopdesktop/modelviews/pet-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/modelviews/pet-view.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.PetController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.PetController">
   <padding>
      <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
   </padding>
--- a/src/main/resources/org/example/petshopdesktop/modelviews/product-supplier-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/modelviews/product-supplier-view.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.ProductSupplierController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.ProductSupplierController">
   <padding>
      <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
   </padding>
--- a/src/main/resources/org/example/petshopdesktop/modelviews/product-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/modelviews/product-view.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.ProductController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.ProductController">
   <padding>
      <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
   </padding>
--- a/src/main/resources/org/example/petshopdesktop/modelviews/purchase-order-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/modelviews/purchase-order-view.fxml
@@ -7,7 +7,7 @@

 <VBox spacing="20.0"
      style="-fx-font-size: 14px;"
-      xmlns="http://javafx.com/javafx/25"
+      xmlns="http://javafx.com/javafx/17"
      xmlns:fx="http://javafx.com/fxml/1"
      fx:controller="org.example.petshopdesktop.controllers.PurchaseOrderController">

--- a/src/main/resources/org/example/petshopdesktop/modelviews/purchaseorder-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/modelviews/purchaseorder-view.fxml
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-
-<VBox minHeight="-Infinity"
-      minWidth="-Infinity"
-      spacing="20"
-      style="-fx-font-size:14px;"
-      xmlns="http://javafx.com/javafx/25"
-      xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="org.example.petshopdesktop.controllers.PurchaseOrderdialogController">
-
-    <padding>
-        <Insets top="20" right="20" bottom="20" left="20"/>
-    </padding>
-
-    <!-- HEADER -->
-    <HBox alignment="CENTER_LEFT" spacing="20">
-
-        <Label text="Purchase Orders" textFill="#2c3e50">
-            <font>
-                <Font name="System Bold" size="30"/>
-            </font>
-        </Label>
-
-        <Region HBox.hgrow="ALWAYS"/>
-
-    </HBox>
-
-    <!-- SEARCH BAR -->
-    <HBox alignment="CENTER_LEFT"
-          spacing="10"
-          style="-fx-background-color:white; -fx-background-radius:14;">
-
-        <padding>
-            <Insets top="10" bottom="10" left="15" right="15"/>
-        </padding>
-
-        <TextField fx:id="txtSearch"
-                   promptText="Search Purchase Orders..."
-                   style="-fx-border-width:0; -fx-background-color:transparent;"
-                   HBox.hgrow="ALWAYS"/>
-
-    </HBox>
-
-    <!-- TABLE -->
-    <TableView fx:id="tvPurchaseOrders"
-               prefHeight="362"
-               style="-fx-background-color:white; -fx-background-radius:12;"
-               VBox.vgrow="ALWAYS">
-
-        <columns>
-
-            <TableColumn fx:id="colOrderId"
-                         text="Order ID"
-                         prefWidth="120"/>
-
-            <TableColumn fx:id="colSupplier"
-                         text="Supplier"
-                         prefWidth="250"/>
-
-            <TableColumn fx:id="colOrderDate"
-                         text="Order Date"
-                         prefWidth="200"/>
-
-            <TableColumn fx:id="colStatus"
-                         text="Status"
-                         prefWidth="180"/>
-
-        </columns>
-
-    </TableView>
-
-</VBox>
--- a/src/main/resources/org/example/petshopdesktop/modelviews/sale-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/modelviews/sale-view.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.SaleController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.SaleController">
   <padding>
      <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
   </padding>
--- a/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.ServiceController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.ServiceController">
   <padding>
      <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
   </padding>
--- a/src/main/resources/org/example/petshopdesktop/modelviews/supplier-view.fxml
+++ b/src/main/resources/org/example/petshopdesktop/modelviews/supplier-view.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.SupplierController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" spacing="20.0" style="-fx-font-size: 14px;" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.example.petshopdesktop.controllers.SupplierController">
   <padding>
      <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
   </padding>