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..40b771a 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="$PROJECT_DIR$/../../../../Gradle/gradle-8.13" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/build.gradle b/build.gradle
index e8bdf58..13c0b52 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,15 +29,26 @@ application {
   mainClass = 'ap.restaurant.restaurant.HelloApplication'
 }
 
-javafx {
-  version = '17.0.6'
-  modules = ['javafx.controls', 'javafx.fxml']
-}
 
 dependencies {
 
   testImplementation("org.junit.jupiter:junit-jupiter-api:${junitVersion}")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}")
+
+  implementation 'org.postgresql:postgresql:42.7.2'
+  implementation 'org.openjfx:javafx-controls:21.0.2'
+  implementation 'org.openjfx:javafx-fxml:21.0.2'
+}
+
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(23))
+  }
+}
+
+javafx {
+  version = "21.0.2"
+  modules = ['javafx.controls', 'javafx.fxml']
 }
 
 test {
diff --git a/src/main/java/ap/restaurant/DB/DatabaseManager.java b/src/main/java/ap/restaurant/DB/DatabaseManager.java
new file mode 100644
index 0000000..90d53d1
--- /dev/null
+++ b/src/main/java/ap/restaurant/DB/DatabaseManager.java
@@ -0,0 +1,134 @@
+package ap.restaurant.DB;
+
+import java.sql.*;
+
+import static ap.restaurant.utils.PasswordUtil.hash;
+
+public class DatabaseManager {
+    private static final String DB_URL = "jdbc:postgresql://localhost:5432/restaurant_db";
+    private static final String DB_USER = "postgres";
+    private static final String DB_PASSWORD = System.getenv("DB_PASSWORD");
+
+    public static Connection getConnection() throws SQLException {
+        if (DB_PASSWORD == null || DB_PASSWORD.isEmpty()) {
+            throw new SQLException("Database password is not provided. Please set the DB_PASSWORD environment variable.");
+        }
+        return DriverManager.getConnection(DB_URL, DB_USER, DB_PASSWORD);
+    }
+
+    public static void createTables() throws SQLException {
+        String[] sqls = {
+                "CREATE TABLE IF NOT EXISTS \"User\" (" +
+                        "id SERIAL PRIMARY KEY, " +
+                        "username VARCHAR(100) UNIQUE NOT NULL, " +
+                        "email VARCHAR(100) UNIQUE NOT NULL, " +
+                        "password VARCHAR(255) NOT NULL" +
+                        ")",
+                "CREATE TABLE IF NOT EXISTS MenuItem (" +
+                        "id SERIAL PRIMARY KEY, " +
+                        "name VARCHAR(100) NOT NULL UNIQUE, " +
+                        "description TEXT, " +
+                        "price DECIMAL(10,2) NOT NULL, " +
+                        "category VARCHAR(50)" +
+                        ")",
+                "CREATE TABLE IF NOT EXISTS \"Order\" (" +
+                        "id SERIAL PRIMARY KEY, " +
+                        "user_id INTEGER REFERENCES \"User\"(id) ON DELETE SET NULL, " +
+                        "total_price DECIMAL(10,2) NOT NULL, " +
+                        "order_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP" +
+                        ")",
+                "CREATE TABLE IF NOT EXISTS OrderDetail (" +
+                        "id SERIAL PRIMARY KEY, " +
+                        "order_id INTEGER REFERENCES \"Order\"(id) ON DELETE CASCADE, " +
+                        "menu_item_id INTEGER REFERENCES MenuItem(id) ON DELETE SET NULL, " +
+                        "quantity INTEGER NOT NULL, " +
+                        "subtotal DECIMAL(10,2) NOT NULL" +
+                        ")"
+        };
+
+        try (Connection conn = getConnection(); Statement stmt = conn.createStatement()) {
+            for (String sql : sqls) {
+                stmt.executeUpdate(sql);
+            }
+            stmt.executeUpdate("INSERT INTO MenuItem (name, description, price, category) VALUES " +
+                    "('Kebab', 'Grilled lamb kebab with spices', 12.50, 'Main Course'), " +
+                    "('Fesenjan', 'Chicken stew with pomegranate and walnuts', 15.00, 'Traditional'), " +
+                    "('Ghormeh Sabzi', 'Herb stew with beef', 13.75, 'Traditional') " +
+                    "ON CONFLICT (name) DO NOTHING");
+        }
+    }
+
+    public static void saveUser(String username, String email, String password) throws SQLException {
+        String sql = "INSERT INTO \"User\" (username, email, password) VALUES (?, ?, ?)";
+        try (Connection conn = getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, username);
+            stmt.setString(2, email);
+            stmt.setString(3, hash(password));
+            stmt.executeUpdate();
+        }
+    }
+
+    public static boolean authenticateUser(String email, String password) throws SQLException {
+        String sql = "SELECT COUNT(*) FROM \"User\" WHERE email = ? AND password = ?";
+        try (Connection conn = getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, email);
+            stmt.setString(2, hash(password));
+            try (ResultSet rs = stmt.executeQuery()) {
+                if (rs.next()) {
+                    return rs.getInt(1) > 0;
+                }
+            }
+        }
+        return false;
+    }
+
+    public static ResultSet getMenuItems() throws SQLException {
+        String sql = "SELECT id, name, price FROM MenuItem";
+        Connection conn = getConnection();
+        try {
+            PreparedStatement stmt = conn.prepareStatement(sql);
+            return stmt.executeQuery();
+        } catch (SQLException e) {
+            conn.close();
+            throw e;
+        }
+    }
+
+    public static int saveOrder(int userId, double totalPrice) throws SQLException {
+        String sql = "INSERT INTO \"Order\" (user_id, total_price, order_date) VALUES (?, ?, ?) RETURNING id";
+        try (Connection conn = getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setInt(1, userId);
+            stmt.setDouble(2, totalPrice);
+            stmt.setTimestamp(3, new java.sql.Timestamp(System.currentTimeMillis()));
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                return rs.getInt("id");
+            }
+            throw new SQLException("Failed to retrieve order ID");
+        }
+    }
+
+    public static void saveOrderDetail(int orderId, int menuItemId, int quantity, double subtotal) throws SQLException {
+        String sql = "INSERT INTO OrderDetail (order_id, menu_item_id, quantity, subtotal) VALUES (?, ?, ?, ?)";
+        try (Connection conn = getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setInt(1, orderId);
+            stmt.setInt(2, menuItemId);
+            stmt.setInt(3, quantity);
+            stmt.setDouble(4, subtotal);
+            stmt.executeUpdate();
+        }
+    }
+
+    public static int getUserIdFromEmail(String email) throws SQLException {
+        String sql = "SELECT id FROM \"User\" WHERE email = ?";
+        try (Connection conn = getConnection(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, email);
+            try (ResultSet rs = stmt.executeQuery()) {
+                if (rs.next()) {
+                    return rs.getInt("id");
+                }
+            }
+        }
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ap/restaurant/app/Main.java b/src/main/java/ap/restaurant/app/Main.java
new file mode 100644
index 0000000..27dca52
--- /dev/null
+++ b/src/main/java/ap/restaurant/app/Main.java
@@ -0,0 +1,58 @@
+package ap.restaurant.app;
+
+import ap.restaurant.DB.DatabaseManager;
+import ap.restaurant.controllers.auth.SignInController;
+import ap.restaurant.utils.AlertUtil;
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.Objects;
+
+public class Main extends Application {
+
+    @Override
+    public void start(Stage primaryStage) {
+        try {
+            try {
+                DatabaseManager.createTables();
+            } catch (SQLException e) {
+                AlertUtil.showError("Failed to initialize database: " + e.getMessage() +
+                        "\nPlease ensure PostgreSQL is running and DB_PASSWORD is set.");
+                return;
+            }
+
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/ap/restaurant/fxml/SignIn.fxml"));
+            Scene scene = new Scene(loader.load());
+
+            SignInController controller = loader.getController();
+            if (controller == null) {
+                throw new RuntimeException("SignInController is null. Check fx:controller attribute in SignIn.fxml.");
+            }
+
+            primaryStage.setTitle("SBU RESTAURANT");
+            primaryStage.setScene(scene);
+            primaryStage.setResizable(true);
+            primaryStage.getIcons().add(
+                    new javafx.scene.image.Image(Objects.requireNonNull(getClass().getResourceAsStream("/pics/Sbu-logo.svg.png")))
+            );
+            primaryStage.show();
+
+        } catch (IOException e) {
+            System.err.println("Error loading SignIn.fxml: " + e.getMessage());
+            e.printStackTrace();
+            AlertUtil.showError("Failed to load the Sign In page. Please check the application resources and try again.");
+        } catch (Exception e) {
+            System.err.println("Unexpected error during application startup: " + e.getMessage());
+            e.printStackTrace();
+            AlertUtil.showError("An unexpected error occurred during startup: " + e.getMessage());
+        }
+    }
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ap/restaurant/controllers/CheckoutController.java b/src/main/java/ap/restaurant/controllers/CheckoutController.java
new file mode 100644
index 0000000..c6deff8
--- /dev/null
+++ b/src/main/java/ap/restaurant/controllers/CheckoutController.java
@@ -0,0 +1,118 @@
+package ap.restaurant.controllers;
+
+import ap.restaurant.utils.AlertUtil;
+import ap.restaurant.utils.SceneUtil;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+
+import java.sql.SQLException;
+
+public class CheckoutController {
+    @FXML
+    private TableView<MenuController.CartItem> receiptTable;
+    @FXML
+    private TableColumn<MenuController.CartItem, String> nameCol;
+    @FXML
+    private TableColumn<MenuController.CartItem, Integer> qtyCol;
+    @FXML
+    private TableColumn<MenuController.CartItem, Double> priceCol;
+    @FXML
+    private TableColumn<MenuController.CartItem, Double> subtotalCol;
+    @FXML
+    private Label totalPriceLabel;
+    @FXML
+    private Label confirmationLabel;
+    @FXML
+    private Button placeOrderButton;
+    @FXML
+    private Button orderAgainButton;
+    @FXML
+    private Button logoutButton;
+
+    private ObservableList<MenuController.CartItem> cartItems;
+    private int userId;
+
+    public void setCartItems(ObservableList<MenuController.CartItem> cartItems) {
+        this.cartItems = cartItems;
+        initializeTable();
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    @FXML
+    private void initialize() {
+        nameCol.setCellValueFactory(cell ->
+                new javafx.beans.value.ObservableValueBase<String>() {
+                    @Override public String getValue() {
+                        return cell.getValue().getMenuItem().getName();
+                    }
+                });
+        qtyCol.setCellValueFactory(cell ->
+                new javafx.beans.value.ObservableValueBase<Integer>() {
+                    @Override public Integer getValue() {
+                        return cell.getValue().getQuantity();
+                    }
+                });
+        priceCol.setCellValueFactory(cell ->
+                new javafx.beans.value.ObservableValueBase<Double>() {
+                    @Override public Double getValue() {
+                        return cell.getValue().getMenuItem().getPrice();
+                    }
+                });
+        subtotalCol.setCellValueFactory(cell ->
+                new javafx.beans.value.ObservableValueBase<Double>() {
+                    @Override public Double getValue() {
+                        return cell.getValue().getSubtotal();
+                    }
+                });
+        if (cartItems != null) {
+            initializeTable();
+        }
+    }
+
+    private void initializeTable() {
+        receiptTable.setItems(cartItems);
+        double total = 0;
+        for (MenuController.CartItem item : cartItems) {
+            total += item.getSubtotal();
+        }
+        totalPriceLabel.setText("Total: " + String.format("%.2f", total) + " Toman");
+    }
+
+    @FXML
+    private void onPlaceOrderClick() {
+        if (userId == 0) {
+            AlertUtil.showError("User not logged in.");
+            return;
+        }
+        try {
+            double total = 0;
+            for (MenuController.CartItem item : cartItems) {
+                total += item.getSubtotal();
+            }
+            int orderId = ap.restaurant.DB.DatabaseManager.saveOrder(userId, total);
+            for (MenuController.CartItem item : cartItems) {
+                ap.restaurant.DB.DatabaseManager.saveOrderDetail(orderId, item.getMenuItem().getId(), item.getQuantity(), item.getSubtotal());
+            }
+            confirmationLabel.setText("Purchase done!");
+        } catch (SQLException e) {
+            AlertUtil.showError("Order failed.");
+        }
+    }
+
+    @FXML
+    private void onOrderAgainClick() {
+        SceneUtil.changeSceneWithSameSize(orderAgainButton, "/ap/restaurant/fxml/Menu.fxml");
+    }
+
+    @FXML
+    private void onLogoutClick() {
+        SceneUtil.changeSceneWithSameSize(logoutButton, "/ap/restaurant/fxml/SignIn.fxml");
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ap/restaurant/controllers/MenuController.java b/src/main/java/ap/restaurant/controllers/MenuController.java
new file mode 100644
index 0000000..11018f2
--- /dev/null
+++ b/src/main/java/ap/restaurant/controllers/MenuController.java
@@ -0,0 +1,149 @@
+package ap.restaurant.controllers;
+
+import ap.restaurant.utils.AlertUtil;
+import ap.restaurant.utils.SceneUtil;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.VBox;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class MenuController {
+    @FXML
+    private ListView<String> menuList;
+    @FXML
+    private ListView<String> cartList;
+    @FXML
+    private TextField quantityField;
+    @FXML
+    private Label totalLabel;
+    @FXML
+    private Button addButton;
+    @FXML
+    private Button removeButton;
+    @FXML
+    private Button checkoutButton;
+    @FXML
+    private VBox rootVBox;
+
+    private static int currentUserId;
+    private final ObservableList<MenuItem> menuItems = FXCollections.observableArrayList();
+    private final ObservableList<CartItem> cartItems = FXCollections.observableArrayList();
+
+    public static class MenuItem {
+        private final SimpleIntegerProperty id;
+        private final SimpleStringProperty name;
+        private final SimpleDoubleProperty price;
+
+        public MenuItem(int id, String name, double price) {
+            this.id = new SimpleIntegerProperty(id);
+            this.name = new SimpleStringProperty(name);
+            this.price = new SimpleDoubleProperty(price);
+        }
+
+        public int getId() { return id.get(); }
+        public String getName() { return name.get(); }
+        public double getPrice() { return price.get(); }
+    }
+
+    public static class CartItem {
+        private final MenuItem menuItem;
+        private final SimpleIntegerProperty quantity;
+        private final SimpleDoubleProperty subtotal;
+
+        public CartItem(MenuItem menuItem, int quantity) {
+            this.menuItem = menuItem;
+            this.quantity = new SimpleIntegerProperty(quantity);
+            this.subtotal = new SimpleDoubleProperty(menuItem.getPrice() * quantity);
+        }
+
+        public MenuItem getMenuItem() { return menuItem; }
+        public int getQuantity() { return quantity.get(); }
+        public double getSubtotal() { return subtotal.get(); }
+    }
+
+    public static void setCurrentUserId(int userId) {
+        currentUserId = userId;
+    }
+
+    public static int getCurrentUserId() {
+        return currentUserId;
+    }
+
+    public void setUserId(int userId) {
+        this.currentUserId = userId;
+    }
+
+    @FXML
+    private void initialize() {
+        try (ResultSet rs = ap.restaurant.DB.DatabaseManager.getMenuItems()) {
+            while (rs.next()) {
+                MenuItem item = new MenuItem(rs.getInt("id"), rs.getString("name"), rs.getDouble("price"));
+                menuItems.add(item);
+                menuList.getItems().add(item.getName() + " - " + item.getPrice() + " Toman");
+            }
+        } catch (SQLException e) {
+            AlertUtil.showError("Failed to load menu items: " + e.getMessage());
+        }
+
+        System.out.println("MenuController initialized with userId: " + currentUserId);
+
+        if (rootVBox != null) {
+            Button backButton = new Button("Back");
+            backButton.setStyle("-fx-background-color: #363636; -fx-text-fill: #FFFFFF;");
+            backButton.setOnAction(event -> SceneUtil.changeSceneWithSameSize(backButton, "/ap/restaurant/fxml/SignIn.fxml"));
+            rootVBox.getChildren().add(backButton);
+        }
+    }
+
+    @FXML
+    private void onAddClick() {
+        int selectedIndex = menuList.getSelectionModel().getSelectedIndex();
+        if (selectedIndex >= 0) {
+            try {
+                int quantity = Integer.parseInt(quantityField.getText().trim());
+                if (quantity > 0) {
+                    MenuItem selectedItem = menuItems.get(selectedIndex);
+                    cartItems.add(new CartItem(selectedItem, quantity));
+                    cartList.getItems().add(selectedItem.getName() + " x" + quantity + " - " + (selectedItem.getPrice() * quantity) + " Toman");
+                    updateTotal();
+                }
+            } catch (NumberFormatException e) {
+                AlertUtil.showError("Please enter a valid quantity.");
+            }
+        }
+    }
+
+    @FXML
+    private void onRemoveClick() {
+        int selectedIndex = cartList.getSelectionModel().getSelectedIndex();
+        if (selectedIndex >= 0) {
+            cartItems.remove(selectedIndex);
+            cartList.getItems().remove(selectedIndex);
+            updateTotal();
+        }
+    }
+
+    @FXML
+    private void onCheckoutClick() {
+        if (cartItems.isEmpty()) {
+            AlertUtil.showError("Cart is empty. Please add items before checkout.");
+            return;
+        }
+        SceneUtil.changeToCheckout(checkoutButton, "/ap/restaurant/fxml/checkout.fxml", cartItems, currentUserId);
+    }
+
+    private void updateTotal() {
+        double total = cartItems.stream().mapToDouble(CartItem::getSubtotal).sum();
+        totalLabel.setText("Total: " + String.format("%.2f", total) + " Toman");
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ap/restaurant/controllers/auth/SignInController.java b/src/main/java/ap/restaurant/controllers/auth/SignInController.java
new file mode 100644
index 0000000..2eabcd1
--- /dev/null
+++ b/src/main/java/ap/restaurant/controllers/auth/SignInController.java
@@ -0,0 +1,65 @@
+package ap.restaurant.controllers.auth;
+
+import ap.restaurant.DB.DatabaseManager;
+import ap.restaurant.controllers.MenuController;
+import ap.restaurant.utils.AlertUtil;
+import ap.restaurant.utils.PasswordUtil;
+import ap.restaurant.utils.SceneUtil;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+
+import java.sql.SQLException;
+
+public class SignInController {
+    @FXML
+    private TextField emailField;
+    @FXML
+    private PasswordField passwordField;
+    @FXML
+    private Label signUpLabel;
+    @FXML
+    private Button loginButton;
+
+    @FXML
+    private void initialize() {
+        signUpLabel.setOnMouseClicked(event -> SceneUtil.changeSceneWithSameSize(signUpLabel, "/ap/restaurant/fxml/SignUp.fxml"));
+    }
+
+    @FXML
+    private void onLoginClick() {
+        String email = emailField.getText().trim();
+        String password = passwordField.getText().trim();
+
+        if (email.isEmpty() || password.isEmpty()) {
+            AlertUtil.showError("Email and password are required.");
+            return;
+        }
+
+        try {
+            String hashedPassword = PasswordUtil.hash(password);
+            System.out.println("Attempting login with email: " + email + ", hashed password: " + hashedPassword);
+            if (DatabaseManager.authenticateUser(email, hashedPassword)) {
+                System.out.println("Authentication successful for email: " + email);
+                int userId = DatabaseManager.getUserIdFromEmail(email);
+                System.out.println("Retrieved userId: " + userId);
+                if (userId > 0) {
+                    SceneUtil.changeSceneWithSameSize(loginButton, "/ap/restaurant/fxml/menu.fxml");
+                    MenuController.setCurrentUserId(userId);
+                } else {
+                    AlertUtil.showError("User ID not found.");
+                }
+            } else {
+                AlertUtil.showError("Invalid email or password.");
+            }
+        } catch (SQLException e) {
+            System.err.println("Database error: " + e.getMessage());
+            AlertUtil.showError("Database error: " + e.getMessage());
+        } catch (Exception e) {
+            System.err.println("Login failed: " + e.getMessage());
+            AlertUtil.showError("Login failed: " + e.getMessage());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ap/restaurant/controllers/auth/SignUpController.java b/src/main/java/ap/restaurant/controllers/auth/SignUpController.java
new file mode 100644
index 0000000..404d52f
--- /dev/null
+++ b/src/main/java/ap/restaurant/controllers/auth/SignUpController.java
@@ -0,0 +1,52 @@
+package ap.restaurant.controllers.auth;
+
+import ap.restaurant.utils.AlertUtil;
+import ap.restaurant.utils.PasswordUtil;
+import ap.restaurant.utils.SceneUtil;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+
+import java.sql.SQLException;
+
+public class SignUpController {
+    @FXML
+    private TextField usernameField;
+    @FXML
+    private TextField emailField;
+    @FXML
+    private PasswordField passwordField;
+    @FXML
+    private Label signInLabel;
+    @FXML
+    private Button signUpButton;
+
+    @FXML
+    private void initialize() {
+        signInLabel.setOnMouseClicked(event -> SceneUtil.changeSceneWithSameSize(signInLabel, "/ap/restaurant/fxml/SignIn.fxml"));
+    }
+
+    @FXML
+    private void onSignUpClick() {
+        String username = usernameField.getText().trim();
+        String email = emailField.getText().trim();
+        String password = passwordField.getText().trim();
+
+        if (username.isEmpty() || email.isEmpty() || password.isEmpty()) {
+            AlertUtil.showError("All fields are required.");
+            return;
+        }
+
+        try {
+            ap.restaurant.DB.DatabaseManager.saveUser(username, email, PasswordUtil.hash(password));
+            AlertUtil.showSuccess("Registration successful! Please sign in.");
+            SceneUtil.changeSceneWithSameSize(signUpButton, "/ap/restaurant/fxml/SignIn.fxml");
+        } catch (SQLException e) {
+            AlertUtil.showError("Registration failed: " + e.getMessage() + ". Username or email may already exist.");
+        } catch (Exception e) {
+            AlertUtil.showError("An unexpected error occurred: " + e.getMessage());
+        }
+    }
+}
\ No newline at end of file
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/utils/AlertUtil.java b/src/main/java/ap/restaurant/utils/AlertUtil.java
new file mode 100644
index 0000000..9c93b0c
--- /dev/null
+++ b/src/main/java/ap/restaurant/utils/AlertUtil.java
@@ -0,0 +1,39 @@
+package ap.restaurant.utils;
+
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.image.Image;
+import javafx.stage.Stage;
+
+import java.util.Objects;
+
+public class AlertUtil {
+
+    private static final String LOGO_PATH = "/pics/Sbu-logo.svg.png";
+
+    public static void showAlert(AlertType type, String title, String message) {
+        Alert alert = new Alert(type);
+        alert.setTitle(title);
+        alert.setHeaderText(null);
+        alert.setContentText(message);
+
+        Stage stage = (Stage) alert.getDialogPane().getScene().getWindow();
+        stage.getIcons().add(new Image(Objects.requireNonNull(
+                AlertUtil.class.getResourceAsStream(LOGO_PATH)
+        )));
+
+        alert.showAndWait();
+    }
+
+    public static void showError(String message) {
+        showAlert(AlertType.ERROR, "Error", message);
+    }
+
+    public static void showSuccess(String message) {
+        showAlert(AlertType.INFORMATION, "Success", message);
+    }
+
+    public static void showWarning(String message) {
+        showAlert(AlertType.WARNING, "Warning", message);
+    }
+}
diff --git a/src/main/java/ap/restaurant/utils/PasswordUtil.java b/src/main/java/ap/restaurant/utils/PasswordUtil.java
new file mode 100644
index 0000000..e389e12
--- /dev/null
+++ b/src/main/java/ap/restaurant/utils/PasswordUtil.java
@@ -0,0 +1,18 @@
+package ap.restaurant.utils;
+
+import java.security.MessageDigest;
+
+public class PasswordUtil {
+    public static String hash(String password) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            byte[] bytes = md.digest(password.getBytes());
+            StringBuilder sb = new StringBuilder();
+            for (byte b : bytes)
+                sb.append(String.format("%02x", b));
+            return sb.toString();
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to hash password", e);
+        }
+    }
+}
diff --git a/src/main/java/ap/restaurant/utils/SceneUtil.java b/src/main/java/ap/restaurant/utils/SceneUtil.java
new file mode 100644
index 0000000..64f60de
--- /dev/null
+++ b/src/main/java/ap/restaurant/utils/SceneUtil.java
@@ -0,0 +1,106 @@
+package ap.restaurant.utils;
+
+import ap.restaurant.controllers.CheckoutController;
+import ap.restaurant.controllers.MenuController;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
+public class SceneUtil {
+
+    public static void changeScene(Node node, String fxmlPath) {
+        try {
+            String resourcePath = "/ap/restaurant/fxml" + fxmlPath;
+            FXMLLoader loader = new FXMLLoader(SceneUtil.class.getResource(resourcePath));
+            Parent root = loader.load();
+            Stage stage = (Stage) node.getScene().getWindow();
+            Scene scene = new Scene(root);
+            stage.setScene(scene);
+            stage.show();
+        } catch (IOException e) {
+            AlertUtil.showError("Error loading scene: " + fxmlPath + ". Please check the FXML file.");
+            throw new RuntimeException("Failed to load scene: " + fxmlPath, e);
+        }
+    }
+
+    public static void changeSceneWithSameSize(Node node, String fxmlPath, MenuController controller) {
+        try {
+            FXMLLoader loader = new FXMLLoader(SceneUtil.class.getResource(fxmlPath));
+            if (controller != null) {
+                loader.setController(controller);
+            }
+            Parent root = loader.load();
+            Stage stage = (Stage) node.getScene().getWindow();
+            Scene currentScene = node.getScene();
+            double width = currentScene.getWidth();
+            double height = currentScene.getHeight();
+            Scene newScene = new Scene(root, width, height);
+            stage.setScene(newScene);
+            stage.show();
+        } catch (IOException e) {
+            System.err.println("Error loading scene with same size: " + fxmlPath);
+            throw new RuntimeException("Error loading scene with same size: " + fxmlPath, e);
+        }
+    }
+
+    public static void changeSceneWithSameSize(Node node, String fxmlPath) {
+        try {
+            FXMLLoader loader = new FXMLLoader(SceneUtil.class.getResource(fxmlPath));
+            Parent root = loader.load();
+            Stage stage = (Stage) node.getScene().getWindow();
+            Scene currentScene = node.getScene();
+            double width = currentScene.getWidth();
+            double height = currentScene.getHeight();
+            Scene newScene = new Scene(root, width, height);
+            stage.setScene(newScene);
+            stage.show();
+        } catch (IOException e) {
+            System.err.println("Error loading scene with same size: " + fxmlPath);
+            throw new RuntimeException("Error loading scene with same size: " + fxmlPath, e);
+        }
+    }
+
+    public static void changeToCheckout(Node node, String fxmlPath, ObservableList<MenuController.CartItem> cartItems, int userId) {
+        try {
+            String resourcePath;
+            resourcePath = fxmlPath;
+            System.out.println("Attempting to load checkout scene from: " + resourcePath);
+            if (SceneUtil.class.getResource(resourcePath) == null) {
+                System.err.println("Resource not found: " + resourcePath);
+                throw new IOException("FXML resource not found at: " + resourcePath);
+            }
+            FXMLLoader loader = new FXMLLoader(SceneUtil.class.getResource(resourcePath));
+            Parent root = loader.load();
+            System.out.println("Checkout scene loaded successfully.");
+            CheckoutController controller = loader.getController();
+            if (controller != null) {
+                controller.setCartItems(cartItems);
+                controller.setUserId(userId);
+                System.out.println("Cart items and userId set successfully for userId: " + userId);
+            } else {
+                System.err.println("CheckoutController is null after loading!");
+                throw new IllegalStateException("CheckoutController is null after loading FXML.");
+            }
+            Stage stage = (Stage) node.getScene().getWindow();
+            Scene currentScene = node.getScene();
+            double width = currentScene.getWidth() > 0 ? currentScene.getWidth() : 900;
+            double height = currentScene.getHeight() > 0 ? currentScene.getHeight() : 800;
+            Scene newScene = new Scene(root, width, height);
+            stage.setScene(newScene);
+            stage.show();
+        } catch (IOException e) {
+            System.err.println("Error loading checkout scene: " + fxmlPath + ". Error: " + e.getMessage());
+            AlertUtil.showError("Error loading checkout scene: " + fxmlPath + ". Please check the FXML file and resource path.");
+            throw new RuntimeException("Failed to load checkout scene: " + fxmlPath, e);
+        } catch (IllegalStateException e) {
+            System.err.println("Invalid state in checkout scene: " + e.getMessage());
+            AlertUtil.showError("Invalid state loading checkout scene: " + e.getMessage());
+            throw new RuntimeException("Failed to load checkout scene: " + fxmlPath, e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 359f4ee..2ce0584 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,8 +1,12 @@
-module ap.restaurant.restaurant {
+module ap.restaurant {
     requires javafx.controls;
     requires javafx.fxml;
+    requires java.sql;
+    requires org.postgresql.jdbc;
 
+    exports ap.restaurant.app;
 
-    opens ap.restaurant.restaurant to javafx.fxml;
-    exports ap.restaurant.restaurant;
+    opens ap.restaurant.app to javafx.fxml;
+    opens ap.restaurant.controllers to javafx.fxml;
+    opens ap.restaurant.controllers.auth to javafx.fxml;
 }
\ No newline at end of file
diff --git a/src/main/resources/ap/restaurant/fxml/checkout.fxml b/src/main/resources/ap/restaurant/fxml/checkout.fxml
new file mode 100644
index 0000000..8a4bc19
--- /dev/null
+++ b/src/main/resources/ap/restaurant/fxml/checkout.fxml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.Cursor?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<VBox alignment="TOP_CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="900.0" style="-fx-background-color: black;" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ap.restaurant.controllers.CheckoutController">
+    <children>
+        <BorderPane prefHeight="38.0" prefWidth="900.0" style="-fx-background-color: #FFFF64;">
+            <center>
+                <Label text="Beheshti Restaurant" textFill="BLACK">
+                    <font>
+                        <Font name="System Bold" size="36.0" />
+                    </font>
+                </Label>
+            </center>
+        </BorderPane>
+        <AnchorPane prefHeight="762.0" prefWidth="900.0" style="-fx-background-color: black;">
+            <children>
+                <Label alignment="CENTER" contentDisplay="CENTER" layoutX="271.0" layoutY="14.0" prefHeight="94.0" prefWidth="358.0" text="RECEIPT" textFill="#FFFF64">
+                    <font>
+                        <Font name="System Bold" size="36.0" />
+                    </font>
+                </Label>
+                <VBox alignment="CENTER" layoutX="20.0" layoutY="120.0" prefHeight="600.0" prefWidth="860.0" spacing="15" style="-fx-background-color: #99999920;">
+                    <padding>
+                        <Insets bottom="15" left="15" right="15" top="15" />
+                    </padding>
+                    <children>
+                        <TableView fx:id="receiptTable" prefHeight="450.0" prefWidth="830.0">
+                            <columns>
+                                <TableColumn fx:id="nameCol" prefWidth="400.0" text="Item" />
+                                <TableColumn fx:id="qtyCol" prefWidth="150.0" text="Quantity" />
+                                <TableColumn fx:id="priceCol" prefWidth="150.0" text="Unit Price" />
+                                <TableColumn fx:id="subtotalCol" prefWidth="150.0" text="Subtotal" />
+                            </columns>
+                        </TableView>
+                        <Label fx:id="totalPriceLabel" text="Total: 0 Toman" textFill="WHITE">
+                            <font>
+                                <Font size="16.0" />
+                            </font>
+                        </Label>
+                        <Button fx:id="placeOrderButton" onAction="#onPlaceOrderClick" style="-fx-background-color: #363636;" text="Place Order" textFill="WHITE">
+                            <font>
+                                <Font size="16.0" />
+                            </font>
+                            <cursor>
+                                <Cursor fx:constant="HAND" />
+                            </cursor>
+                        </Button>
+                        <Label fx:id="confirmationLabel" text="" textFill="#00FF00">
+                            <font>
+                                <Font size="16.0" />
+                            </font>
+                        </Label>
+                        <HBox alignment="CENTER" spacing="20">
+                            <children>
+                                <Button fx:id="orderAgainButton" onAction="#onOrderAgainClick" style="-fx-background-color: #363636;" text="Order Again" textFill="WHITE">
+                                    <font>
+                                        <Font size="16.0" />
+                                    </font>
+                                    <cursor>
+                                        <Cursor fx:constant="HAND" />
+                                    </cursor>
+                                </Button>
+                                <Button fx:id="logoutButton" onAction="#onLogoutClick" style="-fx-background-color: #363636;" text="Log Out" textFill="WHITE">
+                                    <font>
+                                        <Font size="16.0" />
+                                    </font>
+                                    <cursor>
+                                        <Cursor fx:constant="HAND" />
+                                    </cursor>
+                                </Button>
+                            </children>
+                        </HBox>
+                    </children>
+                </VBox>
+            </children>
+        </AnchorPane>
+    </children>
+</VBox>
\ No newline at end of file
diff --git a/src/main/resources/ap/restaurant/fxml/menu.fxml b/src/main/resources/ap/restaurant/fxml/menu.fxml
new file mode 100644
index 0000000..e258a6e
--- /dev/null
+++ b/src/main/resources/ap/restaurant/fxml/menu.fxml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.Cursor?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.control.SplitPane?>
+<VBox alignment="TOP_CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="900.0" style="-fx-background-color: black;" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ap.restaurant.controllers.MenuController">
+    <children>
+        <BorderPane prefHeight="38.0" prefWidth="900.0" style="-fx-background-color: #FFFF64;">
+            <center>
+                <Label text="Beheshti Restaurant" textFill="BLACK">
+                    <font>
+                        <Font name="System Bold" size="36.0" />
+                    </font>
+                </Label>
+            </center>
+        </BorderPane>
+        <AnchorPane prefHeight="762.0" prefWidth="900.0" style="-fx-background-color: black;">
+            <children>
+                <Label alignment="CENTER" contentDisplay="CENTER" layoutX="271.0" layoutY="20.0" prefHeight="94.0" prefWidth="358.0" text="MENU" textFill="#FFFF64">
+                    <font>
+                        <Font name="System Bold" size="36.0" />
+                    </font>
+                </Label>
+                <SplitPane dividerPositions="0.35" layoutX="20.0" layoutY="120.0" prefHeight="600.0" prefWidth="860.0" style="-fx-background-color: black;">
+                    <items>
+                        <!-- Left: Cart -->
+                        <AnchorPane prefWidth="300.0">
+                            <children>
+                                <VBox alignment="CENTER" prefHeight="600.0" prefWidth="300.0" spacing="20" style="-fx-background-color: #99999920;">
+                                    <padding>
+                                        <Insets bottom="20" left="20" right="20" top="20" />
+                                    </padding>
+                                    <children>
+                                        <Label text="Cart" textFill="WHITE">
+                                            <font>
+                                                <Font name="System Bold" size="36.0" />
+                                            </font>
+                                        </Label>
+                                        <ListView fx:id="cartList" prefHeight="400.0" prefWidth="260.0" />
+                                        <HBox alignment="CENTER" prefHeight="50.0" prefWidth="260.0" spacing="20">
+                                            <children>
+                                                <Button fx:id="removeButton" onAction="#onRemoveClick" style="-fx-background-color: #363636;" text="Remove Item" textFill="WHITE">
+                                                    <font>
+                                                        <Font size="16.0" />
+                                                    </font>
+                                                    <cursor>
+                                                        <Cursor fx:constant="HAND" />
+                                                    </cursor>
+                                                </Button>
+                                                <Button fx:id="checkoutButton" onAction="#onCheckoutClick" style="-fx-background-color: #363636;" text="Checkout" textFill="WHITE">
+                                                    <font>
+                                                        <Font size="16.0" />
+                                                    </font>
+                                                    <cursor>
+                                                        <Cursor fx:constant="HAND" />
+                                                    </cursor>
+                                                </Button>
+                                            </children>
+                                        </HBox>
+                                    </children>
+                                </VBox>
+                            </children>
+                        </AnchorPane>
+                        <!-- Right: Menu -->
+                        <AnchorPane prefWidth="560.0">
+                            <children>
+                                <VBox alignment="CENTER" prefHeight="600.0" prefWidth="560.0" spacing="20" style="-fx-background-color: #99999920;">
+                                    <padding>
+                                        <Insets bottom="20" left="20" right="20" top="20" />
+                                    </padding>
+                                    <children>
+                                        <Label text="Beheshti Restaurant Menu" textFill="WHITE">
+                                            <font>
+                                                <Font name="System Bold" size="36.0" />
+                                            </font>
+                                        </Label>
+                                        <ListView fx:id="menuList" prefHeight="400.0" prefWidth="520.0" />
+                                        <HBox alignment="CENTER" spacing="20">
+                                            <children>
+                                                <TextField fx:id="quantityField" prefWidth="150.0" promptText="Quantity" style="-fx-background-color: #363636; -fx-text-fill: #FFFFFF;">
+                                                    <font>
+                                                        <Font size="14.0" />
+                                                    </font>
+                                                </TextField>
+                                                <Button fx:id="addButton" onAction="#onAddClick" style="-fx-background-color: #363636;" text="Add to Cart" textFill="WHITE">
+                                                    <font>
+                                                        <Font size="14.0" />
+                                                    </font>
+                                                    <cursor>
+                                                        <Cursor fx:constant="HAND" />
+                                                    </cursor>
+                                                </Button>
+                                                <Label fx:id="totalLabel" text="Total: 0 Toman" textFill="WHITE">
+                                                    <font>
+                                                        <Font size="16.0" />
+                                                    </font>
+                                                </Label>
+                                            </children>
+                                        </HBox>
+                                    </children>
+                                </VBox>
+                            </children>
+                        </AnchorPane>
+                    </items>
+                </SplitPane>
+            </children>
+        </AnchorPane>
+    </children>
+</VBox>
\ No newline at end of file
diff --git a/src/main/resources/ap/restaurant/fxml/signIn.fxml b/src/main/resources/ap/restaurant/fxml/signIn.fxml
new file mode 100644
index 0000000..e0a8761
--- /dev/null
+++ b/src/main/resources/ap/restaurant/fxml/signIn.fxml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+
+<VBox alignment="TOP_CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="814.0" prefWidth="1007.0" style="-fx-background-color: black;" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ap.restaurant.controllers.auth.SignInController">
+   <children>
+      <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="711.0" prefWidth="877.0" style="-fx-background-color: black;">
+         <children>
+            <BorderPane prefHeight="38.0" style="-fx-background-color: #FFFF64;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+               <center>
+                  <Label text="Beheshti Restaurant" textFill="BLACK">
+                     <font>
+                        <Font name="System Bold" size="36.0" />
+                     </font>
+                  </Label>
+               </center>
+            </BorderPane>
+            <Label alignment="CENTER" contentDisplay="CENTER" layoutY="79.0" text="SIGN IN" textFill="#FFFF64" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="79.0">
+               <font>
+                  <Font size="36.0" />
+               </font>
+            </Label>
+            <GridPane alignment="CENTER" prefHeight="452.0" prefWidth="498.0" style="-fx-background-color: #99999920;" AnchorPane.leftAnchor="189.0" AnchorPane.rightAnchor="189.0" AnchorPane.topAnchor="146.0">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="50.0" />
+                  <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="400.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="50.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints maxHeight="100.0" minHeight="15.0" prefHeight="15.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="100.0" minHeight="15.0" prefHeight="20.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="100.0" minHeight="15.0" prefHeight="15.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="100.0" minHeight="15.0" prefHeight="20.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="100.0" minHeight="15.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <TextField fx:id="emailField" style="-fx-background-color: #363636; -fx-text-fill: #FFFFFF;" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  <PasswordField fx:id="passwordField" prefWidth="266.0" style="-fx-background-color: #363636; -fx-text-fill: #FFFFFF;" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <Label alignment="BOTTOM_LEFT" prefHeight="114.0" prefWidth="423.0" text="Beheshti Restaurant email" textFill="WHITE" GridPane.columnIndex="1" />
+                  <Label alignment="BOTTOM_LEFT" prefHeight="114.0" prefWidth="409.0" text="Password " textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                  <Button fx:id="loginButton" onAction="#onLoginClick" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" prefHeight="34.0" prefWidth="125.0" style="-fx-background-color: #363636;" text="Login" textAlignment="CENTER" textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="4">
+                     <cursor>
+                        <Cursor fx:constant="HAND" />
+                     </cursor>
+                  </Button>
+               </children>
+            </GridPane>
+            <HBox alignment="CENTER" spacing="10.0" AnchorPane.bottomAnchor="50.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+               <children>
+                  <Label text="Don't have an account?" textFill="WHITE" />
+                  <Label fx:id="signUpLabel" prefHeight="24.0" prefWidth="76.0" text="Sign up here." textFill="#5BA7C2">
+                     <cursor>
+                        <Cursor fx:constant="HAND" />
+                     </cursor>
+                  </Label>
+               </children>
+            </HBox>
+         </children>
+      </AnchorPane>
+   </children>
+</VBox>
diff --git a/src/main/resources/ap/restaurant/fxml/signUp.fxml b/src/main/resources/ap/restaurant/fxml/signUp.fxml
new file mode 100644
index 0000000..b732f7d
--- /dev/null
+++ b/src/main/resources/ap/restaurant/fxml/signUp.fxml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.Cursor?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<VBox alignment="TOP_CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="900.0" style="-fx-background-color: black;" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ap.restaurant.controllers.auth.SignUpController">
+   <children>
+      <BorderPane prefHeight="38.0" prefWidth="877.0" style="-fx-background-color: #FFFF64;">
+         <center>
+            <Label text="Beheshti Restaurant" textFill="BLACK">
+               <font>
+                  <Font name="System Bold" size="36.0" />
+               </font>
+            </Label>
+         </center>
+      </BorderPane>
+      <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="711.0" prefWidth="877.0" style="-fx-background-color: black;">
+         <children>
+            <Label alignment="CENTER" contentDisplay="CENTER" layoutX="259.0" layoutY="14.0" prefHeight="94.0" prefWidth="358.0" text="SIGN UP" textFill="#ffff64">
+               <font>
+                  <Font size="36.0" />
+               </font>
+            </Label>
+            <Label alignment="CENTER" contentDisplay="CENTER" layoutX="175.0" layoutY="95.0" prefHeight="53.0" prefWidth="525.0" text="and enjoy Beheshti Restaurant" textFill="#ffff64">
+               <font>
+                  <Font size="36.0" />
+               </font>
+            </Label>
+            <GridPane fx:id="signUpGrid" alignment="CENTER" layoutX="167.0" layoutY="164.0" prefHeight="492.0" prefWidth="542.0" style="-fx-background-color: #99999920;">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="50.0" />
+                  <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="400.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="50.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints maxHeight="100.0" minHeight="5.0" prefHeight="5.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="100.0" minHeight="5.0" prefHeight="15.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="100.0" minHeight="5.0" prefHeight="5.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="100.0" minHeight="5.0" prefHeight="15.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="100.0" minHeight="5.0" prefHeight="5.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="100.0" minHeight="5.0" prefHeight="15.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="100.0" minHeight="5.0" prefHeight="5.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="100.0" minHeight="15.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <TextField fx:id="usernameField" style="-fx-background-color: #363636; -fx-text-fill: #FFFFFF;" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  <TextField fx:id="emailField" style="-fx-background-color: #363636; -fx-text-fill: #FFFFFF;" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <PasswordField fx:id="passwordField" prefWidth="266.0" style="-fx-background-color: #363636; -fx-text-fill: #FFFFFF;" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+                  <Label alignment="BOTTOM_LEFT" prefHeight="73.0" prefWidth="432.0" text="Beheshti Restaurant Username" textFill="WHITE" GridPane.columnIndex="1" />
+                  <Label alignment="BOTTOM_LEFT" prefHeight="66.0" prefWidth="422.0" text="Email" textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                  <Label alignment="BOTTOM_LEFT" prefHeight="65.0" prefWidth="422.0" text="Password" textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                  <Button fx:id="signUpButton" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" onMouseClicked="#onSignUpClick" prefHeight="34.0" prefWidth="125.0" style="-fx-background-color: #363636;" text="Create Account" textAlignment="CENTER" textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="7" GridPane.valignment="TOP">
+                     <cursor>
+                        <Cursor fx:constant="HAND" />
+                     </cursor>
+                  </Button>
+               </children>
+            </GridPane>
+            <Label layoutX="331.0" layoutY="673.0" text="Already have an account?" textFill="WHITE" />
+            <Label fx:id="signInLabel" layoutX="476.0" layoutY="673.0" text="Sign in here." textFill="#5ba7c2">
+               <cursor>
+                  <Cursor fx:constant="HAND" />
+               </cursor>
+            </Label>
+         </children>
+      </AnchorPane>
+   </children>
+</VBox>
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/pics/Sbu-logo.svg.png b/src/main/resources/pics/Sbu-logo.svg.png
new file mode 100644
index 0000000..1c0e22e
Binary files /dev/null and b/src/main/resources/pics/Sbu-logo.svg.png differ