wip editor

Editing record edit and i am in the middle of creating the dropdown component

config/lucent.php

@@ -2,7 +2,7 @@
 
 return [
     "env" => env("LUCENT_ENV", "production"),
-    "schemas_path" => env("LUCENT_SCHEMAS_PATH", "app/Lucent"),
+    "schemas_path" => env("LUCENT_SCHEMAS_PATH", "resources/lucent/schemas"),
     "database" => env('LUCENT_DB_CONNECTION', env('DB_CONNECTION', "sqlite")),
     "name" => env("LUCENT_NAME", "Lucent"),
     "url" => env("LUCENT_URL", env('APP_URL')),
@@ -45,5 +45,15 @@ return [
         \Lucent\Schema\Ui\Slug::class,
         \Lucent\Schema\Ui\Text::class,
         \Lucent\Schema\Ui\Textarea::class
+    ],
+    "renderers" => [
+        "row" => [
+            "file" => \Lucent\Schema\Renderer\Row\File::class,
+            "slug" => \Lucent\Schema\Renderer\Row\Text::class,
+            "text" => \Lucent\Schema\Renderer\Row\Text::class,
+            "checkbox" => \Lucent\Schema\Renderer\Row\Text::class,
+            "number" => \Lucent\Schema\Renderer\Row\Text::class,
+            "rich" => \Lucent\Schema\Renderer\Row\Text::class,
+        ]
     ]
 ];

front/dist/manifest.json

@@ -1,11 +1,11 @@
 {
   "main.js": {
-    "file": "assets/main-D9joEh0I.js",
+    "file": "assets/main-BJyanQ7P.js",
     "name": "main",
     "src": "main.js",
     "isEntry": true,
     "css": [
-      "assets/main-BnJW41Dx.css"
+      "assets/main-Dk7njt4m.css"
     ]
   }
 }

front/js/components/dropdown.js

@@ -0,0 +1,46 @@
+import {onClickOutside} from "./../helpers/clickOutside.js";
+
+export function dropdown() {
+    document.querySelectorAll(".dropdown").forEach(el => {
+        dropdownInit(el);
+    })
+}
+
+function dropdownInit(el) {
+    const button = el.querySelector("button");
+    const menu = el.querySelector(".dropdown-menu");
+    button.addEventListener('click', function () {
+        if (menu.hasAttribute('hidden')) {
+            this.setAttribute('aria-expanded', 'true');
+            menu.removeAttribute('hidden');
+
+            // Set focus on first link
+            // will be highlighted for keyboard users
+            menu.querySelector(".dropdown-item:first-child")?.focus();
+        } else {
+            menu.setAttribute('hidden', 'true');
+            this.setAttribute('aria-expanded', 'false');
+        }
+    });
+
+    document.addEventListener('keydown', (event) => {
+        // Ignore IME composition
+        if (event.isComposing || event.key === "esc") {
+            return;
+        }
+
+        // Close menu with ESC key
+        if (event.keyCode === 27) {
+            if (!menu.hasAttribute('hidden')) {
+                menu.setAttribute('aria-expanded', 'false');
+                menu.setAttribute('hidden', 'true');
+            }
+        }
+    });
+
+    onClickOutside(menu, ".dropdown", () => menu.hidden = true);
+
+
+}
+
+

front/js/helpers/clickOutside.js

@@ -0,0 +1,8 @@
+export function onClickOutside(ele, closest, cb) {
+    document.addEventListener('click', function (event) {
+        if (!event.target.closest(closest)) {
+            cb(event)
+        }
+    }, false);
+};
+

front/js/helpers/debounce.js

@@ -0,0 +1,72 @@
+export function throttle(delay, callback, options) {
+    const {
+        noTrailing = false,
+        noLeading = false,
+        debounceMode = undefined
+    } = options || {};
+
+    let timeoutID;
+    let cancelled = false;
+    let lastExec = 0;
+
+    function clearExistingTimeout() {
+        if (timeoutID) {
+            clearTimeout(timeoutID);
+        }
+    }
+
+    function cancel(options) {
+        const {upcomingOnly = false} = options || {};
+        clearExistingTimeout();
+        cancelled = !upcomingOnly;
+    }
+
+    function wrapper(...arguments_) {
+        let self = this;
+        let elapsed = Date.now() - lastExec;
+
+        if (cancelled) {
+            return;
+        }
+
+        function exec() {
+            lastExec = Date.now();
+            callback.apply(self, arguments_);
+        }
+
+        function clear() {
+            timeoutID = undefined;
+        }
+
+        if (!noLeading && debounceMode && !timeoutID) {
+            exec();
+        }
+
+        clearExistingTimeout();
+
+        if (debounceMode === undefined && elapsed > delay) {
+            if (noLeading) {
+                lastExec = Date.now();
+                if (!noTrailing) {
+                    timeoutID = setTimeout(debounceMode ? clear : exec, delay);
+                }
+            } else {
+                exec();
+            }
+        } else if (noTrailing !== true) {
+            timeoutID = setTimeout(
+                debounceMode ? clear : exec,
+                debounceMode === undefined ? delay - elapsed : delay
+            );
+        }
+    }
+
+    wrapper.cancel = cancel;
+    return wrapper;
+}
+
+
+export function debounce(delay, callback, options) {
+    const {atBegin = false} = options || {};
+    return throttle(delay, callback, {debounceMode: atBegin !== false});
+}

front/js/main.js

@@ -4,6 +4,21 @@ import Account from "./svelte/Account.svelte";
 import Channel from "./svelte/Channel.svelte";
 import Mustache from "mustache";
 import 'htmx.org';
