Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
274 changes: 152 additions & 122 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions src/hooks.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ import { env } from "$env/dynamic/private";
import { oauth2ProviderManager } from "$lib/oauth/providerManager";
import { SessionOAuthHelper } from "$lib/oauth/sessionHelper";
import { resourceDocsCache } from "$lib/stores/resourceDocsCache";

// Constants
const DEFAULT_PORT = 3003;

// Check if server is running on non-default port
function checkServerPort() {
// Check common port environment variables
const envPort =
process.env.PORT || process.env.VITE_PORT || process.env.SERVER_PORT;
env.PORT || env.VITE_PORT || env.SERVER_PORT;

if (envPort && parseInt(envPort) !== DEFAULT_PORT) {
logger.warn(
Expand Down
19 changes: 15 additions & 4 deletions src/lib/components/Navigation.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { page } from "$app/stores";
import { goto } from "$app/navigation";
import { configHelpers } from "$lib/config";
import { env } from "$env/dynamic/public";

// Props from layout with better typing
let {
Expand All @@ -21,7 +21,18 @@
// Reactive statements for better state management
let isAuthenticated = $derived(!!user && !!authInfo?.authenticated);
let userDisplayName = $derived(user?.username || user?.email || "User");
let obpInfo = $derived(configHelpers.getObpConnectionInfo());

// Configuration - extract display name from URL
function getDisplayName(url: string): string {
try {
const parsed = new URL(url);
return `${parsed.hostname}:${parsed.port || (parsed.protocol === 'https:' ? '443' : '80')}`;
} catch {
return url;
}
}

let obpDisplayName = $derived(getDisplayName(env.PUBLIC_OBP_BASE_URL || "http://127.0.0.1:8080"));

let isMobileMenuOpen = $state(false);
let openDropdown = $state<string | null>(null);
Expand Down Expand Up @@ -183,7 +194,7 @@
<div class="user-info desktop-only">
<div class="user-details">
<span class="user-name">{userDisplayName}</span>
<span class="obp-host">→ {obpInfo.displayName}</span>
<span class="obp-host">→ {obpDisplayName}</span>
</div>
</div>

Expand Down Expand Up @@ -228,7 +239,7 @@
<!-- User Info in Mobile -->
<div class="mobile-user-info">
<div class="mobile-user-name">{userDisplayName}</div>
<div class="mobile-obp-host">Connected to: {obpInfo.displayName}</div>
<div class="mobile-obp-host">Connected to: {obpDisplayName}</div>
</div>

<!-- Navigation Links -->
Expand Down
19 changes: 14 additions & 5 deletions src/lib/components/ObpStatusIndicator.svelte
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
<script lang="ts">
import { configHelpers } from "$lib/config";
import { env } from "$env/dynamic/public";

// Props
export let hasApiAccess: boolean = false;
export let size: "small" | "medium" | "large" = "medium";
export let showDetails: boolean = false;
export let inline: boolean = false;

// Configuration
$: obpInfo = configHelpers.getObpConnectionInfo();
// Configuration - extract display name from URL
function getDisplayName(url: string): string {
try {
const parsed = new URL(url);
return `${parsed.hostname}:${parsed.port || (parsed.protocol === 'https:' ? '443' : '80')}`;
} catch {
return url;
}
}

$: displayName = getDisplayName(env.PUBLIC_OBP_BASE_URL || "http://127.0.0.1:8080");
$: connectionStatus = hasApiAccess ? "connected" : "disconnected";
$: statusColor = hasApiAccess ? "#10b981" : "#ef4444";
$: statusIcon = hasApiAccess ? "🟢" : "🔴";
Expand Down Expand Up @@ -46,7 +55,7 @@
<div
class="status-indicator {currentSize.container}"
class:inline={inline}
title="OBP Server: {obpInfo.displayName} - {statusText}"
title="OBP Server: {displayName} - {statusText}"
>
<!-- Status Dot with Animation -->
<div
Expand All @@ -67,7 +76,7 @@
<div class="status-details {currentSize.details}">
<div class="detail-row">
<span class="detail-label">Host:</span>
<span class="detail-value">{obpInfo.displayName}</span>
<span class="detail-value">{displayName}</span>
</div>
<div class="detail-row">
<span class="detail-label">Status:</span>
Expand Down
209 changes: 0 additions & 209 deletions src/lib/config.ts

This file was deleted.

Loading