fix bad copy of mfa code and version. fix badmerge

Signed-off-by: Ronni Skansing <rskansing@gmail.com>
This commit is contained in:
Ronni Skansing
2025-10-23 13:03:11 +02:00
parent 031d5f93bc
commit 82f370bf5a
3 changed files with 3 additions and 53 deletions
@@ -612,50 +612,4 @@
{/each}
</Table>
</div>
<<<<<<< HEAD
<SubHeadline>Recent Campaigns</SubHeadline>
<div class="min-h-[300px] mb-8">
<Table
isGhost={isCampaignStatsLoading}
columns={[
{ column: 'Campaign', size: 'large' },
{ column: 'Template', size: 'medium' },
{ column: 'Recipients', size: 'small' },
{ column: 'Open Rate', size: 'small' },
{ column: 'Click Rate', size: 'small' },
{ column: 'Submission Rate', size: 'small' },
{ column: 'Report Rate', size: 'small' },
{ column: 'Closed', size: 'small' }
]}
hasData={!!campaignStats.length}
plural="campaign statistics"
hasActions={false}
>
{#each campaignStats as stat}
<TableRow>
<TableCell>
{#if stat.campaignId}
<a href={`/campaign/${stat.campaignId}`}>
{stat.campaignName}
</a>
{:else}
<span class="text-gray-600 dark:text-gray-400">
{stat.campaignName}
</span>
{/if}
</TableCell>
<TableCell value={stat.templateName} />
<TableCell value={stat.totalRecipients} />
<TableCell value="{Math.round(stat.openRate)}%" />
<TableCell value="{Math.round(stat.clickRate)}%" />
<TableCell value="{Math.round(stat.submissionRate)}%" />
<TableCell value="{Math.round(stat.reportRate)}%" />
<TableCell value={stat.campaignClosedAt} isDate isRelative />
</TableRow>
{/each}
</Table>
</div>
=======
>>>>>>> fix-dashboards-setup
</main>
+2 -2
View File
@@ -609,7 +609,7 @@
</p>
<button
type="button"
on:click|preventDefault={() => onClickCopy('.totp-code')}
on:click|preventDefault={() => onClickCopy(mfaValues.totpCode)}
class="flex items-center bg-gray-100 hover:bg-gray-200 py-2 px-4 rounded-md text-gray-700 transition-colors"
>
<span class="totp-code font-mono">{mfaValues.totpCode}</span>
@@ -656,7 +656,7 @@
your authenticator app:
</p>
<button
on:click|preventDefault={() => onClickCopy('.totp-recoveryCode')}
on:click|preventDefault={() => onClickCopy(mfaValues.totpRecoveryCode)}
class="flex items-center bg-gray-100 hover:bg-gray-200 py-3 px-4 rounded-md text-gray-700 w-full mb-4 transition-colors"
>
<span class="totp-recoveryCode font-mono">{mfaValues.totpRecoveryCode}</span>
+1 -5
View File
@@ -22,10 +22,6 @@
import { addToast } from '$lib/store/toast';
import { onMount } from 'svelte';
import { onClickCopy } from '$lib/utils/common';
import SelectSquare from '$lib/components/SelectSquare.svelte';
// services
const appStateService = AppStateService.instance;
const logLevels = ['debug', 'info', 'warn', 'error'];
const dbLogLevels = ['silent', 'info', 'warn', 'error'];
@@ -884,7 +880,7 @@
>
<div class="flex items-center gap-4 flex-wrap">
<button
on:click|preventDefault={() => onClickCopy('.version-text')}
on:click|preventDefault={() => onClickCopy(version)}
class="flex items-center hover:bg-gray-100 dark:hover:bg-gray-700 py-2 px-4 rounded-md text-gray-700 dark:text-gray-300 transition-colors duration-200"
>
<span class="version-text font-mono">Version: {version}</span>