From 8b3a3964a56a46b9126a0f8e79ae737b8e039290 Mon Sep 17 00:00:00 2001
From: lexx <alexlingris@gmail.com>
Date: Wed, 6 May 2026 19:36:53 +0300
Subject: [PATCH] fixes

---
 .env.example                                 |  1 +
 front/js/svelte/files/Uploader.svelte        |  4 ---
 front/js/svelte/layout/Header.svelte         | 13 +++++---
 front/js/svelte/layout/Navbar.svelte         | 34 +++++---------------
 front/js/svelte/records/elements/File.svelte |  2 +-
 src/Channel/Channel.php                      |  5 +--
 src/Channel/ChannelService.php               |  5 +++
 src/Config/main.php                          |  9 +++---
 src/Data/ChannelAuth.php                     |  9 ++++++
 src/LucentServiceProvider.php                | 11 ++++---
 10 files changed, 48 insertions(+), 45 deletions(-)
 create mode 100644 .env.example
 create mode 100644 src/Data/ChannelAuth.php

diff --git a/.env.example b/.env.example
new file mode 100644
index 0000000..79b9d76
--- /dev/null
+++ b/.env.example
@@ -0,0 +1 @@
+LUCENT_AUTH=lucent // or lunar
diff --git a/front/js/svelte/files/Uploader.svelte b/front/js/svelte/files/Uploader.svelte
index 6394e25..ff76256 100644
--- a/front/js/svelte/files/Uploader.svelte
+++ b/front/js/svelte/files/Uploader.svelte
@@ -39,10 +39,6 @@
                     dispatch("uploadComplete", data);
                 }
                 isLoading = false;
-            })
-            .catch((error) => {
-                isLoading = false;
-                console.log(error);
             });
     }
 </script>
diff --git a/front/js/svelte/layout/Header.svelte b/front/js/svelte/layout/Header.svelte
index 8513fc1..f54cfe5 100644
--- a/front/js/svelte/layout/Header.svelte
+++ b/front/js/svelte/layout/Header.svelte
@@ -8,8 +8,9 @@
 </script>
 
 <div class="top-nav">
