openship 0.1.1 → 0.1.7

package/apps/dashboard/src/app/(dashboard)/settings/_components/ServerConnection.tsx

@@ -1,407 +0,0 @@
-"use client";
-
-import { useState, useEffect, useCallback } from "react";
-import {
-  Server,
-  Loader2,
-  Check,
-  KeyRound,
-  Lock,
-  Network,
-  ChevronDown,
-  Pencil,
-  X,
-} from "lucide-react";
-import { getApiErrorMessage, systemApi } from "@/lib/api";
-import type { InstanceSettings } from "@/lib/api/system";
-import { useToast } from "@/context/ToastContext";
-import { SettingsSection } from "./SettingsSection";
-
-/* ── Tunnel label helper ────────────────────────────────────────── */
-
-const TUNNEL_LABELS: Record<string, string> = {
-  edge: "Openship Edge",
-  cloudflare: "Cloudflare Tunnel",
-  ngrok: "ngrok",
-};
-
-/* ── Component ──────────────────────────────────────────────────── */
-
-export function ServerConnection() {
-  const { showToast } = useToast();
-  const [settings, setSettings] = useState<InstanceSettings | null>(null);
-  const [loading, setLoading] = useState(true);
-  const [editing, setEditing] = useState(false);
-  const [saving, setSaving] = useState(false);
-
-  /* ── Form state ── */
-  const [sshHost, setSshHost] = useState("");
-  const [sshPort, setSshPort] = useState("22");
-  const [sshUser, setSshUser] = useState("root");
-  const [sshAuthMethod, setSshAuthMethod] = useState<"password" | "key">("password");
-  const [sshPassword, setSshPassword] = useState("");
-  const [sshKeyPath, setSshKeyPath] = useState("");
-  const [sshKeyPassphrase, setSshKeyPassphrase] = useState("");
-  const [tunnelProvider, setTunnelProvider] = useState<string>("");
-  const [tunnelToken, setTunnelToken] = useState("");
-  const [showAdvanced, setShowAdvanced] = useState(false);
-
-  const fetchSettings = useCallback(async () => {
-    try {
-      setLoading(true);
-      const res = await systemApi.getSettings();
-      setSettings(res);
-      if (res?.configured) {
-        setSshHost(res.sshHost ?? "");
-        setSshPort(String(res.sshPort ?? 22));
-        setSshUser(res.sshUser ?? "root");
-        setSshAuthMethod(res.sshAuthMethod ?? "password");
-        setTunnelProvider(res.tunnelProvider ?? "");
-      }
-    } catch {
-      /* silent — may not be available in cloud mode */
-    } finally {
-      setLoading(false);
-    }
-  }, []);
-
-  useEffect(() => {
-    fetchSettings();
-  }, [fetchSettings]);
-
-  function startEdit() {
-    setEditing(true);
-    // Reset secret fields — user must re-enter
-    setSshPassword("");
-    setSshKeyPath("");
-    setSshKeyPassphrase("");
-    setTunnelToken("");
-  }
-
-  function cancelEdit() {
-    setEditing(false);
-    // Restore from settings
-    if (settings?.configured) {
-      setSshHost(settings.sshHost ?? "");
-      setSshPort(String(settings.sshPort ?? 22));
-      setSshUser(settings.sshUser ?? "root");
-      setSshAuthMethod(settings.sshAuthMethod ?? "password");
-      setTunnelProvider(settings.tunnelProvider ?? "");
-    }
-  }
-
-  async function handleSave() {
-    if (!sshHost.trim()) {
-      showToast("Server host is required", "error", "Settings");
-      return;
-    }
-
-    setSaving(true);
-    try {
-      const patch: Record<string, unknown> = {
-        sshHost: sshHost.trim(),
-        sshPort: parseInt(sshPort, 10) || 22,
-        sshUser: sshUser.trim() || "root",
-        sshAuthMethod,
-        tunnelProvider: tunnelProvider || null,
-      };
-
-      // Only send secrets if user provided them
-      if (sshAuthMethod === "password" && sshPassword) {
-        patch.sshPassword = sshPassword;
-      }
-      if (sshAuthMethod === "key" && sshKeyPath) {
-        patch.sshKeyPath = sshKeyPath;
-        if (sshKeyPassphrase) patch.sshKeyPassphrase = sshKeyPassphrase;
-      }
-      if (tunnelProvider && tunnelProvider !== "edge" && tunnelToken) {
-        patch.tunnelToken = tunnelToken;
-      }
-
-      await systemApi.updateSettings(patch);
-      showToast("Server settings updated", "success", "Settings");
-      setEditing(false);
-      fetchSettings();
-    } catch (err) {
-      showToast(
-        getApiErrorMessage(err, "Failed to update server settings"),
-        "error",
-        "Settings",
-      );
-    } finally {
-      setSaving(false);
-    }
-  }
-
-  const configured = settings?.configured;
-  const description = loading
-    ? "Loading…"
-    : configured
-      ? settings.sshHost ?? "Configured"
-      : "Not configured";
-
-  return (
-    <SettingsSection
-      icon={Server}
-      title="Server Connection"
-      iconBg="bg-blue-500/10"
-      iconColor="text-blue-500"
-      description={description}
-    >
-      {loading ? (
-        <div className="flex items-center gap-2 text-sm text-muted-foreground py-2">
-          <Loader2 className="size-4 animate-spin" />
-          Loading server settings…
-        </div>
-      ) : !editing ? (
-        /* ── Read-only view ── */
-        <>
-          {configured ? (
-            <div className="space-y-3">
-              <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
-                {/* SSH Host */}
-                <div className="flex items-center gap-3 rounded-xl border border-border/50 p-4">
-                  <div className="w-8 h-8 rounded-lg bg-muted flex items-center justify-center">
-                    <Server className="size-4 text-muted-foreground" />
-                  </div>
-                  <div>
-                    <p className="text-sm font-medium text-foreground">
-                      {settings.sshHost}:{settings.sshPort ?? 22}
-                    </p>
-                    <p className="text-xs text-muted-foreground">
-                      {settings.sshUser ?? "root"}@host
-                    </p>
-                  </div>
-                </div>
-
-                {/* Auth method */}
-                <div className="flex items-center gap-3 rounded-xl border border-border/50 p-4">
-                  <div className="w-8 h-8 rounded-lg bg-muted flex items-center justify-center">
-                    {settings.sshAuthMethod === "key" ? (
-                      <KeyRound className="size-4 text-muted-foreground" />
-                    ) : (
-                      <Lock className="size-4 text-muted-foreground" />
-                    )}
-                  </div>
-                  <div>
-                    <p className="text-sm font-medium text-foreground">
-                      {settings.sshAuthMethod === "key" ? "SSH Key" : "Password"}
-                    </p>
-                    <p className="text-xs text-muted-foreground">Authentication method</p>
-                  </div>
-                </div>
-
-                {/* Tunnel */}
-                {settings.tunnelProvider && (
-                  <div className="flex items-center gap-3 rounded-xl border border-border/50 p-4">
-                    <div className="w-8 h-8 rounded-lg bg-muted flex items-center justify-center">
-                      <Network className="size-4 text-muted-foreground" />
-                    </div>
-                    <div>
-                      <p className="text-sm font-medium text-foreground">
-                        {TUNNEL_LABELS[settings.tunnelProvider] ?? settings.tunnelProvider}
-                      </p>
-                      <p className="text-xs text-muted-foreground">Tunnel provider</p>
-                    </div>
-                  </div>
-                )}
-              </div>
-
-              <button
-                onClick={startEdit}
-                className="inline-flex items-center gap-2 px-4 py-2 bg-muted/50 text-foreground text-sm font-medium rounded-xl hover:bg-muted transition-colors mt-1"
-              >
-                <Pencil className="size-3.5" />
-                Edit Connection
-              </button>
-            </div>
-          ) : (
-            <div className="text-center py-4">
-              <p className="text-sm text-muted-foreground mb-4">
-                No server connection configured. Set up SSH access to deploy to a remote server.
-              </p>
-              <button
-                onClick={startEdit}
-                className="inline-flex items-center gap-2 px-6 py-3 bg-primary text-primary-foreground text-sm font-medium rounded-xl hover:bg-primary/90 transition-all hover:shadow-lg hover:shadow-primary/25 hover:-translate-y-0.5"
-              >
-                <Server className="size-4" />
-                Configure Server
-              </button>
-            </div>
-          )}
-        </>
-      ) : (
-        /* ── Edit form ── */
-        <div className="space-y-4">
-          {/* SSH Host + Port */}
-          <div className="grid grid-cols-1 sm:grid-cols-[1fr_120px] gap-3">
-            <div>
-              <label className="text-xs font-medium text-muted-foreground mb-1.5 block">
-                Server Host
-              </label>
-              <input
-                type="text"
-                value={sshHost}
-                onChange={(e) => setSshHost(e.target.value)}
-                placeholder="192.168.1.100 or example.com"
-                className="w-full h-10 px-3 rounded-lg border border-border bg-background text-sm text-foreground placeholder:text-muted-foreground/50 focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary/50"
-              />
-            </div>
-            <div>
-              <label className="text-xs font-medium text-muted-foreground mb-1.5 block">
-                Port
-              </label>
-              <input
-                type="number"
-                value={sshPort}
-                onChange={(e) => setSshPort(e.target.value)}
-                placeholder="22"
-                className="w-full h-10 px-3 rounded-lg border border-border bg-background text-sm text-foreground placeholder:text-muted-foreground/50 focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary/50"
-              />
-            </div>
-          </div>
-
-          {/* Username */}
-          <div>
-            <label className="text-xs font-medium text-muted-foreground mb-1.5 block">
-              Username
-            </label>
-            <input
-              type="text"
-              value={sshUser}
-              onChange={(e) => setSshUser(e.target.value)}
-              placeholder="root"
-              className="w-full h-10 px-3 rounded-lg border border-border bg-background text-sm text-foreground placeholder:text-muted-foreground/50 focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary/50"
-            />
-          </div>
-
-          {/* Auth method tabs */}
-          <div>
-            <label className="text-xs font-medium text-muted-foreground mb-1.5 block">
-              Authentication
-            </label>
-            <div className="flex rounded-lg border border-border overflow-hidden mb-3">
-              <button
-                type="button"
-                onClick={() => setSshAuthMethod("password")}
-                className={`flex-1 flex items-center justify-center gap-2 px-3 py-2 text-sm transition-colors ${
-                  sshAuthMethod === "password"
-                    ? "bg-primary/10 text-primary font-medium"
-                    : "text-muted-foreground hover:bg-muted/50"
-                }`}
-              >
-                <Lock className="size-3.5" />
-                Password
-              </button>
-              <button
-                type="button"
-                onClick={() => setSshAuthMethod("key")}
-                className={`flex-1 flex items-center justify-center gap-2 px-3 py-2 text-sm border-l border-border transition-colors ${
-                  sshAuthMethod === "key"
-                    ? "bg-primary/10 text-primary font-medium"
-                    : "text-muted-foreground hover:bg-muted/50"
-                }`}
-              >
-                <KeyRound className="size-3.5" />
-                SSH Key
-              </button>
-            </div>
-
-            {sshAuthMethod === "password" ? (
-              <input
-                type="password"
-                value={sshPassword}
-                onChange={(e) => setSshPassword(e.target.value)}
-                placeholder="Enter password (leave empty to keep current)"
-                className="w-full h-10 px-3 rounded-lg border border-border bg-background text-sm text-foreground placeholder:text-muted-foreground/50 focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary/50"
-              />
-            ) : (
-              <div className="space-y-3">
-                <input
-                  type="text"
-                  value={sshKeyPath}
-                  onChange={(e) => setSshKeyPath(e.target.value)}
-                  placeholder="Path to SSH key (e.g. ~/.ssh/id_rsa)"
-                  className="w-full h-10 px-3 rounded-lg border border-border bg-background text-sm text-foreground placeholder:text-muted-foreground/50 focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary/50"
-                />
-                <input
-                  type="password"
-                  value={sshKeyPassphrase}
-                  onChange={(e) => setSshKeyPassphrase(e.target.value)}
-                  placeholder="Key passphrase (optional)"
-                  className="w-full h-10 px-3 rounded-lg border border-border bg-background text-sm text-foreground placeholder:text-muted-foreground/50 focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary/50"
-                />
-              </div>
-            )}
-          </div>
-
-          {/* Tunnel provider */}
-          <div>
-            <label className="text-xs font-medium text-muted-foreground mb-1.5 block">
-              Tunnel Provider
-            </label>
-            <div className="relative">
-              <select
-                value={tunnelProvider}
-                onChange={(e) => setTunnelProvider(e.target.value)}
-                className="w-full h-10 px-3 pr-8 rounded-lg border border-border bg-background text-sm text-foreground appearance-none focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary/50"
-              >
-                <option value="">None (public IP)</option>
-                <option value="edge">Openship Edge (managed)</option>
-                <option value="cloudflare">Cloudflare Tunnel</option>
-                <option value="ngrok">ngrok</option>
-              </select>
-              <ChevronDown className="absolute right-3 top-1/2 -translate-y-1/2 size-4 text-muted-foreground pointer-events-none" />
-            </div>
-
-            {tunnelProvider && tunnelProvider !== "edge" && (
-              <input
-                type="password"
-                value={tunnelToken}
-                onChange={(e) => setTunnelToken(e.target.value)}
-                placeholder={`${TUNNEL_LABELS[tunnelProvider] ?? tunnelProvider} auth token`}
-                className="w-full h-10 px-3 rounded-lg border border-border bg-background text-sm text-foreground placeholder:text-muted-foreground/50 focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary/50 mt-3"
-              />
-            )}
-          </div>
-
-          {/* Advanced toggle (placeholder for jumpHost, sshArgs) */}
-          <button
-            type="button"
-            onClick={() => setShowAdvanced(!showAdvanced)}
-            className="text-xs text-muted-foreground hover:text-foreground transition-colors flex items-center gap-1"
-          >
-            <ChevronDown className={`size-3 transition-transform ${showAdvanced ? "rotate-180" : ""}`} />
-            Advanced options
-          </button>
-
-          {showAdvanced && (
-            <p className="text-xs text-muted-foreground bg-muted/50 rounded-lg p-3">
-              Jump host and extra SSH args can be configured during onboarding
-              or via the CLI. Support for editing these here is coming soon.
-            </p>
-          )}
-
-          {/* Actions */}
-          <div className="flex items-center gap-3 pt-2">
-            <button
-              onClick={handleSave}
-              disabled={saving || !sshHost.trim()}
-              className="inline-flex items-center gap-2 px-5 py-2.5 bg-primary text-primary-foreground text-sm font-medium rounded-xl hover:bg-primary/90 transition-all disabled:opacity-50"
-            >
-              {saving ? <Loader2 className="size-4 animate-spin" /> : <Check className="size-4" />}
-              Save
-            </button>
-            <button
-              onClick={cancelEdit}
-              className="inline-flex items-center gap-2 px-5 py-2.5 bg-muted/50 text-foreground text-sm font-medium rounded-xl hover:bg-muted transition-colors"
-            >
-              <X className="size-4" />
-              Cancel
-            </button>
-          </div>
-        </div>
-      )}
-    </SettingsSection>
-  );
-}

