lucent/lucent-laravel
2
0
Fork 0
Code Issues 14 Pull Requests Releases 1 Activity

static

Browse Source
This commit is contained in:
Alex Lingris
2023-10-04 23:48:12 +03:00
parent 1ca5f4e521
commit 718cdb54f9
22 changed files with 262 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/js/svelte/Channel.svelte
+2
View File
@@ -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;
front/js/svelte/Navbar.svelte
+64 -39
View File
@@ -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"
})
}
</script>
<nav class="lx-nav">
<a class="nav-item" href="{channel.lucentUrl}">{channel.name}</a>
<a class="nav-item" href="{channel.lucentUrl}/members">Members</a>
<a class="nav-item" href="{channel.lucentUrl}/profile">
<Avatar side="28" name={user.name}/>
</a
>
<div>
</div>
<div>
<a class="nav-item" href="{channel.lucentUrl}">{channel.name}</a>
<a class="nav-item" href="{channel.lucentUrl}/members">Members</a>
{#if channel.generateCommand}
<button on:click={buildWebsite} class="btn btn-outline-primary btn-sm">Build website</button>
{/if}
</div>
<div>
<a class="nav-item" href="{channel.lucentUrl}/profile">
<Avatar side="28" name={user.name}/>
</a>
</div>
<div class="offcanvas offcanvas-start show border-0 bg-light-subtle" style="margin-top:36px " data-bs-scroll="true"
data-bs-backdrop="false"
tabindex="-1" aria-labelledby="offcanvasScrollingLabel">
<div class="offcanvas-header">
<h5 class="offcanvas-title" id="offcanvasScrollingLabel">Content</h5>
</div>
<div class="offcanvas-body">
</nav>
<div class="accordion" id="accordionPanelsStayOpenExample">
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingOne">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseOne" aria-expanded="true" aria-controls="panelsStayOpen-collapseOne">
Main
</button>
</h2>
<div id="panelsStayOpen-collapseOne" class="accordion-collapse collapse show" aria-labelledby="panelsStayOpen-headingOne">
<div class="accordion-body">
<NavbarMenu
<div class="offcanvas offcanvas-start show border-0 bg-light-subtle" style="padding-top:36px " data-bs-scroll="true"
data-bs-backdrop="false"
tabindex="-1" aria-labelledby="offcanvasScrollingLabel">
<!-- <div class="offcanvas-header">-->
<!-- <h5 class="offcanvas-title" id="offcanvasScrollingLabel">Content</h5>-->
<!-- </div>-->
<div class="offcanvas-body">
<div class="accordion" id="accordionPanelsStayOpenExample">
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingOne">
<button class="accordion-button" type="button" data-bs-toggle="collapse"
data-bs-target="#panelsStayOpen-collapseOne" aria-expanded="true"
aria-controls="panelsStayOpen-collapseOne">
Main
</button>
</h2>
<div id="panelsStayOpen-collapseOne" class="accordion-collapse collapse show"
aria-labelledby="panelsStayOpen-headingOne">
<div class="accordion-body">
<NavbarMenu
schemas={ channel.schemas.filter((sc) => sc.isEntry)}
schema={schema}
/>
</div>
/>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingTwo">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseTwo" aria-expanded="false" aria-controls="panelsStayOpen-collapseTwo">
Other
</button>
</h2>
<div id="panelsStayOpen-collapseTwo" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-headingTwo">
<div class="accordion-body">
<NavbarMenu
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingTwo">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
data-bs-target="#panelsStayOpen-collapseTwo" aria-expanded="false"
aria-controls="panelsStayOpen-collapseTwo">
Other
</button>
</h2>
<div id="panelsStayOpen-collapseTwo" class="accordion-collapse collapse"
aria-labelledby="panelsStayOpen-headingTwo">
<div class="accordion-body">
<NavbarMenu
schemas={ channel.schemas.filter((sc) => !sc.isEntry)}
schema={schema}
/>
</div>
/>
</div>
</div>
</div>
</div>
</div>
</nav>
</div>
front/js/svelte/SidebarHeader.svelte
-29
View File
@@ -1,29 +0,0 @@
<script>
import Icon from "./common/Icon.svelte";
export let label;
let isExpanded = true;
</script>
<span class="sidebar-header d-flex align-items-center">
{#if !isExpanded}
<span class="d-flex" on:click={(e) => (isExpanded = true)}>
<Icon icon="circle-chevron-down" viewBox="0 0 512 512" />
</span>
{/if}
{#if isExpanded}
<span class="d-flex" on:click={(e) => (isExpanded = false)}>
<Icon icon="circle-chevron-up" viewBox="0 0 512 512" />
</span>
{/if}
<span class="ms-1">{label}</span>
<div class="actions">
<slot name="actions" />
</div>
</span>
{#if isExpanded}
<div class="mb-2">
<slot />
</div>
{/if}
front/js/svelte/SidebarItem.svelte
-10
View File
@@ -1,10 +0,0 @@
<script>
export let active = false;
</script>
<div class="sidebar-item" class:active>
<slot />
<div class="actions">
<slot name="actions" />
</div>
</div>
front/js/svelte/account/Nav.svelte
-47
View File
@@ -1,47 +0,0 @@
<script>
export let active = "";
import { getContext } from "svelte";
const user = getContext("user");
let logged = user?.id ? true : false;
let menuItems = [
{
name: "Account",
link: "/profile",
auth: true,
guest: false,
},
{
name: "Login",
link: "/login",
auth: false,
guest: true,
},
{
name: "Register",
link: "/register",
auth: false,
guest: true,
},
];
</script>
<ul class="nav justify-content-center mt-4 mb-5">
{#each menuItems as item}
{#if item.auth == logged || item.guest == !logged}
<li class="nav-item">
<a
class="nav-link"
class:active={active == item.name}
href={item.link}>{item.name}</a
>
</li>
{/if}
{/each}
</ul>
<style>
.nav-item a.active{
font-weight: bold;
}
</style>
front/js/svelte/account/Profile.svelte
+2 -14
View File
@@ -1,11 +1,11 @@
<script>
import ErrorAlert from "../common/ErrorAlert.svelte";
import SpinnerButton from "../common/SpinnerButton.svelte";
import Nav from "./Nav.svelte";
import Avatar from "./Avatar.svelte";
import {getContext} from "svelte";
const user = getContext("user");
const channel = getContext("channel");
let name = user.name;
let email = user.email;
let errorMessage = "";
@@ -45,7 +45,6 @@
}
</script>
<Nav active="Account"/>
<div class="wrapper-tiny">
<ErrorAlert message={errorMessage}/>
@@ -64,18 +63,7 @@
</div>
</form>
<!-- <form on:submit={saveEmail}>-->
<!-- <div class="input-group mb-3">-->
<!-- <input-->
<!-- type="text"-->
<!-- bind:value={email}-->
<!-- class="form-control"-->
<!-- placeholder="Email"-->
<!-- />-->
<!-- <SpinnerButton label="Update" />-->
<!-- </div>-->
<!-- </form>-->
<div class="list-group">
<a class="list-group-item list-group-item-action" href="/logout">Logout from this device</a>
<a class="list-group-item list-group-item-action" href="{ channel.lucentUrl }/logout">Logout from this device</a>
</div>
</div>
front/js/svelte/build/Report.svelte
+32
View File
@@ -0,0 +1,32 @@
<script>
import {getContext} from "svelte";
import SpinnerButton from "../common/SpinnerButton.svelte";
import ErrorAlert from "../common/ErrorAlert.svelte";
import MemberSettingsCard from "../members/MemberSettingsCard.svelte";
import SuccessAlert from "../common/SuccessAlert.svelte";
import Radio from "../forms/Radio.svelte";
const channel = getContext("channel");
export let title;
$: output = "";
const eventSource = new EventSource(channel.lucentUrl + "/build-report-source");
console.log("heklko")
eventSource.onmessage = function(event) {
const data = JSON.parse(event.data);
console.log(data)
output = output + "message: " + data.time;
}
eventSource.onerror = (e)=>{
console.log(e)
}
</script>
<div class="wrapper-tiny transparent mb-5">
<div class="lx-card mt-5">
<h3 class="header-small mb-5">{title}</h3>
{output}
</div>
</div>
front/js/svelte/records/Edit.svelte
+4 -4
View File
@@ -158,13 +158,13 @@
<EditHeader {schema} {record} {isCreateMode} {graph} bind:activeContentTab/>
{#if !["_graph", "_info"].includes(activeContentTab)}
<div
style="position:fixed;bottom:0;left:0px;width:100%;background:rgba(255,255,255,.7);z-index:10"
<div class="shadow-lg "
style="position:fixed;bottom:0;left:0px;width:100%;background:rgba(255,255,255,1);z-index:1050"
>
<div
class="d-flex mt-4 mb-3 align-items-center justify-content-center"
class="d-flex mt-4 mb-3 align-items-center justify-content-center"
>
<StatusSelect bind:status={record.status} {schema}/>
<StatusSelect bind:status={record.status} {record} {schema}/>
{#if isCreateMode}
<button
class="ms-2 btn btn-primary btn-spinner"
front/js/svelte/records/EditHeader.svelte
+1 -13
View File
@@ -45,19 +45,7 @@
<Icon icon="ellipsis"/>
</button>
<div class="dropdown-menu">
<!--{#if channel.previewTargets.length > 0}-->
<!-- <h6 class="dropdown-header">Preview targets</h6>-->
<!-- {#each channel.previewTargets as previewTarget}-->
<!-- <a-->
<!-- class="dropdown-item"-->
<!-- target="_blank"-->
<!-- rel="noreferrer"-->
<!-- href="{previewTarget.url}?id={record.data-->
<!-- .id}&schema={record._sys.schema}"-->
<!-- >{previewTarget.label}</a-->
<!-- >-->
<!-- {/each}-->
<!--{/if}-->
<h6 class="dropdown-header">Record Actions</h6>
<a
class="dropdown-item"
front/js/svelte/records/StatusSelect.svelte
+38 -26
View File
@@ -1,8 +1,11 @@
<script>
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 @@
</script>
<!-- Example split danger button -->
<div class="btn-group dropup">
<button type="button" class="btn btn-{currentStatus.bg}"
>{currentStatus.text}</button
>
<button
bind:this={dropdown}
type="button"
class="btn btn-{currentStatus.bg} dropdown-toggle dropdown-toggle-split"
data-bs-toggle="dropdown"
aria-expanded="false"
>
<span class="visually-hidden">Toggle Dropdown</span>
</button>
<div class="dropdown-menu">
<div class="dropdown-header">Change status to</div>
{#each statusList as astatus}
{#if astatus.value !== status}
<button
type="button"
class="dropdown-item my-2 rounded w-100 bg-{astatus.bg} text-{astatus.color}"
on:click={(e) => updateStatus(e, astatus.value)}
>
{astatus.text}
</button>
{/if}
{/each}
<div class="d-flex justify-content-between">
<div class="btn-group dropup">
<button type="button" class="btn btn-{currentStatus.bg}"
>{currentStatus.text}</button
>
<button
bind:this={dropdown}
type="button"
class="btn btn-{currentStatus.bg} dropdown-toggle dropdown-toggle-split"
data-bs-toggle="dropdown"
aria-expanded="false"
>
<span class="visually-hidden">Toggle Dropdown</span>
</button>
<div class="dropdown-menu">
<div class="dropdown-header">Change status to</div>
{#each statusList as astatus}
{#if astatus.value !== status}
<button
type="button"
class="dropdown-item my-2 rounded w-100 bg-{astatus.bg} text-{astatus.color}"
on:click={(e) => updateStatus(e, astatus.value)}
>
{astatus.text}
</button>
{/if}
{/each}
</div>
</div>
{#if channel.previewTarget}
<a href="{channel.previewTarget}?schema={schema.name}&id={record.id}" target="_blank" class="btn btn-outline-info ms-3">
Preview
</a>
{/if}
</div>
front/sass/_nav.scss
+4 -3
View File
@@ -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;
front/sass/app.scss
-1
View File
@@ -107,7 +107,6 @@ body {
display: inline-block;
}
.cursor-pointer {
cursor: pointer;
}
src/Account/AuthService.php
+2 -2
View File
@@ -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);
}
src/Channel/Channel.php
+2
View File
@@ -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,
src/Channel/ChannelService.php
+2
View File
@@ -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"] ?? [],
);
src/Http/Controller/AccountController.php
+12 -17
View File
@@ -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();
}
}
src/Http/Controller/Api/AccountController.php
-51
View File
@@ -1,51 +0,0 @@
<?php
namespace Lucent\Http\Controller\Api;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\View\View;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Lucent\Account\AuthService;
use Lucent\LucentException;
use function Lucent\Response\fail;
use function Lucent\Response\ok;
use function Lucent\Svelte\svelte;
class AccountController extends Controller
{
public function __construct(
private readonly AuthService $authService,
)
{
}
public function profile(): View
{
return svelte(
layout: "account",
view: "profile",
title: "Profile",
data: []
);
}
public function updateName(Request $request): Response
{
try {
$this->authService->updateName(session("user.id"), $request->input("name"));
} catch (LucentException $th) {
return fail($th);
}
$request->session()->put("user.name", $request->input("name"));
return ok();
}
}
src/Http/Controller/BuildController.php
+64
View File
@@ -0,0 +1,64 @@
<?php
namespace Lucent\Http\Controller;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\View\View;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Artisan;
use Lucent\Channel\ChannelService;
use Lucent\Svelte\Svelte;
use function Lucent\Response\ok;
class BuildController extends Controller
{
public function __construct(
public readonly Svelte $svelte,
public readonly ChannelService $channelService,
)
{
}
public function build()
{
exec("cd ".base_path(). " && php8.2 artisan {$this->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',
]);
}
}
src/Http/Controller/HomeController.php
+4 -3
View File
@@ -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,
src/Http/web.php
+5 -2
View File
@@ -1,13 +1,13 @@
<?php
use Illuminate\Support\Facades\Route;
use Lucent\Http\Controller\Api\AccountController;
use Lucent\Http\Controller\AccountController;
use Lucent\Http\Controller\AuthController;
use Lucent\Http\Controller\BuildController;
use Lucent\Http\Controller\FileController;
use Lucent\Http\Controller\HomeController;
use Lucent\Http\Controller\MemberController;
use Lucent\Http\Controller\RecordController;
use Lucent\Http\Controller\SchemaController;
use Lucent\Revision\RevisionController;
@@ -31,6 +31,9 @@ Route::group([
Route::get('/logout', [AuthController::class, 'logout']);
Route::get('/profile', [AccountController::class, 'profile']);
Route::post('/account/update-name', [AccountController::class, 'updateName']);
Route::get('/build-report', [BuildController::class, 'report']);
Route::get('/build-report-source', [BuildController::class, 'reportSource']);
Route::post('/build', [BuildController::class, 'build']);
});
src/StaticGenerator/StaticGenerator.php
+14 -2
View File
@@ -1,9 +1,13 @@
<?php namespace Lucent\StaticGenerator;
use Illuminate\Contracts\View\View;
class StaticGenerator
{
public function construct()
public function __construct(
)
{
}
@@ -35,5 +39,13 @@ class StaticGenerator
return 0;
}
public function createRedirect(string $from, string $to, string $title = "Redirecting", string $message = "Redirecting Soon..."): void
{
$html = view("lucent::redirect", [
"to" => $to,
"title" => $title,
"message" => $message,
])->render();
$this->save($from, $html);
}
}
src/Views/redirect.blade.php
+10
View File
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>{{$title}}</title>
<meta http-equiv="refresh" content="0; url='{{$to}}'"/>
</head>
<body>
<p>{{$message}}</p>
</body>
</html>