Merge branch 'main' of https://interstellardevelopment.org/code/sageTheDm/IMS-java
This commit is contained in:
commit
ce516db161
10 changed files with 36 additions and 6 deletions
|
@ -43,6 +43,11 @@ public class CartController {
|
||||||
// Observable list to hold cart items
|
// Observable list to hold cart items
|
||||||
private final ObservableList<Item> cartItems = FXCollections.observableArrayList();
|
private final ObservableList<Item> cartItems = FXCollections.observableArrayList();
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
void handleTitleClick(MouseEvent event) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
public void initialize() {
|
public void initialize() {
|
||||||
// Set up columns to match Item properties
|
// Set up columns to match Item properties
|
||||||
|
|
|
@ -71,6 +71,11 @@ public class CheckOutController {
|
||||||
countryComboBox.getSelectionModel().selectFirst();
|
countryComboBox.getSelectionModel().selectFirst();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
void handleTitleClick(MouseEvent event) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void handleCartButton() throws IOException {
|
private void handleCartButton() throws IOException {
|
||||||
App.setRoot("cart");
|
App.setRoot("cart");
|
||||||
|
|
|
@ -111,6 +111,11 @@ public class LoginController {
|
||||||
@FXML
|
@FXML
|
||||||
private Label usernameLabel;
|
private Label usernameLabel;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
void handleTitleClick(MouseEvent event) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
void handleRegisterButtonClick(ActionEvent event) {
|
void handleRegisterButtonClick(ActionEvent event) {
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
package com.example;
|
||||||
|
|
||||||
|
public class MouseEvent {
|
||||||
|
|
||||||
|
}
|
|
@ -46,6 +46,11 @@ public class RegisterController {
|
||||||
@FXML
|
@FXML
|
||||||
private Label footerCopyText;
|
private Label footerCopyText;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
void handleTitleClick(MouseEvent event) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void handleCartButton() throws IOException {
|
private void handleCartButton() throws IOException {
|
||||||
App.setRoot("cart");
|
App.setRoot("cart");
|
||||||
|
|
|
@ -37,6 +37,11 @@ public class ShopController {
|
||||||
System.out.println("ShopController initialized.");
|
System.out.println("ShopController initialized.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
void handleTitleClick(MouseEvent event) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void handleCartButton() throws IOException {
|
private void handleCartButton() throws IOException {
|
||||||
App.setRoot("cart");
|
App.setRoot("cart");
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
<top>
|
<top>
|
||||||
<HBox fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
|
<HBox fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
|
||||||
<children>
|
<children>
|
||||||
<Label fx:id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
|
<Label fx:id="mainTitle" onMouseClicked="#handleTitleClick" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
|
||||||
<Pane HBox.hgrow="ALWAYS" />
|
<Pane HBox.hgrow="ALWAYS" />
|
||||||
<Button fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
|
<Button fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
|
||||||
<Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
|
<Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
|
||||||
|
|
|
@ -12,12 +12,12 @@
|
||||||
<?import javafx.scene.layout.RowConstraints?>
|
<?import javafx.scene.layout.RowConstraints?>
|
||||||
<?import javafx.scene.layout.VBox?>
|
<?import javafx.scene.layout.VBox?>
|
||||||
|
|
||||||
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.RegisterController">
|
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.RegisterController">
|
||||||
<top>
|
<top>
|
||||||
<HBox id="header" fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
|
<HBox id="header" fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
|
||||||
<children>
|
<children>
|
||||||
<!-- Main Title -->
|
<!-- Main Title -->
|
||||||
<Label id="mainTitle" fx:id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
|
<Label id="mainTitle" fx:id="mainTitle" onMouseClicked="#handleTitleClick" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
|
||||||
|
|
||||||
<!-- Spacer for alignment -->
|
<!-- Spacer for alignment -->
|
||||||
<Pane fx:id="spacerPane" HBox.hgrow="ALWAYS" />
|
<Pane fx:id="spacerPane" HBox.hgrow="ALWAYS" />
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
<top>
|
<top>
|
||||||
<HBox fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
|
<HBox fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
|
||||||
<children>
|
<children>
|
||||||
<Label fx:id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
|
<Label fx:id="mainTitle" onMouseClicked="#handleTitleClick" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
|
||||||
<Pane HBox.hgrow="ALWAYS" />
|
<Pane HBox.hgrow="ALWAYS" />
|
||||||
<Button fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
|
<Button fx:id="cartBtn" mnemonicParsing="false" onAction="#handleCartButton" styleClass="cartBtn" text="Cart" />
|
||||||
<Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
|
<Button fx:id="loginBtn" mnemonicParsing="false" styleClass="loginBtn" text="Login" />
|
||||||
|
|
|
@ -12,12 +12,12 @@
|
||||||
<?import javafx.scene.layout.RowConstraints?>
|
<?import javafx.scene.layout.RowConstraints?>
|
||||||
<?import javafx.scene.layout.VBox?>
|
<?import javafx.scene.layout.VBox?>
|
||||||
|
|
||||||
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.RegisterController">
|
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.RegisterController">
|
||||||
<top>
|
<top>
|
||||||
<HBox id="header" fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
|
<HBox id="header" fx:id="header" alignment="CENTER" prefHeight="60.0" prefWidth="631.0" spacing="20.0" styleClass="header" BorderPane.alignment="CENTER">
|
||||||
<children>
|
<children>
|
||||||
<!-- Main Title -->
|
<!-- Main Title -->
|
||||||
<Label id="mainTitle" fx:id="mainTitle" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
|
<Label id="mainTitle" fx:id="mainTitle" onMouseClicked="#handleTitleClick" styleClass="mainTitle" text="Bookshop - Fantasy Brigade" />
|
||||||
|
|
||||||
<!-- Spacer for alignment -->
|
<!-- Spacer for alignment -->
|
||||||
<Pane fx:id="spacerPane" HBox.hgrow="ALWAYS" />
|
<Pane fx:id="spacerPane" HBox.hgrow="ALWAYS" />
|
||||||
|
|
Loading…
Reference in a new issue