From 93a16ee91601d7b6a8beb0c93c125c46c9e84c13 Mon Sep 17 00:00:00 2001 From: lexx Date: Wed, 6 May 2026 21:43:13 +0300 Subject: [PATCH] cleanup --- .env.example | 1 - front/js/svelte/content/Table.svelte | 3 - .../svelte/content/tools/AppliedFilter.svelte | 51 +++---- .../content/tools/FilterReferenceInput.svelte | 51 +++---- front/js/svelte/home/RecordRow.svelte | 3 +- front/js/svelte/layout/Navbar.svelte | 16 +-- front/js/svelte/layout/NavbarMenu.svelte | 34 ----- front/js/svelte/records/Preview.js | 33 ----- .../js/svelte/records/PreviewCardSmall.svelte | 14 +- .../records/elements/ReferenceTags.svelte | 136 +++++++++--------- front/js/svelte/records/header/Title.svelte | 16 +-- .../records/previews/PreviewFile.svelte | 3 - .../records/previews/PreviewReference.svelte | 38 +++-- src/Config/main.php | 2 + src/Data/Schema.php | 3 - src/Http/Controller/RecordController.php | 4 +- src/Http/Middleware/AuthMiddleware.php | 3 - src/Schema/CollectionSchema.php | 33 ----- src/Schema/FilesSchema.php | 36 ----- src/Schema/Schema.php | 9 -- src/Schema/SchemaService.php | 4 - src/Schema/Ui/Slug.php | 2 +- src/ViewModel/ViewModel.php | 40 ------ 23 files changed, 148 insertions(+), 387 deletions(-) delete mode 100644 .env.example delete mode 100644 front/js/svelte/layout/NavbarMenu.svelte delete mode 100644 front/js/svelte/records/Preview.js delete mode 100644 src/Schema/CollectionSchema.php delete mode 100644 src/Schema/FilesSchema.php delete mode 100644 src/Schema/Schema.php delete mode 100644 src/ViewModel/ViewModel.php diff --git a/.env.example b/.env.example deleted file mode 100644 index 79b9d76..0000000 --- a/.env.example +++ /dev/null @@ -1 +0,0 @@ -LUCENT_AUTH=lucent // or lunar diff --git a/front/js/svelte/content/Table.svelte b/front/js/svelte/content/Table.svelte index 4f7aa5a..0347720 100644 --- a/front/js/svelte/content/Table.svelte +++ b/front/js/svelte/content/Table.svelte @@ -1,13 +1,10 @@ + {#if filter.isReference && filterRecord} + {filter.label} is {filterRecord.data.name} + {:else} + {filter.label} + {operators.find((o) => o.name === filter.operator)?.symbol ?? ""} + {operators.find((o) => o.name === filter.operator)?.hasValue + ? value + : ""} + {/if} - {#if filter.isReference && filterRecord} - {filter.label} is {previewTitle(channel.schemas, filterRecord)} - {:else} - {filter.label} {operators.find((o) => o.name === filter.operator)?.symbol ?? ""} {operators.find((o) => o.name === filter.operator)?.hasValue ? value : ""} - {/if} - - + - - diff --git a/front/js/svelte/content/tools/FilterReferenceInput.svelte b/front/js/svelte/content/tools/FilterReferenceInput.svelte index e65b79e..38805be 100644 --- a/front/js/svelte/content/tools/FilterReferenceInput.svelte +++ b/front/js/svelte/content/tools/FilterReferenceInput.svelte @@ -1,8 +1,6 @@ +
- {#if searchOptions} {#each searchOptions as option (option.id)}
apply(e, option)} - on:keypress={(e) => apply(e, option)} + class="reference-tags-option" + role="button" + tabindex="0" + on:click={(e) => apply(e, option)} + on:keypress={(e) => apply(e, option)} > - {previewTitle(channel.schemas, option)} + {option.data.name}
- {:else} -
- Start typing... -
+
Start typing...
{/each} {/if}
- - - - diff --git a/front/js/svelte/home/RecordRow.svelte b/front/js/svelte/home/RecordRow.svelte index 6050713..66701e5 100644 --- a/front/js/svelte/home/RecordRow.svelte +++ b/front/js/svelte/home/RecordRow.svelte @@ -1,7 +1,6 @@ - - -{#if expanded} - {#each schemas as aschema} - {aschema.label} - {/each} -{/if} \ No newline at end of file diff --git a/front/js/svelte/records/Preview.js b/front/js/svelte/records/Preview.js deleted file mode 100644 index 34237e6..0000000 --- a/front/js/svelte/records/Preview.js +++ /dev/null @@ -1,33 +0,0 @@ -import Mustache from "mustache"; -import { stripHtml } from "../../helpers"; - -export function previewTitle(schemas, record, graph) { - let schema = schemas.find((aSchema) => aSchema.name === record?.schema); - if (!schema?.cardTitle) { - return noTemplate(schema, record); - } - - let recordData = record.data; - let render = Mustache.render(schema.cardTitle, recordData); - if (!render || render === "") { - return noTemplate(schema, record); - } - - return stripHtml(render.slice(0, 300)); -} - -function noTemplate(schema, record) { - if (schema?.type === "files") { - return file.path; - } - - let title = stripHtml( - record?.data[schema.fields.filter((f) => f.info.name === "text")[0]?.name], - ).slice(0, 300); - - if (title.trim() === "") { - return "~Untitled~"; - } - - return title; -} diff --git a/front/js/svelte/records/PreviewCardSmall.svelte b/front/js/svelte/records/PreviewCardSmall.svelte index 6b83a0d..9626589 100644 --- a/front/js/svelte/records/PreviewCardSmall.svelte +++ b/front/js/svelte/records/PreviewCardSmall.svelte @@ -1,21 +1,13 @@ {#if record?.data} - + {title} {/if} diff --git a/front/js/svelte/records/elements/ReferenceTags.svelte b/front/js/svelte/records/elements/ReferenceTags.svelte index efa8595..b3ec753 100644 --- a/front/js/svelte/records/elements/ReferenceTags.svelte +++ b/front/js/svelte/records/elements/ReferenceTags.svelte @@ -1,9 +1,8 @@ +
{#if errorMessage}
@@ -93,44 +101,39 @@ {/if}
- {#if searchOptions} {#each searchOptions as option (option.id)}
insert(e, option)} - on:keypress={(e) => insert(e, option)} - > - {previewTitle(channel.schemas, option ,graph)} -
- - {:else} -
- Start typing... -
- {/each} - {/if} - {#if search } -
saveNew(e,search)} - on:keypress={(e) => saveNew(e,search)} + on:click={(e) => insert(e, option)} + on:keypress={(e) => insert(e, option)} + > + {option.data.name} +
+ {:else} +
Start typing...
+ {/each} + {/if} + {#if search} +
saveNew(e, search)} + on:keypress={(e) => saveNew(e, search)} > Add "{search}"
@@ -142,26 +145,23 @@
{#each references as record (record.id)} - - {previewTitle(channel.schemas, record)} - + + {record.data.name} + - + + {/each}
{/if} - - - diff --git a/front/js/svelte/records/header/Title.svelte b/front/js/svelte/records/header/Title.svelte index 3ba35cc..c39ed16 100644 --- a/front/js/svelte/records/header/Title.svelte +++ b/front/js/svelte/records/header/Title.svelte @@ -1,27 +1,21 @@
- - {schema.label.toUpperCase()}{schema.label.toUpperCase()} {#if !isCreateMode} - {previewTitle(channel.schemas, record)} + {record.data.name} {:else} New Record {/if} - -
\ No newline at end of file +
diff --git a/front/js/svelte/records/previews/PreviewFile.svelte b/front/js/svelte/records/previews/PreviewFile.svelte index 5bfe1cb..f534177 100644 --- a/front/js/svelte/records/previews/PreviewFile.svelte +++ b/front/js/svelte/records/previews/PreviewFile.svelte @@ -3,9 +3,6 @@ import { createEventDispatcher, getContext } from "svelte"; import Preview from "../../files/Preview.svelte"; - import { previewTitle } from "./../Preview"; - import { fileurl, htmlurl } from "../../files/imageserver.js"; - import Status from "./../Status.svelte"; import Dropdown from "../../common/Dropdown.svelte"; const dispatch = createEventDispatcher(); diff --git a/front/js/svelte/records/previews/PreviewReference.svelte b/front/js/svelte/records/previews/PreviewReference.svelte index 12845cc..d9a4857 100644 --- a/front/js/svelte/records/previews/PreviewReference.svelte +++ b/front/js/svelte/records/previews/PreviewReference.svelte @@ -1,8 +1,7 @@ -
- {#if cardImageRecord}
- +
{/if}
- {cardTitle} + {record.data.name} from {schema.label} {#if record.status === "draft"} - + {/if} -
-
{#if hasDelete}
-
{/if}
- diff --git a/src/Config/main.php b/src/Config/main.php index 8e41f4d..0886901 100644 --- a/src/Config/main.php +++ b/src/Config/main.php @@ -2,7 +2,9 @@ return [ "env" => env("LUCENT_ENV", "production"), + // lucent or lunar "auth" => env("LUCENT_AUTH", "lucent"), + "disk" => env("LUCENT_DISK", "public"), "schemas_path" => env("LUCENT_SCHEMAS_PATH", "resources/lucent/schemas"), "database" => env("LUCENT_DB_CONNECTION", env("DB_CONNECTION", "sqlite")), "name" => env("LUCENT_NAME", "Lucent"), diff --git a/src/Data/Schema.php b/src/Data/Schema.php index 9221fd1..b349649 100644 --- a/src/Data/Schema.php +++ b/src/Data/Schema.php @@ -16,10 +16,7 @@ class Schema public array $visible, public array $groups, public Collection $fields, - public bool $isEntry = false, - public string $color = "", public string $sortBy = "-_sys.updatedAt", - public ?string $cardTitle = null, public ?string $cardImage = null, public int $revisions = 0, public array $read = [], diff --git a/src/Http/Controller/RecordController.php b/src/Http/Controller/RecordController.php index 5cf9ed6..955c2e4 100644 --- a/src/Http/Controller/RecordController.php +++ b/src/Http/Controller/RecordController.php @@ -21,7 +21,6 @@ use Lucent\Schema\System; use Lucent\Schema\Ui\Reference; use Lucent\Schema\Validator\ValidatorException; use Lucent\Svelte\Svelte; -use Lucent\ViewModel\ViewModel; use function Lucent\Response\fail; use function Lucent\Response\ok; @@ -36,7 +35,6 @@ class RecordController extends Controller private readonly Query $query, private readonly Manager $recordManager, private readonly OperatorRegistry $operatorRegistry, - private readonly ViewModel $viewModel, ) {} public function index(Request $request) @@ -217,7 +215,7 @@ class RecordController extends Controller $c[] = ""; } elseif (count($fieldRecords) === 1) { $c[] = data_get($fieldRecords, "0.id"); - $c[] = $this->viewModel->getRecordName($fieldRecords[0]); + $c[] = $fieldRecords[0]->data["name"]; } else { $c[] = collect($fieldRecords)->pluck("id")->join("::"); $c[] = collect($fieldRecords) diff --git a/src/Http/Middleware/AuthMiddleware.php b/src/Http/Middleware/AuthMiddleware.php index 8f271e5..5928124 100644 --- a/src/Http/Middleware/AuthMiddleware.php +++ b/src/Http/Middleware/AuthMiddleware.php @@ -8,7 +8,6 @@ use Illuminate\Support\Facades\View; use Lucent\Account\AccountService; use Lucent\Account\AuthService; use Lucent\Channel\ChannelService; -use Lucent\ViewModel\ViewModel; readonly class AuthMiddleware { @@ -16,7 +15,6 @@ readonly class AuthMiddleware private AuthService $authService, private AccountService $accountService, private ChannelService $channelService, - private ViewModel $viewModel, ) {} public function handle(Request $request, Closure $next) @@ -38,7 +36,6 @@ readonly class AuthMiddleware ) ->values(), ); - View::share("viewModel", $this->viewModel); return $next($request); } diff --git a/src/Schema/CollectionSchema.php b/src/Schema/CollectionSchema.php deleted file mode 100644 index 8d130aa..0000000 --- a/src/Schema/CollectionSchema.php +++ /dev/null @@ -1,33 +0,0 @@ - $fields - * @param array $visible - */ - function __construct( - public string $name, - public string $label, - public array $visible, - public array $groups, - public Collection $fields, - public bool $isEntry = false, - public string $color = "", - public string $sortBy = "-_sys.updatedAt", - public ?string $cardTitle = null, - public ?string $cardImage = null, - public int $revisions = 0, - public array $read = [], - public array $write = [], - ) - { - } - -} diff --git a/src/Schema/FilesSchema.php b/src/Schema/FilesSchema.php deleted file mode 100644 index 7605ba4..0000000 --- a/src/Schema/FilesSchema.php +++ /dev/null @@ -1,36 +0,0 @@ - $fields - * @param array $groups - */ - function __construct( - public string $name, - public string $label, - public Collection $fields, - public string $disk, - public string $path, - public array $groups, - public bool $isEntry = false, - public string $sortBy = "-_sys.updatedAt", - public string $color = "", - public ?string $cardTitle = null, - public ?string $cardImage = null, - public int $revisions = 0, - public array $read = [], - public array $write = [], - ) - { - } - - -} diff --git a/src/Schema/Schema.php b/src/Schema/Schema.php deleted file mode 100644 index 01d888a..0000000 --- a/src/Schema/Schema.php +++ /dev/null @@ -1,9 +0,0 @@ -source]); } - $output[$this->name] = new Nullable( + $output[$this->name] = Nullable::make( $this->nullable, $value, "", diff --git a/src/ViewModel/ViewModel.php b/src/ViewModel/ViewModel.php deleted file mode 100644 index e22c87c..0000000 --- a/src/ViewModel/ViewModel.php +++ /dev/null @@ -1,40 +0,0 @@ -channelService->getSchema($record->schema)->get(); - if (empty($schema->cardTitle)) { - $title = match (get_class($schema)) { - CollectionSchema::class => $record->data[$schema->fields->filter(fn(FieldInterface $f) => $f->info->name === "text")->first()->name], - FilesSchema::class => $record->_file->path, - }; - - if (empty(trim($title))) { - return "~Untitled~"; - } - - return $title; - } - - $m = new Mustache_Engine(array('entity_flags' => ENT_QUOTES)); - return $m->render($schema->cardTitle, $record->data); - } -} \ No newline at end of file