wip

SethSharp · Feb 10, 2024 · d1cead6 · d1cead6
1 parent f55698d
commit d1cead6
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 8 deletions.
diff --git a/app/Domain/File/Actions/DestroyFileAction.php b/app/Domain/File/Actions/DestroyFileAction.php
@@ -11,7 +11,11 @@ class DestroyFileAction
     public function __invoke(File $file): bool
     {
         try {
-            Storage::disk('s3')->delete($file->path);
+            Storage::disk(app()->environment('local')
+                ? 'public'
+                : config('filesystems.default'))
+                ->delete($file->path);
+
             return true;
         } catch (Exception $e) {
             return false;

diff --git a/app/Domain/File/Actions/StoreFileAction.php b/app/Domain/File/Actions/StoreFileAction.php
@@ -11,8 +11,11 @@ public function __invoke(UploadedFile $file): string
     {
         $structure = app()->environment('local') ? 'testing/' : 'production/';
 
-        $dir = $structure . 'blogs/images';
+        $dir = $structure . 'blogs';
 
-        return Storage::disk('s3')->put($dir, $file);
+        return Storage::disk(app()->environment('local')
+            ? 'public'
+            : config('filesystems.default'))
+            ->put($dir, $file);
     }
 }
diff --git a/app/Http/Controllers/Dashboard/Blogs/StoreBlogImageController.php b/app/Http/Controllers/Dashboard/Blogs/StoreBlogImageController.php
@@ -15,7 +15,9 @@ class StoreBlogImageController extends Controller
     public function __invoke(StoreBlogImageRequest $request, StoreFileAction $action): JsonResponse
     {
         $path = $action($request->file('file'));
-        $url = Storage::disk('s3')->url($path);
+        $url = app()->environment('local')
+            ? $path
+            : Storage::url($path);
 
         $fileId = intval($request->input('fileId'));
         $blogId = intval($request->input('blogId')) ?: null;

diff --git a/resources/js/Components/Editor/Nodes/Image/View.vue b/resources/js/Components/Editor/Nodes/Image/View.vue
@@ -7,11 +7,10 @@ export default {
 <script setup>
 import { ref } from 'vue'
 import { NodeViewWrapper, nodeViewProps } from '@tiptap/vue-3'
-import { PhotoIcon, XMarkIcon } from '@heroicons/vue/24/solid'
+import { PhotoIcon } from '@heroicons/vue/24/solid'
 import EditableNode from '../../Components/EditableNodeWrapper.vue'
-import EditImage from '@/Components/Editor/Components/Modals/EditImage.vue'
-import SecondaryButton from '@/Components/Buttons/SecondaryButton.vue'
 import breakdownNodeViewProps from '@/Helpers/breakdownNodeViewProps'
+import EditImage from '@/Components/Editor/Components/Modals/EditImage.vue'
 
 const props = defineProps({
     ...nodeViewProps,
@@ -42,6 +41,7 @@ let { fileId, blogId, src, alt, height } = breakdownNodeViewProps(props)
                     <div class="flex w-full justify-center">
                         <div class="flex-col w-full">
                             <div v-if="src" class="flex mb-4 w-full">
+                                {{ src }}
                                 <img :src="src" />
                             </div>
 

diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
@@ -12,7 +12,7 @@
 
     <!-- Scripts -->
     @routes
-    @vite(['resources/js/app.js', "resources/js/Pages/{$page['component']}.vue"])
+    @vite('resources/js/app.js')
     @inertiaHead
 </head>
 <body class="font-sans antialiased">

diff --git a/tests/Domain/File/Actions/StoreFileActionTest.php b/tests/Domain/File/Actions/StoreFileActionTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Domain\File\Actions;
+
+use Tests\TestCase;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+use App\Domain\File\Actions\StoreFileAction;
+
+class StoreFileActionTest extends TestCase
+{
+    /** @test */
+    public function can_store_file()
+    {
+        Storage::fake();
+
+        $file = UploadedFile::fake()->image('file.jpg');
+
+        app(StoreFileAction::class)($file);
+
+        Storage::assertExists($file->hashName('testing/blogs'));
+    }
+}