package/apps/dashboard/src/app/(dashboard)/settings/_components/SettingsSection.tsx

@@ -1,32 +0,0 @@
-"use client";
-
-export function SettingsSection({
-  icon: Icon,
-  title,
-  description,
-  children,
-  iconBg = "bg-primary/10",
-  iconColor = "text-primary",
-}: {
-  icon: React.ElementType;
-  title: string;
-  description: string;
-  children: React.ReactNode;
-  iconBg?: string;
-  iconColor?: string;
-}) {
-  return (
-    <div className="bg-card rounded-2xl border border-border/50">
-      <div className="flex items-center gap-3 px-5 py-4 border-b border-border/50">
-        <div className={`w-9 h-9 ${iconBg} rounded-xl flex items-center justify-center`}>
-          <Icon className={`size-[18px] ${iconColor}`} />
-        </div>
-        <div>
-          <h2 className="font-semibold text-foreground text-[15px]">{title}</h2>
-          <p className="text-xs text-muted-foreground">{description}</p>
-        </div>
-      </div>
-      <div className="p-5">{children}</div>
-    </div>
-  );
-}

package/apps/dashboard/src/app/(dashboard)/settings/page.tsx

@@ -1,67 +0,0 @@
-"use client";
-
-import { useEffect } from "react";
-import { useSearchParams } from "next/navigation";
-import { useGitHub } from "@/context/GitHubContext";
-import { useCloud } from "@/context/CloudContext";
-import { useToast } from "@/context/ToastContext";
-
-import { BuildPreferences } from "./_components/BuildPreferences";
-import { ServerConnection } from "./_components/ServerConnection";
-import { CloudConnection } from "./_components/CloudConnection";
-import { InstanceInfo } from "./_components/InstanceInfo";
-
-export default function SettingsPage() {
-  const { selfHosted, authMode } = useGitHub();
-  const { refresh } = useCloud();
-  const { showToast } = useToast();
-  const searchParams = useSearchParams();
-
-  // Build preferences: only self-hosted — SaaS manages builds.
-  const showBuildPreferences = selfHosted;
-  // Server connection (SSH / tunnel) only when self-hosted with local infra
-  const showServerConnection = selfHosted && authMode !== "cloud";
-  // Cloud connection available for self-hosted instances (connect/disconnect)
-  const showCloudConnection = selfHosted;
-
-  /* ── Cloud callback (redirect after connect) ── */
-  useEffect(() => {
-    if (searchParams.get("cloud") === "connected") {
-      refresh();
-      showToast("Connected to Openship Cloud", "success", "Cloud");
-      window.history.replaceState({}, "", "/settings");
-    }
-  }, [searchParams, showToast, refresh]);
-
-  return (
-    <div className="min-h-screen bg-background">
-      <div className="max-w-[1600px] mx-auto px-4 sm:px-6 lg:px-8 py-6">
-        <div className="mb-6">
-          <h1
-            className="text-2xl font-medium text-foreground/80"
-            style={{ letterSpacing: "-0.2px" }}
-          >
-            Settings
-          </h1>
-          <p className="text-sm text-muted-foreground/70 mt-1">
-            Manage your preferences, connections, and instance configuration
-          </p>
-        </div>
-
-        <div className="grid grid-cols-1 lg:grid-cols-[1fr_340px] gap-6">
-          {/* ── LEFT COLUMN ── */}
-          <div className="space-y-6 min-w-0">
-            {showBuildPreferences && <BuildPreferences />}
-            {showServerConnection && <ServerConnection />}
-            <InstanceInfo />
-          </div>
-
-          {/* ── RIGHT COLUMN (Sticky) ── */}
-          <div className="space-y-4 lg:sticky lg:top-6 lg:self-start">
-            {showCloudConnection && <CloudConnection />}
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

package/apps/dashboard/src/app/auth/callback/close/page.tsx

@@ -1,23 +0,0 @@
-"use client";
-
-import { useEffect } from "react";
-
-/**
- * OAuth callback landing page — auto-closes the popup/window.
- *
- * Better Auth redirects here after successful GitHub OAuth in desktop mode.
- * The popup closes, and the opener detects it via the authWindow middleware.
- */
-export default function OAuthCallbackClose() {
-  useEffect(() => {
-    // Give a brief moment for cookies to settle, then close
-    const timer = setTimeout(() => window.close(), 300);
-    return () => clearTimeout(timer);
-  }, []);
-
-  return (
-    <div className="flex h-screen items-center justify-center bg-background text-foreground">
-      <p className="text-sm text-muted-foreground">Authenticated — closing…</p>
-    </div>
-  );
-}

package/apps/dashboard/src/app/auth/callback/install/page.tsx

@@ -1,40 +0,0 @@
-"use client";
-
-import { useEffect } from "react";
-
-/**
- * OAuth callback for cloud mode — after GitHub OAuth completes,
- * fetches the GitHub App installation URL from the API and redirects.
- *
- * Flow: GitHub OAuth → Better Auth callback → this page → GitHub App install
- */
-export default function OAuthCallbackInstall() {
-  useEffect(() => {
-    async function redirect() {
-      try {
-        const BASE = process.env.NEXT_PUBLIC_API_URL ?? "http://localhost:4000";
-        const res = await fetch(`${BASE}/api/github/connect`, {
-          method: "POST",
-          credentials: "include",
-        });
-        const data = await res.json();
-
-        if (data?.url) {
-          window.location.href = data.url;
-          return;
-        }
-      } catch {
-        // If fetch fails, just close — the opener will detect it
-      }
-      window.close();
-    }
-
-    redirect();
-  }, []);
-
-  return (
-    <div className="flex h-screen items-center justify-center bg-background text-foreground">
-      <p className="text-sm text-muted-foreground">Setting up GitHub access…</p>
-    </div>
-  );
-}