Compare commits

..

4 Commits

Author SHA1 Message Date
gpt-engineer-app[bot]
64d81f2687 Add documentation to utils.ts 2025-10-30 16:52:58 +00:00
gpt-engineer-app[bot]
ac67f4bdd9 Add dev branch to workflow triggers 2025-10-30 16:48:59 +00:00
gpt-engineer-app[bot]
1e212652ce Fix invalid secrets syntax 2025-10-30 16:44:04 +00:00
pacnpal
89ca76ead2 Merge Sessions tab into Security tab and update date
Updated the date for the account security improvements and merged the Sessions tab into the Security tab, removing the redundant Sessions component.
2025-10-30 12:41:28 -04:00
3 changed files with 26 additions and 6 deletions

View File

@@ -2,9 +2,9 @@ name: Playwright E2E Tests
on:
push:
branches: [main, develop]
branches: [main, develop, dev]
pull_request:
branches: [main, develop]
branches: [main, develop, dev]
env:
GRAFANA_LOKI_URL: ${{ secrets.GRAFANA_LOKI_URL }}
@@ -30,9 +30,13 @@ jobs:
echo "✅ Required secrets validated"
- name: Test Grafana Cloud Loki Connection
if: ${{ secrets.GRAFANA_LOKI_URL != '' }}
continue-on-error: true
run: |
if [ -z "${{ secrets.GRAFANA_LOKI_URL }}" ]; then
echo "⏭️ Skipping Loki connection test (GRAFANA_LOKI_URL not configured)"
exit 0
fi
echo "🔍 Testing Grafana Cloud Loki connection..."
timestamp=$(date +%s)000000000
@@ -90,9 +94,13 @@ jobs:
run: npx playwright install --with-deps ${{ matrix.browser }}
- name: Send Test Start Event to Loki
if: ${{ secrets.GRAFANA_LOKI_URL != '' }}
continue-on-error: true
run: |
if [ -z "${{ secrets.GRAFANA_LOKI_URL }}" ]; then
echo "⏭️ Skipping Loki logging (GRAFANA_LOKI_URL not configured)"
exit 0
fi
timestamp=$(date +%s)000000000
response=$(curl -s -w "\n%{http_code}" \
@@ -168,9 +176,14 @@ jobs:
fi
- name: Send Test Results to Loki
if: always() && secrets.GRAFANA_LOKI_URL != ''
if: always()
continue-on-error: true
run: |
if [ -z "${{ secrets.GRAFANA_LOKI_URL }}" ]; then
echo "⏭️ Skipping Loki logging (GRAFANA_LOKI_URL not configured)"
exit 0
fi
STATUS="${{ steps.playwright-run.outputs.test_exit_code == '0' && 'success' || 'failure' }}"
timestamp=$(date +%s)000000000

View File

@@ -2,7 +2,7 @@
## UI Consolidation: Sessions Merged into Security Tab
**Date**: 2025-01-14
**Date**: 2025-10-14
**Changes**:
- Merged `SessionsTab` functionality into `SecurityTab` "Active Sessions & Login History" section

View File

@@ -1,6 +1,13 @@
import { clsx, type ClassValue } from "clsx";
import { twMerge } from "tailwind-merge";
/**
* Combines multiple class names into a single string, merging Tailwind CSS classes intelligently.
* Uses clsx for conditional class handling and tailwind-merge to resolve conflicts.
*
* @param inputs - Class values to combine (strings, objects, arrays)
* @returns Merged class string with Tailwind conflicts resolved
*/
export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs));
}