Merge pull request #38 from deanblackborough/v1.12.1

v1.12.1

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 The complete changelog for the Costs to Expect Website, our changelog follows the format defined at https://keepachangelog.com/en/1.0.0/
 
+## [v1.12.1] - 2020-02-26
+### Fixed
+- Search the name field rather than the description field.
+- Selecting a subcategory will now jump you to the expenses table.
+
 ## [v1.12.0] - 2020-02-17
 ### Added
 - We have added caching for the requests not covered in the v1.11.0 update.

app/Request/Uri.php

@@ -209,7 +209,7 @@ public static function expensesSummary(
         }
 
         if ($term !== null) {
-            $params['search'] = 'description:' . urlencode($term);
+            $params['search'] = 'name:' . urlencode($term);
         }
 
         $i = 0;

config/web/app.php

@@ -3,8 +3,8 @@
 declare(strict_types=1);
 
 return [
-    'release' => 'v1.12.0',
-    'date' => '17th February 2020',
+    'release' => 'v1.12.1',
+    'date' => '26th February 2020',
     'copyright' => 'Dean Blackborough 2018 - ' . date('Y'),
     'copyright_url' => 'https://www.deanblackborough.com',
     'api-link' => 'https://api.costs-to-expect.com',

resources/views/changelog.blade.php

@@ -22,6 +22,15 @@
 
         <hr />
 
+        <h2>[v1.12.1] - 26th February 2020</h2>
+
+        <h3>Fixed</h3>
+
+        <ul>
+            <li>Search the name field rather than the description field.</li>
+            <li>Selecting a subcategory will now jump you to the expenses table.</li>
+        </ul>
+
         <h2>[v1.12.0] - 17th February 2020</h2>
 
         <h3>Added</h3>

resources/views/child-category.blade.php

@@ -63,7 +63,7 @@
                 'component-container.cost-summary-block',
                 [
                     'icon' => 'expenses.png',
-                    'uri' => $active . '/expenses/category/' . $active_category_id . '/subcategory/' . $subcategory['id'] . '#subcategories',
+                    'uri' => $active . '/expenses/category/' . $active_category_id . '/subcategory/' . $subcategory['id'] . '#expenses-table',
                     'heading' => $subcategory['name'],
                     'subheading' => $subcategory['description'] . ' expenses',
                     'description' => null,

resources/views/child-subcategory.blade.php

@@ -63,7 +63,7 @@
                 'component-container.cost-summary-block',
                 [
                     'icon' => 'expenses.png',
-                    'uri' => $active . '/expenses/category/' . $active_category_id . '/subcategory/' . $subcategory['id'] . '#subcategories',
+                    'uri' => $active . '/expenses/category/' . $active_category_id . '/subcategory/' . $subcategory['id'] . '#expenses-table',
                     'heading' => $subcategory['name'],
                     'subheading' => $subcategory['description'] . ' expenses',
                     'description' => null,
@@ -90,7 +90,7 @@
 
 @if ($recent_expenses !== null)
 <div class="row mt-4">
-    <div class="col-12">
+    <div class="col-12" id="expenses-table">
         <h4>The 25 most recent {{ $active_category_name . '/' . $active_subcategory_name }} expenses for
             {{ $child_details['short_name'] }} <small> - <a href="{{ $child_details['uri'] . '/expenses?category=' . $active_category_id . '&subcategory=' . $active_subcategory_id . '#expenses-table' }}">(View all {{ $active_category_name . '/' . $active_subcategory_name }} expenses)</a></small></h4>
 
@@ -113,7 +113,7 @@
             )
         </div>
         @else
-        <div class="alert alert-info" role="alert">
+        <div class="alert alert-info" role="alert" id="expenses-table">
             There are no listed expenses for {{ $child_details['short_name'] }} in
                 the {{ $active_category_name }} category.
         </div>