diff --git a/assets/css/main.css b/assets/css/main.css index a24c989e..4d065668 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,8 +1,9 @@ /* Global Styles & Variables */ :root { - --turquoise: #40E0D0; - --green: #228B22; --coral: #FF6B6B; + --sandy-beige: #F4E8D8; + --turquoise: #40E0D0; + --ocean-blue: #1E90FF; --white: #FFFFFF; --off-white: #f8f9fa; --text-color: #333; @@ -10,8 +11,8 @@ --medium-gray: #ccc; --dark-gray: #555; - --font-heading: 'Inter', sans-serif; - --font-body: 'Open Sans', sans-serif; + --font-heading: 'Poppins', sans-serif; + --font-body: 'Lato', sans-serif; --shadow-soft: 0 4px 12px rgba(0, 0, 0, 0.08); --border-radius: 16px; @@ -20,7 +21,7 @@ body { font-family: var(--font-body); color: var(--text-color); - background-color: var(--white); /* Changed to white for a cleaner base */ + background-color: var(--off-white); margin: 0; padding: 0; -webkit-font-smoothing: antialiased; @@ -30,7 +31,6 @@ body { h1, h2, h3, h4, h5, h6 { font-family: var(--font-heading); font-weight: 600; - letter-spacing: 0.5px; /* Reduced for better readability */ } a { @@ -172,57 +172,6 @@ header { animation: fadeIn 0.5s ease-in-out forwards; } -/* Hero Section */ -.hero { - position: relative; - height: 400px; - background-image: url('../pasted-20251014-230507-170c4564.jpg'); - background-size: cover; - background-position: center; - display: flex; - align-items: center; - justify-content: center; - text-align: center; - color: var(--white); - margin-bottom: 40px; -} - -.hero::after { - content: ''; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background: rgba(0, 0, 0, 0.4); -} - -.hero-content { - position: relative; - z-index: 1; - max-width: 600px; -} - -.hero h1 { - font-size: 3rem; - font-weight: 700; - margin-bottom: 1rem; - text-shadow: 0 2px 4px rgba(0,0,0,0.5); -} - -.search-bar { - width: 100%; - padding: 1rem; - font-size: 1rem; - border-radius: 50px; - border: none; - box-shadow: var(--shadow-soft); - padding-left: 3rem; - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23767676' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-search'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); - background-repeat: no-repeat; - background-position: 1rem center; -} - /* Restaurant Grid */ .page-title { font-size: 2rem; @@ -260,28 +209,35 @@ header { } .restaurant-card-content { - padding: 1.5rem; + padding: 1rem; display: flex; flex-direction: column; flex-grow: 1; } .restaurant-card-content h3 { - font-size: 1.25rem; + font-size: 1.15rem; font-weight: 700; - margin-bottom: 0.5rem; + margin-bottom: 0.25rem; } .restaurant-card-content p { color: var(--dark-gray); - font-size: 0.95rem; + font-size: 0.9rem; margin-bottom: 0.5rem; } +.restaurant-info { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: auto; +} + .rating-display { display: flex; align-items: center; - font-size: 1rem; + font-size: 0.9rem; font-weight: 600; color: var(--text-color); } @@ -291,18 +247,17 @@ header { margin-right: 0.25rem; } -.rating-display .rating-count { +.delivery-info { font-size: 0.9rem; + font-weight: 600; color: var(--dark-gray); - margin-left: 0.5rem; - font-weight: 400; } footer { text-align: center; padding: 3rem 0; margin-top: 3rem; - background-color: var(--off-white); + background-color: var(--white); border-top: 1px solid var(--light-gray); } @@ -738,7 +693,7 @@ footer { } .order-confirmation h1 { - color: var(--green); + color: var(--ocean-blue); font-size: 2.5rem; margin-bottom: 1rem; } @@ -970,4 +925,108 @@ footer { } .search-bar { flex-grow: 1; +} + +/* Cuisine Carousel */ +.cuisine-carousel { + display: flex; + overflow-x: auto; + padding-bottom: 1rem; + margin-bottom: 1.5rem; + scrollbar-width: thin; /* For Firefox */ + scrollbar-color: var(--medium-gray) var(--light-gray); +} + +.cuisine-carousel::-webkit-scrollbar { + height: 8px; +} + +.cuisine-carousel::-webkit-scrollbar-track { + background: var(--light-gray); + border-radius: 10px; +} + +.cuisine-carousel::-webkit-scrollbar-thumb { + background-color: var(--medium-gray); + border-radius: 10px; +} + +.cuisine-card { + position: relative; + margin-right: 1rem; +} + +.cuisine-card input[type="checkbox"] { + position: absolute; + opacity: 0; + width: 100%; + height: 100%; + cursor: pointer; +} + +.cuisine-card label { + display: block; + padding: 0.75rem 1.5rem; + border: 1px solid var(--medium-gray); + border-radius: 50px; + background-color: var(--white); + color: var(--text-color); + font-weight: 600; + white-space: nowrap; + transition: all 0.3s ease; +} + +.cuisine-card input[type="checkbox"]:checked + label { + background-color: var(--coral); + color: var(--white); + border-color: var(--coral); +} + +.cuisine-card label:hover { + background-color: var(--light-gray); +} + +.cuisine-card input[type="checkbox"]:checked + label:hover { + background-color: #ff4f4f; +} + +/* New Filter Bar */ +.filter-bar-new { + display: flex; + align-items: center; + gap: 1.5rem; + margin-bottom: 2rem; + background-color: var(--white); + padding: 1rem; + border-radius: var(--border-radius); + box-shadow: var(--shadow-soft); +} + +.filter-bar-new .form-group, +.filter-bar-new .form-check { + margin-bottom: 0; +} + +.filter-bar-new .form-control { + border-radius: 50px; + border: 1px solid var(--medium-gray); + padding: 0.5rem 1rem; +} + +.filter-bar-new .form-check-label { + font-weight: 600; +} + +.filter-bar-new .btn-secondary { + margin-left: auto; +} + +/* Remove old column styles */ +.row { + display: block; +} +.col-md-3, +.col-md-9 { + width: 100%; + padding: 0; } \ No newline at end of file diff --git a/assets/pasted-20251015-151258-a85c3b51.png b/assets/pasted-20251015-151258-a85c3b51.png new file mode 100644 index 00000000..d4e19ede Binary files /dev/null and b/assets/pasted-20251015-151258-a85c3b51.png differ diff --git a/assets/pasted-20251015-151954-a05facda.png b/assets/pasted-20251015-151954-a05facda.png new file mode 100644 index 00000000..cf6901a6 Binary files /dev/null and b/assets/pasted-20251015-151954-a05facda.png differ diff --git a/assets/pasted-20251015-151955-4afb19e2.png b/assets/pasted-20251015-151955-4afb19e2.png new file mode 100644 index 00000000..32058a82 Binary files /dev/null and b/assets/pasted-20251015-151955-4afb19e2.png differ diff --git a/assets/pasted-20251015-152035-29d5dbfa.png b/assets/pasted-20251015-152035-29d5dbfa.png new file mode 100644 index 00000000..09454b86 Binary files /dev/null and b/assets/pasted-20251015-152035-29d5dbfa.png differ diff --git a/assets/pasted-20251015-152039-5ff1195a.png b/assets/pasted-20251015-152039-5ff1195a.png new file mode 100644 index 00000000..ae5b97fe Binary files /dev/null and b/assets/pasted-20251015-152039-5ff1195a.png differ diff --git a/assets/pasted-20251015-152137-402eb713.png b/assets/pasted-20251015-152137-402eb713.png new file mode 100644 index 00000000..1edce3b7 Binary files /dev/null and b/assets/pasted-20251015-152137-402eb713.png differ diff --git a/assets/pasted-20251015-152159-f3bbf59e.png b/assets/pasted-20251015-152159-f3bbf59e.png new file mode 100644 index 00000000..ba181f3b Binary files /dev/null and b/assets/pasted-20251015-152159-f3bbf59e.png differ diff --git a/assets/pasted-20251015-152218-471cd34e.png b/assets/pasted-20251015-152218-471cd34e.png new file mode 100644 index 00000000..d5676234 Binary files /dev/null and b/assets/pasted-20251015-152218-471cd34e.png differ diff --git a/assets/pasted-20251015-152243-150e3dc0.png b/assets/pasted-20251015-152243-150e3dc0.png new file mode 100644 index 00000000..da56fc7e Binary files /dev/null and b/assets/pasted-20251015-152243-150e3dc0.png differ diff --git a/assets/pasted-20251015-152405-8fffc81d.png b/assets/pasted-20251015-152405-8fffc81d.png new file mode 100644 index 00000000..260f99ae Binary files /dev/null and b/assets/pasted-20251015-152405-8fffc81d.png differ diff --git a/hero.php b/hero.php new file mode 100644 index 00000000..32104efc --- /dev/null +++ b/hero.php @@ -0,0 +1,103 @@ + + + + +
+
+

Everything you crave, delivered.

+

Your favorite local restaurants, delivered to your door.

+
+ + +
+
+
diff --git a/index.php b/index.php index 2d3499d8..36f99896 100644 --- a/index.php +++ b/index.php @@ -1,146 +1,141 @@ - -
-
-
-

Order from Majuro's best

-
- - -
-
- - -
-
-
+
-
- -
-

Filter Results

-
- - "> - + + + -
By Cuisine
- query("SELECT * FROM cuisines ORDER BY name"); - $all_cuisines = $cuisine_stmt->fetchAll(PDO::FETCH_ASSOC); - $selected_cuisines = isset($_GET['cuisines']) && is_array($_GET['cuisines']) ? $_GET['cuisines'] : []; +

Explore Cuisines

+
+ query("SELECT * FROM cuisines ORDER BY name"); + $all_cuisines = $cuisine_stmt->fetchAll(PDO::FETCH_ASSOC); + $selected_cuisines = isset($_GET['cuisines']) && is_array($_GET['cuisines']) ? $_GET['cuisines'] : []; - foreach ($all_cuisines as $cuisine): ?> -
- > - -
- - -
By Rating
-
- + foreach ($all_cuisines as $cuisine): ?> +
+ onchange="this.form.submit()"> +
- - - Clear Filters - +
- -
-

All Restaurants

-
-
- +
+ + +
+
+ onchange="this.form.submit()"> + +
+ Clear Filters +
+ - // Join with restaurant_cuisines if filtering by cuisine - if (!empty($selected_cuisines)) { - $sql .= " JOIN restaurant_cuisines rc ON r.id = rc.restaurant_id"; - } +

All Restaurants

+
+
+ = ? AND r.days_open LIKE ?"; + $params[] = $current_time; + $params[] = $current_time; + $params[] = '%' . $current_day . '%'; + } - $sql .= " GROUP BY r.id, r.name, r.image_url"; - // Add rating filter (HAVING clause) - $selected_min_rating = isset($_GET['min_rating']) && is_numeric($_GET['min_rating']) ? (int)$_GET['min_rating'] : 0; - if ($selected_min_rating > 0) { - $sql .= " HAVING AVG(rt.rating) >= ?"; - $params[] = $selected_min_rating; - } + if (!empty($where_clauses)) { + $sql .= " WHERE " . implode(' AND ', $where_clauses); + } - $sql .= " ORDER BY r.name"; + $sql .= " GROUP BY r.id, r.name, r.image_url, r.opening_time, r.closing_time, r.days_open"; - $stmt = db()->prepare($sql); - $stmt->execute($params); - $restaurants = $stmt->fetchAll(); + // Add rating filter (HAVING clause) + $selected_min_rating = isset($_GET['min_rating']) && is_numeric($_GET['min_rating']) ? (int)$_GET['min_rating'] : 0; + if ($selected_min_rating > 0) { + $sql .= " HAVING AVG(rt.rating) >= ?"; + $params[] = $selected_min_rating; + } - if (empty($restaurants)) { - echo '

No restaurants found matching your criteria.

'; + $sql .= " ORDER BY r.name"; + + $stmt = db()->prepare($sql); + $stmt->execute($params); + $restaurants = $stmt->fetchAll(); + + if (empty($restaurants)) { + echo '

No restaurants found matching your criteria.

'; + } else { + foreach ($restaurants as $restaurant) { + // Get cuisines for this restaurant + $cuisine_sql = "SELECT c.name FROM cuisines c JOIN restaurant_cuisines rc ON c.id = rc.cuisine_id WHERE rc.restaurant_id = ?"; + $cuisine_stmt = db()->prepare($cuisine_sql); + $cuisine_stmt->execute([$restaurant['id']]); + $restaurant_cuisines_list = $cuisine_stmt->fetchAll(PDO::FETCH_COLUMN); + + echo ''; + echo '' . htmlspecialchars($restaurant['name']) . ''; + echo '
'; + echo '

' . htmlspecialchars($restaurant['name']) . '

'; + echo '

' . htmlspecialchars(implode(', ', $restaurant_cuisines_list)) . '

'; + echo '
'; + if ($restaurant['rating_count'] > 0) { + echo '
'; + echo '★'; + echo '' . htmlspecialchars(number_format($restaurant['average_rating'], 1)) . ''; + echo '
'; } else { - foreach ($restaurants as $restaurant) { - // Get cuisines for this restaurant - $cuisine_sql = "SELECT c.name FROM cuisines c JOIN restaurant_cuisines rc ON c.id = rc.cuisine_id WHERE rc.restaurant_id = ?"; - $cuisine_stmt = db()->prepare($cuisine_sql); - $cuisine_stmt->execute([$restaurant['id']]); - $restaurant_cuisines_list = $cuisine_stmt->fetchAll(PDO::FETCH_COLUMN); - - echo ''; - echo '' . htmlspecialchars($restaurant['name']) . ''; - echo '
'; - echo '

' . htmlspecialchars($restaurant['name']) . '

'; - echo '

' . htmlspecialchars(implode(', ', $restaurant_cuisines_list)) . '

'; - if ($restaurant['rating_count'] > 0) { - echo '
'; - echo '★'; - echo '' . htmlspecialchars(number_format($restaurant['average_rating'], 1)) . ''; - echo '(' . htmlspecialchars($restaurant['rating_count']) . ' ratings)'; - echo '
'; - } else { - echo '
No ratings yet
'; - } - echo '
'; - echo ''; - } + echo '
No ratings yet
'; } - ?> -
-
+ echo '
'; + echo '
'; + echo ''; + } + } + ?>
-
+
@@ -301,4 +296,4 @@ document.addEventListener('DOMContentLoaded', function() { }); - \ No newline at end of file + diff --git a/migrations/20251015_add_hours_to_restaurants.sql b/migrations/20251015_add_hours_to_restaurants.sql new file mode 100644 index 00000000..fae2029b --- /dev/null +++ b/migrations/20251015_add_hours_to_restaurants.sql @@ -0,0 +1,11 @@ + +ALTER TABLE restaurants +ADD COLUMN opening_time TIME, +ADD COLUMN closing_time TIME, +ADD COLUMN days_open VARCHAR(255); + +-- Update existing restaurants with some default hours (e.g., 9 AM to 9 PM, open all week) +UPDATE restaurants SET + opening_time = '09:00:00', + closing_time = '21:00:00', + days_open = 'Mon,Tue,Wed,Thu,Fri,Sat,Sun';