- {$_('ago')}
+ {#if device.deviceType.data_table_v2 === 'cw_relay_data'}
+
diff --git a/src/lib/i18n/locales/en.ts b/src/lib/i18n/locales/en.ts
index 82d3a3c3..d708ddbe 100644
--- a/src/lib/i18n/locales/en.ts
+++ b/src/lib/i18n/locales/en.ts
@@ -58,6 +58,33 @@ export const strings = {
motorcycle_count: 'Motorcycles',
'Data Date Range': 'Data Date Range',
data_date_range: 'Data Date Range',
+ // All Reports page
+ all_reports_heading: 'All Reports',
+ all_reports_subheading: 'Manage and view all your configured reports',
+ search_reports_placeholder: 'Search reports...',
+ download_selected: 'Download Selected',
+ downloading: 'Downloading...',
+ bulk_download_description: 'Choose the date range used for each selected report download.',
+ selection: 'Selection',
+ select_all_reports_aria: 'Select all reports',
+ select_report_aria: 'Select report {name}',
+ bulk_progress_message: 'Downloading {current} of {total}...',
+ bulk_missing_date_range: 'Please choose a valid date range.',
+ bulk_invalid_date_selection: 'Date selection is invalid.',
+ bulk_start_after_end: 'Start date must be before end date.',
+ bulk_no_reports_available: 'No reports available to download.',
+ bulk_report_missing_identifier: 'Report {name} is missing a device identifier.',
+ bulk_unable_to_download: 'Unable to download {name}.',
+ bulk_partial_suffix: ' (some failed)',
+ bulk_download_success: '{count} {reportWord} downloaded{partial}.',
+ download: 'Download',
+ no_reports_match_search: 'No reports match your search.',
+ no_reports_found: 'No reports found.',
+ untitled_report: 'Untitled report',
+ None: 'None',
+ report_deleted: 'Report deleted',
+ failed_to_delete: 'Failed to delete',
+
// CSVDownloadButton translations
select_date_range: 'Select Date Range',
select_start_end_dates: 'Select start and end dates',
@@ -117,19 +144,31 @@ export const strings = {
'you@example.com': 'you@example.com',
Password: 'Password',
'Confirm Password': 'Confirm Password',
+ 'Passwords must match': 'Passwords must match',
+ 'At least 8 characters': 'At least 8 characters',
+ 'Contains a lowercase letter (a-z)': 'Contains a lowercase letter (a-z)',
+ 'Contains an uppercase letter (A-Z)': 'Contains an uppercase letter (A-Z)',
+ 'Contains a number (0-9)': 'Contains a number (0-9)',
+ 'Contains a symbol (!@#$, etc.)': 'Contains a symbol (!@#$, etc.)',
Company: 'Company',
'Acme Inc.': 'Acme Inc.',
'I agree to the': 'I agree to the',
'Terms of Service': 'Terms of Service',
'Privacy Policy': 'Privacy Policy',
'Cookie Policy': 'Cookie Policy',
+ 'Required Agreements': 'Required Agreements',
+ 'All three agreements must be accepted to register':
+ 'All three agreements must be accepted to register',
'First name is required': 'First name is required',
'Last name is required': 'Last name is required',
'Email is required': 'Email is required',
'Please enter a valid email address': 'Please enter a valid email address',
'Password is required': 'Password is required',
'Password must be at least 8 characters': 'Password must be at least 8 characters',
+ 'Password must be at least 8 characters and include a lowercase letter, uppercase letter, number, and symbol':
+ 'Password must be at least 8 characters and include a lowercase letter, uppercase letter, number, and symbol',
'Passwords do not match': 'Passwords do not match',
+ 'Please confirm your password': 'Please confirm your password',
'Company name is required': 'Company name is required',
'You must agree to all terms and policies': 'You must agree to all terms and policies',
'An unexpected error occurred. Please try again.':
@@ -159,6 +198,7 @@ export const strings = {
'Sending...': 'Sending...',
'Password reset link sent to your email.': 'Password reset link sent to your email.',
'Back to login': 'Back to login',
+ 'Still needed': 'Still needed',
'If an account exists with the email': 'If an account exists with the email',
"you'll receive a password reset link shortly.": "you'll receive a password reset link shortly.",
@@ -226,6 +266,22 @@ export const strings = {
'Settings updated successfully!': 'Settings updated successfully!',
'Failed to update settings': 'Failed to update settings',
'Failed to delete device': 'Failed to delete device',
+ 'Relay control': 'Relay control',
+ 'Two big buttons for each relay. Tap once and wait for the light to change.':
+ 'Two big buttons for each relay. Tap once and wait for the light to change.',
+ 'Relay 1': 'Relay 1',
+ 'Relay 2': 'Relay 2',
+ 'Next action available in {seconds}s': 'Next action available in {seconds}s',
+ 'Checking relay status…': 'Checking relay status…',
+ 'Checking status…': 'Checking status…',
+ 'Currently ON': 'Currently ON',
+ 'Currently OFF': 'Currently OFF',
+ ON: 'ON',
+ OFF: 'OFF',
+ 'Sending command…': 'Sending command…',
+ 'Relay {number} {state}': 'Relay {number} {state}',
+ 'Downlink failed: {reason}': 'Downlink failed: {reason}',
+ 'Downlink failed': 'Downlink failed',
Permissions: 'Permissions',
manage_permissions_description: 'Manage who has access and their permission levels.',
Notifications: 'Notifications',
diff --git a/src/lib/i18n/locales/ja.ts b/src/lib/i18n/locales/ja.ts
index 86766738..bb74c47a 100644
--- a/src/lib/i18n/locales/ja.ts
+++ b/src/lib/i18n/locales/ja.ts
@@ -59,6 +59,32 @@ export const strings = {
motorcycle_count: 'バイク台数',
'Data Date Range': 'データ日付範囲',
data_date_range: 'データ日付範囲',
+ // All Reports page
+ all_reports_heading: 'レポート一覧',
+ all_reports_subheading: '設定済みのレポートを管理・表示します',
+ search_reports_placeholder: 'レポートを検索…',
+ download_selected: '選択したレポートをダウンロード',
+ downloading: 'ダウンロード中...',
+ bulk_download_description: '選択した各レポートのダウンロードに使用する期間を選択してください。',
+ selection: '選択',
+ select_all_reports_aria: 'すべてのレポートを選択',
+ select_report_aria: 'レポート「{name}」を選択',
+ bulk_progress_message: '{total} 件中 {current} 件をダウンロード中...',
+ bulk_missing_date_range: '有効な期間を選択してください。',
+ bulk_invalid_date_selection: '日付の選択が正しくありません。',
+ bulk_start_after_end: '開始日は終了日より前である必要があります。',
+ bulk_no_reports_available: 'ダウンロード可能なレポートがありません。',
+ bulk_report_missing_identifier: 'レポート「{name}」にデバイスIDがありません。',
+ bulk_unable_to_download: '「{name}」をダウンロードできませんでした。',
+ bulk_partial_suffix: '（一部失敗）',
+ bulk_download_success: '{reportWord}{count}件をダウンロードしました{partial}。',
+ download: 'ダウンロード',
+ no_reports_match_search: '検索条件に一致するレポートがありません。',
+ no_reports_found: 'レポートが見つかりません。',
+ untitled_report: '名称未設定のレポート',
+ None: 'なし',
+ report_deleted: 'レポートを削除しました',
+ failed_to_delete: '削除に失敗しました',
Close: '閉じる',
close: '閉じる',
Open: '開く',
@@ -111,18 +137,29 @@ export const strings = {
'Email address': 'メールアドレス',
'you@example.com': 'you@example.com',
Password: 'パスワード',
+ 'At least 8 characters': '8文字以上',
+ 'Contains a lowercase letter (a-z)': '英小文字 (a-z) を含む',
+ 'Contains an uppercase letter (A-Z)': '英大文字 (A-Z) を含む',
+ 'Contains a number (0-9)': '数字 (0-9) を含む',
+ 'Contains a symbol (!@#$, etc.)': '記号 (!@#$ など) を含む',
+ 'Passwords must match': 'パスワードが一致している必要があります',
Company: '会社名',
'Acme Inc.': '株式会社サンプル',
'I agree to the': '同意します',
'Terms of Service': '利用規約',
'Privacy Policy': 'プライバシーポリシー',
'Cookie Policy': 'クッキーポリシー',
+ 'Required Agreements': '必須の同意事項',
+ 'All three agreements must be accepted to register': '登録するには3つすべての同意が必要です',
'First name is required': '名は必須です',
'Last name is required': '姓は必須です',
'Email is required': 'メールアドレスは必須です',
'Please enter a valid email address': '有効なメールアドレスを入力してください',
'Password is required': 'パスワードは必須です',
'Password must be at least 8 characters': 'パスワードは8文字以上で入力してください',
+ 'Password must be at least 8 characters and include a lowercase letter, uppercase letter, number, and symbol':
+ 'パスワードは8文字以上で、英小文字・英大文字・数字・記号を含める必要があります',
+ 'Please confirm your password': 'パスワードを確認してください',
'Passwords do not match': 'パスワードが一致しません',
'Company name is required': '会社名は必須です',
'You must agree to all terms and policies': 'すべての規約とポリシーに同意してください',
@@ -153,6 +190,7 @@ export const strings = {
'Sending...': '送信中...',
'Password reset link sent to your email.': 'パスワードリセットリンクがメールに送信されました。',
'Back to login': 'ログインに戻る',
+ 'Still needed': '残りの条件',
'If an account exists with the email': 'メールでアカウントが存在する場合',
"you'll receive a password reset link shortly.":
'まもなくパスワードリセットリンクを受け取ります。',
@@ -262,6 +300,22 @@ export const strings = {
'Settings updated successfully!': '設定が正常に更新されました！',
'Failed to update settings': '設定の更新に失敗しました',
'Failed to delete device': 'デバイスの削除に失敗しました',
+ 'Relay control': 'リレー制御',
+ 'Two big buttons for each relay. Tap once and wait for the light to change.':
+ '各リレーに大きなボタンが2つあります。1回タップしてランプが変わるまでお待ちください。',
+ 'Relay 1': 'リレー1',
+ 'Relay 2': 'リレー2',
+ 'Next action available in {seconds}s': '次の操作は{seconds}秒後に利用できます',
+ 'Checking relay status…': 'リレー状態を確認中…',
+ 'Checking status…': '状態を確認中…',
+ 'Currently ON': '現在オンです',
+ 'Currently OFF': '現在オフです',
+ ON: 'オン',
+ OFF: 'オフ',
+ 'Sending command…': 'コマンド送信中…',
+ 'Relay {number} {state}': 'リレー{number}{state}',
+ 'Downlink failed: {reason}': 'ダウンリンクに失敗しました: {reason}',
+ 'Downlink failed': 'ダウンリンクに失敗しました',
// CSVDownloadButton translations
select_date_range: '日付範囲を選択',
diff --git a/src/lib/utilities/deviceTimerManager.ts b/src/lib/utilities/deviceTimerManager.ts
index d9c464be..49f6fc5e 100644
--- a/src/lib/utilities/deviceTimerManager.ts
+++ b/src/lib/utilities/deviceTimerManager.ts
@@ -1,5 +1,6 @@
// $lib/utilities/deviceTimerManager.ts
import { createActiveTimer } from './ActiveTimer';
+import { getDeviceLatestTimestamp } from './deviceUtils';
import type { DeviceWithType } from '$lib/models/Device';
import type { AirData } from '$lib/models/AirData';
import type { SoilData } from '$lib/models/SoilData';
@@ -47,7 +48,8 @@ export class DeviceTimerManager {
uploadInterval: number,
onStatusChange?: (deviceId: string, isActive: boolean | null) => void
): void {
- if (!device.latestData?.created_at) return;
+ const latestTimestamp = getDeviceLatestTimestamp(device);
+ if (!latestTimestamp) return;
const deviceId = device.dev_eui as string;
// Clear any existing timer for this device
@@ -61,7 +63,7 @@ export class DeviceTimerManager {
10;
// Create a closure to capture the current timestamp
- const currentTimestamp = device.latestData.created_at;
+ const currentTimestamp = latestTimestamp;
const activeTimer = createActiveTimer(new Date(currentTimestamp), Number(effectiveInterval));
@@ -69,7 +71,7 @@ export class DeviceTimerManager {
const unsubscribe = activeTimer.subscribe((isActive) => {
// Only update if this is still the current device data
// This prevents old timers from incorrectly marking devices as inactive
- if (device.latestData?.created_at === currentTimestamp) {
+ if (getDeviceLatestTimestamp(device) === currentTimestamp) {
//console.log(`Device ${device.name} (${deviceId}) status updated:`, {
// isActive,
// lastUpdate: currentTimestamp,
diff --git a/src/lib/utilities/deviceTimerSetup.ts b/src/lib/utilities/deviceTimerSetup.ts
index 86e5d60b..c377926d 100644
--- a/src/lib/utilities/deviceTimerSetup.ts
+++ b/src/lib/utilities/deviceTimerSetup.ts
@@ -1,4 +1,5 @@
import { DeviceTimerManager } from './deviceTimerManager';
+import { getDeviceLatestTimestamp } from './deviceUtils';
import type { DeviceWithType } from '$lib/models/Device';
import type { AirData } from '$lib/models/AirData';
import type { SoilData } from '$lib/models/SoilData';
@@ -20,7 +21,8 @@ export function setupDeviceActiveTimer(
timerManager: DeviceTimerManager,
deviceActiveStatus: Record
) {
- if (!device.latestData?.created_at) return;
+ const latestTimestamp = getDeviceLatestTimestamp(device);
+ if (!latestTimestamp) return;
const deviceId = device.dev_eui as string;
// Get the upload interval from the device
diff --git a/src/lib/utilities/deviceUtils.ts b/src/lib/utilities/deviceUtils.ts
index b102fefe..daa5d7cc 100644
--- a/src/lib/utilities/deviceUtils.ts
+++ b/src/lib/utilities/deviceUtils.ts
@@ -8,24 +8,53 @@
* @returns boolean indicating if the device is a soil sensor
*/
export function isSoilSensor(device: any): boolean {
- // Check device name for soil-related terms
- const deviceName = device.name?.toLowerCase() || '';
- const deviceTypeName = device.deviceType?.name?.toLowerCase() || '';
+ // Check device name for soil-related terms
+ const deviceName = device.name?.toLowerCase() || '';
+ const deviceTypeName = device.deviceType?.name?.toLowerCase() || '';
- // Check device type (type 17 is soil sensor in your system)
- if (device.type === 17) {
- return true;
- }
+ // Check device type (type 17 is soil sensor in your system)
+ if (device.type === 17) {
+ return true;
+ }
- // Check if the device name or type contains soil-related terms
- return (
- deviceName.includes('soil') ||
- deviceName.includes('moisture') ||
- deviceTypeName.includes('soil') ||
- deviceTypeName.includes('moisture') ||
- // Check if the device has soil-specific data points
- (device.latestData && 'moisture' in device.latestData)
- );
+ // Check if the device name or type contains soil-related terms
+ return (
+ deviceName.includes('soil') ||
+ deviceName.includes('moisture') ||
+ deviceTypeName.includes('soil') ||
+ deviceTypeName.includes('moisture') ||
+ // Check if the device has soil-specific data points
+ (device.latestData && 'moisture' in device.latestData)
+ );
+}
+
+/**
+ * Returns the most relevant timestamp for a device based on its latest data
+ * Prefers latestData.last_update, then device.last_update, then created_at fallbacks
+ */
+export function getDeviceLatestTimestamp(device: {
+ latestData?: Record | null;
+ created_at?: string | Date | null;
+ last_update?: string | Date | null;
+}): string | null {
+ if (!device) return null;
+ const latest = device.latestData ?? null;
+ const candidates: Array = [
+ latest?.last_update,
+ device.last_update,
+ latest?.created_at,
+ device.created_at
+ ];
+
+ for (const candidate of candidates) {
+ if (!candidate) continue;
+ if (candidate instanceof Date) {
+ return candidate.toISOString();
+ }
+ return candidate;
+ }
+
+ return null;
}
/**
@@ -34,35 +63,19 @@ export function isSoilSensor(device: any): boolean {
* @param deviceActiveStatus - Record of device active statuses by device ID
* @returns boolean indicating if the device is active
*/
-export function isDeviceActive(
- device: any,
- deviceActiveStatus: Record
-): boolean {
- if (!device) return false;
-
- // Get the device ID
- const devEui = device.dev_eui as string;
-
- // Special handling for devices with negative upload intervals (always active)
- const uploadInterval =
- device.upload_interval || device.deviceType?.default_upload_interval || 10;
- if (uploadInterval <= 0) {
- return true;
- }
+export function isDeviceActive(device: any, deviceActiveStatus: Record): boolean {
+ if (!device) return false;
- // Special handling for soil sensors
- if (isSoilSensor(device)) {
- if (device.deviceType?.isActive !== undefined) {
- return Boolean(device.deviceType.isActive);
- }
+ // Get the device ID
+ const devEui = device.dev_eui as string;
- // If the soil sensor has moisture data, consider it active
- if (device.latestData && 'moisture' in device.latestData) {
- return true;
- }
- }
+ // Special handling for devices with negative upload intervals (always active)
+ const uploadInterval = device.upload_interval || device.deviceType?.default_upload_interval || 10;
+ if (uploadInterval <= 0) {
+ return true;
+ }
- return Boolean(deviceActiveStatus[devEui]);
+ return Boolean(deviceActiveStatus[devEui]);
}
/**
@@ -72,26 +85,26 @@ export function isDeviceActive(
* @returns Object with active devices array and status flags
*/
export function getLocationActiveStatus(
- location: any,
- deviceActiveStatus: Record
+ location: any,
+ deviceActiveStatus: Record
) {
- if (!location || !location.cw_devices || location.cw_devices.length === 0) {
- return { activeDevices: [], allActive: false, allInactive: false };
- }
+ if (!location || !location.cw_devices || location.cw_devices.length === 0) {
+ return { activeDevices: [], allActive: false, allInactive: false };
+ }
+
+ const locationDevices = location.cw_devices;
+ // Use isDeviceActive instead of getDeviceActiveStatus for consistency
+ const activeDevices = locationDevices.filter((device: any) =>
+ isDeviceActive(device, deviceActiveStatus)
+ );
+
+ const allActive =
+ locationDevices.length > 0 &&
+ locationDevices.every((device: any) => isDeviceActive(device, deviceActiveStatus));
- const locationDevices = location.cw_devices;
- // Use isDeviceActive instead of getDeviceActiveStatus for consistency
- const activeDevices = locationDevices.filter((device: any) =>
- isDeviceActive(device, deviceActiveStatus)
- );
-
- const allActive =
- locationDevices.length > 0 &&
- locationDevices.every((device: any) => isDeviceActive(device, deviceActiveStatus));
-
- const allInactive =
- locationDevices.length > 0 &&
- locationDevices.every((device: any) => !isDeviceActive(device, deviceActiveStatus));
+ const allInactive =
+ locationDevices.length > 0 &&
+ locationDevices.every((device: any) => !isDeviceActive(device, deviceActiveStatus));
- return { activeDevices, allActive, allInactive };
+ return { activeDevices, allActive, allInactive };
}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 12e72d3a..76412d9b 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -115,13 +115,9 @@
stopLoading();
});
- import { get } from 'svelte/store';
- let theme = $state(get(themeStore));
- let unsub: () => void;
+ const theme = $derived(themeStore);
onMount(() => {
initThemeOnce();
- unsub = themeStore.subscribe((v) => (theme = v));
- return () => unsub && unsub();
});
@@ -141,7 +137,7 @@
--sidebar-width: {showSidebar ? (sidebarStore.isOpen ? '256px' : '64px') : '0'};"
data-auth-page={page.url.pathname.startsWith('/auth') ? 'true' : undefined}
>
- {@render children()}
+ {@render children?.()}
-
-
+
-
All Reports
+
{$_('all_reports_heading')}
- Manage and view all your configured reports
+ {$_('all_reports_subheading')}
-
+
-
+
+ {#if bulkDownloading}
+ {$_('downloading')}
+ {:else}
+ {$_('download_selected')}
+ {/if}
+
-
- {#if filterReports(reports).length > 0}
- {@const filteredReports = filterReports(reports)}
- {#each filteredReports as report (report.id)}
-
-
+
+
+
+ {$_('cancel')}
+
+
+ {$_('download')}
+
+
+
+
+
+
+ {#if bulkDownloading && bulkProgress}
+
+ {$_('bulk_progress_message', {
+ values: {
+ current: bulkProgress.current,
+ total: bulkProgress.total
+ }
+ })}
+
+ {/if}
+
+ {#if filteredReports.length > 0}
+
+ {:else}
+
+
+
+ {searchTerm ? $_('no_reports_match_search') : $_('no_reports_found')}
+
+
+ {/if}
diff --git a/src/routes/app/dashboard/location/[location_id]/devices/[devEui]/+page.svelte b/src/routes/app/dashboard/location/[location_id]/devices/[devEui]/+page.svelte
index 3e3aa5cf..f91ccb8b 100644
--- a/src/routes/app/dashboard/location/[location_id]/devices/[devEui]/+page.svelte
+++ b/src/routes/app/dashboard/location/[location_id]/devices/[devEui]/+page.svelte
@@ -2,7 +2,6 @@
import { page } from '$app/state';
import CameraStream from '$lib/components/dashboard/CameraStream.svelte';
import DateRangeSelector from '$lib/components/dashboard/DateRangeSelector.svelte';
- import DeviceMap from '$lib/components/dashboard/DeviceMap.svelte';
import DataCard from '$lib/components/DataCard/DataCard.svelte';
import ExportButton from '$lib/components/devices/ExportButton.svelte';
import Spinner from '$lib/components/Spinner.svelte';
@@ -18,16 +17,14 @@
} from '$lib/utilities/helpers';
import { formatNumber, getNumericKeys } from '$lib/utilities/stats';
import type { RealtimeChannel } from '@supabase/supabase-js';
- import { DateTime } from 'luxon';
import { onMount, untrack } from 'svelte';
import { _, locale } from 'svelte-i18n';
import type { PageProps } from './$types';
- import { getDeviceDetailDerived, setupDeviceDetail } from './device-detail.svelte';
+ import { setupDeviceDetail } from './device-detail.svelte';
import Header from './Header.svelte';
import { setupRealtimeSubscription } from './realtime.svelte';
import RelayControl from '$lib/components/RelayControl.svelte';
import { browser } from '$app/environment';
- import { afterNavigate } from '$app/navigation';
import { createActiveTimer } from '$lib/utilities/ActiveTimer';
// Get device data from server load function
@@ -36,7 +33,6 @@
let { location_id, devEui } = page.params;
let basePath = `/app/dashboard/location/${location_id}/devices/${devEui}`;
let device = $state(data.device as DeviceWithType);
- let dataType = $state(data.dataType);
let latestData: DeviceDataRecord | null = $state(null);
let historicalData: DeviceDataRecord[] = $state([]);
let userId = $state(data.user.id); // User ID for permissions
@@ -460,42 +456,44 @@
-
-
-
- {$_('Latest Sensor Readings')}
- {#if latestData}
-
-
- {#each Object.keys(latestData) as key}
- {#if !['id', 'dev_eui', 'created_at', 'is_simulated', 'battery_level', 'vape_detected', 'smoke_detected', 'traffic_hour'].includes(key) && latestData[key] !== null}
-
- {/if}
- {/each}
+ {#if device.cw_device_type?.data_table_v2 !== 'cw_relay_data'}
+
+
+
+ {$_('Latest Sensor Readings')}
+ {#if latestData}
+
+
+ {#each Object.keys(latestData) as key}
+ {#if !['id', 'dev_eui', 'created_at', 'is_simulated', 'battery_level', 'vape_detected', 'smoke_detected', 'traffic_hour'].includes(key) && latestData[key] !== null}
+
+
+
+ {$_('Last updated:')}
+ {formatDateForDisplay(latestData.created_at)}
+
- {$_('Last updated:')}
- {formatDateForDisplay(latestData.created_at)}
-
-
- {:else}
-
{$_('No recent data available')}
- {/if}
-
-
-
-
-
-
+ {:else}
+
{$_('No recent data available')}
+ {/if}
+
+
+
+
+
+
{:else if device.cw_device_type?.data_table_v2 === 'cw_relay_data'}
-
+
{:else}
-
-
{$_('Stats Summary')}
@@ -602,9 +585,11 @@
{#if device.cw_device_type?.data_table_v2 === 'cw_air_data'}
{$_('Weather & Data')}
@@ -658,24 +643,6 @@
}
}
}
-
- /* ApexCharts style overrides */
- /* .apexcharts-canvas {
- background-color: transparent !important;
- width: 100% !important;
- max-width: 100% !important;
- }
-
- .apexcharts-tooltip {
- box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2) !important;
- border: none !important;
- }
-
- .apexcharts-yaxis-label,
- .apexcharts-xaxis-label {
- font-size: 12px !important;
- } */
-
.wrapper {
:global {
h2 {
diff --git a/src/routes/app/dashboard/location/[location_id]/devices/[devEui]/settings/reports/create/+page.server.ts b/src/routes/app/dashboard/location/[location_id]/devices/[devEui]/settings/reports/create/+page.server.ts
index 7dad2c77..090951a6 100644
--- a/src/routes/app/dashboard/location/[location_id]/devices/[devEui]/settings/reports/create/+page.server.ts
+++ b/src/routes/app/dashboard/location/[location_id]/devices/[devEui]/settings/reports/create/+page.server.ts
@@ -89,11 +89,18 @@ export const load: PageServerLoad = async ({ params, locals, url }) => {
point.operator = point.operator === null ? 'null' : point.operator;
});
+ let { data: previouslyUsedAlertColors, error: dpe } = await locals.supabase
+ .from('report_alert_points')
+ .select('name, hex_color')
+ .eq('user_id', session.user.id)
+ .order('created_at', { ascending: false });
+
return {
devEui,
locationId: location_id,
report,
alertPoints,
+ previouslyUsedAlertColors: previouslyUsedAlertColors || [],
recipients,
schedules,
dataKeys,
diff --git a/src/routes/app/dashboard/location/[location_id]/devices/[devEui]/settings/reports/create/+page.svelte b/src/routes/app/dashboard/location/[location_id]/devices/[devEui]/settings/reports/create/+page.svelte
index 4069d536..8ec1b4e2 100644
--- a/src/routes/app/dashboard/location/[location_id]/devices/[devEui]/settings/reports/create/+page.svelte
+++ b/src/routes/app/dashboard/location/[location_id]/devices/[devEui]/settings/reports/create/+page.svelte
@@ -23,6 +23,7 @@
const isEditing = $derived(data.isEditing);
const recipientsData = $derived(data.recipients);
const dataKeys = $derived(data.dataKeys);
+ const alertPointsColorHistory = $derived(data.previouslyUsedAlertColors);
// Form state
let reportName = $state('');
@@ -71,6 +72,18 @@
});
}
+ if (previouslyUsedAlertColors) {
+ untrack(() => {
+ previouslyUsedAlertColors.splice(
+ 0,
+ previouslyUsedAlertColors.length,
+ ...data.previouslyUsedAlertColors.data
+ .map((item: any) => item.hex_color)
+ .filter((color: string) => color)
+ );
+ });
+ }
+
if (isEditing && data.alertPoints) {
untrack(() => {
alertPoints.splice(
@@ -428,6 +441,29 @@
bind:value={point.hex_color}
disabled={point.operator === null}
/>
+
+ Select Color
+ {#each alertPointsColorHistory as color}
+
+ {color.name} - {color.hex_color}
+
+ {/each}
+ {#each colors as color}
+
+ {color}
+
+ {/each}
+
= 8 &&
+ passwordRequirementPatterns.lowercase.test(password) &&
+ passwordRequirementPatterns.uppercase.test(password) &&
+ passwordRequirementPatterns.number.test(password) &&
+ passwordRequirementPatterns.symbol.test(password)
+ );
+}
+
export const actions: Actions = {
register: async ({ request, locals }) => {
const data = await request.formData();
@@ -40,11 +57,14 @@ export const actions: Actions = {
if (!password) {
errors.password = 'Password is required';
- } else if (password.length < 8) {
- errors.password = 'Password must be at least 8 characters';
+ } else if (!meetsPasswordRequirements(password)) {
+ errors.password =
+ 'Password must be at least 8 characters and include a lowercase letter, uppercase letter, number, and symbol';
}
- if (password !== confirmPassword) {
+ if (!confirmPassword) {
+ errors.confirmPassword = 'Please confirm your password';
+ } else if (password !== confirmPassword) {
errors.confirmPassword = 'Passwords do not match';
}
diff --git a/src/routes/auth/register/+page.svelte b/src/routes/auth/register/+page.svelte
index 847471a9..05d664e1 100644
--- a/src/routes/auth/register/+page.svelte
+++ b/src/routes/auth/register/+page.svelte
@@ -39,6 +39,59 @@
return regex.test(email);
}
+ type PasswordRequirementKey = 'length' | 'lowercase' | 'uppercase' | 'number' | 'symbol';
+
+ const passwordRequirementPatterns: Record
, RegExp> = {
+ lowercase: /[a-z]/,
+ uppercase: /[A-Z]/,
+ number: /\d/,
+ symbol: /[^A-Za-z0-9]/
+ };
+
+ const passwordRequirementEntries: Array<{ key: PasswordRequirementKey; label: string }> = [
+ { key: 'length', label: 'At least 8 characters' },
+ { key: 'lowercase', label: 'Contains a lowercase letter (a-z)' },
+ { key: 'uppercase', label: 'Contains an uppercase letter (A-Z)' },
+ { key: 'number', label: 'Contains a number (0-9)' },
+ { key: 'symbol', label: 'Contains a symbol (!@#$, etc.)' }
+ ];
+
+ function meetsPasswordRequirements(value: string): boolean {
+ return (
+ value.length >= 8 &&
+ passwordRequirementPatterns.lowercase.test(value) &&
+ passwordRequirementPatterns.uppercase.test(value) &&
+ passwordRequirementPatterns.number.test(value) &&
+ passwordRequirementPatterns.symbol.test(value)
+ );
+ }
+
+ function computePasswordRequirementStatus(
+ value: string
+ ): Record {
+ return {
+ length: value.length >= 8,
+ lowercase: passwordRequirementPatterns.lowercase.test(value),
+ uppercase: passwordRequirementPatterns.uppercase.test(value),
+ number: passwordRequirementPatterns.number.test(value),
+ symbol: passwordRequirementPatterns.symbol.test(value)
+ };
+ }
+
+ function getUnmetRequirementLabels(status: Record): string[] {
+ const labels: string[] = [];
+
+ for (const entry of passwordRequirementEntries) {
+ if (!status[entry.key]) {
+ labels.push(entry.label);
+ }
+ }
+
+ return labels;
+ }
+
+ let passwordsMatch = $derived(confirmPassword.length > 0 && confirmPassword === password);
+
// Function to validate the form
function validateForm(): boolean {
let isValid = true;
@@ -77,13 +130,17 @@
if (!password) {
errors.password = 'Password is required';
isValid = false;
- } else if (password.length < 8) {
- errors.password = 'Password must be at least 8 characters';
+ } else if (!meetsPasswordRequirements(password)) {
+ errors.password =
+ 'Password must be at least 8 characters and include a lowercase letter, uppercase letter, number, and symbol';
isValid = false;
}
// Validate password confirmation
- if (password !== confirmPassword) {
+ if (!confirmPassword) {
+ errors.confirmPassword = 'Please confirm your password';
+ isValid = false;
+ } else if (password !== confirmPassword) {
errors.confirmPassword = 'Passwords do not match';
isValid = false;
}
@@ -111,7 +168,7 @@
email.trim() !== '' &&
isValidEmail(email) &&
password !== '' &&
- password.length >= 8 &&
+ meetsPasswordRequirements(password) &&
confirmPassword !== '' &&
password === confirmPassword &&
company.trim() !== '' &&
@@ -151,8 +208,9 @@
function validatePasswordField() {
if (!password) {
errors.password = 'Password is required';
- } else if (password.length < 8) {
- errors.password = 'Password must be at least 8 characters';
+ } else if (!meetsPasswordRequirements(password)) {
+ errors.password =
+ 'Password must be at least 8 characters and include a lowercase letter, uppercase letter, number, and symbol';
} else {
errors.password = '';
}
@@ -251,6 +309,115 @@
}
+{#snippet passwordRequirementList({
+ value,
+ includeMatch
+}: {
+ value: string;
+ includeMatch: boolean;
+})}
+ {@const status = includeMatch ? null : computePasswordRequirementStatus(value)}
+ {@const unmetRequirementLabels = status ? getUnmetRequirementLabels(status) : []}
+
+ {#if !includeMatch}
+ {#each passwordRequirementEntries as { key, label }}
+ {@const satisfied = status ? status[key] : false}
+
+
+ {#if satisfied}
+
+
+ {:else}
+
+
+ {/if}
+
+ {$_(label)}
+
+ {/each}
+ {/if}
+
+ {#if includeMatch}
+
+
+ {#if passwordsMatch}
+
+
+ {:else}
+
+
+ {/if}
+
+
+ {#if passwordsMatch}
+ {$_('Passwords match')}
+ {:else}
+ {$_('Passwords must match')}
+ {/if}
+
+
+ {/if}
+
+
+ {@const unmetWithMatch = (() => {
+ const messages = [];
+ const labels =
+ !includeMatch && Array.isArray(unmetRequirementLabels) ? unmetRequirementLabels : [];
+
+ for (const label of labels) {
+ messages.push($_(label));
+ }
+
+ if (includeMatch && !passwordsMatch) {
+ messages.push($_('Passwords must match'));
+ }
+
+ return messages;
+ })()}
+
+ {#if unmetWithMatch.length > 0}
+
+ {$_('Still needed')}: {unmetWithMatch.join(', ')}
+
+ {/if}
+{/snippet}
+
{$_('Register')} | IoT Dashboard
@@ -388,7 +555,7 @@
{#if errors.password}
{$_(errors.password)}
{/if}
- Minimum 8 characters required
+ {@render passwordRequirementList({ value: password, includeMatch: false })}
@@ -417,6 +584,7 @@
{#if errors.confirmPassword}
{$_(errors.confirmPassword)}
{/if}
+ {@render passwordRequirementList({ value: confirmPassword, includeMatch: true })}
@@ -535,7 +703,7 @@
{#if !agreedToTerms || !agreedToPrivacy || !agreedToCookies}
- All three agreements must be accepted to register
+ {$_('All three agreements must be accepted to register')}
{/if}
diff --git a/static/build-info.json b/static/build-info.json
index 80831620..8f7c4505 100644
--- a/static/build-info.json
+++ b/static/build-info.json
@@ -1,9 +1,9 @@
{
- "commit": "39e6e87",
+ "commit": "efbc4d6",
"branch": "develop",
"author": "Kevin Cantrell",
- "date": "2025-10-07T13:50:32.498Z",
+ "date": "2025-10-24T04:18:03.692Z",
"builder": "kevin@kevin-desktop",
"ipAddress": "192.168.1.100",
- "timestamp": 1759845032499
+ "timestamp": 1761279483692
}
diff --git a/tsconfig.json b/tsconfig.json
index 1714465d..4778bafa 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,6 +12,7 @@
"moduleResolution": "bundler",
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
+ "types": ["svelte", "vite/client"]
}
// Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
// except $lib which is handled by https://svelte.dev/docs/kit/configuration#files