Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into TIST-16

Reviewed-on: #41

apps/Index/Templates/error.php

@@ -1,23 +1,28 @@
-<?php 
+<?php
+
+use Lycoreco\Includes\Routing\HttpExceptions\PageError;
+
 $error = $context['error_model'];
 
 the_header(
-    $error->get_http_error(), 
+    $error->get_http_error(),
-    '', 
+    '',
-    'error', 
+    'error',
     [
         ['robots', 'nofollow, noindex']
-    ]); 
+    ]
+);
+
+/**
+ * @var PageError
+ */
 
-    /**
-     * @var PageError
-     */
-    
 ?>
 
-<div class="error-page">
+<div class="container">
-    <div class="error-code"><?php echo $error->get_http_error() ?></div>
+    <div class="error-page">
-    <div class="error-message"><?php echo $error->getMessage() ?></div>
+        <div class="error-code"><?php echo $error->get_http_error() ?></div>
+        <div class="error-message"><?php echo $error->getMessage() ?></div>
+    </div>
 </div>
-
 <?php the_footer() ?>

apps/Index/Templates/index.php

@@ -106,6 +106,7 @@ the_header(
         </div>
     </div>
     <?php if(CURRENT_USER): ?>
+    <?php if($context['usermenu_recipe_prefetch']): ?>
     <div class="daily-meals">
         <h2 class="title">Your Menu for <?= date("l"); ?></h2>
         <div class="daily-meals-grid">
@@ -116,6 +117,12 @@ the_header(
             ?>
         </div>
     </div>
+    <?php else: ?>
+    <div class="daily-meals">
+        <h2 class="title">No meals added for <?= date("l"); ?></h2>
+        <p class="no-daily-meals-msg">You have not added any recipes for <?= date("l");?>, please go to the catalog and add recipes.</p>
+    </div>
+    <?php endif; ?>
     <?php endif; ?>
 
 </div>

apps/Recipes/Templates/catalog.php

@@ -28,61 +28,66 @@ the_header(
                 <div class="filters-inner">
                     <form class="filters-form" method="get">
                         <div class="categories-filter">
-                        <h3 class="filters__title">
+                            <h3 class="filters__title">
-                            Categories</h3>
+                                Categories</h3>
                             <div class="filters__search">
                                 <i class="fa-solid fa-magnifying-glass search-icon"></i>
                                 <input type="text" class="search-input" placeholder="Search categories...">
                             </div>
-                            
+
                             <div class="filters-checkboxes">
                                 <ul>
-                                    <?php foreach ($context['categories'] as $cat): 
+                                    <?php foreach ($context['categories'] as $cat):
                                         $field_id = 'cat_' . $cat->get_id();
 
                                         $is_checked = false;
                                         $category = $_GET['category'] ?? null;
-                                        if($category == $cat->get_id())
+                                        if ($category == $cat->get_id())
                                             $is_checked = true;
                                         ?>
-                                    <li>
+                                        <li>
-                                        <input id="<?= $field_id ?>" type="radio" name="category" value="<?= $cat->get_id() ?>" <?= $is_checked ? 'checked' : '' ?>>
+                                            <input id="<?= $field_id ?>" type="radio" name="category"
-                                        <label for="<?= $field_id ?>"><?= $cat->field_name ?></label>
+                                                value="<?= $cat->get_id() ?>" <?= $is_checked ? 'checked' : '' ?>>
-                                    </li>
+                                            <label for="<?= $field_id ?>"><?= $cat->field_name ?></label>
+                                        </li>
                                     <?php endforeach; ?>
                                 </ul>
                             </div>
                         </div>
                         <div class="ingredients-filter">
-                        <h3 class="filters__title">
+                            <h3 class="filters__title">
-                            Ingredients</h3>
+                                Ingredients</h3>
                             <div class="filters__search">
                                 <i class="fa-solid fa-magnifying-glass search-icon"></i>
                                 <input type="text" class="search-input" placeholder="Search Ingredients...">
                             </div>
                             <div class="filters-checkboxes">
                                 <ul>
-                                    <?php foreach ($context['ingredients'] as $ing): 
+                                    <?php foreach ($context['ingredients'] as $ing):
                                         $field_id = 'ing_' . $ing->get_id();
 
                                         $is_checked = false;
                                         $ingredients = $_GET['ingredient'] ?? null;
-                                        if($ingredients) {
+                                        if ($ingredients) {
                                             if (in_array($ing->get_id(), $ingredients))
                                                 $is_checked = true;
                                         }
                                         ?>
-                                    <li>
+                                        <li>
-                                        <input id="<?= $field_id ?>" type="checkbox" name="ingredient[]" value="<?= $ing->get_id() ?>" <?= $is_checked ? 'checked' : '' ?>>
+                                            <input id="<?= $field_id ?>" type="checkbox" name="ingredient[]"
-                                        <label for="<?= $field_id ?>"><?= $ing->field_name ?></label>
+                                                value="<?= $ing->get_id() ?>" <?= $is_checked ? 'checked' : '' ?>>
-                                    </li>
+                                            <label for="<?= $field_id ?>"><?= $ing->field_name ?></label>
-                                    <?php endforeach; ?>                                    
+                                        </li>
+                                    <?php endforeach; ?>
                                 </ul>
                             </div>
                         </div>
                         <button class="btn btn-primary hover-anim" type="submit">
                             Apply
                         </button>
+                        <a class="btn btn-secondary hover-anim" type="button" href="<?php the_permalink('recipes:catalog') ?>">
+                            Reset
+                        </a>
                     </form>
                 </div>
             </div>

apps/Recipes/Templates/components/recipe-ings-item.php

@@ -5,7 +5,7 @@
     <div class="daily-meal-info">
         <div class="daily-meal-title">
             <h3><?= $recipe->field_title ?></h3>
-            <span class="meta"><i class="fa-regular fa-clock"></i><?= $recipe->field_estimated_time ?>mins to make</span>
+            <span class="meta"><i class="fa-regular fa-clock"></i> <?= $recipe->field_estimated_time ?> mins to make</span>
         </div>
         <div class="daily-meal-ingredients">
             <ul class="ingredients-list">

apps/Recipes/Templates/daily-meals.php

@@ -17,6 +17,7 @@ the_header(
 <?php
 foreach ($context['weeks'] as $day => $recipe_prefetches) {
 ?>
+    <?php if(!empty($recipe_prefetches)): ?>
     <div class="daily-meals">
         <h2 class="title">Your Menu for <?= ucfirst($day) ?></h2>
         <div class="daily-meals-grid">
@@ -28,6 +29,12 @@ foreach ($context['weeks'] as $day => $recipe_prefetches) {
             ?>
         </div>
     </div>
+    <?php else: ?>
+        <div class="daily-meals">
+        <h2 class="title">No meals added for <?= ucfirst($day); ?></h2>
+        <p class="no-daily-meals-msg">You have not added any recipes for <?= ucfirst($day);?>, please go to the catalog and add recipes.</p>
+    </div>
+    <?php endif; ?>
 <?php
 }
 ?>

assets/css/style.css

@@ -334,12 +334,15 @@ body {
 .reviews-grid {
     display: grid;
     grid-template-columns: repeat(3, 310px);
-    grid-template-rows: repeat(2, 175px);
+    grid-auto-rows: 175px;    
     row-gap: 20px;
     column-gap: 50px;
 }
 
 .recent-review {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
     height: 100%;
     width: 310px;
     padding: 15px;
@@ -406,7 +409,7 @@ body {
 .daily-meals-grid {
     display: grid;
     grid-template-columns: repeat(2, 300px);
-    grid-template-rows: repeat(3, 100px);
+    grid-auto-rows: auto;  
     row-gap: 20px;
     column-gap: 20px;
     margin: 0 auto;
@@ -452,6 +455,7 @@ body {
     font-family: var(--title-font);
     font-size: 14px;
     color: var(--common-text);
+    margin-bottom: 3px;
 
 }
 
@@ -469,19 +473,27 @@ body {
 }
 
 .ingredients-list {
-    /* columns: 2;
-    -webkit-columns: 2;
-    -moz-columns: 2; */
     margin-left: 15px;
     display: grid;
     grid-template-columns: 1fr 1fr;
     row-gap: 3px;
     column-gap: 8px;
     padding: 0;
+    height: 100%;
 }
 
 .ingredients-list li {
-    margin-right: 5px;
+    margin-right: 15px;
+    max-width: 72px;
+}
+
+.daily-meal-ingredients{
+    height: 100%;
+}
+
+.no-daily-meals-msg{
+    width: 100%;
+    text-align: center;
 }
 
 
@@ -819,7 +831,7 @@ input[type="checkbox"]{
 
 .filters {
     position: fixed;
-    max-height: 454px;
+    max-height: 500px;
     width: 230px;
     padding: 15px;
     background-color: var(--panel-background);
@@ -862,6 +874,7 @@ input[type="checkbox"]{
 
 .filters-form .btn {
     width: 200px;
+    margin-bottom: 10px;
 }
 
 .single-recipe {
@@ -1167,6 +1180,11 @@ label {
     width: 50%;
 }
 
+.review{
+    margin-bottom: 20px;
+    border-bottom: 1px solid #b3b3b3;
+}
+
 .subtitle{
     font-family: var(--title-font);
     font-size: 16px;
@@ -1264,6 +1282,60 @@ label {
     z-index: 9999;
 }
 
+.pagination ul{
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    margin-top: 20px;
+}
+
+.pagination ul li {
+    margin: 0 5px;
+}
+
+.pagination ul li:hover{
+    opacity: 0.7;
+}
+
+.error-page{
+    margin-top: 46px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+
+.error-code{
+    font-family: var(--title-font);
+    font-size: 100px;
+    color: var(--title-color);
+    margin-bottom: 20px;
+}
+
+.error-message{
+    font-size: 24px;
+    color: var(--common-text);
+    text-align: center;
+}
+
+.alert{
+    display: flex;
+    margin-bottom: 5px;
+}
+
+.alert .alert-icon{
+    margin-right: 5px;
+}
+
+.warning{
+    color: #ff0000;
+}
+
+.success{
+    color: #00ff00;
+}
+
 @media (max-width: 768px) {
 
     .catalog-items {

urls.php

@@ -1,4 +1,5 @@
 <?php
+use Lycoreco\Apps\Index\Controllers\ErrorController;
 use Lycoreco\Includes\Routing\Router;
 
 require APPS_PATH . '/Index/urls.php';
@@ -13,5 +14,5 @@ Router::includes($admin_urls, 'admin');
 Router::includes($ajax_urls, 'ajax');
 Router::includes($recipes_urls, 'recipes');
 
-// Router::set_error_controller('default', new ErrorController())
+Router::set_error_controller('default', new ErrorController());
 ?>