From 9fbf59034b2c3750382a2fe8f485853ae57e8a31 Mon Sep 17 00:00:00 2001
From: MOOH <arad3.138563@gmail.com>
Date: Wed, 9 Jul 2025 11:03:45 +0330
Subject: [PATCH] done

---
 .idea/.name                                   |   1 +
 .idea/gradle.xml                              |   2 +-
 .idea/material_theme_project_new.xml          |  12 +
 .../Controller/CheckOutController.java        | 179 +++++++++++++
 .../restaurant/Controller/Contoller.java      |  19 ++
 .../Controller/DisplayController.java         |  19 ++
 .../Controller/LoginSignupController.java     | 253 ++++++++++++++++++
 .../Controller/OrderingController.java        | 175 ++++++++++++
 .../restaurant/Database/DatabaseManager.java  |  14 +
 .../restaurant/Entities/MenuItem.java         |   4 +
 .../restaurant/Entities/MenuItemData.java     |  17 ++
 .../restaurant/restaurant/Entities/Order.java |   4 +
 .../restaurant/Entities/OrderDetail.java      |   4 +
 .../restaurant/restaurant/Entities/User.java  |   4 +
 .../restaurant/HelloApplication.java          |  23 --
 .../restaurant/HelloController.java           |  14 -
 .../java/ap/restaurant/restaurant/Login.java  |   4 +
 .../java/ap/restaurant/restaurant/Main.java   |  25 ++
 .../restaurant/Service/CartService.java       |  33 +++
 .../restaurant/Service/SessionService.java    |  38 +++
 src/main/java/module-info.java                |   1 +
 .../ap/restaurant/restaurant/checkout.fxml    |  34 +++
 .../ap/restaurant/restaurant/hello-view.fxml  |  16 --
 .../ap/restaurant/restaurant/login.fxml       |  27 ++
 .../ap/restaurant/restaurant/menu.fxml        |  40 +++
 .../ap/restaurant/restaurant/signup.fxml      |  28 ++
 .../ap/restaurant/restaurant/stl.css          |  43 +++
 27 files changed, 979 insertions(+), 54 deletions(-)
 create mode 100644 .idea/.name
 create mode 100644 .idea/material_theme_project_new.xml
 create mode 100644 src/main/java/ap/restaurant/restaurant/Controller/CheckOutController.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Controller/Contoller.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Controller/DisplayController.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Controller/LoginSignupController.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Controller/OrderingController.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Database/DatabaseManager.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Entities/MenuItem.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Entities/MenuItemData.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Entities/Order.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Entities/OrderDetail.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Entities/User.java
 delete mode 100644 src/main/java/ap/restaurant/restaurant/HelloApplication.java
 delete mode 100644 src/main/java/ap/restaurant/restaurant/HelloController.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Login.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Main.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Service/CartService.java
 create mode 100644 src/main/java/ap/restaurant/restaurant/Service/SessionService.java
 create mode 100644 src/main/resources/ap/restaurant/restaurant/checkout.fxml
 delete mode 100644 src/main/resources/ap/restaurant/restaurant/hello-view.fxml
 create mode 100644 src/main/resources/ap/restaurant/restaurant/login.fxml
 create mode 100644 src/main/resources/ap/restaurant/restaurant/menu.fxml
 create mode 100644 src/main/resources/ap/restaurant/restaurant/signup.fxml
 create mode 100644 src/main/resources/ap/restaurant/restaurant/stl.css

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..42fc59f
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+Restaurant
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cb9a3a0..34fc5fc 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="D:/Software 2023/Gradle/gradle-8.12.1" />
+        <option name="gradleHome" value="C:\Gradle\gradle-8.10.2" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
new file mode 100644
index 0000000..dc06877
--- /dev/null
+++ b/.idea/material_theme_project_new.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MaterialThemeProjectNewConfig">
+    <option name="metadata">
+      <MTProjectMetadataState>
+        <option name="migrated" value="true" />
+        <option name="pristineConfig" value="false" />
+        <option name="userId" value="76d9f21e:194e5d1bc5f:-7ffe" />
+      </MTProjectMetadataState>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/ap/restaurant/restaurant/Controller/CheckOutController.java b/src/main/java/ap/restaurant/restaurant/Controller/CheckOutController.java
new file mode 100644
index 0000000..e8ec41f
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Controller/CheckOutController.java
@@ -0,0 +1,179 @@
+package ap.restaurant.restaurant.Controller;
+
+
+import ap.restaurant.restaurant.Database.DatabaseManager;
+import ap.restaurant.restaurant.Service.CartService;
+import ap.restaurant.restaurant.Service.SessionService;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Map;
+
+public class CheckOutController {
+
+    @FXML private TableView<OrderItem> receiptTable;
+    @FXML private TableColumn<OrderItem, String> colItem;
+    @FXML private TableColumn<OrderItem, Integer> colQuantity;
+    @FXML private TableColumn<OrderItem, Double> colUnitPrice;
+    @FXML private TableColumn<OrderItem, Double> colTotal;
+
+    @FXML private Label totalLabel;
+
+    private final ObservableList<OrderItem> cartItems = FXCollections.observableArrayList();
+
+    @FXML
+    public void initialize() {
+        Map<String, double[]> cart = CartService.getInstance().getCartItems();
+        cartItems.clear();
+
+        for (var entry : cart.entrySet()) {
+            String name = entry.getKey();
+            int qty = (int) entry.getValue()[0];
+            double price = entry.getValue()[1];
+
+            cartItems.add(new OrderItem(name, qty, price));
+        }
+
+        // Set up table columns (same as before)
+        colItem.setCellValueFactory(new PropertyValueFactory<>("name"));
+        colQuantity.setCellValueFactory(new PropertyValueFactory<>("quantity"));
+        colUnitPrice.setCellValueFactory(new PropertyValueFactory<>("unitPrice"));
+        colTotal.setCellValueFactory(new PropertyValueFactory<>("totalPrice"));
+        receiptTable.setItems(cartItems);
+
+        double total = cartItems.stream().mapToDouble(OrderItem::getTotalPrice).sum();
+        totalLabel.setText("Total: $" + String.format("%.2f", total));
+    }
+
+
+    private int getMenuItemIdByName(String name, Connection conn) throws Exception {
+        String sql = "SELECT id FROM menu_items WHERE name = ?";
+        PreparedStatement stmt = conn.prepareStatement(sql);
+        stmt.setString(1, name);
+        ResultSet rs = stmt.executeQuery();
+        if (rs.next()) {
+            return rs.getInt("id");
+        } else {
+            throw new Exception("Menu item not found: " + name);
+        }
+    }
+
+    @FXML
+    private void confirmOrder() {
+        try (Connection conn = DatabaseManager.getConnection()) {
+            conn.setAutoCommit(false); // Begin transaction
+
+            // STEP 1: Insert new order
+            String insertOrder = "INSERT INTO orders (user_id, total_price) VALUES (?, ?) RETURNING id";
+            PreparedStatement orderStmt = conn.prepareStatement(insertOrder);
+            orderStmt.setInt(1, SessionService.getInstance().getUserId());
+
+            orderStmt.setDouble(2, calculateTotal());
+            ResultSet rs = orderStmt.executeQuery();
+            rs.next();
+            int orderId = rs.getInt(1);
+
+            // STEP 2: Insert order details
+            String insertDetail = "INSERT INTO order_details (order_id, menu_item_id, quantity, price) VALUES (?, ?, ?, ?)";
+            PreparedStatement detailStmt = conn.prepareStatement(insertDetail);
+
+            for (OrderItem item : cartItems) {
+                int menuItemId = getMenuItemIdByName(item.getName(), conn); // helper below
+                detailStmt.setInt(1, orderId);
+                detailStmt.setInt(2, menuItemId);
+                detailStmt.setInt(3, item.getQuantity());
+                detailStmt.setDouble(4, item.getUnitPrice());
+                detailStmt.addBatch();
+            }
+
+            detailStmt.executeBatch();
+            conn.commit();
+
+            // clear cart and show success
+            CartService.getInstance().clearCart();
+            Alert alert = new Alert(Alert.AlertType.INFORMATION);
+            alert.setTitle("Success");
+            alert.setContentText("Your order has been placed!");
+            alert.showAndWait();
+            backToMenu();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("Error");
+            alert.setContentText("Could not complete the order.");
+            alert.showAndWait();
+        }
+    }
+
+
+    @FXML
+    private void backToMenu() {
+        try {
+            Parent root = FXMLLoader.load(getClass().getResource("/ap/restaurant/restaurant/menu.fxml"));
+            Stage stage = (Stage) receiptTable.getScene().getWindow();
+            stage.setScene(new Scene(root));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private double calculateTotal() {
+        return cartItems.stream().mapToDouble(OrderItem::getTotalPrice).sum();
+    }
+
+    private int getCurrentUserId() {
+        return 1;
+    }
+
+    @FXML
+    private void logout() {
+        SessionService.getInstance().logout(); // clear session
+
+        Alert alert = new Alert(Alert.AlertType.INFORMATION);
+        alert.setTitle("Logged Out");
+        alert.setHeaderText(null);
+        alert.setContentText("You have been successfully logged out.");
+        alert.showAndWait(); // Wait for user to click OK
+
+        try {
+            Parent root = FXMLLoader.load(getClass().getResource("/ap/restaurant/restaurant/login.fxml"));
+            Stage stage = (Stage) receiptTable.getScene().getWindow(); // ✅ valid UI node
+            stage.setScene(new Scene(root));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    // Inner class to represent each row
+    public static class OrderItem {
+
+        private final String name;
+        private final int quantity;
+        private final double unitPrice;
+
+        public OrderItem(String name, int quantity, double unitPrice) {
+            this.name = name;
+            this.quantity = quantity;
+            this.unitPrice = unitPrice;
+        }
+
+        public String getName() { return name; }
+        public int getQuantity() { return quantity; }
+        public double getUnitPrice() { return unitPrice; }
+        public double getTotalPrice() { return unitPrice * quantity; }
+
+    }
+}
diff --git a/src/main/java/ap/restaurant/restaurant/Controller/Contoller.java b/src/main/java/ap/restaurant/restaurant/Controller/Contoller.java
new file mode 100644
index 0000000..b952826
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Controller/Contoller.java
@@ -0,0 +1,19 @@
+package ap.restaurant.restaurant.Controller;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+
+public class Contoller {
+
+    @FXML
+    private TextField usernameField;
+    @FXML private PasswordField passwordField;
+
+    @FXML
+    private void handleLogin(ActionEvent event) {
+        // custom login logic
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ap/restaurant/restaurant/Controller/DisplayController.java b/src/main/java/ap/restaurant/restaurant/Controller/DisplayController.java
new file mode 100644
index 0000000..e91b1e6
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Controller/DisplayController.java
@@ -0,0 +1,19 @@
+package ap.restaurant.restaurant.Controller;
+
+
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+
+public class DisplayController {
+    @FXML
+    private TextField usernameField;
+    @FXML private PasswordField passwordField;
+
+    @FXML
+    private void handleLogin(ActionEvent event) {
+        // custom login logic
+    }
+}
diff --git a/src/main/java/ap/restaurant/restaurant/Controller/LoginSignupController.java b/src/main/java/ap/restaurant/restaurant/Controller/LoginSignupController.java
new file mode 100644
index 0000000..378edb2
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Controller/LoginSignupController.java
@@ -0,0 +1,253 @@
+package ap.restaurant.restaurant.Controller;
+
+import ap.restaurant.restaurant.Database.DatabaseManager;
+import ap.restaurant.restaurant.Service.SessionService;
+import javafx.animation.PauseTransition;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.util.Duration;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Base64;
+
+public class LoginSignupController {
+
+    @FXML
+    private TextField usernameField;
+
+    @FXML
+    private PasswordField passwordField;
+
+    @FXML
+    private Button loginButton;
+
+    @FXML
+    private Label errorLabel;
+
+
+    private final String DEMO_USERNAME = "admin";
+    private final String DEMO_PASSWORD = "1234"; // You can hash this if needed
+    @FXML
+    private TextField newUsernameField;
+
+    @FXML
+    private PasswordField newPasswordField;
+
+    @FXML
+    private PasswordField confirmPasswordField;
+
+    @FXML
+    private Label signupErrorLabel;
+
+    @FXML
+    private Label strengthLabel;
+
+    @FXML
+    public void initialize() {
+        if (newPasswordField != null) {
+            newPasswordField.textProperty().addListener((obs, oldVal, newVal) -> {
+                strengthLabel.setText(evaluatePasswordStrength(newVal));
+                strengthLabel.setStyle("-fx-text-fill: " + getStrengthColor(newVal));
+            });
+        } else {
+            System.out.println("❌ newPasswordField is NULL — check FXML binding!");
+        }
+        System.out.println("newPasswordField = " + newPasswordField);
+
+    }
+
+
+
+    @FXML
+    private void handleSignup(ActionEvent event) {
+        String username = newUsernameField.getText().trim();
+        String password = newPasswordField.getText().trim();
+        String confirmPassword = confirmPasswordField.getText().trim();
+
+        if (username.isEmpty() || password.isEmpty() || confirmPassword.isEmpty()) {
+            signupErrorLabel.setText("Please fill all fields.");
+            signupErrorLabel.setVisible(true);
+            return;
+        }
+
+        if (!password.equals(confirmPassword)) {
+            signupErrorLabel.setText("Passwords do not match.");
+            signupErrorLabel.setVisible(true);
+            return;
+        }
+
+        try (Connection conn = DatabaseManager.getConnection()) {
+            // Check if username already exists
+            String checkSql = "SELECT COUNT(*) FROM users WHERE username = ?";
+            PreparedStatement checkStmt = conn.prepareStatement(checkSql);
+            checkStmt.setString(1, username);
+            ResultSet rs = checkStmt.executeQuery();
+            rs.next();
+
+            if (rs.getInt(1) > 0) {
+                signupErrorLabel.setText("Username is already taken.");
+                signupErrorLabel.setVisible(true);
+                return;
+            }
+
+            // Store hashed password
+            String hashed = hashPassword(password);
+            String insertSql = "INSERT INTO users (username, password_hash) VALUES (?, ?)";
+            PreparedStatement insertStmt = conn.prepareStatement(insertSql);
+            insertStmt.setString(1, username);
+            insertStmt.setString(2, hashed);
+            insertStmt.executeUpdate();
+
+            signupErrorLabel.setStyle("-fx-text-fill: green;");
+            signupErrorLabel.setText("Account created! Redirecting...");
+            signupErrorLabel.setVisible(true);
+
+            PauseTransition delay = new PauseTransition(Duration.seconds(1.5));
+            delay.setOnFinished(e -> goToLogin(null));
+            delay.play();
+
+        } catch (Exception e) {
+            signupErrorLabel.setText("Error connecting to database.");
+            signupErrorLabel.setVisible(true);
+        }
+    }
+
+
+    @FXML
+    private void goToLogin(ActionEvent event) {
+        try {
+            Parent root = FXMLLoader.load(getClass().getResource("/ap/restaurant/restaurant/login.fxml"));
+            Stage stage = (Stage) newUsernameField.getScene().getWindow();
+            stage.setScene(new Scene(root));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @FXML
+    private void handleLogin(ActionEvent event) {
+        String username = usernameField.getText().trim();
+        String password = passwordField.getText().trim();
+
+        if (username.isEmpty() || password.isEmpty()) {
+            errorLabel.setText("Please enter both username and password.");
+            errorLabel.setVisible(true);
+            return;
+        }
+
+        try (Connection conn = DatabaseManager.getConnection()) {
+            String sql = "SELECT id, password_hash FROM users WHERE username = ?";
+            PreparedStatement stmt = conn.prepareStatement(sql);
+            stmt.setString(1, username);
+            ResultSet rs = stmt.executeQuery();
+
+            if (rs.next()) {
+                String storedHash = rs.getString("password_hash");
+                int userId = rs.getInt("id");
+
+                if (storedHash.equals(hashPassword(password))) {
+                    // ✅ Login successful
+                    SessionService.getInstance().login(userId, username);
+                    loadMenuScene(); // switch to menu.fxml
+                } else {
+                    errorLabel.setText("Incorrect password.");
+                    errorLabel.setVisible(true);
+                }
+            } else {
+                errorLabel.setText("Username not found.");
+                errorLabel.setVisible(true);
+            }
+
+        } catch (Exception e) {
+            errorLabel.setText("Error connecting to database.");
+            errorLabel.setVisible(true);
+            e.printStackTrace();
+        }
+    }
+
+
+    @FXML
+    private void goToSignup(ActionEvent event) {
+        try {
+            Parent root = FXMLLoader.load(getClass().getResource("/ap/restaurant/restaurant/signup.fxml"));
+            Stage stage = (Stage) usernameField.getScene().getWindow();
+            stage.setScene(new Scene(root));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private String hashPassword(String plain) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            byte[] hash = md.digest(plain.getBytes(StandardCharsets.UTF_8));
+            return Base64.getEncoder().encodeToString(hash);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private String evaluatePasswordStrength(String password) {
+        if (password.length() < 6) return "Too short";
+        boolean hasUpper = password.matches(".*[A-Z].*");
+        boolean hasLower = password.matches(".*[a-z].*");
+        boolean hasDigit = password.matches(".*\\d.*");
+        boolean hasSymbol = password.matches(".*[!@#$%^&*()].*");
+
+        int score = 0;
+        if (hasUpper) score++;
+        if (hasLower) score++;
+        if (hasDigit) score++;
+        if (hasSymbol) score++;
+
+        return switch (score) {
+            case 0, 1 -> "Weak";
+            case 2 -> "Fair";
+            case 3 -> "Good";
+            case 4 -> "Strong 💪";
+            default -> "";
+        };
+    }
+
+    private String getStrengthColor(String password) {
+        int length = password.length();
+        int score = (length >= 6 ? 1 : 0)
+                + (password.matches(".*[A-Z].*") ? 1 : 0)
+                + (password.matches(".*\\d.*") ? 1 : 0)
+                + (password.matches(".*[!@#$%^&*()].*") ? 1 : 0);
+
+        return switch (score) {
+            case 0, 1 -> "red";
+            case 2 -> "orange";
+            case 3 -> "blue";
+            case 4 -> "green";
+            default -> "gray";
+        };
+    }
+
+
+
+
+    private void loadMenuScene() {
+        try {
+            Parent root = FXMLLoader.load(getClass().getResource("/ap/restaurant/restaurant/menu.fxml"));
+            Stage stage = (Stage) usernameField.getScene().getWindow();
+            stage.setScene(new Scene(root));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+}
diff --git a/src/main/java/ap/restaurant/restaurant/Controller/OrderingController.java b/src/main/java/ap/restaurant/restaurant/Controller/OrderingController.java
new file mode 100644
index 0000000..0e5d78d
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Controller/OrderingController.java
@@ -0,0 +1,175 @@
+package ap.restaurant.restaurant.Controller;
+
+
+import ap.restaurant.restaurant.Entities.MenuItemData;
+import ap.restaurant.restaurant.Service.SessionService;
+import ap.restaurant.restaurant.Database.DatabaseManager;
+import ap.restaurant.restaurant.Service.CartService;
+import javafx.fxml.FXML;
+import javafx.geometry.Pos;
+import javafx.scene.control.*;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+
+import java.sql.Connection;
+import java.util.*;
+
+public class OrderingController {
+    @FXML
+    private final Map<Integer, String> idToName = new LinkedHashMap<>();
+    private final Map<String, Double> menu = new LinkedHashMap<>();
+
+    @FXML
+    private FlowPane menuPane;
+
+    @FXML
+    private ListView<String> cartListView;
+
+    @FXML
+    private Button checkoutButton;
+
+    @FXML
+    private Label welcomeLabel;
+
+    @FXML
+    private ComboBox<String> categoryBox;
+
+    private List<MenuItemData> allItems = new ArrayList<>();
+
+
+    @FXML
+    public void initialize() {
+        showUsername();
+
+        try (Connection conn = DatabaseManager.getConnection()) {
+            var stmt = conn.createStatement();
+            var rs = stmt.executeQuery("SELECT id, name, price, image_url, category FROM menu_items");
+
+            Set<String> categories = new TreeSet<>();
+            allItems.clear();
+
+            while (rs.next()) {
+                allItems.add(new MenuItemData(
+                        rs.getInt("id"),
+                        rs.getString("name"),
+                        rs.getDouble("price"),
+                        rs.getString("image_url"),
+                        rs.getString("category")
+                ));
+                categories.add(rs.getString("category"));
+            }
+
+            categoryBox.getItems().add("All");
+            categoryBox.getItems().addAll(categories);
+            categoryBox.setValue("All");
+
+            categoryBox.setOnAction(e -> buildMenu(categoryBox.getValue()));
+            buildMenu("All");
+
+        } catch (Exception e) {
+
+        }
+    }
+
+
+    @FXML
+    private void handleCheckout() {
+        try {
+            Parent root = FXMLLoader.load(getClass().getResource("/ap/restaurant/restaurant/checkout.fxml"));
+            Stage stage = (Stage) cartListView.getScene().getWindow();
+            stage.setScene(new Scene(root));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @FXML
+    private void goToLogin() {
+        try {
+            Parent root = FXMLLoader.load(getClass().getResource("/ap/restaurant/restaurant/login.fxml"));
+            Stage stage = (Stage) cartListView.getScene().getWindow();
+            stage.setScene(new Scene(root));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @FXML
+    private void logout() {
+        SessionService.getInstance().logout(); // clear session
+
+        Alert alert = new Alert(Alert.AlertType.INFORMATION);
+        alert.setTitle("Logged Out");
+        alert.setHeaderText(null);
+        alert.setContentText("You have been successfully logged out.");
+        alert.showAndWait(); // Wait for user to close the dialog
+
+        try {
+            Parent root = FXMLLoader.load(getClass().getResource("/ap/restaurant/restaurant/login.fxml"));
+            Stage stage = (Stage) cartListView.getScene().getWindow(); // or any other node
+            stage.setScene(new Scene(root));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    private void buildMenu(String categoryFilter) {
+        menuPane.getChildren().clear();
+
+        for (MenuItemData item : allItems) {
+            if (!categoryFilter.equals("All") && !item.category.equalsIgnoreCase(categoryFilter)) {
+                continue;
+            }
+
+            VBox card = new VBox(6);
+            card.setStyle("-fx-background-color: #fff3; -fx-padding: 8; -fx-background-radius: 12;");
+            card.setPrefWidth(140);
+            card.setAlignment(Pos.CENTER);
+
+            ImageView image = new ImageView(item.imageUrl);
+            image.setFitHeight(100);
+            image.setFitWidth(100);
+            image.setPreserveRatio(true);
+
+            Label nameLabel = new Label(item.name);
+            Label priceLabel = new Label("$" + item.price);
+
+            Button addBtn = new Button("Add");
+            addBtn.setOnAction(e -> addToCart(item.name, item.price)); // ✅ item is valid here
+
+            card.getChildren().addAll(image, nameLabel, priceLabel, addBtn);
+            menuPane.getChildren().add(card);
+        }
+    }
+
+
+    private void addToCart(String itemName, double price) {
+        CartService.getInstance().addItem(itemName, price);
+        refreshCartDisplay();
+    }
+
+    private void refreshCartDisplay() {
+        cartListView.getItems().clear();
+
+        for (var entry : CartService.getInstance().getCartItems().entrySet()) {
+            String item = entry.getKey();
+            int quantity = (int) entry.getValue()[0];
+            cartListView.getItems().add(item + " x" + quantity);
+        }
+    }
+
+    private void showUsername() {
+        String username = SessionService.getInstance().getUsername();
+        if (welcomeLabel != null) {
+            welcomeLabel.setText("Welcome, " + username + " 👋");
+        }
+    }
+
+
+}
+
diff --git a/src/main/java/ap/restaurant/restaurant/Database/DatabaseManager.java b/src/main/java/ap/restaurant/restaurant/Database/DatabaseManager.java
new file mode 100644
index 0000000..29e87b8
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Database/DatabaseManager.java
@@ -0,0 +1,14 @@
+package ap.restaurant.restaurant.Database;
+
+        import java.sql.Connection;
+        import java.sql.DriverManager;
+
+public class DatabaseManager {
+    private static final String URL = "jdbc:postgresql://localhost:5432/Resturant";
+    private static final String USER = "postgres";
+    private static final String PASSWORD = "35546";
+
+    public static Connection getConnection() throws Exception {
+        return DriverManager.getConnection(URL, USER, PASSWORD);
+    }
+}
diff --git a/src/main/java/ap/restaurant/restaurant/Entities/MenuItem.java b/src/main/java/ap/restaurant/restaurant/Entities/MenuItem.java
new file mode 100644
index 0000000..1288f29
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Entities/MenuItem.java
@@ -0,0 +1,4 @@
+package ap.restaurant.restaurant.Entities;
+
+public class MenuItem {
+}
diff --git a/src/main/java/ap/restaurant/restaurant/Entities/MenuItemData.java b/src/main/java/ap/restaurant/restaurant/Entities/MenuItemData.java
new file mode 100644
index 0000000..96cfc37
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Entities/MenuItemData.java
@@ -0,0 +1,17 @@
+package ap.restaurant.restaurant.Entities;
+
+public class MenuItemData {
+    public int id;
+    public String name;
+    public double price;
+    public String imageUrl;
+    public String category;
+
+    public MenuItemData(int id, String name, double price, String imageUrl, String category) {
+        this.id = id;
+        this.name = name;
+        this.price = price;
+        this.imageUrl = imageUrl;
+        this.category = category;
+    }
+}
diff --git a/src/main/java/ap/restaurant/restaurant/Entities/Order.java b/src/main/java/ap/restaurant/restaurant/Entities/Order.java
new file mode 100644
index 0000000..731b916
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Entities/Order.java
@@ -0,0 +1,4 @@
+package ap.restaurant.restaurant.Entities;
+
+public class Order {
+}
diff --git a/src/main/java/ap/restaurant/restaurant/Entities/OrderDetail.java b/src/main/java/ap/restaurant/restaurant/Entities/OrderDetail.java
new file mode 100644
index 0000000..0d9fd30
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Entities/OrderDetail.java
@@ -0,0 +1,4 @@
+package ap.restaurant.restaurant.Entities;
+
+public class OrderDetail {
+}
diff --git a/src/main/java/ap/restaurant/restaurant/Entities/User.java b/src/main/java/ap/restaurant/restaurant/Entities/User.java
new file mode 100644
index 0000000..ff1e6b3
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Entities/User.java
@@ -0,0 +1,4 @@
+package ap.restaurant.restaurant.Entities;
+
+public class User {
+}
diff --git a/src/main/java/ap/restaurant/restaurant/HelloApplication.java b/src/main/java/ap/restaurant/restaurant/HelloApplication.java
deleted file mode 100644
index 6fc62a1..0000000
--- a/src/main/java/ap/restaurant/restaurant/HelloApplication.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package ap.restaurant.restaurant;
-
-import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-
-import java.io.IOException;
-
-public class HelloApplication extends Application {
-    @Override
-    public void start(Stage stage) throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("hello-view.fxml"));
-        Scene scene = new Scene(fxmlLoader.load(), 320, 240);
-        stage.setTitle("Hello!");
-        stage.setScene(scene);
-        stage.show();
-    }
-
-    public static void main(String[] args) {
-        launch();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/ap/restaurant/restaurant/HelloController.java b/src/main/java/ap/restaurant/restaurant/HelloController.java
deleted file mode 100644
index 9e14d4c..0000000
--- a/src/main/java/ap/restaurant/restaurant/HelloController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package ap.restaurant.restaurant;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-
-public class HelloController {
-    @FXML
-    private Label welcomeText;
-
-    @FXML
-    protected void onHelloButtonClick() {
-        welcomeText.setText("Welcome to JavaFX Application!");
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/ap/restaurant/restaurant/Login.java b/src/main/java/ap/restaurant/restaurant/Login.java
new file mode 100644
index 0000000..7e4b345
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Login.java
@@ -0,0 +1,4 @@
+package ap.restaurant.restaurant;
+
+public class Login {
+}
diff --git a/src/main/java/ap/restaurant/restaurant/Main.java b/src/main/java/ap/restaurant/restaurant/Main.java
new file mode 100644
index 0000000..4633031
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Main.java
@@ -0,0 +1,25 @@
+package ap.restaurant.restaurant;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import javafx.scene.Parent;
+
+public class Main extends Application {
+    @Override
+    public void start(Stage stage) {
+        try{
+            Parent root = FXMLLoader.load(getClass().getResource("login.fxml"));
+            stage.setTitle("Restaurant Ordering App");
+            stage.setScene(new Scene(root));
+            stage.show();
+        }catch (Exception e) {
+        e.printStackTrace();
+        }
+    }
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+}
diff --git a/src/main/java/ap/restaurant/restaurant/Service/CartService.java b/src/main/java/ap/restaurant/restaurant/Service/CartService.java
new file mode 100644
index 0000000..15f3852
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Service/CartService.java
@@ -0,0 +1,33 @@
+package ap.restaurant.restaurant.Service;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class CartService {
+    private static final CartService instance = new CartService();
+
+    // itemName → quantity, unitPrice
+    private final Map<String, double[]> cartMap = new LinkedHashMap<>();
+
+    private CartService() {}
+
+    public static CartService getInstance() {
+        return instance;
+    }
+
+    public void addItem(String name, double price) {
+        if (cartMap.containsKey(name)) {
+            cartMap.get(name)[0]++; // increase quantity
+        } else {
+            cartMap.put(name, new double[]{1, price}); // new item
+        }
+    }
+
+    public void clearCart() {
+        cartMap.clear();
+    }
+
+    public Map<String, double[]> getCartItems() {
+        return cartMap;
+    }
+}
diff --git a/src/main/java/ap/restaurant/restaurant/Service/SessionService.java b/src/main/java/ap/restaurant/restaurant/Service/SessionService.java
new file mode 100644
index 0000000..26efc29
--- /dev/null
+++ b/src/main/java/ap/restaurant/restaurant/Service/SessionService.java
@@ -0,0 +1,38 @@
+package ap.restaurant.restaurant.Service;
+
+public class SessionService {
+    private static SessionService instance;
+    private int userId;
+    private String username;
+
+    private SessionService() {}
+
+    public static SessionService getInstance() {
+        if (instance == null) {
+            instance = new SessionService();
+        }
+        return instance;
+    }
+
+    public void login(int id, String username) {
+        this.userId = id;
+        this.username = username;
+    }
+
+    public void logout() {
+        this.userId = -1;
+        this.username = null;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public boolean isLoggedIn() {
+        return userId > 0;
+    }
+}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 359f4ee..7d8e9ef 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -2,6 +2,7 @@
     requires javafx.controls;
     requires javafx.fxml;
 
+    requires java.sql;
 
     opens ap.restaurant.restaurant to javafx.fxml;
     exports ap.restaurant.restaurant;
diff --git a/src/main/resources/ap/restaurant/restaurant/checkout.fxml b/src/main/resources/ap/restaurant/restaurant/checkout.fxml
new file mode 100644
index 0000000..b0a6e9c
--- /dev/null
+++ b/src/main/resources/ap/restaurant/restaurant/checkout.fxml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.geometry.Insets?>
+
+<BorderPane xmlns:fx="http://javafx.com/fxml"
+            fx:controller="ap.restaurant.restaurant.Controller.CheckOutController"
+            stylesheets="@stl.css"
+            prefWidth="600" prefHeight="400">
+
+    <!-- CENTER: Receipt Table -->
+    <VBox spacing="12" padding="20" BorderPane.alignment="CENTER">
+        <Label text="🧾 Order Summary" styleClass="title-label"/>
+
+        <TableView fx:id="receiptTable" prefHeight="250">
+            <columns>
+                <TableColumn fx:id="colItem" text="Item"/>
+                <TableColumn fx:id="colQuantity" text="Quantity"/>
+                <TableColumn fx:id="colUnitPrice" text="Price"/>
+                <TableColumn fx:id="colTotal" text="Total"/>
+            </columns>
+        </TableView>
+
+        <Label fx:id="totalLabel" text="Total: $0.00" style="-fx-font-size: 16px; -fx-font-weight: bold;"/>
+    </VBox>
+
+    <!-- BOTTOM: Action Buttons -->
+    <HBox alignment="CENTER" spacing="16" padding="16" BorderPane.alignment="BOTTOM_CENTER">
+        <Button text="Confirm Order" onAction="#confirmOrder"/>
+        <Button text="Back to Menu" onAction="#backToMenu"/>
+        <Button text="Logout" onAction="#logout"/>
+    </HBox>
+</BorderPane>
diff --git a/src/main/resources/ap/restaurant/restaurant/hello-view.fxml b/src/main/resources/ap/restaurant/restaurant/hello-view.fxml
deleted file mode 100644
index 035d3a5..0000000
--- a/src/main/resources/ap/restaurant/restaurant/hello-view.fxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.VBox?>
-
-<?import javafx.scene.control.Button?>
-<VBox alignment="CENTER" spacing="20.0" xmlns:fx="http://javafx.com/fxml"
-      fx:controller="ap.restaurant.restaurant.HelloController">
-  <padding>
-    <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
-  </padding>
-
-  <Label fx:id="welcomeText"/>
-  <Button text="Hello!" onAction="#onHelloButtonClick"/>
-</VBox>
diff --git a/src/main/resources/ap/restaurant/restaurant/login.fxml b/src/main/resources/ap/restaurant/restaurant/login.fxml
new file mode 100644
index 0000000..481be36
--- /dev/null
+++ b/src/main/resources/ap/restaurant/restaurant/login.fxml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+
+<AnchorPane xmlns:fx="http://javafx.com/fxml"
+            fx:controller="ap.restaurant.restaurant.Controller.LoginSignupController"
+            stylesheets="@stl.css">
+
+    <!-- Wrapper pane to center content -->
+    <VBox alignment="CENTER" spacing="16.0" AnchorPane.topAnchor="40" AnchorPane.bottomAnchor="40" AnchorPane.leftAnchor="40" AnchorPane.rightAnchor="40">
+
+        <Label text="Welcome Back 🍽️" styleClass="title-label"/>
+
+        <TextField fx:id="usernameField" promptText="Username"/>
+        <PasswordField fx:id="passwordField" promptText="Password"/>
+
+        <Label fx:id="errorLabel" text="" textFill="red" visible="false"/>
+
+        <Button fx:id="loginButton" text="Login" onAction="#handleLogin"/>
+
+        <Hyperlink text="Don't have an account? Sign Up" onAction="#goToSignup"/>
+        <Button text="Logout" onAction="#goToLogin"/>
+    </VBox>
+</AnchorPane>
diff --git a/src/main/resources/ap/restaurant/restaurant/menu.fxml b/src/main/resources/ap/restaurant/restaurant/menu.fxml
new file mode 100644
index 0000000..3dcdd90
--- /dev/null
+++ b/src/main/resources/ap/restaurant/restaurant/menu.fxml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+
+
+
+
+<BorderPane xmlns:fx="http://javafx.com/fxml"
+            fx:controller="ap.restaurant.restaurant.Controller.OrderingController"
+            stylesheets="@stl.css">
+    <top>
+        <HBox alignment="CENTER_LEFT" padding="12.0">
+            <Label fx:id="welcomeLabel" styleClass="title-label"/>
+        </HBox>
+    </top>
+
+    <!-- LEFT: User Cart Section -->
+    <VBox fx:id="cartBox" spacing="8" prefWidth="300">
+        <padding>
+            <Insets top="16.0" right="16.0" bottom="16.0" left="16.0"/>
+        </padding>
+
+        <Label text="🧺 Your Order" styleClass="title-label"/>
+        <ListView fx:id="cartListView"/>
+        <HBox spacing="8">
+            <Button fx:id="checkoutButton" text="Checkout" onAction="#handleCheckout"/>
+            <Button text="Logout" onAction="#goToLogin"/>
+        </HBox>
+    </VBox>
+
+    <!-- RIGHT: Restaurant Menu Section -->
+    <FlowPane fx:id="menuPane" hgap="16.0" vgap="16.0">
+    <padding>
+        <Insets top="16.0" right="16.0" bottom="16.0" left="16.0"/>
+    </padding>
+</FlowPane>
+</BorderPane>
diff --git a/src/main/resources/ap/restaurant/restaurant/signup.fxml b/src/main/resources/ap/restaurant/restaurant/signup.fxml
new file mode 100644
index 0000000..79529db
--- /dev/null
+++ b/src/main/resources/ap/restaurant/restaurant/signup.fxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+
+<AnchorPane xmlns:fx="http://javafx.com/fxml"
+            fx:controller="ap.restaurant.restaurant.Controller.LoginSignupController"
+            stylesheets="@stl.css">
+
+    <VBox alignment="CENTER" spacing="16.0" AnchorPane.topAnchor="40" AnchorPane.bottomAnchor="40" AnchorPane.leftAnchor="40" AnchorPane.rightAnchor="40">
+
+        <Label text="Create Account 📝" styleClass="title-label"/>
+
+        <TextField fx:id="newUsernameField" promptText="Choose a Username"/>
+        <PasswordField fx:id="newPasswordField" promptText="Enter Password"/>
+
+        <Label fx:id="strengthLabel" text="" style="-fx-text-fill: gray;"/>
+        <PasswordField fx:id="confirmPasswordField" promptText="Confirm Password"/>
+
+        <Label fx:id="signupErrorLabel" text="" textFill="red" visible="false"/>
+
+        <Button fx:id="signupButton" text="Sign Up" onAction="#handleSignup"/>
+        <Hyperlink text="Back to Login" onAction="#goToLogin"/>
+        <Hyperlink text="Already have an account? Log In" onAction="#goToLogin"/>
+    </VBox>
+</AnchorPane>
diff --git a/src/main/resources/ap/restaurant/restaurant/stl.css b/src/main/resources/ap/restaurant/restaurant/stl.css
new file mode 100644
index 0000000..12db914
--- /dev/null
+++ b/src/main/resources/ap/restaurant/restaurant/stl.css
@@ -0,0 +1,43 @@
+/* stl.css */
+
+.root {
+    -fx-background-color: linear-gradient(to bottom, #fff8f0, #ffd6a5);
+    -fx-font-family: "Segoe UI", sans-serif;
+}
+
+.title-label {
+    -fx-font-size: 28px;
+    -fx-text-fill: #333;
+    -fx-font-weight: bold;
+}
+
+.button {
+    -fx-background-color: #ff914d;
+    -fx-text-fill: white;
+    -fx-font-weight: bold;
+    -fx-padding: 8 16;
+    -fx-background-radius: 10;
+}
+
+.button:hover {
+    -fx-background-color: #ff6f1a;
+}
+.list-view {
+    -fx-background-color: #fefefe;
+    -fx-border-radius: 10;
+}
+
+.flow-pane > .vbox {
+    -fx-effect: dropshadow(one-pass-box, rgba(0,0,0,0.1), 6, 0, 2, 2);
+}
+
+.title-label {
+    -fx-font-size: 20px;
+    -fx-text-fill: #4e008e;
+    -fx-font-weight: bold;
+}
+
+
+.label {
+    -fx-font-size: 14px;
+}