From 718cdb54f98a94ea91acce4e568789e7157b6b54 Mon Sep 17 00:00:00 2001 From: lexx Date: Wed, 4 Oct 2023 23:48:12 +0300 Subject: [PATCH] static --- front/js/svelte/Channel.svelte | 2 + front/js/svelte/Navbar.svelte | 103 +++++++++++------- front/js/svelte/SidebarHeader.svelte | 29 ----- front/js/svelte/SidebarItem.svelte | 10 -- front/js/svelte/account/Nav.svelte | 47 -------- front/js/svelte/account/Profile.svelte | 16 +-- front/js/svelte/build/Report.svelte | 32 ++++++ front/js/svelte/records/Edit.svelte | 8 +- front/js/svelte/records/EditHeader.svelte | 14 +-- front/js/svelte/records/StatusSelect.svelte | 64 ++++++----- front/sass/_nav.scss | 7 +- front/sass/app.scss | 1 - src/Account/AuthService.php | 4 +- src/Channel/Channel.php | 2 + src/Channel/ChannelService.php | 2 + src/Http/Controller/AccountController.php | 29 ++--- src/Http/Controller/Api/AccountController.php | 51 --------- src/Http/Controller/BuildController.php | 64 +++++++++++ src/Http/Controller/HomeController.php | 7 +- src/Http/web.php | 7 +- src/StaticGenerator/StaticGenerator.php | 16 ++- src/Views/redirect.blade.php | 10 ++ 22 files changed, 262 insertions(+), 263 deletions(-) delete mode 100644 front/js/svelte/SidebarHeader.svelte delete mode 100644 front/js/svelte/SidebarItem.svelte delete mode 100644 front/js/svelte/account/Nav.svelte create mode 100644 front/js/svelte/build/Report.svelte delete mode 100644 src/Http/Controller/Api/AccountController.php create mode 100644 src/Http/Controller/BuildController.php create mode 100644 src/Views/redirect.blade.php diff --git a/front/js/svelte/Channel.svelte b/front/js/svelte/Channel.svelte index 912552b..6d4f026 100644 --- a/front/js/svelte/Channel.svelte +++ b/front/js/svelte/Channel.svelte @@ -6,6 +6,7 @@ import {setContext} from "svelte"; import Navbar from "./Navbar.svelte"; import HomeIndex from "./home/Index.svelte"; + import BuildReport from "./build/Report.svelte"; const components = { members: Members, @@ -13,6 +14,7 @@ recordNotFound: RecordNotFound, contentIndex: ContentIndex, homeIndex: HomeIndex, + buildReport: BuildReport, }; export let title; diff --git a/front/js/svelte/Navbar.svelte b/front/js/svelte/Navbar.svelte index 21fe9a7..4c11851 100644 --- a/front/js/svelte/Navbar.svelte +++ b/front/js/svelte/Navbar.svelte @@ -7,60 +7,85 @@ const channel = getContext("channel"); const user = getContext("user"); + function buildWebsite(e) { + e.preventDefault(); + + axios.post(channel.lucentUrl + "/build").then(response => { + window.location.href = channel.lucentUrl + "/build-report" + }) + + } -
-
-

- -

-
-
- + + + +
+ +
+
+

+ +

+
+
+ sc.isEntry)} schema={schema} - /> -
+ />
-
-

- -

-
-
- +
+

+ +

