starred/UpSnap-seriousm4x-4
1
0
Fork 0
mirror of https://github.com/seriousm4x/UpSnap.git synced 2026-03-31 06:24:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: add <pre> tags for cron explaination

Browse Source
This commit is contained in:
Maxi Quoß
2025-03-16 14:42:55 +01:00
parent 4d24e7ac2b
commit ce42d060ff
3 changed files with 83 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
frontend/src/lib/components/DeviceForm.svelte
View File

@@ -365,7 +365,9 @@
</fieldset> </fieldset>
</div> </div>
<div class="flex flex-row flex-wrap gap-4"> <div class="flex flex-row flex-wrap gap-4">
<fieldset class="fieldset bg-base-100 border-base-300 rounded-box w-64 border p-4"> <fieldset
class="fieldset bg-base-100 border-base-300 rounded-box w-fit min-w-64 border p-4"
>
<legend class="fieldset-legend">{m.device_wake_cron_enable()}</legend> <legend class="fieldset-legend">{m.device_wake_cron_enable()}</legend>
<label class="fieldset-label"> <label class="fieldset-label">
<input <input
@@ -400,6 +402,18 @@
</p> </p>
{/if} {/if}
</label> </label>
{#if device.wake_cron_enabled}
<pre class="bg-base-100 text-base-content/80 w-fit rounded p-2"><code
>* * * * * *
| | | | | |
| | | | | day of the week (0–6)
| | | | month (1–12)
| | | day of the month (1–31)
| | hour (0–23)
| minute (0–59)
second (0–59, optional)
</code></pre>
{/if}
</fieldset> </fieldset>
<fieldset class="fieldset bg-base-100 border-base-300 rounded-box w-64 border p-4"> <fieldset class="fieldset bg-base-100 border-base-300 rounded-box w-64 border p-4">
<legend class="fieldset-legend">{m.device_require_confirmation()}</legend> <legend class="fieldset-legend">{m.device_require_confirmation()}</legend>
@@ -465,7 +479,9 @@
{m.device_shutdown_cron_desc()} {m.device_shutdown_cron_desc()}
</p> </p>
<div class="flex flex-row flex-wrap gap-4"> <div class="flex flex-row flex-wrap gap-4">
<fieldset class="fieldset bg-base-100 border-base-300 rounded-box w-64 border p-4"> <fieldset
class="fieldset bg-base-100 border-base-300 rounded-box w-fit min-w-64 border p-4"
>
<legend class="fieldset-legend">{m.device_shutdown_cron_enable()}</legend> <legend class="fieldset-legend">{m.device_shutdown_cron_enable()}</legend>
<label class="fieldset-label"> <label class="fieldset-label">
<input <input
@@ -492,7 +508,7 @@
/> />
{#if device.shutdown_cron_enabled} {#if device.shutdown_cron_enabled}
<p class="fieldset-label"> <p class="fieldset-label">
{#await validateCron(device.wake_cron)} {#await validateCron(device.shutdown_cron)}
<span class="loading loading-spinner loading-xs"></span> <span class="loading loading-spinner loading-xs"></span>
{:then valid} {:then valid}
{valid ? '✅ ' + nextCronDate(device.shutdown_cron) : m.settings_invalid_cron()} {valid ? '✅ ' + nextCronDate(device.shutdown_cron) : m.settings_invalid_cron()}
@@ -500,6 +516,18 @@
</p> </p>
{/if} {/if}
</label> </label>
{#if device.shutdown_cron_enabled}
<pre class="bg-base-100 text-base-content/80 w-fit rounded p-2"><code
>* * * * * *
| | | | | |
| | | | | day of the week (0–6)
| | | | month (1–12)
| | | day of the month (1–31)
| | hour (0–23)
| minute (0–59)
second (0–59, optional)
</code></pre>
{/if}
</fieldset> </fieldset>
<fieldset class="fieldset bg-base-100 border-base-300 rounded-box w-64 border p-4"> <fieldset class="fieldset bg-base-100 border-base-300 rounded-box w-64 border p-4">
<legend class="fieldset-legend">{m.device_require_confirmation()}</legend> <legend class="fieldset-legend">{m.device_require_confirmation()}</legend>

81
frontend/src/routes/account/+page.svelte
View File

@@ -205,48 +205,51 @@
<form on:submit|preventDefault={changePassword}> <form on:submit|preventDefault={changePassword}>
<div class="w-full max-w-xs"> <div class="w-full max-w-xs">
{#if !$pocketbase.authStore.isSuperuser} {#if !$pocketbase.authStore.isSuperuser}
<label class="label" for="password-old"> <fieldset class="fieldset">
<span>{m.account_change_password_label()}</span> <label class="floating-label mt-2">
</label> <span>{m.account_change_password_label()} <span class="text-error">*</span></span>
<input <input
id="password-old" type="password"
type="password" placeholder={m.account_change_password_label()}
placeholder={m.account_change_password_label()} class="input"
class="input w-full max-w-xs" minlength="5"
minlength="5" maxlength="72"
maxlength="72" bind:value={newPassword.old}
bind:value={newPassword.old} required
required />
/> </label>
</fieldset>
{/if} {/if}
<label class="label" for="password-new"> <fieldset class="fieldset">
<span>{m.account_change_password_new()}</span> <label class="floating-label mt-2">
</label> <span>{m.account_change_password_new()} <span class="text-error">*</span></span>
<input <input
id="password-new" type="password"
type="password" placeholder={m.account_change_password_new()}
placeholder={m.account_change_password_new()} class="input"
class="input w-full max-w-xs" minlength={$pocketbase.authStore.isSuperuser ? 10 : 5}
minlength={$pocketbase.authStore.isSuperuser ? 10 : 5} maxlength="72"
maxlength="72" bind:value={newPassword.password}
bind:value={newPassword.password} required
required />
/> </label>
</fieldset>
</div> </div>
<div class="w-full max-w-xs"> <div class="w-full max-w-xs">
<label class="label" for="password-confirm"> <fieldset class="fieldset">
<span>{m.account_change_password_confirm()}</span> <label class="floating-label mt-2">
</label> <span>{m.account_change_password_confirm()} <span class="text-error">*</span></span>
<input <input
id="password-confirm" type="password"
type="password" placeholder={m.account_change_password_confirm()}
placeholder={m.account_change_password_confirm()} class="input"
class="input w-full max-w-xs" minlength={$pocketbase.authStore.isSuperuser ? 10 : 5}
minlength={$pocketbase.authStore.isSuperuser ? 10 : 5} maxlength="72"
maxlength="72" bind:value={newPassword.confirm}
bind:value={newPassword.confirm} required
required />
/> </label>
</fieldset>
</div> </div>
<div class="mt-2"> <div class="mt-2">
<button type="submit" class="btn btn-success mt-2" <button type="submit" class="btn btn-success mt-2"

19
frontend/src/routes/settings/+page.svelte
View File

@@ -117,14 +117,6 @@
<!-- eslint-disable svelte/no-at-html-tags --> <!-- eslint-disable svelte/no-at-html-tags -->
{@html m.settings_ping_interval_desc2()} {@html m.settings_ping_interval_desc2()}
</p> </p>
<p>
<span class="badge">Second (Optional)</span>
<span class="badge">Minute</span>
<span class="badge">Hour</span>
<span class="badge">DoM</span>
<span class="badge">Month</span>
<span class="badge">DoW</span>
</p>
<div class="mt-2 w-full"> <div class="mt-2 w-full">
<input <input
type="text" type="text"
@@ -140,7 +132,16 @@
{valid ? '✅ ' + nextCronDate(settingsPrivClone.interval) : m.settings_invalid_cron()} {valid ? '✅ ' + nextCronDate(settingsPrivClone.interval) : m.settings_invalid_cron()}
{/await} {/await}
</p> </p>
<pre class="bg-base-100 text-base-content/80 w-fit rounded p-2"><code
>* * * * * *
| | | | | |
| | | | | day of the week (0–6)
| | | | month (1–12)
| | | day of the month (1–31)
| | hour (0–23)
| minute (0–59)
second (0–59, optional)
</code></pre>
<h2 class="card-title mt-2">{m.settings_lazy_ping_title()}</h2> <h2 class="card-title mt-2">{m.settings_lazy_ping_title()}</h2>
<p class="mt-2"> <p class="mt-2">
{m.settings_lazy_ping_desc()} {m.settings_lazy_ping_desc()}