@@ -93,44 +101,39 @@
{/if}
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}
{#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