+
+
+ !sc.isEntry)} schema={schema} - /> -
+ />
- +
- - +
\ No newline at end of file diff --git a/front/js/svelte/SidebarHeader.svelte b/front/js/svelte/SidebarHeader.svelte deleted file mode 100644 index 2dd5fcf..0000000 --- a/front/js/svelte/SidebarHeader.svelte +++ /dev/null @@ -1,29 +0,0 @@ - - - - {#if !isExpanded} - (isExpanded = true)}> - - - {/if} - - {#if isExpanded} - (isExpanded = false)}> - - - {/if} - {label} -
- -
- -{#if isExpanded} -
- -
-{/if} diff --git a/front/js/svelte/SidebarItem.svelte b/front/js/svelte/SidebarItem.svelte deleted file mode 100644 index 069cd91..0000000 --- a/front/js/svelte/SidebarItem.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - -
- -
- -
-
diff --git a/front/js/svelte/account/Nav.svelte b/front/js/svelte/account/Nav.svelte deleted file mode 100644 index e12a5ce..0000000 --- a/front/js/svelte/account/Nav.svelte +++ /dev/null @@ -1,47 +0,0 @@ - - - - -
    - {#each menuItems as item} - {#if item.auth == logged || item.guest == !logged} -
  • - {item.name} -
    • - {/if} - {/each} -
- diff --git a/front/js/svelte/account/Profile.svelte b/front/js/svelte/account/Profile.svelte index 7721446..bfd88ff 100644 --- a/front/js/svelte/account/Profile.svelte +++ b/front/js/svelte/account/Profile.svelte @@ -1,11 +1,11 @@ -
diff --git a/front/js/svelte/build/Report.svelte b/front/js/svelte/build/Report.svelte new file mode 100644 index 0000000..9e50176 --- /dev/null +++ b/front/js/svelte/build/Report.svelte @@ -0,0 +1,32 @@ + + +
+
+

{title}

+ + {output} +
+
diff --git a/front/js/svelte/records/Edit.svelte b/front/js/svelte/records/Edit.svelte index be94d4e..a7c19a7 100644 --- a/front/js/svelte/records/Edit.svelte +++ b/front/js/svelte/records/Edit.svelte @@ -158,13 +158,13 @@ {#if !["_graph", "_info"].includes(activeContentTab)} -
- + {#if isCreateMode}
- - - - - - - - - - - - - +
Record Actions
+ import {getContext} from "svelte"; import Status from "./Status.svelte"; import {getStatus, getStatusList} from "./StatusText"; + const channel = getContext("channel"); export let status = "draft"; + export let record; export let schema; let dropdown; $: currentStatus = getStatus(status); @@ -16,31 +19,40 @@ -
- - -
-
Change status to
- {#each statusList as astatus} - {#if astatus.value !== status} - - {/if} - {/each} +
+
+ + +
+
Change status to
+ {#each statusList as astatus} + {#if astatus.value !== status} + + {/if} + {/each} +
+ +
+ {#if channel.previewTarget} + + Preview + + {/if}
diff --git a/front/sass/_nav.scss b/front/sass/_nav.scss index 99a1152..4edb0e9 100644 --- a/front/sass/_nav.scss +++ b/front/sass/_nav.scss @@ -1,11 +1,12 @@ .lx-nav{ display: flex; - justify-content: center; + justify-content: space-between; + padding: 12px 20px; align-items: center; - background-color: rgba(255,255,255,.7); + background-color: rgba(255,255,255,1); margin-bottom:0px ; .nav-item{ - padding:4px 0; + padding:16px 0; margin: 0 16px; color: $primary; diff --git a/front/sass/app.scss b/front/sass/app.scss index 97566b5..769ceed 100644 --- a/front/sass/app.scss +++ b/front/sass/app.scss @@ -107,7 +107,6 @@ body { display: inline-block; } - .cursor-pointer { cursor: pointer; } diff --git a/src/Account/AuthService.php b/src/Account/AuthService.php index 38c4d05..ec9561d 100644 --- a/src/Account/AuthService.php +++ b/src/Account/AuthService.php @@ -132,10 +132,10 @@ readonly class AuthService /** * @throws LucentException */ - public function updateName(string $userId, string $name): void + public function updateName( string $name): void { $name = (new Name($name)); - $this->userRepo->updateName($userId, $name); + $this->userRepo->updateName($this->currentUserId(), $name); } diff --git a/src/Channel/Channel.php b/src/Channel/Channel.php index 81ab553..e97daf4 100644 --- a/src/Channel/Channel.php +++ b/src/Channel/Channel.php @@ -16,6 +16,8 @@ final class Channel function __construct( public string $name, public string $url, + public string $previewTarget, + public string $generateCommand, public Collection $schemas, public array $imageFilters, // public Collection $previewTargets, diff --git a/src/Channel/ChannelService.php b/src/Channel/ChannelService.php index 68d1d6f..79d8651 100644 --- a/src/Channel/ChannelService.php +++ b/src/Channel/ChannelService.php @@ -36,6 +36,8 @@ final class ChannelService $channel = new Channel( name: $configArray["name"] ?? "", url: rtrim($configArray["url"] ?? "", "/"), + previewTarget: rtrim($configArray["previewTarget"] ?? "", "/"), + generateCommand: $configArray["generateCommand"] ?? "", schemas: $schemasCollection, imageFilters: $configArray["imageFilters"] ?? [], ); diff --git a/src/Http/Controller/AccountController.php b/src/Http/Controller/AccountController.php index 0222795..d6da6ef 100644 --- a/src/Http/Controller/AccountController.php +++ b/src/Http/Controller/AccountController.php @@ -4,23 +4,29 @@ namespace Lucent\Http\Controller; use App\Http\Controllers\Controller; use Illuminate\Http\Request; -use Lucent\Account\Auth; +use Lucent\Account\AuthService; +use Lucent\Svelte\Svelte; +use Throwable; use function Lucent\Response\fail; use function Lucent\Response\ok; -use function Lucent\Svelte\svelte; class AccountController extends Controller { + public function __construct( + public Svelte $svelte, + public AuthService $authService, + ) + { + } public function profile() { - return svelte( + return $this->svelte->render( layout: "account", view: "profile", title: "Profile", - data: [] ); } @@ -28,23 +34,12 @@ class AccountController extends Controller { try { - (new Auth)->updateName(session("user.id"), $request->input("name")); - } catch (\Throwable $th) { + $this->authService->updateName($request->input("name")); + } catch (Throwable $th) { return fail($th); } return ok(); } - public function updateEmail(Request $request) - { - - try { - (new Auth)->updateEmail(session("user.id"), $request->input("email")); - } catch (\Throwable $th) { - return fail($th); - } - - return ok(); - } } diff --git a/src/Http/Controller/Api/AccountController.php b/src/Http/Controller/Api/AccountController.php deleted file mode 100644 index f996e54..0000000 --- a/src/Http/Controller/Api/AccountController.php +++ /dev/null @@ -1,51 +0,0 @@ -authService->updateName(session("user.id"), $request->input("name")); - } catch (LucentException $th) { - return fail($th); - } - $request->session()->put("user.name", $request->input("name")); - - return ok(); - } - - -} diff --git a/src/Http/Controller/BuildController.php b/src/Http/Controller/BuildController.php new file mode 100644 index 0000000..2c56be2 --- /dev/null +++ b/src/Http/Controller/BuildController.php @@ -0,0 +1,64 @@ +channelService->channel->generateCommand} > /dev/null 2>&1 & echo $!",$op); + $pid = (int)$op[0]; + return redirect($this->channelService->channel->lucentUrl . "/build-report"); + } + + public function report(): View + { + + return $this->svelte->render( + layout: "channel", + view: "buildReport", + title: "Build Report", + ); + } + + public function reportSource() + { + return response()->stream(function () { + while (true) { + $curDate = time(); + echo 'data: {"time": "' . $curDate . '"}'; + echo "\n\n"; + logger( $curDate); + + ob_flush(); + flush(); + + // Break the loop if the client aborted the connection (closed the page) + if (connection_aborted()) {break;} + sleep(2); // 50ms + } + }, 200, [ + 'Cache-Control' => 'no-cache', + 'X-Accel-Buffering' => 'no', + 'Content-Type' => 'text/event-stream', + ]); + } + + +} diff --git a/src/Http/Controller/HomeController.php b/src/Http/Controller/HomeController.php index cb05b09..83f0a25 100644 --- a/src/Http/Controller/HomeController.php +++ b/src/Http/Controller/HomeController.php @@ -6,6 +6,7 @@ use App\Http\Controllers\Controller; use Illuminate\Contracts\View\View; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Lucent\Account\AccountService; use Lucent\Account\UserRepo; use Lucent\Channel\ChannelService; use Lucent\Query\Query; @@ -16,7 +17,7 @@ class HomeController extends Controller { public function __construct( private readonly Svelte $svelte, - private readonly UserRepo $userRepo, + private readonly AccountService $accountService, private readonly Query $query, ) { @@ -39,7 +40,7 @@ class HomeController extends Controller $sort = data_get($urlParams, "sort") ?? "-_sys.updatedAt"; $filter = data_get($urlParams, "filter") ?? []; $arguments = array_merge([ - "_sys.status_in" => ["draft", "published"] + "status_in" => ["draft", "published"] ], $filter); $limit = 30; @@ -52,7 +53,7 @@ class HomeController extends Controller ->sort($sort) ->run(); - $users = $this->userRepo->all(); + $users = $this->accountService->all(); return ok([ "users" => $users, diff --git a/src/Http/web.php b/src/Http/web.php index 8453715..5cdf4a5 100644 --- a/src/Http/web.php +++ b/src/Http/web.php @@ -1,13 +1,13 @@ $to, + "title" => $title, + "message" => $message, + ])->render(); + $this->save($from, $html); + } } diff --git a/src/Views/redirect.blade.php b/src/Views/redirect.blade.php new file mode 100644 index 0000000..e37855b --- /dev/null +++ b/src/Views/redirect.blade.php @@ -0,0 +1,10 @@ + + + + {{$title}} + + + +

{{$message}}

+ + \ No newline at end of file