configurable disks

front/dist/manifest.json

@@ -1,11 +1,11 @@
 {
   "main.js": {
-    "file": "assets/main-B-nfEWyS.js",
+    "file": "assets/main-BtcBvcC_.js",
     "name": "main",
     "src": "main.js",
     "isEntry": true,
     "css": [
-      "assets/main-CaexgiEy.css"
+      "assets/main-BWRwkaBb.css"
     ]
   }
 }

front/js/svelte/content/tools/AppliedFilterNotLinked.svelte

@@ -4,10 +4,10 @@
 
         const channel = getContext("channel");
     const dispatch = createEventDispatcher();
-
     export let inModal;
     export let modalUrl;
     const url = new URL(modalUrl ?? window.location.href);
+
     function removeFilter(k) {
 
         const url = new URL(modalUrl ?? window.location.href);

front/js/svelte/content/tools/Tools.svelte

@@ -135,13 +135,13 @@
 </div>
 
 
-{#if Object.entries(filter).length > 0}
+<div class="applied-filters">
-    <div class="applied-filters">
+    <AppliedFilterNotLinked
-        <AppliedFilterNotLinked
+            {inModal}
-                {inModal}
+            {modalUrl}
-                {modalUrl}
+            on:refresh
-                on:refresh
+    ></AppliedFilterNotLinked>
-        />
+    {#if Object.entries(filter).length > 0}
         {#each Object.entries(filter) as [k, v]}
             <AppliedFilter
                     {schema}
@@ -154,6 +154,7 @@
                     on:refresh
             />
         {/each}
-    </div>
+    {/if}
-{/if}
+</div>
+
 

front/js/svelte/records/elements/ReferenceInlineButtons.svelte

@@ -100,9 +100,9 @@
 
 <DialogRecord bind:this={dialogRecord}>
     {#if inLineCreateRecord}
-
         <InlineEdit
                 {...inLineCreateRecord}
+                isCreateMode={true}
                 on:cancel={(e) => (inLineCreateRecord = null)}
                 on:inlinesaved={save}
         />

front/sass/_record-edit.scss

@@ -44,7 +44,7 @@
   margin: 6px 0;
   border-color: transparent;
 
-  .button {
+  .button:not(.primary) {
     background: var(--p30);
 
     &:hover {
@@ -53,9 +53,10 @@
   }
 
   dialog {
-    .button {
+    .button:not(.primary) {
       background: var(--p20);
 
+
       &:hover {
         background: var(--p30);
       }
@@ -143,3 +144,4 @@
 
   }
 }
+

front/sass/_sidebar.scss

@@ -19,7 +19,7 @@
   background: var(--p20);
   display: flex;
   flex-direction: column;
-  gap: 3px;
+  gap: 4px;
 }
 
 .sidebar-header {

front/views/layouts/account.blade.php

@@ -9,7 +9,7 @@
 
     @if(config("lucent.env") === "production")
         <!-- if production -->
-        <link rel="stylesheet" href="/vendor/lucent/dist/{{ $manifest['main.css']["file"] }}"/>
+        <link rel="stylesheet" href="/vendor/lucent/dist/{{ $manifest['main.js']["css"][0] }}"/>
         <script type="module" src="/vendor/lucent/dist/{{ $manifest['main.js']["file"] }}"></script>
     @else
         <!-- if development -->

front/views/layouts/channel.blade.php

@@ -8,7 +8,7 @@
     <title>@yield('title') - Lucent Data Platform</title>
     @if(config("lucent.env") == "production")
         <!-- if production -->
-        <link rel="stylesheet" href="/vendor/lucent/dist/{{ $manifest['main.css']["file"] }}"/>
+        <link rel="stylesheet" href="/vendor/lucent/dist/{{ $manifest['main.js']["css"][0] }}"/>
         <script type="module" src="/vendor/lucent/dist/{{ $manifest['main.js']["file"] }}"></script>
     @else
         <!-- if development -->

front/vite.config.js

@@ -10,7 +10,7 @@ export default defineConfig({
 
     outDir: '../dist',
     emptyOutDir: true,
-    manifest: true,
+    manifest: "manifest.json",
     rollupOptions: {
       // overwrite default .html entry
       input: path.resolve(__dirname, 'js/main.js')

src/Channel/Channel.php

@@ -25,8 +25,18 @@ final class Channel
     )
     {
         $this->lucentUrl = $url . "/lucent";
-        $this->filesUrl = $url . "/storage";
+        $this->filesUrl = $this->makeFilesUrl();
-        $this->previewTargetUrl = $url . "/". $previewTarget;
+        $this->previewTargetUrl = $url . "/" . $previewTarget;
+    }
+
+
+    private function makeFilesUrl(): string
+    {
+        return match (config("filesystems.disks.lucent.driver")) {
+            "s3" => config("filesystems.disks.lucent.endpoint") . "/" . config("filesystems.disks.lucent.bucket"),
+            "local" => $this->url . "/storage" . config("filesystems.disks.lucent.endpoint"),
+        };
+
     }
 
 }

src/Channel/ChannelService.php

@@ -3,6 +3,7 @@
 namespace Lucent\Channel;
 
 
+use Lucent\File\FileService;
 use Lucent\Primitive\Collection;
 use Lucent\Schema\Schema;
 use Lucent\Schema\SchemaService;
@@ -13,7 +14,7 @@ final class ChannelService
     public Channel $channel;
 
     private function __construct(
-        public SchemaService $schemaService
+        public SchemaService $schemaService,
     )
     {
 

src/File/FileService.php

@@ -14,7 +14,6 @@ use Lucent\LucentException;
 use Lucent\Record\FileData as RecordFile;
 use Lucent\Record\QueryRecord;
 use Lucent\Schema\FilesSchema;
-use Lucent\Schema\Schema;
 use Spatie\ImageOptimizer\OptimizerChainFactory;
 
 class FileService
@@ -28,7 +27,7 @@ class FileService
 
     public function getPath(QueryRecord $file): string
     {
-        return $this->channelService->channel->url . "/storage/" . $file->_file->path;
+        return $this->channelService->channel->filesUrl . "/" . $file->_file->path;
     }
 
     public function createFromUrl(FilesSchema $schema, string $url): FileUploadResult
@@ -111,15 +110,16 @@ class FileService
 
     public function loadDisk(): Filesystem
     {
+        return Storage::disk('lucent');
         return Storage::build([
-            'driver' => 'local',
+            'driver' => 'lucent',
 //        'key' => config("filesystems.disks.s3.key"),
 //        'secret' => config("filesystems.disks.s3.secret"),
 //        'region' => config("filesystems.disks.s3.region"),
 //        'bucket' => config("filesystems.disks.s3.bucket"),
 //        // 'url' => $schema->objectStorageUrl,
 //        'endpoint' => $schema->objectStorageEndpoint,
-            'use_path_style_endpoint' => false,
+//            'use_path_style_endpoint' => false,
             'visibility' => 'public', // now managed by aws policy
             'root' => storage_path('app/public'),
             'throw' => true,
@@ -140,12 +140,10 @@ class FileService
 
     private function createThumbnail(Filesystem $disk, string $schemaPath, string $filename, UploadedFile $file): void
     {
-
+        $thumbDir = "thumbs/" . $schemaPath . "/";
-
+//        if (!file_exists($thumbDir)) {
-        $thumbDir = storage_path("app/public/thumbs/" . $schemaPath . "/");
+//            make_dir_r($thumbDir);
-        if (!file_exists($thumbDir)) {
+//        }
-            make_dir_r($thumbDir);
-        }
 
         try {
             ImageManagerStatic::configure(['driver' => 'imagick']);
@@ -157,7 +155,8 @@ class FileService
 
         $image->fit(300, 300);
         try {
-            $image->encode('webp', 75)->save($thumbDir . $filename);
+            $this->loadDisk()->put($thumbDir . $filename, $image->encode('webp', 75));
+//            $image->encode('webp', 75)->save($thumbDir . $filename);
         } catch (Exception $e) {
             logger($e->getMessage());
         }

src/File/ImageService.php

@@ -15,6 +15,7 @@ class ImageService
 
     public function __construct(
         public ImageManager   $imageManager,
+        public FileService   $fileService,
         public ChannelService $channelService,
         public Logger         $logger
     )
@@ -50,28 +51,18 @@ class ImageService
 
     private function createTemplate(string $originalPath, string $template): string
     {
-        $originalFilePath = public_path("storage/" . $originalPath);
-        $templateUri = "/templates/" . $template . "/" . $originalPath;
-        $templateFilePath = public_path("storage/" . $templateUri);
-        if (!file_exists($originalFilePath)) {
-            return $this->notFoundImage;
-        }
-
-        if (!file_exists(pathinfo($templateFilePath, PATHINFO_DIRNAME))) {
-            $this->make_dir(pathinfo($templateFilePath, PATHINFO_DIRNAME));
-        }
 
         try {
-            $image = $this->imageManager->make($originalFilePath);
+            $image = $this->imageManager->make( $this->fileService->loadDisk()->get($originalPath));
         } catch (Exception $e) {
             $this->logger->error($e->getMessage());
-            return $this->notFoundImage;
+            return $originalPath;
         }
 
         $image = $image->filter(new $this->channelService->channel->imageFilters[$template]);
         try {
-            $image = $this->imageManager->make((string)$image->encode('webp', 75));
+            $templateUri = "/templates/" . $template . "/" . $originalPath;
-            $image->save($templateFilePath);
+            $this->fileService->loadDisk()->put($templateUri, $image->encode('webp', 75));
         } catch (Exception $e) {
             $this->logger->error($e->getMessage());
             return $this->notFoundImage;
@@ -80,10 +71,4 @@ class ImageService
         return $templateUri;
     }
 
-    private function make_dir(string $path): void
-    {
-        is_dir($path) || mkdir($path, 0777, true);
-    }
-
-
 }

src/Http/Controller/BuildController.php

@@ -28,7 +28,7 @@ class BuildController extends Controller
             unlink($buildLogFile);
         }
 
-        exec("cd " . base_path() . " && php8.2 artisan {$this->channelService->channel->generateCommand} > " . $buildLogFile . " 2>&1 & echo $!", $op);
+        exec("cd " . base_path() . " && php8.3 artisan {$this->channelService->channel->generateCommand} > " . $buildLogFile . " 2>&1 & echo $!", $op);
         $pid = (int)$op[0];
         return redirect($this->channelService->channel->lucentUrl . "/build-report");
     }

src/Query/Query.php

@@ -261,6 +261,12 @@ final  class Query
         return $this;
     }
 
+    public function onlyPublished(): Query
+    {
+        $this->options->status = ["published"];
+        return $this;
+    }
+
     public
     function orderByQuery(Builder $query): Builder
     {