Merge pull request #290 from mycookbook/fix-missing-route

use storage facade to write keywords to local storage
mycookbook · Sep 21, 2023 · 206a078 · 206a078
2 parents 1fc5969 + 19c4890
commit 206a078
Show file tree

Hide file tree

Showing 7 changed files with 356 additions and 343 deletions.
diff --git a/app/Http/Controllers/Files/keywords.txt b/app/Http/Controllers/Files/keywords.txt
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
@@ -8,6 +8,7 @@
 use App\Services\SearchService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 use Symfony\Component\HttpFoundation\Response as ResponseAlias;
 
@@ -176,16 +177,8 @@ private function jsonResponse(Collection $collection)
     public function writeToCsv(Request $request)
     {
         $data = $request->only(['city', 'country', 'ip', 'keyword', 'loc', 'timezone']);
-        $filePath = __DIR__ . '/Files/keywords.txt';
-        $contents = file_get_contents($filePath);
-
-        if ($contents == "") {
-            $data = json_encode($data);
-        } else {
-            $originalContents = json_decode($contents, true);
-            $data = json_encode([$data, $originalContents]);
-        }
+        //TODO: if any data is null, fill up, default keyword to ""
 
-        file_put_contents($filePath, $data);
+        Storage::disk('local')->append('keywords.txt', json_encode($data), "," . PHP_EOL);
     }
 }
diff --git a/app/Http/Controllers/StaticContentController.php b/app/Http/Controllers/StaticContentController.php
@@ -4,34 +4,40 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Category;
 use App\Models\StaticContent;
+use Illuminate\Http\Request;
 
 class StaticContentController extends Controller
 {
     /**
      * @return \Illuminate\Http\JsonResponse
      */
-    public function get()
+    public function get(Request $request)
     {
-        /** @var \Illuminate\Database\Eloquent\Builder $cookie_policy */
-        $cookie_policy = StaticContent::where('title', 'cookie-policy');
-
-        /** @var \Illuminate\Database\Eloquent\Builder $usage_policy */
-        $usage_policy = StaticContent::where('title', 'usage-policy');
-
-        /** @var \Illuminate\Database\Eloquent\Builder $dr_policy */
-        $dr_policy = StaticContent::where('title', 'data-retention-policy');
-
-        /** @var \Illuminate\Database\Eloquent\Builder $tnc */
-        $tnc = StaticContent::where('title', 'terms-and-conditions');
-
-        return response()->json([
-            'response' => [
-                'cookiePolicy' => $cookie_policy->first(),
-                'usagePolicy' => $usage_policy->first(),
-                'dataRetentionPolicy' => $dr_policy->first(),
-                'termsAndConditions' => $tnc->first(),
-            ],
-        ]);
+        if ($request->route() && $request->route()->getName() == 'getCategories') {
+            return $this->successResponse(['response' => Category::all()]);
+        } else {
+            /** @var \Illuminate\Database\Eloquent\Builder $cookie_policy */
+            $cookie_policy = StaticContent::where('title', 'cookie-policy');
+
+            /** @var \Illuminate\Database\Eloquent\Builder $usage_policy */
+            $usage_policy = StaticContent::where('title', 'usage-policy');
+
+            /** @var \Illuminate\Database\Eloquent\Builder $dr_policy */
+            $dr_policy = StaticContent::where('title', 'data-retention-policy');
+
+            /** @var \Illuminate\Database\Eloquent\Builder $tnc */
+            $tnc = StaticContent::where('title', 'terms-and-conditions');
+
+            return response()->json([
+                'response' => [
+                    'cookiePolicy' => $cookie_policy->first(),
+                    'usagePolicy' => $usage_policy->first(),
+                    'dataRetentionPolicy' => $dr_policy->first(),
+                    'termsAndConditions' => $tnc->first()
+                ],
+            ]);
+        }
     }
 }
diff --git a/composer.json b/composer.json
@@ -55,8 +55,7 @@
             "database/seeders"
         ],
         "files": [
-            "app/Http/helpers.php",
-            "app/Http/Controllers/Files/keywords.txt"
+            "app/Http/helpers.php"
         ]
     },
     "autoload-dev": {