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

build fixes

Browse Source
This commit is contained in:
Alex Lingris
2023-10-08 13:46:05 +03:00
parent 9c90f51711
commit 129e3af471
2 changed files with 77 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/js/svelte/build/Report.svelte
+43 -13
View File
@@ -1,5 +1,5 @@
<script> <script>
import {getContext} from "svelte"; import {getContext, onMount} from "svelte";
import SpinnerButton from "../common/SpinnerButton.svelte"; import SpinnerButton from "../common/SpinnerButton.svelte";
import ErrorAlert from "../common/ErrorAlert.svelte"; import ErrorAlert from "../common/ErrorAlert.svelte";
import MemberSettingsCard from "../members/MemberSettingsCard.svelte"; import MemberSettingsCard from "../members/MemberSettingsCard.svelte";
@@ -10,26 +10,39 @@
export let title; export let title;
$: date = ""; $: date = "";
$: logs = ""; $: logs = "";
let inProgress = false;
function connect() {
const eventSource = new EventSource(channel.lucentUrl + "/build-report-source");
eventSource.onmessage = function (event) {
inProgress = true;
const data = JSON.parse(event.data);
date = data.date;
logs = data.logs;
}
eventSource.onerror = (e) => {
console.log(e)
eventSource.close();
inProgress = false;
}
}
function buildWebsite(e) { function buildWebsite(e) {
e.preventDefault(); e.preventDefault();
inProgress = true;
axios.post(channel.lucentUrl + "/build").then(response => { axios.post(channel.lucentUrl + "/build").then(response => {
const eventSource = new EventSource(channel.lucentUrl + "/build-report-source"); connect()
eventSource.onmessage = function(event) {
const data = JSON.parse(event.data);
date = data.date;
logs = data.logs;
}
eventSource.onerror = (e)=>{
console.log(e)
}
}) })
} }
onMount(() => {
connect()
})
</script> </script>
<div class="wrapper-tiny transparent mb-5"> <div class="wrapper-tiny transparent mb-5">
@@ -37,9 +50,26 @@
<h3 class="header-small mb-5">{title}</h3> <h3 class="header-small mb-5">{title}</h3>
<button on:click={buildWebsite} class="btn btn-outline-primary btn-sm mb-3">Start Build</button> <button on:click={buildWebsite} class="btn btn-outline-primary btn-sm mb-3" disabled={inProgress}>Start Build
</button>
<div class="mb-3">{date}</div>
<div class="mb-3">
{#if inProgress}
<span class="badge text-bg-warning">
Build in progress
</span>
{/if}
{#if !inProgress && logs}
<span class="badge text-bg-info">
Build completed at
</span>
{/if}
<span class="badge text-bg-light"> {date}</span>
</div>
<pre>{logs}</pre> <pre>{logs}</pre>
</div> </div>
front/js/svelte/content/Table.svelte
+34 -30
View File
@@ -46,24 +46,24 @@
<tr> <tr>
<th> <th>
<input <input
on:change|preventDefault={toggleAll} on:change|preventDefault={toggleAll}
indeterminate={selected.length > 0 && indeterminate={selected.length > 0 &&
selected.length < records.length} selected.length < records.length}
checked={selected.length == records.length} checked={selected.length == records.length}
class="form-check-input" class="form-check-input"
type="checkbox" type="checkbox"
/> />
</th> </th>
{#each visibleColumns as field} {#each visibleColumns as field}
<th <th
class="field-ui-{field.ui}" class="field-ui-{field.ui}"
class:is-sort={"-" + field.name == sort || class:is-sort={"-" + field.name == sort ||
field.name == sort} field.name == sort}
scope="col" scope="col"
title={field.help} title={field.help}
data-bs-toggle="tooltip" data-bs-toggle="tooltip"
data-bs-placement="top">{field.label}</th data-bs-placement="top">{field.label}</th
> >
{/each} {/each}
{#each systemFields.filter(c => schema.visible.includes(c.name)) as sysField} {#each systemFields.filter(c => schema.visible.includes(c.name)) as sysField}
@@ -76,50 +76,54 @@
<tr> <tr>
<td class="title-td"> <td class="title-td">
<div <div
class="title-td-contents d-inline-flex justify-content-between w-100 align-items-center" class="title-td-contents d-inline-flex justify-content-between w-100 align-items-center"
> >
<div class="d-flex align-items-center "> <div class="d-flex align-items-center ">
<div class="form-check"> <div class="form-check">
<input <input
on:change={(e) => on:change={(e) =>
selectRecord(e, record)} selectRecord(e, record)}
class="form-check-input " class="form-check-input "
type="checkbox" type="checkbox"
checked={selected.find( checked={selected.find(
(r) => r.id === record.id (r) => r.id === record.id
)} )}
value={record} value={record}
/> />
</div> </div>
<a <a
class="me-2 text-decoration-none text-dark fs-6"
href="{channel.lucentUrl}/records/{record.id}" class="me-2 text-decoration-none text-dark fs-6"
target={inModal ? "_blank" : "_self"} href="{channel.lucentUrl}/records/{record.id}"
target={inModal ? "_blank" : "_self"}
title={previewTitle(channel.schemas, record, graph)}
data-bs-toggle="tooltip" data-bs-placement="left"
> >
{previewTitle(channel.schemas, record, graph)} {previewTitle(channel.schemas, record, graph)}
</a> </a>
</div> </div>
<div> <div>
<Avatar <Avatar
name={usernameById( name={usernameById(
users, users,
record._sys.updatedBy record._sys.updatedBy
)} )}
side={24} side={24}
/> />
</div> </div>
</div> </div>
</td> </td>
<RecordRow <RecordRow
{record} {record}
{graph} {graph}
{schema} {schema}
{visibleColumns} {visibleColumns}
{sort} {sort}
{systemFields} {systemFields}
{inModal} {inModal}
{users} {users}
/> />
</tr> </tr>
{/each} {/each}