+import {dropdown} from "./components/dropdown.js";
+import {colorPicker} from "./recordEditor/colorPicker.js";
+import {sortReferences} from "./recordEditor/sortReferences.js";
+import {recordDialog} from "./recordEditor/recordDialog.js";
+import {createRecordEntry} from "./recordEditor/createRecordEntry.js";
+import {editRecordEntry} from "./recordEditor/editRecordEntry.js";
+
+addEventListener("load", (event) => {
+    dropdown()
+    colorPicker()
+    sortReferences()
+    recordDialog()
+    createRecordEntry()
+    editRecordEntry()
+});
 
 Mustache.escape = function (value) {
     return value;

front/js/recordEditor/colorPicker.js

@@ -0,0 +1,13 @@
+export function colorPicker() {
+    document.querySelectorAll(".color-picker").forEach(el => {
+        colorPickerInit(el);
+    })
+}
+
+function colorPickerInit(el){
+    const colorInput = el.querySelector("[type=color]");
+    const textInput = el.querySelector("[type=text]");
+
+    colorInput.addEventListener("change",(e) => textInput.value = colorInput.value);
+    textInput.addEventListener("change",(e) => colorInput.value = textInput.value);
+}

front/js/recordEditor/createRecordEntry.js

@@ -0,0 +1,49 @@
+import axios from "axios";
+
+export function createRecordEntry() {
+    const createButton = document.getElementById("record-create-button");
+    if(!createButton){
+        return;
+    }
+    createButton.addEventListener("click", save)
+}
+
+
+function save(e) {
+    e.preventDefault();
+    const recordForm = document.getElementById("record-form");
+    let validationErrors = null;
+    let errorMessage = "";
+    const urlParams = new URLSearchParams(window.location.search);
+    const schemaName = urlParams.get("schema")
+    console.log("SAVE: Attempt");
+
+   let formData =  new FormData(recordForm)
+
+        axios
+            .post("/lucent/records", {
+                schema: schemaName,
+                data: Object.fromEntries(formData),
+                status: "draft",
+                // edges: graph.edges,
+                isCreateMode: true,
+            })
+            .then(function (response) {
+                console.log("SAVE: SAVED");
+                window.location = "/lucent/recordss/" + record.id;
+                return;
+            })
+            .catch(function (error) {
+                if (!error?.response) {
+                }
+                if (typeof error?.response.data.error === "string") {
+                    errorMessage = error.response.data.error;
+                } else {
+                    validationErrors = error.response.data.error;
+                    console.log(validationErrors)
+                }
+
+
+            });
+
+}

front/js/recordEditor/editRecordEntry.js

@@ -0,0 +1,44 @@
+import axios from "axios";
+
+export function editRecordEntry() {
+    const saveButton = document.getElementById("record-save-button");
+    if(!saveButton){
+        return;
+    }
+    saveButton.addEventListener("click", save)
+}
+
+
+function save(e) {
+    e.preventDefault();
+    const recordForm = document.getElementById("record-form");
+   //  let validationErrors = null;
+   //  let errorMessage = "";
+    console.log("SAVE: Attempt");
+   //
+   let formData =  new FormData(recordForm)
+   //
+    axios
+        .post("/lucent/records", {
+            id: recordForm.dataset.recordId,
+            data: Object.fromEntries(formData),
+            status: "draft",
+            // edges: graph.edges,
+            isCreateMode: false,
+        })
+        .then(function (response) {
+            console.log("SAVE: SAVED");
+        })
+        .catch(function (error) {
+            // if (!error?.response) {
+            // }
+            // if (typeof error?.response.data.error === "string") {
+            //     errorMessage = error.response.data.error;
+            // } else {
+            //     validationErrors = error.response.data.error;
+            //     console.log(validationErrors)
+            // }
+
+
+        });
+}

front/js/recordEditor/recordDialog.js

@@ -0,0 +1,32 @@
+import axios from "axios";
+
+export function recordDialog() {
+    document.querySelectorAll("[data-open-modal]").forEach(el => {
+        const schema = el.dataset.openModal
+        el.addEventListener("click", e => {
+            e.preventDefault()
+            load(schema)
+        })
+    })
+}
+
+
+function load(schema) {
+    axios
+        .get("/lucent/content/" + schema)
+        .then((response) => {
+
+            const dialogWrapperEl = document.createElement("div");
+            dialogWrapperEl.innerHTML = response.data;
+            document.body.appendChild(dialogWrapperEl);
+            const dialogEl = dialogWrapperEl.querySelector("dialog");
+            dialogEl.showModal();
+            dialogWrapperEl.querySelector(".close").addEventListener("click", e => dialogEl.close());
+
+            dialogEl.addEventListener("close", (event) => {
+                dialogWrapperEl.remove();
+            });
+        })
+        .catch((error) => console.log(error));
+}
+

front/js/recordEditor/sortReferences.js

@@ -0,0 +1,19 @@
+import Sortable from "sortablejs";
+export function sortReferences() {
+    document.querySelectorAll(".color-picker").forEach(el => {
+
+        let options = {
+            animation: 150, // ms, animation speed moving items when sorting, `0` — without animation
+            easing: "cubic-bezier(1, 0, 0, 1)",
+            direction: 'vertical',
+            onUpdate: function (/**Event*/ evt) {
+                // dispatch("update", {
+                //     source: evt.oldIndex,
+                //     target: evt.newIndex,
+                // });
+            }
+        };
+
+        Sortable.create(el, options);
+    })
+}

front/js/svelte/Account.svelte

@@ -3,6 +3,7 @@
     import Login from "./account/Login.svelte";
     import Verify from "./account/Verify.svelte";
     import Profile from "./account/Profile.svelte";
+    import SetupIndex from "./setup/Index.svelte";
     import {setContext} from "svelte";
 
     const components = {
@@ -10,6 +11,7 @@
         login: Login,
         verify: Verify,
         profile: Profile,
+        setup: SetupIndex,
     };
 
     export let title;
@@ -22,7 +24,7 @@
     setContext("user", user);
 </script>
 <div style="text-align: center;background: var(--p20);padding: 20px;color: var(--p90)">
-    <h1><a class="text-decoration-none" href="{channel.lucentUrl}">{channel.name}</a></h1>
+    <h1><a class="text-decoration-none" href="{channel.lucentUrl}">{channel.name ?? "Lucent Setup"}</a></h1>
 </div>
 <div>
     <svelte:component this={components[view]} {title} {...data}/>

front/js/svelte/Channel.svelte

@@ -38,13 +38,13 @@
 
 
 <div class="main-wrapper">
-<div class="sidebar-content">
+    <div class="sidebar-content">
-    <Navbar schema={data.schema}/>
+        <Navbar schema={data.schema}/>
-</div>
+    </div>
-<div class="main-content">
+    <div class="main-content">
-    <Header />
+        <Header/>
-    <svelte:component this={components[view]} {title} {...data}/>
+        <svelte:component this={components[view]} {title} {...data}/>
-</div>
+    </div>
 </div>
 
 

front/js/svelte/content/Table.svelte

@@ -83,7 +83,11 @@
                         {#if record._file?.path}
                             <div class="file-table-row">
                                 <Preview record={record} size={record._file?.width > 0 ? "medium" : "small"}/>
+
                                 <div>
+                                    {#if record.status === "draft"}
+                                        <span style="text-transform: uppercase;font-size:10px">{record.status}</span>
+                                    {/if}
                                     <a
                                             href="{channel.lucentUrl}/records/{record.id}"
                                             target={inModal ? "_blank" : "_self"}
@@ -109,6 +113,9 @@
                                     href="{channel.lucentUrl}/records/{record.id}"
                                     target={inModal ? "_blank" : "_self"}
                             >
+                                {#if record.status === "draft"}
+                                    <span style="text-transform: uppercase;font-size:10px">{record.status}</span>
+                                {/if}
                                 {previewTitle(channel.schemas, record, graph)}
                             </a>
                         {/if}

front/js/svelte/content/elements/Reference.svelte

@@ -18,7 +18,7 @@
 
 <div class="references">
     {#each recordEdges as recordEdge}
-        <span class="mr-3">
+        <span class="reference">
             <PreviewCardSmall {schemas} {graph} record={recordEdge}/>
         </span>
     {/each}

front/js/svelte/content/elements/Rich.svelte

@@ -11,7 +11,8 @@
         /* max-width: 128px; */
         max-height: 24px;
         text-overflow: ellipsis;
-        /* white-space: nowrap; */
         overflow: hidden;
+        /* white-space: nowrap; */
+
     }
 </style>

front/js/svelte/files/imageserver.js

@@ -1,27 +1,24 @@
-
+export function imgurl(channel, record) {
-export function imgurl(channel,record) {
-
     if (record._file.mime === "image/svg+xml") {
         return fileurl(channel, record);
     }
-    return channel.filesUrl + `/thumbs/${record._file.path}`;
+    return channel.disks[record._file.disk] + `/thumbs/${record._file.path}`;
 }
 
 export function fileurl(channel, record) {
-    return channel.filesUrl + `/${record._file.path}`;
+    return channel.disks[record._file.disk] + `/${record._file.path}`;
 }
 
-export function htmlurl(channel,record, preset) {
+export function htmlurl(channel, record, preset) {
 
     let html = "";
-    let url = fileurl(channel,record)
+    let url = fileurl(channel, record)
 
     if (record._file.width > 0) {
         let presetUrl = url;
         if (preset) {
-            presetUrl = channel.filesUrl + `/templates/${preset}/${record._file.path}`;
+            presetUrl = channel.disks[record._file.disk] + `/templates/${preset}/${record._file.path}`;
         }
-
         html = `<img src="${presetUrl}" alt="${record._file.path}" />`
     } else if (record._file.mime === "image/svg+xml") {
         html = `<img src="${url}" alt="${record._file.path}"/>`

front/js/svelte/libs/CodemirrorMarkdown.svelte

@@ -1,10 +1,10 @@
 <script>
 
     // https://codesandbox.io/s/codemirror-remark-editor-4m4z9?file=/src/CodeEditor.js:374-387
-    import {onMount, onDestroy} from "svelte";
+    import {onDestroy, onMount} from "svelte";
     import {basicSetup, EditorView} from "codemirror";
-    import { autocompletion, completionKeymap } from "@codemirror/autocomplete";
+    import {autocompletion, completionKeymap} from "@codemirror/autocomplete";
-    import {EditorState, Compartment} from "@codemirror/state";
+    import {Compartment, EditorState} from "@codemirror/state";
     import {keymap} from "@codemirror/view";
     import {indentWithTab} from "@codemirror/commands";
     import {markdown} from "@codemirror/lang-markdown";
@@ -15,6 +15,29 @@
     export let value;
     export let editable = true;
 
+    export function insertMedia(info) {
+        let insertText = "";
+        if (info.record._file.width > 0) {
+            insertText = `![${info.record._file.originalName}](${info.url})`;
+        } else {
+            insertText = `[${info.record._file.originalName}](${info.originalUrl})`;
+        }
+        const cursor = codeMirrorView.state.selection.main.head;
+        const transaction = codeMirrorView.state.update({
+            changes: {
+                from: cursor,
+                insert: insertText,
+            },
+            // the next 2 lines will set the appropriate cursor position after inserting the new text.
+            selection: {anchor: cursor + 1},
+            scrollIntoView: true,
+        });
+
+        if (transaction) {
+            codeMirrorView.dispatch(transaction);
+        }
+    }
+
     onMount(() => {
         let language = new Compartment();
         let tabSize = new Compartment();
@@ -51,7 +74,6 @@
         });
 
 
-
     });
 
     onDestroy(() => {

front/js/svelte/libs/Trix.svelte

@@ -28,6 +28,15 @@
         editor.addEventListener("trix-file-accept", (e) => {
             e.preventDefault();
         })
+
+        editor.addEventListener("trix-before-initialize", (e) => {
+            Trix.config.blockAttributes.heading1.tagName = 'h2';
+            const { toolbarElement } = e.target
+            const h1Button = toolbarElement.querySelector("[data-trix-attribute=heading1]")
+            h1Button.insertAdjacentHTML("afterend", `<button style="text-indent: initial;padding: 14px 10px !important;" type="button" class="trix-button trix-button--icon" data-trix-attribute="heading3" title="Heading 3" tabindex="-1" data-trix-active="">H3</button>`)
+        })
+
+
     })
     // onDestroy(() => {
     //     editor.removeEventListener("trix-before-initialize")
@@ -35,7 +44,13 @@
 
 
     Trix.config.blockAttributes.default.breakOnReturn = false
-    console.log(Trix.config)
+    Trix.config.blockAttributes.heading3 = {
+        tagName: 'h3',
+        terminal: true,
+        breakOnReturn: true,
+        group: false
+    }
+    // console.log(Trix.config)
 
 </script>
 

front/js/svelte/records/FormField.svelte

@@ -98,6 +98,16 @@
                 bind:graph
                 {record}
         />
+    {:else if field.info.name === "markdown"}
+        <Markdown
+                bind:value={data[field.name]}
+                {schema}
+                {field}
+                {validationErrors}
+                {isCreateMode}
+                bind:graph
+                {record}
+        />
     {:else}
         <svelte:component
             this={formElement}

front/js/svelte/records/Graph.svelte

@@ -15,11 +15,14 @@
     let backlinks = graph.parentEdges.map(edge => {
         let schema = channel.schemas.find((s) => s.name === edge.sourceSchema);
         let edgeField =  findEdgeField(schema,edge.field);
+        if(!edgeField){
+            return null;
+        }
         return {
             field: edgeField.label,
             record: graph.records.find( record => record.id === edge.source)
         }
-    })
+    }).filter( edgeOrNull => !!edgeOrNull)
 </script>
 <div class="editor-field">
 {#each backlinks as backlink}

front/js/svelte/records/PreviewCardSmall.svelte

@@ -13,11 +13,8 @@
 {#if record?.data}
     <a
         href="{channel.lucentUrl}/records/{record.id}"
-        class="text-decoration-none rounded py-1 px-2 d-inline-block"
         {title}
-        style="border:2px solid {!schema.color
+        class="reference"
-            ? '#999'
-            : schema.color}!important;white-space: nowrap;"
     >
         {title}
     </a>

front/js/svelte/records/elements/Markdown.svelte

@@ -1,21 +1,37 @@
 <script>
     import Codemirror from "../../libs/CodemirrorMarkdown.svelte";
     import { getErrorMessage } from "./errorMessage";
+    import RichEditorFiles from "./RichEditorFiles.svelte";
 
 
     export let value;
     export let field;
+    export let graph;
+    export let record;
     export let isCreateMode;
     // export let id;
     export let validationErrors;
     $: errorMessage = getErrorMessage(validationErrors, field.name);
+    let editor;
 
+    function insertMedia(e){
+        editor.insertMedia(e.detail)
+    }
 </script>
 
 <div class="mb-3">
     
-    <Codemirror bind:value editable={!field.readonly || isCreateMode} />
+    <Codemirror bind:this={editor} bind:value editable={!field.readonly || isCreateMode} />
-
+    {#if field.collections.length > 0}
+        <RichEditorFiles
+                bind:graph
+                {record}
+                {field}
+                {validationErrors}
+                on:editor-insert={insertMedia}
+        >
+        </RichEditorFiles>
+    {/if}
     {#if errorMessage}
         <div class="invalid-feedback d-block">
             {errorMessage}

front/js/svelte/records/elements/RichEditorFiles.svelte

@@ -1,6 +1,4 @@
 <script>
-    import {sortByField} from "../../edges/sortEdges";
-    import Sortable from "../../libs/Sortable.svelte";
     import PreviewFile from "../previews/PreviewFile.svelte";
     import Dropdown from "../../common/Dropdown.svelte";
     import Dialog from "../../dialog/Dialog.svelte";
@@ -70,7 +68,8 @@
     {#each references as reference (reference.id)}
         <!--This div helps the sorting thing-->
         <div>
-            <PreviewFile record={reference} hasDelete={true} hasInsert={true} on:remove={removeReference} on:editor-insert></PreviewFile>
+            <PreviewFile record={reference} hasDelete={true} hasInsert={true} on:remove={removeReference}
+                         on:editor-insert></PreviewFile>
         </div>
     {/each}
 {/if}

front/js/svelte/records/header/EditHeader.svelte

@@ -24,7 +24,7 @@
 
 <div style="display: flex;align-items: center; gap:10px;">
     {#if !isCreateMode}
-        <Dropdown >
+        <Dropdown>
             <div slot="button">
                 <Icon icon="ellipsis"/>
             </div>

front/js/svelte/records/previews/PreviewFile.svelte

@@ -26,9 +26,10 @@
     function insert(e, preset) {
         e.preventDefault();
         let html = htmlurl(channel, record, preset)
+        let url = !preset ?  `/${record._file.path}` : `/templates/${preset}/${record._file.path}`;
         dispatch("editor-insert", {
             html: html,
-            url:  channel.filesUrl + `/templates/${preset}/${record._file.path}`,
+            url:  channel.filesUrl +  url,
             originalUrl:  channel.filesUrl + "/" + record._file.path,
             record: record
         });

front/js/svelte/setup/Index.svelte

@@ -0,0 +1,20 @@
+<script>
+    import Step from "./Step.svelte"
+
+    export let steps;
+    export let allSuccess = false;
+
+    console.log(steps);
+</script>
+<div class="wrapper-tiny">
+
+    {#each steps as step}
+        <Step {step}></Step>
+    {/each}
+
+    <div style="text-align: center;margin-top: 30px;">
+    {#if allSuccess}
+        <a href="/lucent/register" class="bt">Create the first user</a>
+    {/if}
+    </div>
+</div>

front/js/svelte/setup/Step.svelte

@@ -0,0 +1,67 @@
+<script>
+    import Icon from "../common/Icon.svelte"
+
+    export let step;
+
+</script>
+
+
+<div class="step step-{step.status}">
+    <div class="step-icon">
+        {#if step.status === "success"}
+            <Icon icon="check"></Icon>
+        {:else}
+            <Icon icon="close"></Icon>
+        {/if}
+    </div>
+    <div style="width:100%">
+        <h4>{step.name}</h4>
+        <details>
+            <summary>Instuctions</summary>
+            <code class="instructions">{step.instructions}</code>
+        </details>
+    </div>
+
+
+</div>
+
+<style>
+    .step-success .step-icon{
+        background: var(--suc10);
+        color: var(--suc100);
+    }
+
+    .step-fail  .step-icon{
+        background: var(--err10);
+        color: var(--err100);
+    }
+
+    .step-icon{
+        padding: 12px;
+        border-radius: 12px;
+    }
+
+    .step {
+        width: 100%;
+        display: flex;
+        align-items: start;
+        gap: 10px;
+        justify-content: space-between;
+
+        padding: 12px;
+        border-radius: 12px;
+    }
+
+    details {
+        width: 100%;
+    }
+
+    .instructions {
+        margin-top: 20px;
+        padding: 12px;
+        border-radius: 12px;
+        background: var(--p10);
+        white-space: break-spaces;
+        display: block;
+    }
+</style>

front/sass/_codemirror.scss

@@ -7,11 +7,16 @@
 
     .cm-content{
         background-color: var(--p10);
+        color: var(--p100);
     }
 }
 
 .cm-content{
     background-color: var(--p20);
+
+}
+.ͼ4 .cm-line ::selection, .ͼ4 .cm-line::selection{
+    background: var(--p40) !important;
 }
 
 .cm-activeLine{

front/sass/_datepicker.scss

@@ -0,0 +1,43 @@
+
+.flatpickr-wrapper {
+  display: block !important;
+}
+
+.editor-field {
+  .flatpickr-calendar {
+    border-radius: 12px !important;
+  }
+
+  .flatpickr-months .flatpickr-month {
+    background: var(--p30);
+      color: var(--text);
+      font-size: 12px;
+  }
+
+  .flatpickr-current-month .flatpickr-monthDropdown-months {
+      background: var(--p30);
+  }
+
+    .flatpickr-weekdays{
+        background: var(--p30);
+        color: var(--text);
+
+    }
+
+    .flatpickr-weekdaycontainer .flatpickr-weekday{
+        background: var(--p30);
+        color: var(--text);
+    }
+
+    .flatpickr-days{
+        background: var(--p10);
+        color: var(--text);
+    }
+
+    .flatpickr-time{
+        background: var(--p10);
+        color: var(--text);
+    }
+
+}
+

front/sass/_dialog.scss

@@ -15,7 +15,7 @@ body:has(dialog[open]) {
 
 dialog {
   margin: 2vh auto;
-  background-color: #fff;
+  background-color: var(--p10);
   padding: 34px;
   border: none;
   border-radius: 12px;
@@ -49,6 +49,6 @@ dialog::backdrop {
   position: sticky;
   top: -34px;
   z-index: 999;
-  background: #fff;
+  background-color: var(--p10);
   padding: 10px 0;
 }

front/sass/_table.scss

@@ -55,7 +55,11 @@
     border: none;
     overflow: hidden;
 
-
+   &.field-ui-number,&.field-ui-slug,&.field-ui-text,&.field-ui-rich,&.field-ui-url{
+      max-height: 24px;
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
     //img{
     //    width: 48px;
     //}
@@ -113,6 +117,18 @@
   .field-ui-number {
     text-align: right;
   }
+
+  .references{
+    display: flex;
+    gap: 4px;
+
+    .reference{
+      font-size: 13px;
+      border-radius: 12px;
+      background: var(--p30);
+      padding: 1px 5px;
+    }
+  }
 }
 
 .file-table-row {

front/sass/_typography.scss

@@ -22,6 +22,11 @@
         line-height: 30px;
     }
 
+    h3{
+        font-size: 18px;
+        line-height: 28px;
+    }
+
     ul {
         padding: 0 0 0 16px;
         list-style: none outside none;

front/sass/app.scss

@@ -70,6 +70,7 @@
 @import "./reference-tags";
 @import "./members";
 @import "./revisions";
+@import "./datepicker";
 
 body {
   background-color: var(--p10);
@@ -105,6 +106,6 @@ a {
   position: relative;
 }
 
-.flatpickr-wrapper {
+[hidden] {
-  display: block!important;
+  display: none;
 }

front/views/components/avatar.blade.php

@@ -28,7 +28,7 @@
             return strtoupper($segs[0][0]).strtoupper($segs[0][1]);
         };
 
-        $name = $user["name"];
+        $name = (string)data_get($user,"name");
         $charIndex = ord($name[1]) + strlen($name);
         $colorIndex = $charIndex % 19;
         $bgColor = $colors[$colorIndex];
@@ -39,5 +39,5 @@
         title="{{$name}}"
         style="background-color:{{$bgColor}};height: {{$side}}px;width: {{$side}}px; font-size:{{$side / 2}}px"
 >
-    <div class="avatar__letters">{{$initials($user["name"])}}</div>
+    <div class="avatar__letters">{{$initials($name)}}</div>
 </div>

front/views/components/checkbox.blade.php

@@ -0,0 +1,3 @@
+<div class="checkbox-wrapper">
+    <input  id="c1-13" type="checkbox" value="{{$value}}"  {{$indeterminate ?? false ? "indeterminate" : ""}} {{$checked ?? false ? "checked" : ""}} />
+</div>

front/views/components/dropdown.blade.php

@@ -0,0 +1,13 @@
+<div class="dropdown">
+    <button
+            class="button dropdown-button"
+            type="button"
+            aria-expanded="false"
+    >
+        {{$slot}}
+    </button>
+    <div class="dropdown-menu orientation-{orientation}" hidden>
+        {{$items}}
+    </div>
+
+</div>

front/views/components/icon.blade.php

@@ -0,0 +1,148 @@
+@php
+    $icons = [
+            "trash-can"=> [
+                "path"=> '<path d="M135.2 17.69C140.6 6.848 151.7 0 163.8 0H284.2C296.3 0 307.4 6.848 312.8 17.69L320 32H416C433.7 32 448 46.33 448 64C448 81.67 433.7 96 416 96H32C14.33 96 0 81.67 0 64C0 46.33 14.33 32 32 32H128L135.2 17.69zM31.1 128H416V448C416 483.3 387.3 512 352 512H95.1C60.65 512 31.1 483.3 31.1 448V128zM111.1 208V432C111.1 440.8 119.2 448 127.1 448C136.8 448 143.1 440.8 143.1 432V208C143.1 199.2 136.8 192 127.1 192C119.2 192 111.1 199.2 111.1 208zM207.1 208V432C207.1 440.8 215.2 448 223.1 448C232.8 448 240 440.8 240 432V208C240 199.2 232.8 192 223.1 192C215.2 192 207.1 199.2 207.1 208zM304 208V432C304 440.8 311.2 448 320 448C328.8 448 336 440.8 336 432V208C336 199.2 328.8 192 320 192C311.2 192 304 199.2 304 208z"/>',
+                "viewBox"=> "0 0 448 512",
+            ],
+            "circle-chevron-down"=> [
+                "path"=> '<path d="M256 0C114.6 0 0 114.6 0 256c0 141.4 114.6 256 256 256s256-114.6 256-256C512 114.6 397.4 0 256 0zM390.6 246.6l-112 112C272.4 364.9 264.2 368 256 368s-16.38-3.125-22.62-9.375l-112-112c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0L256 290.8l89.38-89.38c12.5-12.5 32.75-12.5 45.25 0S403.1 234.1 390.6 246.6z"/>',
+                "viewBox"=> "0 0 512 512",
+            ],
+            "circle-chevron-up"=> [
+                "path"=> '<path d="M256 0C114.6 0 0 114.6 0 256c0 141.4 114.6 256 256 256s256-114.6 256-256C512 114.6 397.4 0 256 0zM390.6 310.6c-12.5 12.5-32.75 12.5-45.25 0L256 221.3L166.6 310.6c-12.5 12.5-32.75 12.5-45.25 0s-12.5-32.75 0-45.25l112-112C239.6 147.1 247.8 144 256 144s16.38 3.125 22.62 9.375l112 112C403.1 277.9 403.1 298.1 390.6 310.6z"/>',
+                "viewBox"=> "0 0 512 512",
+            ],
+            "ellipsis"=> [
+                "path"=> '<path d="M120 256C120 286.9 94.93 312 64 312C33.07 312 8 286.9 8 256C8 225.1 33.07 200 64 200C94.93 200 120 225.1 120 256zM280 256C280 286.9 254.9 312 224 312C193.1 312 168 286.9 168 256C168 225.1 193.1 200 224 200C254.9 200 280 225.1 280 256zM328 256C328 225.1 353.1 200 384 200C414.9 200 440 225.1 440 256C440 286.9 414.9 312 384 312C353.1 312 328 286.9 328 256z"/>',
+                "viewBox"=> "0 0 448 512",
+            ],
+            "ellipsis-vertical"=> [
+                "path"=> '<path d="M64 360C94.93 360 120 385.1 120 416C120 446.9 94.93 472 64 472C33.07 472 8 446.9 8 416C8 385.1 33.07 360 64 360zM64 200C94.93 200 120 225.1 120 256C120 286.9 94.93 312 64 312C33.07 312 8 286.9 8 256C8 225.1 33.07 200 64 200zM64 152C33.07 152 8 126.9 8 96C8 65.07 33.07 40 64 40C94.93 40 120 65.07 120 96C120 126.9 94.93 152 64 152z"/>',
+                "viewBox"=> "0 0 128 512",
+            ],
+            "angles-down"=> [
+                "path"=> '<path d="M169.4 278.6C175.6 284.9 183.8 288 192 288s16.38-3.125 22.62-9.375l160-160c12.5-12.5 12.5-32.75 0-45.25s-32.75-12.5-45.25 0L192 210.8L54.63 73.38c-12.5-12.5-32.75-12.5-45.25 0s-12.5 32.75 0 45.25L169.4 278.6zM329.4 265.4L192 402.8L54.63 265.4c-12.5-12.5-32.75-12.5-45.25 0s-12.5 32.75 0 45.25l160 160C175.6 476.9 183.8 480 192 480s16.38-3.125 22.62-9.375l160-160c12.5-12.5 12.5-32.75 0-45.25S341.9 252.9 329.4 265.4z"/>',
+                "viewBox"=> "0 0 384 512",
+            ],
+            "angle-right"=> [
+                "path"=> '<path d="M64 448c-8.188 0-16.38-3.125-22.62-9.375c-12.5-12.5-12.5-32.75 0-45.25L178.8 256L41.38 118.6c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0l160 160c12.5 12.5 12.5 32.75 0 45.25l-160 160C80.38 444.9 72.19 448 64 448z"/>',
+                "viewBox"=> "0 0 256 512",
+            ],
+            "photo-film"=> [
+                "path"=> '<path d="M352 432c0 8.836-7.164 16-16 16H176c-8.838 0-16-7.164-16-16L160 128H48C21.49 128 .0003 149.5 .0003 176v288c0 26.51 21.49 48 48 48h416c26.51 0 48-21.49 48-48L512 384h-160L352 432zM104 439c0 4.969-4.031 9-9 9h-30c-4.969 0-9-4.031-9-9v-30c0-4.969 4.031-9 9-9h30c4.969 0 9 4.031 9 9V439zM104 335c0 4.969-4.031 9-9 9h-30c-4.969 0-9-4.031-9-9v-30c0-4.969 4.031-9 9-9h30c4.969 0 9 4.031 9 9V335zM104 231c0 4.969-4.031 9-9 9h-30c-4.969 0-9-4.031-9-9v-30C56 196 60.03 192 65 192h30c4.969 0 9 4.031 9 9V231zM408 409c0-4.969 4.031-9 9-9h30c4.969 0 9 4.031 9 9v30c0 4.969-4.031 9-9 9h-30c-4.969 0-9-4.031-9-9V409zM591.1 0H239.1C213.5 0 191.1 21.49 191.1 48v256c0 26.51 21.49 48 48 48h352c26.51 0 48-21.49 48-48v-256C640 21.49 618.5 0 591.1 0zM303.1 64c17.68 0 32 14.33 32 32s-14.32 32-32 32C286.3 128 271.1 113.7 271.1 96S286.3 64 303.1 64zM574.1 279.6C571.3 284.8 565.9 288 560 288H271.1C265.1 288 260.5 284.6 257.7 279.3C255 273.9 255.5 267.4 259.1 262.6l70-96C332.1 162.4 336.9 160 341.1 160c5.11 0 9.914 2.441 12.93 6.574l22.35 30.66l62.74-94.11C442.1 98.67 447.1 96 453.3 96c5.348 0 10.34 2.672 13.31 7.125l106.7 160C576.6 268 576.9 274.3 574.1 279.6z"/>',
+                "viewBox"=> "0 0 640 512",
+            ],
+            "file"=> [
+                "path"=> '<path d="M0 64C0 28.65 28.65 0 64 0H224V128C224 145.7 238.3 160 256 160H384V448C384 483.3 355.3 512 320 512H64C28.65 512 0 483.3 0 448V64zM256 128V0L384 128H256z"/>',
+                "viewBox"=> "0 0 384 512",
+            ],
+            "circle-info"=> [
+                "path"=> '<path d="M256 0C114.6 0 0 114.6 0 256s114.6 256 256 256s256-114.6 256-256S397.4 0 256 0zM256 128c17.67 0 32 14.33 32 32c0 17.67-14.33 32-32 32S224 177.7 224 160C224 142.3 238.3 128 256 128zM296 384h-80C202.8 384 192 373.3 192 360s10.75-24 24-24h16v-64H224c-13.25 0-24-10.75-24-24S210.8 224 224 224h32c13.25 0 24 10.75 24 24v88h16c13.25 0 24 10.75 24 24S309.3 384 296 384z"/>',
+                "viewBox"=> "0 0 512 512",
+            ],
+            "table-columns"=> [
+                "path"=> '<path d="M0 96C0 60.65 28.65 32 64 32H448C483.3 32 512 60.65 512 96V416C512 451.3 483.3 480 448 480H64C28.65 480 0 451.3 0 416V96zM64 416H224V160H64V416zM448 160H288V416H448V160z"/>',
+                "viewBox"=> "0 0 512 512",
+            ],
+            "arrow-down-a-z"=> [
+                "path"=> '<path d="M239.6 373.1c11.94-13.05 11.06-33.31-1.969-45.27c-13.55-12.42-33.76-10.52-45.22 1.973L160 366.1V64.03c0-17.7-14.33-32.03-32-32.03S96 46.33 96 64.03v302l-32.4-35.39C51.64 317.7 31.39 316.7 18.38 328.7c-13.03 11.95-13.9 32.22-1.969 45.27l87.1 96.09c12.12 13.26 35.06 13.26 47.19 0L239.6 373.1zM448 416h-50.75l73.38-73.38c9.156-9.156 11.89-22.91 6.938-34.88S460.9 288 447.1 288H319.1C302.3 288 288 302.3 288 320s14.33 32 32 32h50.75l-73.38 73.38c-9.156 9.156-11.89 22.91-6.938 34.88S307.1 480 319.1 480h127.1C465.7 480 480 465.7 480 448S465.7 416 448 416zM492.6 209.3l-79.99-160.1c-10.84-21.81-46.4-21.81-57.24 0L275.4 209.3c-7.906 15.91-1.5 35.24 14.31 43.19c15.87 7.922 35.04 1.477 42.93-14.4l7.154-14.39h88.43l7.154 14.39c6.174 12.43 23.97 23.87 42.93 14.4C494.1 244.6 500.5 225.2 492.6 209.3zM367.8 167.4L384 134.7l16.22 32.63H367.8z"/>',
+                "viewBox"=> "0 0 512 512",
+            ],
+            "arrow-up-short-wide"=> [
+                "path"=> '<path d="M544 416h-223.1c-17.67 0-32 14.33-32 32s14.33 32 32 32H544c17.67 0 32-14.33 32-32S561.7 416 544 416zM320 96h32c17.67 0 31.1-14.33 31.1-32s-14.33-32-31.1-32h-32c-17.67 0-32 14.33-32 32S302.3 96 320 96zM320 224H416c17.67 0 32-14.33 32-32s-14.33-32-32-32h-95.1c-17.67 0-32 14.33-32 32S302.3 224 320 224zM320 352H480c17.67 0 32-14.33 32-32s-14.33-32-32-32h-159.1c-17.67 0-32 14.33-32 32S302.3 352 320 352zM151.6 41.95c-12.12-13.26-35.06-13.26-47.19 0l-87.1 96.09C4.475 151.1 5.35 171.4 18.38 183.3c6.141 5.629 13.89 8.414 21.61 8.414c8.672 0 17.3-3.504 23.61-10.39L96 145.9v302C96 465.7 110.3 480 128 480s32-14.33 32-32.03V145.9L192.4 181.3C204.4 194.3 224.6 195.3 237.6 183.3c13.03-11.95 13.9-32.22 1.969-45.27L151.6 41.95z"/>',
+                "viewBox"=> "0 0 576 512",
+            ],
+            "arrow-down-wide-short"=> [
+                "path"=> '<path d="M416 288h-95.1c-17.67 0-32 14.33-32 32s14.33 32 32 32H416c17.67 0 32-14.33 32-32S433.7 288 416 288zM544 32h-223.1c-17.67 0-32 14.33-32 32s14.33 32 32 32H544c17.67 0 32-14.33 32-32S561.7 32 544 32zM352 416h-32c-17.67 0-32 14.33-32 32s14.33 32 32 32h32c17.67 0 31.1-14.33 31.1-32S369.7 416 352 416zM480 160h-159.1c-17.67 0-32 14.33-32 32s14.33 32 32 32H480c17.67 0 32-14.33 32-32S497.7 160 480 160zM192.4 330.7L160 366.1V64.03C160 46.33 145.7 32 128 32S96 46.33 96 64.03v302L63.6 330.7c-6.312-6.883-14.94-10.38-23.61-10.38c-7.719 0-15.47 2.781-21.61 8.414c-13.03 11.95-13.9 32.22-1.969 45.27l87.1 96.09c12.12 13.26 35.06 13.26 47.19 0l87.1-96.09c11.94-13.05 11.06-33.31-1.969-45.27C224.6 316.8 204.4 317.7 192.4 330.7z"/>',
+                "viewBox"=> "0 0 576 512",
+            ],
+            "filter"=> [
+                "path"=> '<path d="M3.853 54.87C10.47 40.9 24.54 32 40 32H472C487.5 32 501.5 40.9 508.1 54.87C514.8 68.84 512.7 85.37 502.1 97.33L320 320.9V448C320 460.1 313.2 471.2 302.3 476.6C291.5 482 278.5 480.9 268.8 473.6L204.8 425.6C196.7 419.6 192 410.1 192 400V320.9L9.042 97.33C-.745 85.37-2.765 68.84 3.854 54.87L3.853 54.87z"/>',
+                "viewBox"=> "0 0 512 512",
+            ],
+            "calendar"=> [
+                "path"=> '<path d="M96 32C96 14.33 110.3 0 128 0C145.7 0 160 14.33 160 32V64H288V32C288 14.33 302.3 0 320 0C337.7 0 352 14.33 352 32V64H400C426.5 64 448 85.49 448 112V160H0V112C0 85.49 21.49 64 48 64H96V32zM448 464C448 490.5 426.5 512 400 512H48C21.49 512 0 490.5 0 464V192H448V464z"/>',
+                "viewBox"=> "0 0 448 512",
+            ],
+            "pencil"=> [
+                "path"=> '<path d="M421.7 220.3L188.5 453.4L154.6 419.5L158.1 416H112C103.2 416 96 408.8 96 400V353.9L92.51 357.4C87.78 362.2 84.31 368 82.42 374.4L59.44 452.6L137.6 429.6C143.1 427.7 149.8 424.2 154.6 419.5L188.5 453.4C178.1 463.8 165.2 471.5 151.1 475.6L30.77 511C22.35 513.5 13.24 511.2 7.03 504.1C.8198 498.8-1.502 489.7 .976 481.2L36.37 360.9C40.53 346.8 48.16 333.9 58.57 323.5L291.7 90.34L421.7 220.3zM492.7 58.75C517.7 83.74 517.7 124.3 492.7 149.3L444.3 197.7L314.3 67.72L362.7 19.32C387.7-5.678 428.3-5.678 453.3 19.32L492.7 58.75z"/>',
+                "viewBox"=> "0 0 512 512",
+            ],
+            "database"=> [
+                "path"=> '<path d="M448 80V128C448 172.2 347.7 208 224 208C100.3 208 0 172.2 0 128V80C0 35.82 100.3 0 224 0C347.7 0 448 35.82 448 80zM393.2 214.7C413.1 207.3 433.1 197.8 448 186.1V288C448 332.2 347.7 368 224 368C100.3 368 0 332.2 0 288V186.1C14.93 197.8 34.02 207.3 54.85 214.7C99.66 230.7 159.5 240 224 240C288.5 240 348.3 230.7 393.2 214.7V214.7zM54.85 374.7C99.66 390.7 159.5 400 224 400C288.5 400 348.3 390.7 393.2 374.7C413.1 367.3 433.1 357.8 448 346.1V432C448 476.2 347.7 512 224 512C100.3 512 0 476.2 0 432V346.1C14.93 357.8 34.02 367.3 54.85 374.7z"/>',
+                "viewBox"=> "0 0 448 512",
+            ],
+            "dice"=> [
+                "path"=> '<path d="M447.1 224c0-12.56-4.781-25.13-14.35-34.76l-174.9-174.9C249.1 4.786 236.5 0 223.1 0C211.4 0 198.9 4.786 189.2 14.35L14.35 189.2C4.783 198.9-.0011 211.4-.0011 223.1c0 12.56 4.785 25.17 14.35 34.8l174.9 174.9c9.625 9.562 22.19 14.35 34.75 14.35s25.13-4.783 34.75-14.35l174.9-174.9C443.2 249.1 447.1 236.6 447.1 224zM96 248c-13.25 0-23.1-10.75-23.1-23.1s10.75-23.1 23.1-23.1S120 210.8 120 224S109.3 248 96 248zM224 376c-13.25 0-23.1-10.75-23.1-23.1s10.75-23.1 23.1-23.1s23.1 10.75 23.1 23.1S237.3 376 224 376zM224 248c-13.25 0-23.1-10.75-23.1-23.1s10.75-23.1 23.1-23.1S248 210.8 248 224S237.3 248 224 248zM224 120c-13.25 0-23.1-10.75-23.1-23.1s10.75-23.1 23.1-23.1s23.1 10.75 23.1 23.1S237.3 120 224 120zM352 248c-13.25 0-23.1-10.75-23.1-23.1s10.75-23.1 23.1-23.1s23.1 10.75 23.1 23.1S365.3 248 352 248zM591.1 192l-118.7 0c4.418 10.27 6.604 21.25 6.604 32.23c0 20.7-7.865 41.38-23.63 57.14l-136.2 136.2v46.37C320 490.5 341.5 512 368 512h223.1c26.5 0 47.1-21.5 47.1-47.1V240C639.1 213.5 618.5 192 591.1 192zM479.1 376c-13.25 0-23.1-10.75-23.1-23.1s10.75-23.1 23.1-23.1s23.1 10.75 23.1 23.1S493.2 376 479.1 376z"/>',
+                "viewBox"=> "0 0 640 512",
+            ],
+
+            "triangle-exclamation"=> [
+                "path"=> '<path d="M506.3 417l-213.3-364c-16.33-28-57.54-28-73.98 0l-213.2 364C-10.59 444.9 9.849 480 42.74 480h426.6C502.1 480 522.6 445 506.3 417zM232 168c0-13.25 10.75-24 24-24S280 154.8 280 168v128c0 13.25-10.75 24-23.1 24S232 309.3 232 296V168zM256 416c-17.36 0-31.44-14.08-31.44-31.44c0-17.36 14.07-31.44 31.44-31.44s31.44 14.08 31.44 31.44C287.4 401.9 273.4 416 256 416z"/>',
+                "viewBox"=> "0 0 512 512",
+            ],
+            "eye"=> [
+                "path"=> '<path d="M279.6 160.4C282.4 160.1 285.2 160 288 160C341 160 384 202.1 384 256C384 309 341 352 288 352C234.1 352 192 309 192 256C192 253.2 192.1 250.4 192.4 247.6C201.7 252.1 212.5 256 224 256C259.3 256 288 227.3 288 192C288 180.5 284.1 169.7 279.6 160.4zM480.6 112.6C527.4 156 558.7 207.1 573.5 243.7C576.8 251.6 576.8 260.4 573.5 268.3C558.7 304 527.4 355.1 480.6 399.4C433.5 443.2 368.8 480 288 480C207.2 480 142.5 443.2 95.42 399.4C48.62 355.1 17.34 304 2.461 268.3C-.8205 260.4-.8205 251.6 2.461 243.7C17.34 207.1 48.62 156 95.42 112.6C142.5 68.84 207.2 32 288 32C368.8 32 433.5 68.84 480.6 112.6V112.6zM288 112C208.5 112 144 176.5 144 256C144 335.5 208.5 400 288 400C367.5 400 432 335.5 432 256C432 176.5 367.5 112 288 112z"/>',
+                "viewBox"=> "0 0 576 512",
+            ],
+            "circle-plus"=> [
+                "path"=> '<path d="M0 256C0 114.6 114.6 0 256 0C397.4 0 512 114.6 512 256C512 397.4 397.4 512 256 512C114.6 512 0 397.4 0 256zM256 368C269.3 368 280 357.3 280 344V280H344C357.3 280 368 269.3 368 256C368 242.7 357.3 232 344 232H280V168C280 154.7 269.3 144 256 144C242.7 144 232 154.7 232 168V232H168C154.7 232 144 242.7 144 256C144 269.3 154.7 280 168 280H232V344C232 357.3 242.7 368 256 368z"/>',
+                "viewBox"=> "0 0 512 512",
+            ],
+            "magnifying-glass"=> [
+                "path"=> '<path d="M500.3 443.7l-119.7-119.7c27.22-40.41 40.65-90.9 33.46-144.7C401.8 87.79 326.8 13.32 235.2 1.723C99.01-15.51-15.51 99.01 1.724 235.2c11.6 91.64 86.08 166.7 177.6 178.9c53.8 7.189 104.3-6.236 144.7-33.46l119.7 119.7c15.62 15.62 40.95 15.62 56.57 0C515.9 484.7 515.9 459.3 500.3 443.7zM79.1 208c0-70.58 57.42-128 128-128s128 57.42 128 128c0 70.58-57.42 128-128 128S79.1 278.6 79.1 208z"/>',
+                "viewBox"=> "0 0 512 512",
+            ],
+            "expand"=> [
+                "path"=> '<path d="M128 32H32C14.31 32 0 46.31 0 64v96c0 17.69 14.31 32 32 32s32-14.31 32-32V96h64c17.69 0 32-14.31 32-32S145.7 32 128 32zM416 32h-96c-17.69 0-32 14.31-32 32s14.31 32 32 32h64v64c0 17.69 14.31 32 32 32s32-14.31 32-32V64C448 46.31 433.7 32 416 32zM128 416H64v-64c0-17.69-14.31-32-32-32s-32 14.31-32 32v96c0 17.69 14.31 32 32 32h96c17.69 0 32-14.31 32-32S145.7 416 128 416zM416 320c-17.69 0-32 14.31-32 32v64h-64c-17.69 0-32 14.31-32 32s14.31 32 32 32h96c17.69 0 32-14.31 32-32v-96C448 334.3 433.7 320 416 320z"/>',
+                "viewBox"=> "0 0 448 512",
+            ],
+            "compress"=> [
+                "path"=> '<path d="M128 320H32c-17.69 0-32 14.31-32 32s14.31 32 32 32h64v64c0 17.69 14.31 32 32 32s32-14.31 32-32v-96C160 334.3 145.7 320 128 320zM416 320h-96c-17.69 0-32 14.31-32 32v96c0 17.69 14.31 32 32 32s32-14.31 32-32v-64h64c17.69 0 32-14.31 32-32S433.7 320 416 320zM320 192h96c17.69 0 32-14.31 32-32s-14.31-32-32-32h-64V64c0-17.69-14.31-32-32-32s-32 14.31-32 32v96C288 177.7 302.3 192 320 192zM128 32C110.3 32 96 46.31 96 64v64H32C14.31 128 0 142.3 0 160s14.31 32 32 32h96c17.69 0 32-14.31 32-32V64C160 46.31 145.7 32 128 32z"/>',
+                "viewBox"=> "0 0 448 512",
+            ],
+            "check"=> [
+                "path"=> '<path d="M438.6 105.4C451.1 117.9 451.1 138.1 438.6 150.6L182.6 406.6C170.1 419.1 149.9 419.1 137.4 406.6L9.372 278.6C-3.124 266.1-3.124 245.9 9.372 233.4C21.87 220.9 42.13 220.9 54.63 233.4L159.1 338.7L393.4 105.4C405.9 92.88 426.1 92.88 438.6 105.4H438.6z"/>',
+                "viewBox"=> "0 0 448 512",
+            ],
+            "close"=> [
+                "path"=> '<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18 17.94 6M18 18 6.06 6"/>',
+                "viewBox"=> "0 0 24 24",
+            ],
+            "arrow-left"=> [
+                "path"=> '<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14M5 12l4-4m-4 4 4 4"/>',
+                "viewBox"=> "0 0 24 24",
+            ],
+            "list"=> [
+                "path"=> '<path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M9 8h10M9 12h10M9 16h10M4.99 8H5m-.02 4h.01m0 4H5"/>',
+                "viewBox"=> "0 0 24 24",
+            ],
+            "ordered-list"=> [
+                "path"=> '<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6h8m-8 6h8m-8 6h8M4 16a2 2 0 1 1 3.321 1.5L4 20h5M4 5l2-1v6m-2 0h4"/>',
+                "viewBox"=> "0 0 24 24",
+            ],
+            "italic"=> [
+                "path"=> '<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m8.874 19 6.143-14M6 19h6.33m-.66-14H18"/>',
+                "viewBox"=> "0 0 24 24",
+            ]
+        ];
+
+@endphp
+
+
+
+<svg
+        class="bi"
+        xmlns="http://www.w3.org/2000/svg"
+        width="{{$width ?? 16}}"
+        height="{{$height ?? 16}}"
+        viewBox="{{$icons[$icon]["viewBox"]}}"
+        aria-labelledby={icon}
+        role="presentation"
+        stroke="{{$stroke ?? "currentColor"}}"
+        fill="{{$fill ?? "currentColor"}}"
+
+>
+    {!! $icons[$icon]["path"]  !!}
+</svg>
+

front/views/components/notice.blade.php

@@ -1,4 +1,4 @@
-<div class="notice {{$type ?? "info"}}">
+<div class="notice {{$type ?? "info"}}" role="alert">
     <div class="title">{{$title}}</div>
     <div class="content">{{ $slot }}</div>
 </div>

front/views/components/switch.blade.php

@@ -0,0 +1 @@
+<input type="checkbox" class="switch" value="{{$value}}" {{$checked ? "checked" : ""}} />

front/views/components/tabs.blade.php

@@ -0,0 +1,22 @@
+@props([
+    'schema',
+    'createMode',
+])
+
+@php
+$groups = ["Main",...$schema->groups];
+if(!$createMode){
+    $groups[] = "Backlinks";
+}
+
+@endphp
+<ul class="tabs">
+    @foreach($groups as $tab)
+    <li class="tab">
+        <button class="button" aria-current="page">
+            {{$tab}}
+        </button>
+    </li>
+    @endforeach
+</ul>
+

front/views/layouts/channel.blade.php

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="csrf-token" content="{{ csrf_token() }}">
-    <title>@yield('title') - Lucent Data Platform</title>
+    <title>{{$title}}  - Lucent Data Platform</title>
     @if(config("lucent.env") == "production")
         <!-- if production -->
         <link rel="stylesheet" href="/vendor/lucent/dist/{{ $manifest['main.js']["css"][0] }}"/>
@@ -24,7 +24,6 @@
 
 <body>
 
-
     @yield('content')
 
 

front/views/records-editor/dialog.blade.php

@@ -0,0 +1,42 @@
+<dialog id="dialog-{{$schema->name}}">
+
+
+    @if($schema)
+        <div class="dialog-header">
+            <button
+                    type="button"
+                    class="button"
+                    disabled
+            >
+                Insert
+            </button>
+            <button
+                    type="button"
+                    class="button"
+                    disabled
+            >
+                Replace
+            </button>
+
+            <div class="hide">
+                <span class="number-of-records-selected"></span> records selected
+            </div>
+
+
+            <button
+                    type="button"
+                    class="button close"
+                    aria-label="Close"
+            >
+                <x-lucent::icon icon="close">
+
+                </x-lucent::icon>
+            </button>
+        </div>
+
+        <div class="dialog-body">
+            @include("lucent::records.index")
+        </div>
+
+    @endif
+</dialog>

front/views/records-editor/edit.blade.php

@@ -0,0 +1,24 @@
+@extends("lucent::layouts.channel")
+
+@section("content")
+    @php
+        $createMode = $createMode ?? false;
+    @endphp
+    <div class="record-edit">
+        @include("lucent::records-editor.header")
+        @include("lucent::records-editor.title")
+        <x-lucent::notice title="Submission Errors">
+            asfasf
+        </x-lucent::notice>
+        <div class=" mt-4" style="margin-bottom:150px;position:relative;">
+            <x-lucent::tabs :schema="$schema" :createMode="$createMode"></x-lucent::tabs>
+        </div>
+        <form id="record-form" data-record-id="{{$record->id}}">
+        @foreach($schema->fields as $field)
+            @include("lucent::records-editor.fields", ["field" => $field])
+        @endforeach
+        </form>
+    </div>
+
+@endsection
+

front/views/records-editor/fieldHeader.blade.php

@@ -0,0 +1,17 @@
+<div class="field-header">
+    <div class="labels">
+        <div class="label-and-help">
+            <label for={{$id}}
+            >{{$field->label}}</label
+            >
+            @if(!empty($field->help))
+            <small class="help-text light-text">{{$field->help}}</small>
+            @endif
+        </div>
+        <span
+                tabindex="-1"
+                class="text-decoration-none"
+        ><code class="field-id">{{$field->name}}</code>
+        </span>
+    </div>
+</div>

front/views/records-editor/fields.blade.php

@@ -0,0 +1,20 @@
+@php
+    $fieldId =  "field-".$field->name."-".$record->id;
+    $params = [
+         "id" => $fieldId,
+         "value" => data_get($record->data,$field->name),
+         "errorMessage" => ""
+];
+@endphp
+<div class="editor-field">
+    @include("lucent::records-editor.fieldHeader", $params)
+    @if($field->info->name  === "text")
+        @include("lucent::records-editor.fields.text", $params)
+    @elseif($field->info->name  === "slug")
+        @include("lucent::records-editor.fields.slug", $params)
+    @elseif($field->info->name  === "color")
+        @include("lucent::records-editor.fields.color", $params)
+    @elseif($field->info->name  === "file")
+        @include("lucent::records-editor.fields.file", $params)
+    @endif
+</div>

front/views/records-editor/fields/color.blade.php

@@ -0,0 +1,25 @@
+<div>
+    <div style="display: flex; align-items: center;gap: 10px" class="color-picker">
+        <input
+                type="color"
+                id="{{$id}}-picker"
+                style="border: none;background: transparent;padding: 0;width:64px;"
+                {{$field->readonly && !$createMode ? "disabled" : ""}}
+                value="{{$value}}"
+        />
+        <input
+                type="text"
+                id="{{$id}}"
+                value="{{$value}}"
+                class="form-control {{!empty($errorMessage) ? "is-invalid" : "" }}"
+                autocomplete="off"
+                {{$field->readonly && !$createMode ? "readonly" : ""}}
+        />
+    </div>
+
+    @if($errorMessage)
+        <div class="invalid-feedback d-block">
+            {{$errorMessage}}
+        </div>
+    @endif
+</div>

front/views/records-editor/fields/file.blade.php

@@ -0,0 +1,33 @@
+@php
+//    $references = $graph->edges
+//    ->filter(fn($edge) =>  $edge->field === $field->name && $edge->source === $record->id)
+//    ->map(fn($edge) =>  $graph->records->firstWhere("id", $edge->target));
+//
+    $references = collect([]);
+
+    $collectionSchemas = $schemas->whereIn("name",$field->collections);
+@endphp
+
+@if(count($field->collections)  === 1)
+    <button class="button" data-open-modal="{{$field->collections[0]}}">Browse</button>
+@else
+    <x-lucent::dropdown>
+        Browse
+        <x-slot:items>
+            @foreach($collectionSchemas as $collectionSchema)
+                <a class="dropdown-item" data-open-modal="{{$collectionSchema->name}}" href="/">{{$collectionSchema->label}}</a>
+            @endforeach
+        </x-slot:items>
+    </x-lucent::dropdown>
+@endif
+
+@if ($references->isNotEmpty())
+    <div class="sortable-container mt-3">
+        @foreach($references as $reference)
+            <!--This div helps the sorting thing-->
+            <div>
+                @include("lucent::records-editor.fields.file.preview", ["record" => $reference])
+            </div>
+        @endforeach
+    </div>
+@endif

front/views/records-editor/fields/file/preview.blade.php

@@ -0,0 +1,51 @@
+@php
+$reference = $record;
+    $schema = $channel->schemas->firstWhere("name",$record->schema);
+@endphp
+
+<div class="preview-file">
+    <div style="display: flex;align-items: center;gap: 10px;">
+        <div class="image">
+            @include("lucent::records-editor.fields.file.thumb", ["size" => "small"])
+        </div>
+        <div class="title">
+            <div>
+                <a class="record-title" href="{{lucent_url("records")}}/{{$record->id}}">
+                    {{$viewModel->getRecordName($record)}}
+                </a>
+                <small class="d-block">
+                    from {{$schema->label}}
+                    @if ($record->status === "draft")
+                        @include("lucent::records-editor.status", ["status" => $record->status])
+                    @endif
+                </small>
+            </div>
+        </div>
+    </div>
+{{--    <div style="display: flex;gap:4px; align-items: center;  margin-right: 10px;">--}}
+{{--        {#if hasInsert}--}}
+{{--        <div class="reference-action">--}}
+{{--            <Dropdown>--}}
+{{--                <div slot="button">--}}
+{{--                    <Icon icon="photo-film"/>--}}
+{{--                </div>--}}
+{{--                <button class="dropdown-item button" on:click={e => insert(e,null)}>original</button>--}}
+{{--                {#each imagePresets as preset}--}}
+{{--                <button class="dropdown-item button" on:click={e => insert(e,preset)}>{preset}</button>--}}
+{{--                {/each}--}}
+{{--            </Dropdown>--}}
+
+{{--        </div>--}}
+{{--        {/if}--}}
+{{--        {#if hasDelete}--}}
+{{--        <div class="reference-action">--}}
+{{--            <button--}}
+{{--                    class="button"--}}
+{{--                    on:click={remove}--}}
+{{--            >--}}
+{{--                <Icon icon="trash-can"/>--}}
+{{--            </button>--}}
+{{--        </div>--}}
+{{--        {/if}--}}
+{{--    </div>--}}
+</div>

front/views/records-editor/fields/file/thumb.blade.php

@@ -0,0 +1,59 @@
+@php
+    $imageSide = 256;
+    $fileSide = 32;
+    $fontSize = "20";
+    $showFilename = $showFilename ?? false;
+
+
+     if ($size === "medium") {
+        $imageSide = 128;
+        $fileSide = 12;
+        $fontSize = "17";
+    } else if ($size === "small") {
+        $imageSide = 64;
+        $fileSide = 12;
+        $fontSize = "15";
+    } else if ($size === "tiny") {
+        $imageSide = 42;
+        $fileSide = 12;
+        $fontSize = "13";
+    }
+@endphp
+
+<div style="display: flex;align-items: center;gap: 5px;">
+
+    @if(str_starts_with($record->_file->mime, "image"))
+        <a
+                href="{{lucent_url("records")}}/{{$record->id}}"
+                title="{{$record->_file->originalName}}"
+                style="width:{{$imageSide}}px;height:{{$imageSide}}px"
+        >
+            <img
+                    class="rounded w-100"
+                    style="border-radius: 12px;padding: 4px;"
+                    src={{lucent_thumbnail($record)}}
+                    alt="{{$record->_file->path}}"
+            />
+        </a>
+    @else
+        <a
+                href="{{lucent_url("records")}}/{{$record->id}}"
+                title="{{$record->_file->path}}"
+                class="file-preview-small"
+                style="width:{{$imageSide}}px;height:{{$imageSide}}px"
+        >
+            <x-lucent::icon icon="file" :width="$fileSide" :height="$fileSide"></x-lucent::icon>
+            <span class="ms-2"
+            >.{{pathinfo($record->_file->path, PATHINFO_EXTENSION)}}</span
+            >
+        </a>
+    @endif
+
+    @if ($showFilename)
+        <a
+                href="{{lucent_url("records")}}/{{$record->id}}"
+                title="{{$record->_file->path}}"
+                class="preview-file-filename lx-small-text text-decoration-none"
+        >{{$record->_file->path}}  </a>
+    @endif
+</div>

front/views/records-editor/fields/slug.blade.php

@@ -0,0 +1,18 @@
+<div>
+    <input
+            type="text"
+            id="{{$id}}"
+            value="{{$value}}"
+            class="form-control {{!empty($errorMessage) ? "is-invalid" : "" }}"
+            autocomplete="off"
+            {{$field->readonly && !$createMode ? "readonly" : ""}}
+    />
+    <div class="system-help-text light-text">
+        Leave this empty to autogenerate from <i>{{$field->source}}</i>
+    </div>
+    @if($errorMessage)
+        <div class="invalid-feedback d-block">
+            {{$errorMessage}}
+        </div>
+    @endif
+</div>

front/views/records-editor/fields/text.blade.php

@@ -0,0 +1,21 @@
+<div style="position: relative;">
+    @if($field->selectOptions)
+        <Autocomplete {field} bind:value={value}></Autocomplete>
+       @else
+        <input
+                type="text"
+                name="{{$field->name}}"
+                id="{{$id}}"
+                value="{{$value}}"
+                class="form-control {{!empty($errorMessage) ? "is-invalid" : "" }}"
+                autocomplete="off"
+                {{$field->readonly && !$createMode ? "readonly" : ""}}
+        />
+    @endif
+
+    @if($errorMessage)
+        <div class="invalid-feedback d-block">
+            {{$errorMessage}}
+        </div>
+    @endif
+</div>

front/views/records-editor/header.blade.php

@@ -0,0 +1,64 @@
+<div class="tools-header">
+    <div style="display: flex;align-items: center; gap:10px;">
+        @if(!$createMode)
+            <x-lucent::dropdown>
+                <x-lucent::icon icon="ellipsis"></x-lucent::icon>
+                <x-slot:items>
+                    <h6 class="dropdown-header">Record Actions</h6>
+                    <a
+                            class="dropdown-item"
+                            href="{{lucent_url("records/new")}}?schema={{$schema->name}}"
+                    >
+                        Create new
+                    </a>
+                    <a
+                            class="dropdown-item"
+                            href="{{lucent_url("records/clone")}}/{{$record->id}}"
+                    >
+                        Clone
+                    </a>
+                    <a
+                            class="dropdown-item"
+                            href="{{lucent_url("records/revisions")}}/{{$record->id}}">Revisions</a
+                    >
+                </x-slot>
+            </x-lucent::dropdown>
+        @endif
+        @if($record->status !== "trashed")
+            <x-lucent::switch value="published" :checked="$record->status === 'published'"></x-lucent::switch>
+        @endif
+        @if($record->status === "published")
+            Published
+        @elseif($record->status === "draft")
+            Draft
+        @elseif($record->status === "trashed")
+            Trashed
+        @endif
+    </div>
+    @if($createMode)
+        <button
+                id="record-create-button"
+                class="button primary btn-spinner"
+        >
+                            <span
+                                    class="spinner-border spinner-border-sm"
+                                    role="status"
+                                    aria-hidden="true"
+                            ></span>
+            Create
+        </button>
+    @else
+        <button
+                id="record-save-button"
+                type="button"
+                class="button primary ms-2 btn btn-primary btn-spinner"
+        >
+                            <span
+                                    class="spinner-border spinner-border-sm"
+                                    role="status"
+                                    aria-hidden="true"
+                            ></span>
+            Save
+        </button>
+    @endif
+</div>

front/views/records-editor/status.blade.php

@@ -0,0 +1,27 @@
+@php
+
+    $statusList = [
+            "published" => [
+                "value" => "published",
+                "text" => "Published",
+                "bg" => "success",
+                "color" => "white",
+            ],
+            "trashed" => [
+                "value" => "trashed",
+                "text" => "Trashed",
+                "bg" => "danger",
+                "color" => "white",
+            ],
+            "draft" => [
+                "value" => "draft",
+                "text" => "Draft",
+                "bg" => "warning",
+                "color" => "dark",
+            ],
+        ];
+@endphp
+
+<span class="badge text-bg-{{$statusList[$status->value]["bg"]}}" style="max-width:84px"
+>{{$statusList[$status->value]["text"]}}</span
+>

front/views/records-editor/title.blade.php

@@ -0,0 +1,10 @@
+<div class="record-header">
+    <a class="schema-name" href="{{lucent_url("content")}}/{{$schema->name}}">{{strtoupper($schema->label)}}</a>
+    <span class="record-title">
+        @if(!$createMode)
+            {{$viewModel->getRecordName($record)}}
+        @else
+            New Record
+        @endif
+    </span>
+</div>

front/views/records/index.blade.php

@@ -0,0 +1,37 @@
+
+<div class="">
+    <div class="{{$inModal ? 'mt-0' : 'mt-5'}}">
+        <h3 class="header-normal mb-5 ">
+        {{$schema->label}}
+    </h3>
+{{--        {#if selected.length > 0 && !inModal && isWritable}--}}
+{{--        <ActionsOnSelected {schema} {selected} {filter}/>--}}
+{{--        {:else}--}}
+{{--        <Tools--}}
+{{--                bind:schema--}}
+{{--                bind:records--}}
+{{--                {systemFields}--}}
+{{--                {sortParam}--}}
+{{--                {sortField}--}}
+{{--                {operators}--}}
+{{--                {filter}--}}
+{{--                {graph}--}}
+{{--                {inModal}--}}
+{{--                {modalUrl}--}}
+{{--                {isWritable}--}}
+{{--                on:refresh={refresh}--}}
+{{--        />--}}
+{{--        {/if}--}}
+        @include("lucent::records.tools")
+        @include("lucent::records.table")
+    </div>
+
+{{--    <Pagination--}}
+{{--            {limit}--}}
+{{--            {skip}--}}
+{{--            {total}--}}
+{{--            on:refresh={refresh}--}}
+{{--            {inModal}--}}
+{{--            {modalUrl}--}}
+{{--    />--}}
+</div>

front/views/records/list.blade.php

@@ -0,0 +1,6 @@
+@extends("lucent::layouts.channel")
+
+@section("content")
+    @include("lucent::records.index")
+@endsection
+

front/views/records/row.blade.php

@@ -0,0 +1,14 @@
+@foreach($schema->visible as $visibleColumn)
+    @php
+        $schemaField = $schema->fields->firstWhere("name", $visibleColumn);
+    @endphp
+    <td class="field-ui-{{$schemaField->info->name ?? $visibleColumn}} {{$visibleColumn === $sortField->name ? "is-sort" : ""}}">
+        @if(in_array($visibleColumn ,["_sys.createdBy","_sys.updatedBy"]))
+            <x-lucent::avatar side="24" :user="$users->firstWhere('id',$record->_sys->createdBy)"></x-lucent::avatar>
+        @elseif($visibleColumn === "_sys.status")
+            @include("lucent::records-editor.status",[ "status" => $record->status])
+        @else
+            {!! $viewModel->renderRow($record,$schemaField)!!}
+        @endif
+    </td>
+@endforeach

front/views/records/table.blade.php

@@ -0,0 +1,88 @@
+<div class="table mt-5 ">
+    <table>
+        <thead>
+        <tr>
+            @if($isWritable)
+                <th>
+                    <x-lucent::checkbox value=""></x-lucent::checkbox>
+                </th>
+            @endif
+
+            @foreach($schema->visible as $visibleColumn)
+                @php
+                    $schemaField = $schema->fields->firstWhere("name", $visibleColumn);
+                    if(empty($schemaField)){
+                        $schemaField = collect($systemFields)->firstWhere("name", str_replace("_sys.", "",$visibleColumn) );
+                    }
+                @endphp
+                <th
+                        class="field-ui-{{$schemaField->info->name ?? $schemaField->ui}} {{$schemaField->name === $sortField->name ? "is-sort" : ""}}"
+                        scope="col"
+                        title={{$schemaField->help ?? ""}}
+                >{{$schemaField->label}}</th
+                >
+            @endforeach
+            <th></th>
+        </tr>
+        </thead>
+        <tbody>
+        @foreach($records as $record)
+            <tr>
+                <td class="title-td">
+                    <div
+                            class="title-td-contents"
+                    >
+                        @if($isWritable)
+                            <x-lucent::checkbox :value="$record->id"></x-lucent::checkbox>
+
+                        @endif
+                        @if($record->_file?->path)
+                            <div class="file-table-row">
+                                @include("lucent::records-editor.fields.file.thumb", ["size" => "small"])
+                                <div>
+                                    @if($record->status === "draft")
+                                        <span style="text-transform: uppercase;font-size:10px">{{$record->status}}</span>
+                                    @endif
+                                    <a
+                                            href="{{lucent_url("records")}}/{{$record->id}}"
+                                            target={{$inModal ? "_blank" : "_self"}}
+                                    >
+                                        {{ $viewModel->getRecordName($record)}}
+                                    </a>
+                                    <span>{{ (int)($record->_file->size / 1024) }}kB</span>
+
+                                    @if($record->_file->width > 0)
+                                        <span>{{$record->_file->width . "x" . $record->_file->height}}</span>
+                                    @endif
+                                    <a
+                                            href="{{lucent_file($record)}}"
+                                            target="_blank"
+                                    >
+                                        Download
+                                    </a>
+                                </div>
+
+                            </div>
+                        @else
+                            <a
+                                    href="{{lucent_url("records")}}/{{$record->id}}"
+                                    target={{$inModal ? "_blank" : "_self"}}
+                            >
+                                @if($record->status === "draft")
+                                    <span style="text-transform: uppercase;font-size:10px">{{$record->status}}</span>
+                                @endif
+                                {{$viewModel->getRecordName($record)}}
+                            </a>
+                        @endif
+                    </div>
+                </td>
+                @include("lucent::records.row")
+                <td>
+                    <x-lucent::avatar side="24"
+                                      :user="$users->firstWhere('id',$record->_sys->createdBy)"></x-lucent::avatar>
+                </td>
+            </tr>
+        @endforeach
+        </tbody>
+    </table>
+</div>

front/views/records/tools.blade.php

@@ -0,0 +1,109 @@
+<div class="toolbar">
+    <div class="toolbar-filters">
+
+        {{--        <SortFields--}}
+        {{--                {schema}--}}
+        {{--                {sortParam}--}}
+        {{--                {sortField}--}}
+        {{--                {systemFields}--}}
+        {{--                {inModal}--}}
+        {{--                {modalUrl}--}}
+        {{--                on:refresh--}}
+        {{--        />--}}
+
+
+        {{--        <FilterFields--}}
+        {{--                bind:schema--}}
+        {{--                {systemFields}--}}
+        {{--                {operators}--}}
+        {{--                {filter}--}}
+        {{--                {inModal}--}}
+        {{--                {modalUrl}--}}
+        {{--                on:refresh--}}
+        {{--        />--}}
+
+        <form method="GET">
+            <input type="search" name="filter[search_regex]" placeholder="Search"
+                   class="search" required>
+        </form>
+
+
+    </div>
+
+    <div style="display:flex;align-items: center;gap:4px">
+        @if(get_class($schema) === \Lucent\Schema\CollectionSchema::class)
+            @if(!$inModal && $isWritable)
+                <a
+                        href="{{lucent_url("records/new?schema=")}}{{$schema->name}}"
+                        class="button"
+                >
+                    New Record
+                </a>
+            @endif
+        @else
+            <div>
+                {{--                <Uploader {schema} on:uploadComplete={uploadComplete}/>--}}
+            </div>
+        @endif
+        @if(!$inModal)
+{{--            <Dropdown orientation="right">--}}
+{{--                <div slot="button">--}}
+{{--                    <Icon icon="ellipsis-vertical"/>--}}
+{{--                </div>--}}
+{{--                {#if filter["status_in"] === "trashed"}--}}
+{{--                {#if isWritable}--}}
+{{--                <a--}}
+{{--                        class="dropdown-item"--}}
+{{--                        href="{channel.lucentUrl}/content/{schema.name}/emptyTrash"--}}
+{{--                >--}}
+{{--                    Empty trash--}}
+{{--                </a>--}}
+{{--                {/if}--}}
+{{--                {:else}--}}
+
+{{--                <a--}}
+{{--                        class="dropdown-item"--}}
+{{--                        href={csvUrl}--}}
+{{--                >Export to CSV</a--}}
+{{--                >--}}
+{{--                <a--}}
+{{--                        class="dropdown-item"--}}
+{{--                        href="{channel.lucentUrl}/content/{schema.name}?filter[status_in]=trashed"--}}
+{{--                >View trashed records</a--}}
+{{--                >--}}
+{{--                <a--}}
+{{--                        class="dropdown-item"--}}
+{{--                        href="{channel.lucentUrl}/content/{schema.name}?notlinked=*"--}}
+{{--                >View unlinked records</a--}}
+{{--                >--}}
+{{--                {/if}--}}
+{{--            </Dropdown>--}}
+
+        @endif
+    </div>
+</div>
+
+
+{{--<div class="applied-filters">--}}
+{{--    <AppliedFilterNotLinked--}}
+{{--            {inModal}--}}
+{{--            {modalUrl}--}}
+{{--            on:refresh--}}
+{{--    ></AppliedFilterNotLinked>--}}
+{{--    {#if Object.entries(filter).length > 0}--}}
+{{--    {#each Object.entries(filter) as [k, v]}--}}
+{{--    <AppliedFilter--}}
+{{--            {schema}--}}
+{{--            {operators}--}}
+{{--            key={k}--}}
+{{--            value={v}--}}
+{{--            {inModal}--}}
+{{--            {modalUrl}--}}
+{{--            {graph}--}}
+{{--            on:refresh--}}
+{{--    />--}}
+{{--    {/each}--}}
+{{--    {/if}--}}
+{{--</div>--}}
+
+

front/views/redirect.blade.php

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>{{$title}}</title>
-    <meta http-equiv="refresh" content="0; url='{{$to}}'"/>
-</head>
-<body>
-<p>{{$message}}</p>
-</body>
-</html>

src/Account/UserRepo.php

@@ -3,7 +3,7 @@
 namespace Lucent\Account;
 
 use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
+use Lucent\Database\Database;
 use Lucent\Primitive\Collection;
 use PhpOption\Option;
 
@@ -12,7 +12,7 @@ class UserRepo
 
     public function count(): int
     {
-        return DB::table("users")->count();
+        return Database::make()->table("users")->count();
     }
 
     /**
@@ -20,7 +20,7 @@ class UserRepo
      */
     public function all(): Collection
     {
-        $usersData = DB::table("users")->get();
+        $usersData = Database::make()->table("users")->get();
 
         $users = array_map(fn($userData) => $this->fromArray((array)$userData), $usersData->toArray());
         return new Collection($users);
@@ -31,14 +31,14 @@ class UserRepo
     {
         $userData = toArray($user);
         $userData["roles"] = json_encode($userData["roles"]);
-        DB::table("users")->insert($userData);
+        Database::make()->table("users")->insert($userData);
     }
 
     public function update(User $user): void
     {
         $userData = toArray($user);
         $userData["roles"] = json_encode($userData["roles"]);
-        DB::table("users")->where("id", $user->id)->update($userData);
+        Database::make()->table("users")->where("id", $user->id)->update($userData);
     }
 
 
@@ -46,7 +46,7 @@ class UserRepo
     {
         $newToken = Token::new(32);
 
-        DB::table("users")
+        Database::make()->table("users")
             ->where("id", $id)
             ->update([
                 'loggedInAt' => Carbon::now()->toJson(),
@@ -62,7 +62,7 @@ class UserRepo
      */
     public function findByEmail(Email $email): Option
     {
-        $user = DB::table("users")->where("email", $email->value())->first();
+        $user = Database::make()->table("users")->where("email", $email->value())->first();
 
         if (empty($user)) {
             return none();
@@ -76,7 +76,7 @@ class UserRepo
      */
     public function findById(string $id): Option
     {
-        $user = DB::table("users")->where("id", $id)->first();
+        $user = Database::make()->table("users")->where("id", $id)->first();
 
         if (empty($user)) {
             return none();
@@ -88,12 +88,12 @@ class UserRepo
 
     public function updateName(string $userId, Name $name): void
     {
-        DB::table("users")->where("id", $userId)->update(["name" => $name->value]);
+        Database::make()->table("users")->where("id", $userId)->update(["name" => $name->value]);
     }
 
     public function updateEmail(string $userId, Email $email): void
     {
-        DB::table("users")->where("id", $userId)->update(["email" => $email->value()]);
+        Database::make()->table("users")->where("id", $userId)->update(["email" => $email->value()]);
     }
 
     public function fromArray(array $data): User
@@ -102,7 +102,7 @@ class UserRepo
             id: $data["id"],
             name: new Name($data["name"] ?? ""),
             email: new Email($data["email"]),
-            roles: json_decode($data["roles"] ?? "[]",true),
+            roles: json_decode($data["roles"] ?? "[]", true),
             createdAt: $data["createdAt"],
             updatedAt: $data["updatedAt"],
             loggedInAt: $data["loggedInAt"] ?? null,

src/Channel/Channel.php

@@ -4,12 +4,14 @@ namespace Lucent\Channel;
 
 use Lucent\Channel\Data\UserCommand;
 use Lucent\Primitive\Collection;
+use Lucent\Schema\FilesSchema;
 use Lucent\Schema\Schema;
 
 final class Channel
 {
     public string $lucentUrl;
     public string $filesUrl;
+    public array $disks;
     public string $previewTargetUrl;
 
     /**
@@ -28,6 +30,7 @@ final class Channel
     {
         $this->lucentUrl = $url . "/lucent";
         $this->filesUrl = $this->makeFilesUrl();
+        $this->disks = $this->getDisksFromSchemas();
         $this->previewTargetUrl = $url . "/" . $previewTarget;
     }
 
@@ -37,8 +40,16 @@ final class Channel
         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"),
+            default => ""
         };
 
     }
 
+    private function getDisksFromSchemas()
+    {
+        return $this->schemas->filter(fn(Schema $schema) => get_class($schema) === FilesSchema::class)->reduce(function (array $carry, Schema $schema) {
+            $carry[$schema->disk] = config("filesystems.disks." . $schema->disk . ".url");
+            return $carry;
+        }, []);
+    }
 }

src/Command/CommandRepo.php

@@ -2,15 +2,15 @@
 
 namespace Lucent\Command;
 
-use Illuminate\Support\Facades\DB;
 use Lucent\Command\Data\CommandLogItem;
+use Lucent\Database\Database;
 
 class CommandRepo
 {
     public function findBySignature($signature): ?CommandLogItem
     {
 
-        $row = DB::table("command_logs")->where("signature", $signature)->first();
+        $row = Database::make()->table("command_logs")->where("signature", $signature)->first();
         if (empty($row)) {
             return null;
         }
@@ -22,16 +22,16 @@ class CommandRepo
     {
         $foundCommandLogItem = $this->findBySignature($commandLogItem->signature);
         if (empty($foundCommandLogItem)) {
-            DB::table("command_logs")->insert(toArray($commandLogItem));
+            Database::make()->table("command_logs")->insert(toArray($commandLogItem));
             return;
         }
 
-        DB::table("command_logs")->where("signature", $commandLogItem->signature)->update(toArray($commandLogItem));
+        Database::make()->table("command_logs")->where("signature", $commandLogItem->signature)->update(toArray($commandLogItem));
     }
 
     public function appendToLogs(string $signature, string $line): void
     {
-       $res =  DB::update(
+        Database::make()->update(
             'update command_logs set logs = logs || ?  where signature = ?',
             [$line, $signature]
         );

src/Commands/GenerateCollectionSchema.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Lucent\Commands;
+
+use Illuminate\Console\Command;
+use Lucent\Primitive\Collection;
+use Lucent\Schema\CollectionSchema;
+
+class GenerateCollectionSchema extends Command
+{
+
+    protected $signature = 'lucent:generate:collection {name}';
+
+    protected $description = 'Generate a lucent collection';
+
+
+    public function handle()
+    {
+        $name = $this->argument('name');
+        $schema = new CollectionSchema(
+            name: $name,
+            label: $name,
+            visible: [],
+            groups: [],
+            fields: Collection::make(),
+        );
+
+        $json = json_encode($schema, JSON_PRETTY_PRINT);
+        $configDir = base_path(config('lucent.schemas_path'));
+        $schemaPath = $configDir . "/" . $name . '.json';
+
+        if(file_exists($schemaPath)){
+            $this->error("The schema file already exists.");
+            return 0;
+        }
+
+        file_put_contents($schemaPath, $json);
+        $this->info("The schema file has been created.");
+
+    }
+
+}

src/Commands/GenerateFileSchema.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Lucent\Commands;
+
+use Illuminate\Console\Command;
+use Lucent\Primitive\Collection;
+use Lucent\Schema\FilesSchema;
+
+class GenerateFileSchema extends Command
+{
+
+    protected $signature = 'lucent:generate:file {name}';
+
+    protected $description = 'Generate a lucent file schema';
+
+
+    public function handle()
+    {
+        $name = $this->argument('name');
+        $schema = new FilesSchema(
+            name: $name,
+            label: $name,
+            visible: [],
+            fields: Collection::make(),
+            disk: "lucent",
+            path: $name,
+            groups: []
+        );
+
+        $json = json_encode($schema, JSON_PRETTY_PRINT);
+        $configDir = base_path(config('lucent.schemas_path'));
+        $schemaPath = $configDir . "/" . $name . '.json';
+
+        if (file_exists($schemaPath)) {
+            $this->error("The schema file already exists.");
+            return 0;
+        }
+
+        file_put_contents($schemaPath, $json);
+        $this->info("The schema file has been created.");
+
+    }
+
+}

src/Commands/LiveLink.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace Lucent\Commands;
-
-use DirectoryIterator;
-use Illuminate\Console\Command;
-
-class LiveLink extends Command
-{
-
-    protected $signature = 'lucent:livelink';
-
-    protected $description = 'Create live folder link';
-
-
-    public function handle()
-    {
-        symlink(storage_path("lucent/live"), public_path("live"));
-        $this->info("public link was created");
-    }
-
-}

src/Commands/RebuildThumbnails.php

@@ -7,6 +7,9 @@ use Exception;
 use Illuminate\Console\Command;
 use Intervention\Image\ImageManager;
 use Lucent\Channel\ChannelService;
+use Lucent\File\FileService;
+use Lucent\Query\Query;
+use Lucent\Schema\FilesSchema;
 use Lucent\Schema\Schema;
 use Lucent\Schema\Type;
 
@@ -18,7 +21,10 @@ class RebuildThumbnails extends Command
     protected $description = 'Rebuilds thumbnails for path';
 
 
-    public function __construct(public ImageManager $imageManager)
+    public function __construct(
+        public Query $query,
+        public FileService $fileService,
+        )
     {
         parent::__construct();
     }
@@ -27,49 +33,19 @@ class RebuildThumbnails extends Command
     public function handle(ChannelService $channelService): int
     {
         $channelService->channel->schemas
-            ->where("type", Type::FILES)->values()
+            ->filter(fn(Schema $schema) => get_class($schema) === FilesSchema::class)
             ->map([$this, 'rebuildThumbnails']);
 
         return 0;
     }
 
-    public function rebuildThumbnails(Schema $schema): void
+    public function rebuildThumbnails(FilesSchema $schema): void
     {
-
+        $this->info("Rebuilding thumbnails for ". $schema->name);
-        $filesDir = storage_path("app/public/" . $schema->path . "/");
+        $records = $this->query->filter(["schema" => $schema->name])->run()->records;
-        $thumbDir = storage_path("app/public/thumbs/" . $schema->path . "/");
+        $disk = $this->fileService->loadDisk($schema->disk);
-        if (!file_exists($thumbDir)) {
+        foreach ($records as $record) {
-            make_dir_r($thumbDir);
+            $this->fileService->createTemplates($disk, $record->_file->path);
-        }
-
-        if (!file_exists($filesDir)) {
-            make_dir_r($filesDir);
-        }
-
-        $filesDirIterator = new DirectoryIterator($filesDir);
-
-        foreach ($filesDirIterator as $file) {
-
-            if ($file->isDot()) {
-                continue;
-            }
-
-            try {
-                $image = $this->imageManager->make($filesDir . $file->getFilename());
-            } catch (Exception $e) {
-                $this->error($e->getMessage());
-                continue;
-            }
-
-            $image->fit(300, 300);
-            try {
-                $image->encode('webp', 75)->save($thumbDir . $file->getFilename());
-            } catch (Exception $e) {
-                $this->error($e->getMessage());
-                continue;
-            }
-
-            $this->info($file->getFilename());
         }
     }
 

src/Commands/SetupDatabase.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace Lucent\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Database\Schema\Blueprint;
+use Lucent\Database\Database;
+
+class SetupDatabase extends Command
+{
+
+    protected $signature = 'lucent:setup-db';
+
+    protected $description = 'Run to setup a new database';
+
+
+    public function handle()
+    {
+
+        $dbConnection = config("lucent.database");
+        $databasePath = config("database.connections.$dbConnection.database");
+
+        if(file_exists($databasePath)){
+            $this->error("Database already exists.");
+            return 0;
+        }
+        touch($databasePath);
+        $this->tableUsers();
+        $this->tableRecords();
+        $this->tableRevisions();
+        $this->tableSessions();
+        $this->tableCommandLogs();
+
+        $this->info("Lucent Database Setup Completed");
+    }
+
+    private function tableUsers(): void
+    {
+        Database::make()->getSchemaBuilder()->create('users', function (Blueprint $table) {
+            $table->uuid("id")->primary();
+            $table->string('name')->nullable();
+            $table->string('email')->unique();
+            $table->jsonb('roles');
+            $table->string('createdAt');
+            $table->string('updatedAt');
+            $table->string('loggedInAt');
+            $table->string('mailToken')->nullable();
+
+        });
+    }
+
+    private function tableSessions(): void
+    {
+        Database::make()->getSchemaBuilder()->create('sessions', function (Blueprint $table) {
+            $table->string('id')->primary();
+            $table->foreignId('user_id')->nullable()->index();
+            $table->string('ip_address', 45)->nullable();
+            $table->text('user_agent')->nullable();
+            $table->longText('payload');
+            $table->integer('last_activity')->index();
+        });
+    }
+
+    private function tableRecords(): void
+    {
+        Database::make()->getSchemaBuilder()->create('records', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->string('schema');
+            $table->string('status');
+            $table->jsonb('data');
+            $table->jsonb('_sys');
+            $table->jsonb('_file');
+            $table->text('search')->default("");
+
+            $table->index(['schema', '_sys->updatedAt', 'status']);
+            $table->index('search');
+        });
+
+        Database::make()->getSchemaBuilder()->create('edges', function (Blueprint $table) {
+            $table->uuid('source');
+            $table->uuid('target');
+            $table->string('sourceSchema');
+            $table->string('targetSchema');
+            $table->string('field');
+            $table->string('rank');
+
+            $table->unique(['source', 'target', "field"]);
+        });
+    }
+
+    private function tableRevisions(): void
+    {
+        Database::make()->getSchemaBuilder()->create('revisions', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->uuid('recordId');
+            $table->string('schema');
+            $table->jsonb('data');
+            $table->jsonb('_sys');
+            $table->jsonb('_file');
+            $table->jsonb('_edges');
+        });
+    }
+
+    private function tableCommandLogs(): void
+    {
+        Database::make()->getSchemaBuilder()->create('command_logs', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->string('signature');
+            $table->integer('pid')->nullable();
+            $table->text('logs');
+        });
+    }
+
+}

src/Commands/UpgradeFiles122.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Lucent\Commands;
+
+use Illuminate\Console\Command;
+use Lucent\Database\Database;
+
+class UpgradeFiles122 extends Command
+{
+
+    protected $signature = 'lucent:upgrade:files_1_2_2 {schema} {disk}';
+    protected $description = 'Upgrade to the new filesystem';
+
+
+    public function handle()
+    {
+        $schema =  $this->argument('schema');
+        $disk =  $this->argument('disk');
+        $db = Database::make();
+        $records = $db->table("records")->where("schema", $schema)->get();
+        foreach ($records as $record) {
+            $array = json_decode($record->_file, true);
+            $array["disk"] = $disk;
+            $db->table("records")->where("id", $record->id)->update(["_file" => json_encode($array)]);
+        }
+    }
+}

src/Database/Database.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Lucent\Database;
+
+use Illuminate\Database\Connection;
+use Illuminate\Support\Facades\DB;
+
+class Database
+{
+    public static function make(): Connection{
+        $dbConnection = config("lucent.database");
+
+        return DB::connection($dbConnection);
+    }
+
+
+}

src/Database/migrations/0000_create_users_table.php

@@ -1,40 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-
-    protected $connection = 'lucentdb';
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('users', function (Blueprint $table) {
-            $table->uuid("id")->primary();
-            $table->string('name')->nullable();
-            $table->string('email')->unique();
-            $table->jsonb('roles');
-            $table->string('createdAt');
-            $table->string('updatedAt');
-            $table->string('loggedInAt');
-            $table->string('mailToken')->nullable();
-
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('users');
-    }
-};

src/Database/migrations/0001_create_sessions_table.php

@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    protected $connection = 'lucentdb';
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('sessions', function (Blueprint $table) {
-            $table->string('id')->primary();
-            $table->foreignId('user_id')->nullable()->index();
-            $table->string('ip_address', 45)->nullable();
-            $table->text('user_agent')->nullable();
-            $table->longText('payload');
-            $table->integer('last_activity')->index();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('sessions');
-    }
-};

src/Database/migrations/0002_records.php

@@ -1,50 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-
-    protected $connection = 'lucentdb';
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('records', function (Blueprint $table) {
-            $table->uuid('id')->primary();
-            $table->string('schema');
-            $table->string('status');
-            $table->jsonb('data');
-            $table->jsonb('_sys');
-            $table->jsonb('_file');
-
-            $table->index(['schema', 'status']);
-        });
-
-        Schema::create('edges', function (Blueprint $table) {
-            $table->uuid('source');
-            $table->uuid('target');
-            $table->string('sourceSchema');
-            $table->string('targetSchema');
-            $table->string('field');
-            $table->string('rank');
-
-            $table->unique(['source', 'target', "field"]);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('records');
-        Schema::dropIfExists('edges');
-    }
-};

src/Database/migrations/0003_revisions.php

@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-
-    protected $connection = 'lucentdb';
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('revisions', function (Blueprint $table) {
-            $table->uuid('id')->primary();
-            $table->uuid('recordId');
-            $table->string('schema');
-            $table->jsonb('data');
-            $table->jsonb('_sys');
-            $table->jsonb('_file');
-            $table->jsonb('_edges');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('revisions');
-    }
-};

src/Database/migrations/0004_generatedIndexColumn.php

@@ -1,38 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-
-    protected $connection = 'lucentdb';
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-
-
-        Schema::table('records', function (Blueprint $table) {
-            $table->text('search')->default("");
-            $table->index('search');
-        });
-
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('records', function (Blueprint $table) {
-            $table->dropColumn('search');
-            $table->dropIndex('search');
-        });
-    }
-};

src/Database/migrations/0005_RecordsUpdatedIndex.php

@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-
-    protected $connection = 'lucentdb';
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('records', function (Blueprint $table) {
-            $table->dropIndex(['schema', 'status']);
-            $table->index(['schema', '_sys->updatedAt', 'status']);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('records', function (Blueprint $table) {
-
-            $table->dropIndex(['schema', '_sys->updatedAt', 'status']);
-            $table->index(['schema', 'status']);
-        });
-    }
-};

src/Database/migrations/0006_CommandLogs.php

@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-
-    protected $connection = 'lucentdb';
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('command_logs', function (Blueprint $table) {
-            $table->uuid('id')->primary();
-            $table->string('signature');
-            $table->integer('pid')->nullable();
-            $table->text('logs');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('command_logs');
-    }
-};

src/Edge/EdgeRepo.php

@@ -1,6 +1,6 @@
 <?php namespace Lucent\Edge;
 
-use Illuminate\Support\Facades\DB;
+use Lucent\Database\Database;
 use Lucent\LucentException;
 use PDOException;
 use stdClass;
@@ -15,7 +15,7 @@ class EdgeRepo
     public function insert(Edge $edge): void
     {
         try {
-            DB::table("edges")->insert($edge->toDB());
+            Database::make()->table("edges")->insert($edge->toDB());
         } catch (PDOException $e) {
             if ($e->getCode() == 23505) {
                 throw new LucentException("Edge already exists");
@@ -34,7 +34,7 @@ class EdgeRepo
     {
         $edgesDB = collect($edges)->map(fn($e) => $e->toDB())->toArray();
         try {
-            DB::table("edges")->insert($edgesDB);
+            Database::make()->table("edges")->insert($edgesDB);
         } catch (PDOException $e) {
             if ($e->getCode() == 23505) {
                 throw new LucentException("Edge already exists");
@@ -52,8 +52,8 @@ class EdgeRepo
     public function replaceForRecord(string $from, array $edges): void
     {
         $edgesDB = collect($edges)->map(fn($e) => $e->toDB())->toArray();
-        DB::table("edges")->where("source", $from)->delete();
+        Database::make()->table("edges")->where("source", $from)->delete();
-        DB::table("edges")->insert($edgesDB);
+        Database::make()->table("edges")->insert($edgesDB);
     }
 
 
@@ -62,13 +62,13 @@ class EdgeRepo
      */
     public function findAll(): array
     {
-        $edges = DB::table("edges")->get();
+        $edges = Database::make()->table("edges")->get();
         return $edges->map([$this, 'mapEdge'])->toArray();
     }
 
     public function findForSource(string $recordId): array
     {
-        $edges = DB::table("edges")->where("source", $recordId)->get();
+        $edges = Database::make()->table("edges")->where("source", $recordId)->get();
         return $edges->map([$this, 'mapEdge'])->toArray();
     }
 
@@ -89,7 +89,7 @@ class EdgeRepo
 
     public function remove(Edge $edge): void
     {
-        DB::table("edges")
+        Database::make()->table("edges")
             ->where("source", $edge->source)
             ->where("target", $edge->target)
             ->where("sourceSchema", $edge->sourceSchema)
@@ -100,7 +100,7 @@ class EdgeRepo
 
     public function findLastEdgeRank(string $source, string $field): string
     {
-        $data = DB::table("edges")
+        $data = Database::make()->table("edges")
             ->where("source", $source)
             ->where("field", $field)
             ->orderBy("rank", "desc")

src/File/FileService.php

@@ -2,25 +2,28 @@
 
 namespace Lucent\File;
 
-use Exception;
 use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Facades\DB;
+use Illuminate\Log\Logger;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use Intervention\Image\ImageManagerStatic;
+use Intervention\Image\ImageManager;
 use Lucent\Channel\ChannelService;
+use Lucent\Database\Database;
 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
 {
 
     public function __construct(
-        public ChannelService $channelService
+        public ChannelService $channelService,
+        public ImageManager   $imageManager,
+        public Logger         $logger
     )
     {
     }
@@ -64,8 +67,7 @@ class FileService
                 isDuplicate: true
             );
         }
-
+        $disk = $this->loadDisk($schema);
-        $disk = $this->loadDisk();
         $path = $schema->path . "/" . $filename;
         $res = $disk->put(
             $path,
@@ -77,13 +79,14 @@ class FileService
             throw new LucentException("File $filename not uploaded");
         }
 
-        $this->createThumbnail($disk, $schema->path, $filename, $file);
+        $this->createTemplates($disk, $path, $file);
 
         list($width, $height) = $this->isImage($mimetype) ? getimagesize($file) : [0, 0];
         $recordFile = new RecordFile(
             originalName: $originalFilename,
             mime: $mimetype,
             path: $path,
+            disk: $schema->disk,
             size: $file->getSize(),
             width: $width,
             height: $height,
@@ -108,28 +111,16 @@ class FileService
         return in_array($mimetype, $imageMimes);
     }
 
-    public function loadDisk(): Filesystem
+    public function loadDisk(Schema|string $schema): Filesystem
     {
-        return Storage::disk('lucent');
+        return Storage::disk($schema->disk ?? $schema);
-        return Storage::build([
+
-            '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,
-            'visibility' => 'public', // now managed by aws policy
-            'root' => storage_path('app/public'),
-            'throw' => true,
-        ]);
     }
 
     private function checkDuplicate(string $schemaName, string $checksum, int $filesize): string
     {
 
-        $record = DB::table("records")
+        $record = Database::make()->table("records")
             ->where("schema", $schemaName)
             ->where("_file->checksum", $checksum)
             ->where("_file->size", $filesize)
@@ -138,29 +129,18 @@ class FileService
         return $record->id ?? "";
     }
 
-    private function createThumbnail(Filesystem $disk, string $schemaPath, string $filename, UploadedFile $file): void
+    public function createTemplates(Filesystem $disk, string $path): void
     {
-        $thumbDir = "thumbs/" . $schemaPath . "/";
+        $originalImage = $this->imageManager->make($disk->get($path));
-//        if (!file_exists($thumbDir)) {
+        foreach (config("lucent.imageFilters") as $preset => $filterClass) {
-//            make_dir_r($thumbDir);
+            $image = $originalImage->filter(new $filterClass);
-//        }
+            $templateUri = "/templates/" . $preset . "/" . $path;
-
+            $disk->put($templateUri, $image->encode('webp', 75));
-        try {
-            ImageManagerStatic::configure(['driver' => 'imagick']);
-            $image = ImageManagerStatic::make($file);
-        } catch (Exception $e) {
-            logger($e->getMessage());
-            return;
         }
 
-        $image->fit(300, 300);
+        $thumbDir = "thumbs/" . $path;
-        try {
+
-            $this->loadDisk()->put($thumbDir . $filename, $image->encode('webp', 75));
+        $image = $originalImage->fit(300, 300);
-//            $image->encode('webp', 75)->save($thumbDir . $filename);
+        $disk->put($thumbDir, $image->encode('webp', 75));
-        } catch (Exception $e) {
-            logger($e->getMessage());
-        }
     }
-
-
 }

src/File/ImageService.php

@@ -1,74 +0,0 @@
-<?php
-
-namespace Lucent\File;
-
-use Exception;
-use Illuminate\Log\Logger;
-use Intervention\Image\ImageManager;
-use Lucent\Channel\ChannelService;
-use Lucent\Record\QueryRecord;
-
-class ImageService
-{
-
-    private string $notFoundImage = "/not-found.jpg";
-
-    public function __construct(
-        public ImageManager   $imageManager,
-        public FileService   $fileService,
-        public ChannelService $channelService,
-        public Logger         $logger
-    )
-    {
-    }
-
-    public function file(?QueryRecord $record, string $template = ""): string
-    {
-        if (empty($record)) {
-            return $this->notFoundImage;
-        }
-
-        $originalPath = $record->_file->path;
-        $templateUri = $this->findTemplate($originalPath, $template);
-
-        if ($templateUri === false) {
-            $templateUri = $this->createTemplate($originalPath, $template);
-        }
-        return $this->channelService->channel->filesUrl . "/" . $templateUri;
-    }
-
-    private function findTemplate(string $originalPath, string $template): string|false
-    {
-        $templateUri = "templates/" . $template . "/" . $originalPath;
-        $templateFilePath = public_path("storage/" . $templateUri);
-
-        if (file_exists($templateFilePath)) {
-            return $templateUri;
-        }
-
-        return false;
-    }
-
-    private function createTemplate(string $originalPath, string $template): string
-    {
-
-        try {
-            $image = $this->imageManager->make( $this->fileService->loadDisk()->get($originalPath));
-        } catch (Exception $e) {
-            $this->logger->error($e->getMessage());
-            return $originalPath;
-        }
-
-        $image = $image->filter(new $this->channelService->channel->imageFilters[$template]);
-        try {
-            $templateUri = "/templates/" . $template . "/" . $originalPath;
-            $this->fileService->loadDisk()->put($templateUri, $image->encode('webp', 75));
-        } catch (Exception $e) {
-            $this->logger->error($e->getMessage());
-            return $this->notFoundImage;
-        }
-
-        return $templateUri;
-    }
-
-}

src/Http/Controller/FileController.php

@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
 use Lucent\Channel\ChannelService;
 use Lucent\File\FileService;
+use Lucent\File\ImageService;
 use Lucent\Query\Query;
 use Lucent\Record\InputData\RecordInputData;
 use Lucent\Record\RecordService;
@@ -27,6 +28,21 @@ class FileController extends Controller
     {
     }
 
+
+    public function fromDisk(Request $request, string $disk)
+    {
+        $imagePath = $request->route("any");
+        $disk = $this->fileService->loadDisk($disk);
+        return response()->file($disk->path($imagePath));
+    }
+
+    public function thumb(Request $request, string $disk)
+    {
+        $imagePath = "thumbs/".$request->route("any");
+        $disk = $this->fileService->loadDisk($disk);
+        return response()->file($disk->path($imagePath));
+    }
+
     public function download(Request $request)
     {
         $disk = $this->fileService->loadDisk();
@@ -39,7 +55,6 @@ class FileController extends Controller
         $validator = Validator::make($request->all(), [
             'files.*' => 'required|file|max:100000',
         ]);
-
         if ($validator->fails()) {
             return fail($validator->errors()->first());
         }

src/Http/Controller/RecordController.php

@@ -16,6 +16,7 @@ use Lucent\Record\Manager;
 use Lucent\Record\QueryRecord;
 use Lucent\Record\RecordService;
 use Lucent\Record\Status;
+use Lucent\Schema\SchemaService;
 use Lucent\Schema\System;
 use Lucent\Schema\Validator\ValidatorException;
 use Lucent\Svelte\Svelte;
@@ -26,8 +27,8 @@ class RecordController extends Controller
 {
     public function __construct(
         private readonly RecordService    $recordService,
+        private readonly SchemaService    $schemaService,
         private readonly AccountService   $accountService,
-        private readonly AuthService      $authService,
         private readonly ChannelService   $channelService,
         private readonly Svelte           $svelte,
         private readonly Query            $query,
@@ -61,10 +62,12 @@ class RecordController extends Controller
         ], $filter);
 
 
+
         $skip = data_get($urlParams, "skip") ?? 0;
         $limit = 30;
         $records = [];
         $graphArray = null;
+
         $graph = $this->query
             ->filter($arguments)
             ->notLinked($request->input("notlinked") ?? "")
@@ -78,14 +81,14 @@ class RecordController extends Controller
             ->runWithCount();
 
 
-        $records = $graph->getRootRecords()->toArray();
-
         $data = [
+            "title" => $schema->label,
             "schemas" => $this->channelService->channel->schemas,
             "schema" => $schema,
             "users" => $users,
-            "records" => $records,
+            "records" => $graph->tree(),
             "graph" => toArray($graph),
+            "visibleFields" => $this->schemaService->getVisibleFields($schema),
             "systemFields" => array_values(System::list()),
             "operators" => $this->operatorRegistry->all(),
             "sortParam" => $sort,
@@ -103,9 +106,10 @@ class RecordController extends Controller
             if (str_starts_with(config("lucent.url"), "https")) {
                 $data["modalUrl"] = str_replace("http://", "https://", $request->fullUrl());
             }
-            return $data;
+            return view("lucent::records-editor.dialog", $data)->render();
         }
         $data["inModal"] = false;
+        return view("lucent::records.list", $data);
         return $this->svelte->render(
             layout: "channel",
             view: "contentIndex",
@@ -167,6 +171,16 @@ class RecordController extends Controller
         $recordHistory = $this->recordManager->fromSession($request->session())->getRecords();
         $record = $this->recordService->createEmpty($schema);
         $queryRecord = QueryRecord::fromRecord($record);
+
+        return view("lucent::records-editor.edit",[
+            "title"=> "New Record",
+            "schema" => $schema,
+            "record" => $queryRecord,
+            "recordHistory" => $recordHistory,
+            "createMode" => true,
+            "isWritable" => in_array($record->schema, $this->accountService->currentWritableSchemas())
+        ]);
+
         return $this->svelte->render(
             layout: "channel",
             view: "recordEdit",
@@ -238,6 +252,18 @@ class RecordController extends Controller
 
         $schema = $this->channelService->getSchema($record->schema)->get();
         $recordHistory = $this->recordManager->fromSession($request->session())->push($rid)->getRecords($rid);
+
+        return view("lucent::records-editor.edit",[
+            "title" => "Edit Record",
+            "schema" => $schema,
+            "graph" => $graph,
+            "record" => $record,
+            "users" => $this->accountService->all(),
+            "recordHistory" => $recordHistory,
+            "isWritable" => in_array($record->schema, $this->accountService->currentWritableSchemas())
+        ]);
+
+
         return $this->svelte->render(
             layout: "channel",
             view: "recordEdit",
@@ -284,25 +310,25 @@ class RecordController extends Controller
 
     public function save(Request $request)
     {
-        $recordId = $request->input("record.id");
+        $recordId = $request->input("id");
         try {
 
             if ($request->input("isCreateMode")) {
                 $recordId = $this->recordService->create(
                     data: new RecordInputData(
-                        $request->input("record.schema"),
+                        $request->input("schema"),
                         $recordId ?? "",
-                        $request->input("record.data"),
+                        $request->input("data"),
-                        Status::from($request->input("record.status")),
+                        Status::from($request->input("status")),
                     ),
                     edges: array_map(EdgeInputData::fromArray(...), $request->input("edges") ?? [])
                 );
             } else {
 
                 $this->recordService->updateWithEdges(
-                    id: $request->input("record.id"),
+                    id: $request->input("id"),
-                    data: $request->input("record.data"),
+                    data: $request->input("data"),
-                    status: Status::from($request->input("record.status")),
+                    status: Status::from($request->input("status")),
                     edges: array_map(EdgeInputData::fromArray(...), $request->input("edges") ?? []),
                 );
             }
@@ -319,10 +345,15 @@ class RecordController extends Controller
         } catch (LucentException $th) {
             return fail($th);
         }
+
+
+
+
         return ok(toArray($newGraph));
     }
 
 
+
     public function clone(Request $request)
     {
         try {

src/Http/Controller/SetupController.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace Lucent\Http\Controller;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Lucent\Account\AccountService;
+use Lucent\Channel\ChannelService;
+use Lucent\LucentException;
+use Lucent\Setup\Data\SetupStep;
+use Lucent\Setup\Data\SetupStepStatus;
+use Lucent\Setup\Setup;
+use Lucent\Setup\Step\ComposerStep;
+use Lucent\Setup\Step\DatabaseSetupStep;
+use Lucent\Setup\Step\IStep;
+use Lucent\Setup\Step\LaravelEnvStep;
+use Lucent\Setup\Step\LucentConfigStep;
+use Lucent\Setup\Step\StorageLinkSetupStep;
+use Lucent\Setup\Step\StorageSetupStep;
+use Lucent\Svelte\Svelte;
+use function Lucent\Response\fail;
+use function Lucent\Response\ok;
+
+
+class SetupController
+{
+    public function __construct(
+        private readonly AccountService $accountService,
+        private readonly ChannelService $channelService,
+        private readonly Svelte         $svelte,
+    )
+    {
+
+    }
+
+    public function setup(Request $request): View|RedirectResponse
+    {
+
+
+        $steps = array_reduce([
+            new ComposerStep,
+            new LucentConfigStep,
+            new LaravelEnvStep,
+            new StorageSetupStep,
+            new StorageLinkSetupStep,
+            new DatabaseSetupStep,
+        ], fn(array $carry, IStep $setupStep) => array_merge($carry, [$setupStep()]), []);
+        $allSuccess = array_reduce($steps, fn(bool $carry, SetupStep $step) => !$carry ? false : $step->status === SetupStepStatus::SUCCESS, true);
+
+        if($allSuccess){
+            if ($this->accountService->countUsers() > 0) {
+                return redirect($this->channelService->channel->lucentUrl . "/login");
+            }
+        }
+
+        return $this->svelte->render(
+            layout: "account",
+            view: "setup",
+            title: "Setup Lucent",
+            data: [
+                "steps" => $steps,
+                "allSuccess" => $allSuccess,
+            ]
+
+        );
+    }
+
+
+}

src/Http/web.php

@@ -10,6 +10,11 @@ use Lucent\Http\Controller\HomeController;
 use Lucent\Http\Controller\MemberController;
 use Lucent\Http\Controller\RecordController;
 use Lucent\Http\Controller\RevisionController;
+use Lucent\Http\Controller\SetupController;
+
+
+Route::get('/lucent/setup', [SetupController::class, 'setup']);
+Route::get('/lfs-{disk}/{any}', [FileController::class, 'fromDisk'])->where('any', '.*');
 
 
 Route::group([
@@ -17,8 +22,11 @@ Route::group([
     'prefix' => "lucent"
 ], function () {
 
+
+
     Route::middleware(['lucent.guest'])->group(function () {
         Route::get('/', [AuthController::class, 'login']);
+
         Route::get('/register', [AuthController::class, 'register']);
         Route::post('/register', [AuthController::class, 'postRegister']);
         Route::get('/login', [AuthController::class, 'login']);

src/LucentServiceProvider.php

@@ -9,11 +9,13 @@ use Illuminate\Support\ServiceProvider;
 use Intervention\Image\ImageManager;
 use Lucent\Channel\ChannelService;
 use Lucent\Commands\CompileSchemas;
-use Lucent\Commands\LiveLink;
+use Lucent\Commands\GenerateCollectionSchema;
+use Lucent\Commands\GenerateFileSchema;
 use Lucent\Commands\RebuildThumbnails;
 use Lucent\Commands\RemoveOrphanEdges;
+use Lucent\Commands\SetupDatabase;
+use Lucent\Commands\UpgradeFiles122;
 use Lucent\File\FileService;
-use Lucent\File\ImageService;
 use Lucent\Query\DatabaseGraph\DatabaseGraph;
 use Lucent\Query\DatabaseGraph\PgsqlDatabaseGraph;
 use Lucent\Query\DatabaseGraph\SqliteDatabaseGraph;
@@ -33,6 +35,10 @@ class LucentServiceProvider extends ServiceProvider
             return new ImageManager(['driver' => 'imagick']);
         });
 
+        $this->mergeConfigFrom(
+            __DIR__.'/../config/lucent.php',
+            'lucent'
+        );
 
 
         $this->app->bind(DatabaseGraph::class, function () {
@@ -67,25 +73,25 @@ class LucentServiceProvider extends ServiceProvider
         $this->loadRoutesFrom(__DIR__ . '/Http/web.php');
         $this->loadRoutesFrom(__DIR__ . '/Http/api.php');
 
-        $this->loadMigrationsFrom(__DIR__ . '/Database/migrations');
-
         if ($this->app->runningInConsole()) {
             $this->commands([
                 CompileSchemas::class,
                 RebuildThumbnails::class,
-                LiveLink::class,
                 RemoveOrphanEdges::class,
+                SetupDatabase::class,
+                GenerateCollectionSchema::class,
+                GenerateFileSchema::class,
+                UpgradeFiles122::class,
             ]);
         }
 
         View::share('manifest', $manifest);
-        View::share('image', app()->make(ImageService::class));
         View::share('file', app()->make(FileService::class));
         Blade::anonymousComponentPath(__DIR__ . '../front/views/components', "lucent");
 
         $this->publishes([
-            __DIR__ . '/Config/main.php' => config_path('lucent.php'),
+            __DIR__ . '/../config/lucent.php' => config_path('lucent.php'),
-        ]);
+        ],"lucent-config");
 
         $this->publishes([
             __DIR__ . '/../front/dist' => public_path('vendor/lucent/dist'),

src/Query/DatabaseGraph/PgsqlDatabaseGraph.php

@@ -3,6 +3,7 @@
 namespace Lucent\Query\DatabaseGraph;
 
 use Illuminate\Support\Facades\DB;
+use Lucent\Database\Database;
 use Lucent\Query\QueryOptions;
 
 class PgsqlDatabaseGraph implements DatabaseGraph
@@ -13,7 +14,7 @@ class PgsqlDatabaseGraph implements DatabaseGraph
      */
     public function getChildren(array $ids, QueryOptions $options): array
     {
-        $subquery = DB::table('edges AS g')
+        $subquery = Database::make()->table('edges AS g')
             ->select(DB::raw('g.source,g.target,g.rank,"g"."sourceSchema","g"."targetSchema",g.field, 1 as depth '))
             ->whereIn('source', $ids);
 
@@ -23,14 +24,14 @@ class PgsqlDatabaseGraph implements DatabaseGraph
 
         $subquery->limit($options->childrenLimit)
             ->unionAll(
-                DB::table(DB::raw("edges AS g, search_graph AS sg "))
+                Database::make()->table(DB::raw("edges AS g, search_graph AS sg "))
                     ->selectRaw('g.source,g.target,g.rank,"g"."sourceSchema","g"."targetSchema",g.field,sg.depth + 1 as depth')
                     ->whereRaw("g.source = sg.target")
                     ->where("depth", "<", $options->childrenDepth)
                     ->orderBy("rank")
             );
 
-        return DB::table('search_graph')
+        return Database::make()->table('search_graph')
             //            ->select(DB::raw("*, 1 as depth "))
             ->withRecursiveExpression('search_graph', $subquery)
             ->get()->toArray();
@@ -41,19 +42,19 @@ class PgsqlDatabaseGraph implements DatabaseGraph
      */
     public function getParents(array $ids, QueryOptions $options): array
     {
-        $subquery = DB::table('edges AS g')
+        $subquery = Database::make()->table('edges AS g')
             ->select(DB::raw('g.source,g.target,g.rank,"g"."sourceSchema","g"."targetSchema",g.field, 1 as depth '))
             ->limit($options->parentsLimit)
             ->whereIn('g.target', $ids)
             ->unionAll(
-                DB::table(DB::raw("edges AS g, search_graph AS sg "))
+                Database::make()->table(DB::raw("edges AS g, search_graph AS sg "))
                     ->selectRaw('g.source,g.target,g.rank,"g"."sourceSchema","g"."targetSchema",g.field,sg.depth + 1 as depth')
                     ->whereRaw("g.target = sg.source")
                     ->where("depth", "<", $options->parentsDepth)
                     ->orderBy("rank")
             );
 
-        return DB::table('search_graph')
+        return Database::make()->table('search_graph')
             //            ->select(DB::raw('sg.source,sg.target,sg.rank,sg."sourceSchema",sg."targetSchema",sg.field,sg.depth'))
             ->withRecursiveExpression('search_graph', $subquery)
             ->get()->toArray();

src/Query/DatabaseGraph/SqliteDatabaseGraph.php

@@ -3,6 +3,7 @@
 namespace Lucent\Query\DatabaseGraph;
 
 use Illuminate\Support\Facades\DB;
+use Lucent\Database\Database;
 use Lucent\Query\QueryOptions;
 
 class SqliteDatabaseGraph implements DatabaseGraph
@@ -12,7 +13,7 @@ class SqliteDatabaseGraph implements DatabaseGraph
      */
     public function getChildren(array $ids, QueryOptions $options): array
     {
-        $subquery = DB::table('edges AS g')
+        $subquery = Database::make()->table('edges AS g')
             ->select(DB::raw('g.source,g.target,g.rank,g.sourceSchema,g.targetSchema,g.field, 1 as depth '))
             ->whereIn('source', $ids);
 
@@ -22,14 +23,14 @@ class SqliteDatabaseGraph implements DatabaseGraph
 
         $subquery->limit($options->childrenLimit)
             ->unionAll(
-                DB::table(DB::raw("edges AS g, search_graph AS sg "))
+                Database::make()->table(DB::raw("edges AS g, search_graph AS sg "))
                     ->selectRaw('g.source,g.target,g.rank,"g"."sourceSchema","g"."targetSchema",g.field,sg.depth + 1 as depth')
                     ->whereRaw("g.source = sg.target")
                     ->where("depth", "<", $options->childrenDepth)
                     ->orderBy("rank")
             );
 
-        return DB::table('search_graph')
+        return Database::make()->table('search_graph')
             //            ->select(DB::raw("*, 1 as depth "))
             ->withRecursiveExpression('search_graph', $subquery)
             ->get()->toArray();
@@ -40,19 +41,19 @@ class SqliteDatabaseGraph implements DatabaseGraph
      */
     public function getParents(array $ids, QueryOptions $options): array
     {
-        $subquery = DB::table('edges AS g')
+        $subquery = Database::make()->table('edges AS g')
             ->select(DB::raw('g.source,g.target,g.rank,"g"."sourceSchema","g"."targetSchema",g.field, 1 as depth '))
             ->limit($options->parentsLimit)
             ->whereIn('g.target', $ids)
             ->unionAll(
-                DB::table(DB::raw("edges AS g, search_graph AS sg "))
+                Database::make()->table(DB::raw("edges AS g, search_graph AS sg "))
                     ->selectRaw('g.source,g.target,g.rank,"g"."sourceSchema","g"."targetSchema",g.field,sg.depth + 1 as depth')
                     ->whereRaw("g.target = sg.source")
                     ->where("depth", "<", $options->parentsDepth)
                     ->orderBy("rank")
             );
 
-        return DB::table('search_graph')
+        return Database::make()->table('search_graph')
             //            ->select(DB::raw('sg.source,sg.target,sg.rank,sg."sourceSchema",sg."targetSchema",sg.field,sg.depth'))
             ->withRecursiveExpression('search_graph', $subquery)
             ->get()->toArray();

src/Query/FilterParser.php

@@ -5,6 +5,7 @@ namespace Lucent\Query;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\DB;
+use Lucent\Database\Database;
 use Lucent\Query\BuilderConverter\BuilderConverter;
 use Lucent\Query\Filter\AndFilter;
 use Lucent\Query\Filter\Argument;
@@ -58,7 +59,7 @@ final class FilterParser
             }
 
             $targetIds = collect($graph->records)->pluck("id");
-            $sourceIds = DB::table("edges")->whereIn("target", $targetIds)->where("field", $k)->get()->pluck("source");
+            $sourceIds = Database::make()->table("edges")->whereIn("target", $targetIds)->where("field", $k)->get()->pluck("source");
             return array_merge($c, $sourceIds->toArray());
         }, []);
 

src/Query/Query.php

@@ -3,7 +3,7 @@
 namespace Lucent\Query;
 
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Facades\DB;
+use Lucent\Database\Database;
 use Lucent\Edge\Edge;
 use Lucent\Primitive\Collection;
 use Lucent\Query\DatabaseGraph\DatabaseGraph;
@@ -67,7 +67,7 @@ final  class Query
         $edgesIds = collect($resultParentSourceTargetIds)->merge($resultChildrenEdgesTargetIds)->unique()->values()->toArray();
         $edgeRecords = [];
         if (!empty($edgesIds)) {
-            $edgeRecords = DB::table('records')
+            $edgeRecords = Database::make()->table('records')
                 ->whereIn("id", $edgesIds)
                 ->whereIn("status", $this->options->status)
                 ->get()->toArray();
@@ -78,6 +78,7 @@ final  class Query
 //            ->toArray();
 
         $formattedRecords = $this->formatRecords($resultsRecordsUnique, $resultChildrenEdges, $resultParentEdges);
+
         $this->reset();
         return $formattedRecords;
 
@@ -94,7 +95,9 @@ final  class Query
         $queryRecords = collect($records)->map(function ($recordData) {
 
             $record = Record::fromDB($recordData);
+
             $record->data = $this->inputFormatter->fill($record->schema, $record->data);
+
             $queryRecord = QueryRecord::fromRecord($record);
             $queryRecord->isRoot = data_get($recordData, "isRoot") === true;
             return $queryRecord;
@@ -142,7 +145,7 @@ final  class Query
 
     private function mainQuery(): array
     {
-        $query = DB::table("records");
+        $query = Database::make()->table("records");
         $query = $this->parseFilters($query);
         $query = $this->findNotLinked($query);
 
@@ -189,7 +192,7 @@ final  class Query
     function runWithCount(): Graph
     {
 
-        $query = DB::table("records");
+        $query = Database::make()->table("records");
         $query = $this->parseFilters($query);
         $query = $this->findNotLinked($query);
         $graph = $this->run();

src/Record/FileData.php

@@ -10,6 +10,7 @@ class FileData
         public readonly string $originalName,
         public readonly string $mime,
         public readonly string $path,
+        public readonly string $disk,
         public readonly int    $size,
         public readonly int    $width,
         public readonly int    $height,
@@ -24,6 +25,7 @@ class FileData
             originalName: data_get($data, "originalName"),
             mime: data_get($data, "mime"),
             path: data_get($data, "path"),
+            disk: data_get($data, "disk", "lucent"),
             size: data_get($data, "size"),
             width: data_get($data, "width"),
             height: data_get($data, "height"),

src/Record/InputFormatter.php

@@ -16,8 +16,11 @@ class InputFormatter
 
     public function fill(string $schemaName, RecordData $input): RecordData
     {
+
         $schema = $this->channelService->getSchema($schemaName)->get();
+
         $data = $schema->fields->reduce(fn(array $carry, FieldInterface $field) => $field->format($input->toArray(), $carry), []);
+
         return new RecordData($data);
     }
 

src/Record/Record.php

@@ -54,7 +54,7 @@ class Record implements JsonSerializable
         $file = json_decode($data->_file, true);
         if (!empty($file)) {
 
-            $file = new FileData(...$file);
+            $file = FileData::fromArray($file);
         } else {
             $file = null;
         }

src/Record/RecordRepo.php

@@ -2,7 +2,7 @@
 
 namespace Lucent\Record;
 
-use Illuminate\Support\Facades\DB;
+use Lucent\Database\Database;
 
 class RecordRepo
 {
@@ -14,7 +14,7 @@ class RecordRepo
     {
         $recordToDB = $record->toDB();
 
-        DB::table("records")->insert($recordToDB);
+        Database::make()->table("records")->insert($recordToDB);
 
     }
 
@@ -23,7 +23,7 @@ class RecordRepo
      */
     public static function updateStatusBulk(Status $status, array $ids): void
     {
-        DB::table("records")->whereIn("id", $ids)->update([
+        Database::make()->table("records")->whereIn("id", $ids)->update([
             'status' => $status->value
         ]);
     }
@@ -31,7 +31,7 @@ class RecordRepo
     public static function update(Record $record): void
     {
         $recordToDB = $record->toDB();
-        DB::table("records")->where("id", $record->id)->update($recordToDB);
+        Database::make()->table("records")->where("id", $record->id)->update($recordToDB);
     }
 
 
@@ -43,17 +43,17 @@ class RecordRepo
     ): void
     {
 
-        DB::table("records")->whereIn("id", $ids)->delete();
+        Database::make()->table("records")->whereIn("id", $ids)->delete();
-        DB::table("edges")->whereIn("source", $ids)->delete();
+        Database::make()->table("edges")->whereIn("source", $ids)->delete();
-        DB::table("edges")->whereIn("target", $ids)->delete();
+        Database::make()->table("edges")->whereIn("target", $ids)->delete();
-        DB::table("revisions")->whereIn("recordId", $ids)->delete();
+        Database::make()->table("revisions")->whereIn("recordId", $ids)->delete();
     }
 
     public function deleteTrashedBySchema(
         string $schemaName,
     ): void
     {
-        $ids = DB::table("records")
+        $ids = Database::make()->table("records")
             ->where("schema", $schemaName)
             ->where("status", Status::TRASHED->value)
             ->get()->pluck("id")->toArray();

src/Revision/RevisionRepo.php

@@ -2,7 +2,7 @@
 
 namespace Lucent\Revision;
 
-use Illuminate\Support\Facades\DB;
+use Lucent\Database\Database;
 use Lucent\Edge\Edge;
 use Lucent\Primitive\Collection;
 use Lucent\Record\FileData;
@@ -19,7 +19,7 @@ class RevisionRepo
     public function create(Revision $revision): string
     {
         $revisionDB = $this->toDB($revision);
-        DB::table($this->table)->insert($revisionDB);
+        Database::make()->table($this->table)->insert($revisionDB);
         return $revision->id;
     }
 
@@ -29,7 +29,7 @@ class RevisionRepo
      **/
     public function getByRecordId(string $rid): Collection
     {
-        $revisions = DB::table($this->table)
+        $revisions = Database::make()->table($this->table)
             ->where("recordId", $rid)
             ->get()
             ->map([$this, 'fromDB'])
@@ -41,7 +41,7 @@ class RevisionRepo
 
     public function cleanupRecord(string $rid, int $numKeep): void
     {
-        $revisionIds = DB::table($this->table)
+        $revisionIds = Database::make()->table($this->table)
             ->where("recordId", $rid)
             ->orderBy("_sys->version", "desc")
             ->limit(100)
@@ -49,7 +49,7 @@ class RevisionRepo
             ->get()
             ->pluck("id");
 
-        DB::table($this->table)
+        Database::make()->table($this->table)
             ->whereIn("id", $revisionIds)
             ->delete();
     }
@@ -61,7 +61,7 @@ class RevisionRepo
     public function getByRecordIdAndVersion(string $rid, int $version): Option
     {
 
-        $res = DB::table($this->table)
+        $res = Database::make()->table($this->table)
             ->where("recordId", $rid)
             ->where('_sys->version', $version)->first();
 
@@ -90,7 +90,7 @@ class RevisionRepo
         $file = json_decode($data->_file, true);
         if (!empty($file)) {
 
-            $file = new FileData(...$file);
+            $file = FileData::fromArray($file);
         } else {
             $file = null;
         }

src/Schema/CollectionSchema.php

@@ -30,4 +30,6 @@ class CollectionSchema implements Schema
     {
     }
 
+
+
 }

src/Schema/FilesSchema.php

@@ -16,7 +16,9 @@ class FilesSchema implements Schema
     function __construct(
         public string     $name,
         public string     $label,
+        public array      $visible,
         public Collection $fields,
+        public string     $disk,
         public string     $path,
         public array      $groups,
         public bool       $isEntry = false,