-    <a class="top-nav-item" href="{channel.lucentUrl}/members">Members</a>
-
+    {#if channel.auth == "lucent"}
+        <a class="top-nav-item" href="{channel.lucentUrl}/members">Members</a>
+    {/if}
     {#if channel.commands.length > 0}
         <Dropdown>
             <div slot="button">Actions</div>
@@ -27,7 +28,11 @@
     <!--                       class="form-control" required/>-->
     <!--            </form>-->
     <!--        </div>-->
-    <a href="{channel.lucentUrl}/profile">
+    {#if channel.auth == "lucent"}
+        <a href="{channel.lucentUrl}/profile">
+            <Avatar side="28" name={user.name} />
+        </a>
+    {:else}
         <Avatar side="28" name={user.name} />
-    </a>
+    {/if}
 </div>
diff --git a/front/js/svelte/layout/Navbar.svelte b/front/js/svelte/layout/Navbar.svelte
index 949cb9e..507f45e 100644
--- a/front/js/svelte/layout/Navbar.svelte
+++ b/front/js/svelte/layout/Navbar.svelte
@@ -1,39 +1,21 @@
 <script>
     import NavbarMenu from "./NavbarMenu.svelte";
-    import {getContext} from "svelte";
+    import { getContext } from "svelte";
 
     export let schema;
     const channel = getContext("channel");
     const readableSchemas = getContext("readableSchemas");
-
-    const fileSchemas = readableSchemas.filter((sc) => sc.type === "files");
-    const otherSchemas = readableSchemas.filter((sc) => !sc.isEntry && sc.type === "collection");
-
 </script>
+
 <div class="sidebar-top">
-    <a class="logo" href="{channel.lucentUrl}">{channel.name}</a>
-    <a class="nav-item" href="{channel.lucentUrl}/profile">
-    </a>
+    <a class="logo" href={channel.lucentUrl}>{channel.name}</a>
+    <a class="nav-item" href="{channel.lucentUrl}/profile"> </a>
 </div>
 <div class="sidebar">
-
-
     <NavbarMenu
-            title="Content"
-            schemas={ readableSchemas.filter((sc) => sc.isEntry)}
-            schema={schema}
-            expanded={true}
-    />
-
-    <NavbarMenu
-            title="Files"
-            schemas={ fileSchemas}
-            schema={schema}
-    />
-
-    <NavbarMenu
-            title="Other"
-            schemas={ otherSchemas}
-            schema={schema}
+        title="Content"
+        schemas={readableSchemas.filter((sc) => sc.isEntry)}
+        {schema}
+        expanded={true}
     />
 </div>
diff --git a/front/js/svelte/records/elements/File.svelte b/front/js/svelte/records/elements/File.svelte
index 02a3c7f..10bb428 100644
--- a/front/js/svelte/records/elements/File.svelte
+++ b/front/js/svelte/records/elements/File.svelte
@@ -34,7 +34,7 @@
     }
 
     function uploadComplete(e) {
-        records = e.detail;
+        // value = [...value, e.detail];
     }
 
     function openBrowseModal(e) {
diff --git a/src/Channel/Channel.php b/src/Channel/Channel.php
index a204476..087bb5a 100644
--- a/src/Channel/Channel.php
+++ b/src/Channel/Channel.php
@@ -4,7 +4,8 @@ namespace Lucent\Channel;
 
 use Lucent\Channel\Data\UserCommand;
 use Lucent\Primitive\Collection;
-use Lucent\Schema\Schema;
+use Lucent\Data\Schema;
+use Lucent\Data\ChannelAuth;
 
 final class Channel
 {
@@ -18,6 +19,7 @@ final class Channel
      */
     function __construct(
         public string $name,
+        public ChannelAuth $auth,
         public string $url,
         public string $previewTarget,
         public Collection $commands,
@@ -27,7 +29,6 @@ final class Channel
     ) {
         $this->lucentUrl = $url . "/lucent";
         $this->filesUrl = $this->makeFilesUrl();
-
         $this->previewTargetUrl = $url . "/" . $previewTarget;
     }
 
diff --git a/src/Channel/ChannelService.php b/src/Channel/ChannelService.php
index f68806f..3939403 100644
--- a/src/Channel/ChannelService.php
+++ b/src/Channel/ChannelService.php
@@ -3,6 +3,7 @@
 namespace Lucent\Channel;
 
 use Lucent\Channel\Data\UserCommand;
+use Lucent\Data\ChannelAuth;
 use Lucent\Primitive\Collection;
 use Lucent\Data\Schema;
 use Lucent\Schema\SchemaService;
@@ -34,6 +35,10 @@ final class ChannelService
 
         $channel = new Channel(
             name: config("lucent.name") ?? "",
+            auth: match (config("lucent.auth")) {
+                "lunar" => ChannelAuth::LUNAR,
+                default => ChannelAuth::LUCENT,
+            },
             url: rtrim(config("lucent.url") ?? "", "/"),
             previewTarget: rtrim(config("lucent.previewTarget") ?? "", "/"),
             commands: Collection::make($userCommands),
diff --git a/src/Config/main.php b/src/Config/main.php
index 83af640..8e41f4d 100644
--- a/src/Config/main.php
+++ b/src/Config/main.php
@@ -2,10 +2,11 @@
 
 return [
     "env" => env("LUCENT_ENV", "production"),
+    "auth" => env("LUCENT_AUTH", "lucent"),
     "schemas_path" => env("LUCENT_SCHEMAS_PATH", "resources/lucent/schemas"),
-    "database" => env('LUCENT_DB_CONNECTION', env('DB_CONNECTION', "sqlite")),
+    "database" => env("LUCENT_DB_CONNECTION", env("DB_CONNECTION", "sqlite")),
     "name" => env("LUCENT_NAME", "Lucent"),
-    "url" => env("LUCENT_URL", env('APP_URL')),
+    "url" => env("LUCENT_URL", env("APP_URL")),
     "previewTarget" => env("LUCENT_PREVIEW_TARGET", "previewTarget"),
     /*
      * Make available laravel artisan commands for admin users
@@ -44,6 +45,6 @@ return [
         \Lucent\Schema\Ui\Rich::class,
         \Lucent\Schema\Ui\Slug::class,
         \Lucent\Schema\Ui\Text::class,
-        \Lucent\Schema\Ui\Textarea::class
-    ]
+        \Lucent\Schema\Ui\Textarea::class,
+    ],
 ];
diff --git a/src/Data/ChannelAuth.php b/src/Data/ChannelAuth.php
new file mode 100644
index 0000000..2ad2169
--- /dev/null
+++ b/src/Data/ChannelAuth.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Lucent\Data;
+
+enum ChannelAuth: string
+{
+    case LUNAR = "lunar";
+    case LUCENT = "lucent";
+}
diff --git a/src/LucentServiceProvider.php b/src/LucentServiceProvider.php
index fc6ac22..34f0753 100644
--- a/src/LucentServiceProvider.php
+++ b/src/LucentServiceProvider.php
@@ -10,16 +10,16 @@ use Intervention\Image\ImageManager;
 use Lucent\Account\AuthService;
 use Lucent\Account\AuthServiceLunar;
 use Lucent\Account\UserRepo;
+use Lucent\Account\UserRepoLucent;
 use Lucent\Account\UserRepoLunar;
 use Lucent\Channel\ChannelService;
 use Lucent\Commands\CompileSchemas;
 use Lucent\Commands\GenerateCollectionSchema;
-use Lucent\Commands\GenerateFileSchema;
 use Lucent\Commands\LiveLink;
 use Lucent\Commands\RebuildThumbnails;
 use Lucent\Commands\RemoveOrphanEdges;
 use Lucent\Commands\SetupDatabase;
-use Lucent\Commands\UpgradeFiles122;
+use Lucent\Data\ChannelAuth;
 use Lucent\File\FileService;
 use Lucent\Query\DatabaseGraph\DatabaseGraph;
 use Lucent\Query\DatabaseGraph\PgsqlDatabaseGraph;
@@ -43,8 +43,11 @@ class LucentServiceProvider extends ServiceProvider
             return new PgsqlDatabaseGraph();
         });
 
-        $this->app->bind(UserRepo::class, function () {
-            return new UserRepoLunar();
+        $this->app->bind(UserRepo::class, function ($app) {
+            return match ($app->make(ChannelService::class)->channel->auth) {
+                ChannelAuth::LUNAR => new UserRepoLunar(),
+                ChannelAuth::LUCENT => new UserRepoLucent(),
+            };
         });
 
         $this->app->bind(AuthService::class, function ($app) {