remove comments

remove filter clearing logic
remove redundant app button
2026-05-16 13:43:04 -07:00 · 2026-05-16 13:37:49 -07:00 · 2026-05-16 13:37:01 -07:00 · 2026-05-16 13:36:08 -07:00 · 2026-05-16 12:18:51 -07:00 · 2026-05-15 20:00:29 -07:00
21 changed files with 453 additions and 5761 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/assets/scss/_global.scss
+++ b/src/assets/scss/_global.scss
@ -234,6 +234,15 @@ body {
  color: $text-secondary;
 }

+// Ensure stat-chip shows primary-dark outline on hover and when active
+.stat-chip {
+  &:hover:not(:disabled),
+  &.active {
+    border-color: $primary-dark;
+    box-shadow: 0 0 0 3px rgba($primary-dark, 0.08);
+  }
+}
+
 // Results count
 .results-count {
  text-align: center;
--- a/src/assets/scss/_mixins.scss
+++ b/src/assets/scss/_mixins.scss
@ -23,11 +23,98 @@
 // Card style
@mixin card {
  background: $bg-primary;
-  border-radius: $radius-lg;
  box-shadow: $shadow-md;
  padding: $spacing-xl;
 }

+// Ensure cards occupy consistent vertical space and can stretch horizontally
+@mixin card-dimensions($min-width: 320px, $min-height: 180px) {
+  min-width: $min-width;
+  min-height: $min-height;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+/// Standard vertical stack for card-style list rows (dashboard recent apps, server detail apps, etc.)
+@mixin card-list-vertical($gap: $spacing-md) {
+  display: flex;
+  flex-direction: column;
+  gap: $gap;
+}
+
+/// Hover lift used by dashboard list cards, server grid cards, and similar surfaces
+@mixin card-hover-lift($translate-y: -2px, $hover-shadow: $shadow-lg) {
+  transition: transform $transition-base, box-shadow $transition-base;
+
+  &:hover {
+    transform: translateY($translate-y);
+    box-shadow: $hover-shadow;
+  }
+}
+
+/// Card shell with horizontal scroll (e.g. data tables)
+@mixin scrollable-card {
+  @include card;
+  overflow-x: auto;
+}
+
+/// Header block inside a card: title area with a bottom rule (server cards, etc.)
+@mixin card-header-rule {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: $spacing-lg;
+  padding-bottom: $spacing-md;
+  border-bottom: 2px solid $bg-secondary;
+}
+
+/// Primary title + muted monospace/meta line (server cards, resource headers)
+@mixin card-title-stack(
+  $title-size: $font-size-xl,
+  $title-weight: $font-weight-bold,
+  $meta-size: $font-size-sm
+) {
+  h3 {
+    margin: 0 0 $spacing-xs;
+    font-size: $title-size;
+    color: $text-primary;
+    font-weight: $title-weight;
+  }
+
+  .server-host {
+    font-size: $meta-size;
+    color: $text-muted;
+    font-family: monospace;
+  }
+}
+
+/// Label + value row inside a card body (server stats, etc.)
+@mixin card-stat-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: $spacing-sm 0;
+  border-bottom: 1px solid $bg-secondary;
+
+  &:last-child {
+    border-bottom: none;
+  }
+}
+
+/// Full-width edge bleed for highlighted rows inside padded cards (matches card horizontal padding)
+@mixin card-row-highlight-bleed($clear-bottom-border: true) {
+  padding: $spacing-sm $spacing-md;
+  margin: $spacing-sm (-$spacing-xl);
+  padding-left: calc($spacing-xl + $spacing-md);
+  padding-right: calc($spacing-xl + $spacing-md);
+
+  @if $clear-bottom-border {
+    border-bottom: none;
+  }
+}
+
 // Button base
@mixin button-base {
  padding: $spacing-sm $spacing-lg;
@ -63,4 +150,63 @@
  font-weight: $font-weight-semibold;
  background-color: rgba($color, 0.1);
  // color: darken($color, 20%);
+}
+
+// Compact chip used for stat chips and small interactive chips
+@mixin chip(
+  $bg: white,
+  $border-color: $border-color,
+  $radius: $radius-md,
+  $padding: $spacing-md $spacing-lg,
+  $gap: $spacing-md,
+  $hover-translate: -2px,
+  $hover-shadow: $shadow-sm,
+  $font-size: $font-size-base
+) {
+  display: flex;
+  align-items: center;
+  gap: $gap;
+  padding: $padding;
+  background: $bg;
+  border: 2px solid $border-color;
+  border-radius: $radius;
+  cursor: pointer;
+  transition: all $transition-base;
+  font-size: $font-size;
+
+  &:hover:not(:disabled) {
+    border-color: $primary;
+    transform: translateY($hover-translate);
+    box-shadow: $hover-shadow;
+  }
+
+  &:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+}
+
+// Reusable action button styles; accepts border width and radius
+@mixin action-btn($border-width: 1px, $radius: $radius-sm, $padding: $spacing-xs $spacing-md, $font-size: $font-size-sm) {
+  background: none;
+  border: $border-width solid $border-color;
+  padding: $padding;
+  border-radius: $radius;
+  cursor: pointer;
+  font-size: $font-size;
+  color: $text-primary;
+  font-weight: $font-weight-medium;
+  transition: all $transition-base;
+
+  &:hover {
+    background-color: rgba($primary, 0.05);
+    color: $text-primary;
+    transform: translateY(-1px);
+    border-color: $primary;
+  }
+
+  &:disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+  }
 }
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@ -26,9 +26,6 @@ return(
        <button onClick={() => navigate('/servers')} className="nav-link">
          Servers
        </button>
-        <button onClick={() => navigate('/recipes')} className="nav-link">
-          Recipes
-        </button>
      </nav>
    </div>
  </header>
--- a/src/components/Terminal/Terminal.tsx
+++ b/src/components/Terminal/Terminal.tsx
@ -10,25 +10,26 @@ interface TerminalProps {

 export const Terminal: React.FC<TerminalProps> = ({ logs, isActive, onClose }) => {
  const terminalRef = useRef<HTMLDivElement>(null);
-  const indexRef = useRef(0);
  const [displayedLogs, setDisplayedLogs] = useState<LogEntry[]>([]);

  // Stream logs in with delays for realistic effect
  useEffect(() => {
    if (!isActive || logs.length === 0) {
-      indexRef.current = 0;
      setDisplayedLogs([]);
      return;
    }

+    setDisplayedLogs([]);
+    let currentIndex = 0;
+
    const streamLogs = () => {
-      if (indexRef.current < logs.length) {
-        setDisplayedLogs(prev => [...prev, logs[indexRef.current]]);
-        indexRef.current++;
+      if (currentIndex < logs.length) {
+        setDisplayedLogs(prev => [...prev, logs[currentIndex]]);
+        currentIndex++;
        
        // Variable delay based on log type
-        const delay = logs[indexRef.current - 1]?.type === 'command' ? 200 : 
-                     logs[indexRef.current - 1]?.type === 'output' ? 100 : 300;
+        const delay = logs[currentIndex - 1]?.type === 'command' ? 200 : 
+                     logs[currentIndex - 1]?.type === 'output' ? 100 : 300;
        
        setTimeout(streamLogs, delay);
      }
@ -36,6 +37,7 @@ export const Terminal: React.FC<TerminalProps> = ({ logs, isActive, onClose }) =

    streamLogs();
  }, [logs, isActive]);
+
  // Auto-scroll to bottom
  useEffect(() => {
    if (terminalRef.current) {
@ -71,6 +73,7 @@ export const Terminal: React.FC<TerminalProps> = ({ logs, isActive, onClose }) =
      <div className="terminal-content" ref={terminalRef}>
        {displayedLogs.filter(log => log && log.type).map((log, index) => (
          <div key={index} className={`terminal-line terminal-${log.type}`}>
+            <span className="terminal-timestamp">[{formatTime(log.timestamp)}]</span>
            <span className="terminal-text">{log.text}</span>
          </div>
        ))}
--- a/src/routes/Apps/App.scss
+++ b/src/routes/Apps/App.scss
@ -47,25 +47,7 @@

 // Action buttons
 .action-btn {
-  padding: $spacing-sm $spacing-lg;
-  border: 2px solid $border-color;
-  border-radius: $radius-md;
-  font-size: $font-size-sm;
-  font-weight: $font-weight-medium;
-  cursor: pointer;
-  transition: all $transition-base;
-  background: white;
-  color: $text-primary;
-
-  &:disabled {
-    opacity: 0.6;
-    cursor: not-allowed;
-  }
-
-  &:hover:not(:disabled) {
-    transform: translateY(-1px);
-    box-shadow: $shadow-md;
-  }
+  @include action-btn(2px, $radius-md, $spacing-sm $spacing-lg, $font-size-sm);

  &.primary {
    background: $primary;
@ -77,12 +59,7 @@
      border-color: $primary-light;
    }
  }
-  &.service {
-    &:hover:not(:disabled) {
-      background: #3fff5c9d;

-    }
-  }
  &.secondary {
    background: $bg-secondary;
    color: $text-primary;
@ -137,87 +114,44 @@
  }
 }

-// service grid
-.service-grid {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(200px, 2fr));
-  gap: $spacing-md;
-}
-
-.service-card {
-  @include card;
-  transition: transform $transition-base, box-shadow $transition-base;
-  position: relative;
-  overflow: hidden;
-  padding: $spacing-md;
-  .service-name {
-    h3 {
-      font-size: $font-size-lg;
-      color: $text-primary;
-      font-weight: $font-weight-bold;
-    }
-  }
-  .service-row {
-    flex-grow: 1;
-    flex: 1;
-
-    .service-value {
-      font-size: $font-size-sm;
-      display: -webkit-box;
-    }
-  }
-  &.dark-green {
-    background-color: #3fff5c;
-  }
-  &.green {
-    background-color: #3fff5c9d;
-  }
-  &.red {
-    background-color: #ff1313;
-  }
-  &.gray {
-    background-color: rgb(187, 187, 187)
-  }
-}
-
 // Info grid
 .info-grid {
  display: grid;
  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
  gap: $spacing-lg;
-}
-
-.info-item {
-  display: flex;
-  flex-direction: column;
-  gap: $spacing-xs;
-
-  label {
-    font-size: $font-size-xs;
-    color: $text-secondary;
-    font-weight: $font-weight-medium;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-  }
-
-  span {
-    font-size: $font-size-base;
-    color: $text-primary;
-  }
-
-  .no-value {
-    color: $text-muted;
-    font-style: italic;
-  }
-
-  .chaos-active {
-    color: darken($info, 10%);
-    font-weight: $font-weight-medium;
+  
+  .info-item {
+    display: flex;
+    flex-direction: column;
+    gap: $spacing-xs;
+    
+    label {
+      font-size: $font-size-xs;
+      color: $text-secondary;
+      font-weight: $font-weight-medium;
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+    }
+    
+    span {
+      font-size: $font-size-base;
+      color: $text-primary;
+    }
+    
+    .no-value {
+      color: $text-muted;
+      font-style: italic;
+    }
+    
+    .chaos-active {
+      color: darken($info, 10%);
+      font-weight: $font-weight-medium;
+    }
  }
 }

 .domain-link {
-  color: $primary;
+  color: $primary-dark;
  text-decoration: none;
  font-size: $font-size-base;
  transition: color $transition-base;
@ -231,7 +165,7 @@
 .server-link {
  background: none;
  border: none;
-  color: $primary;
+  color: $primary-dark;
  cursor: pointer;
  padding: 0;
  font-size: $font-size-base;
@ -395,6 +329,7 @@
        background: rgba($error, 0.05);
      }
    }
+
    .action-text {
      flex: 1;
      font-weight: $font-weight-medium;
--- a/src/routes/Apps/App.tsx
+++ b/src/routes/Apps/App.tsx
@ -1,9 +1,9 @@
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useParams, useNavigate } from 'react-router-dom';
 import { Header } from '../../components/Header/Header';
 import { Terminal } from '../../components/Terminal/Terminal';
 import { apiService } from '../../services/api';
-import type { AbraApp, AbraAppService, AbraServiceState } from '../../types';
+import type { AbraApp } from '../../types';
 import type { LogEntry } from '../../services/mockApi';
 import './App.scss';

@ -12,9 +12,6 @@ export const AppDetail: React.FC = () => {
  const navigate = useNavigate();
  
  const [app, setApp] = useState<AbraApp | null>(null);
-  const [deployState, setDeployState] = useState("undeployed | deploying | deployed | failed");
-  const [serviceState, setServiceState] = useState<Record<string, AbraServiceState>>({});
-  const [services, setServices] = useState<AbraAppService[]>();
  const [loading, setLoading] = useState(true);
  const [error, setError] = useState('');
  const [actionLoading, setActionLoading] = useState<string | null>(null);
@ -23,26 +20,8 @@ export const AppDetail: React.FC = () => {
  const [terminalLogs, setTerminalLogs] = useState<LogEntry[]>([]);
  const [terminalActive, setTerminalActive] = useState(false);

-  // Stream state
-  const stopRef = useRef<null | (() => void)>(null);
-  const deployRef = useRef<null | (() => void)>(null);
+  const isMockMode = import.meta.env.VITE_MOCK_AUTH === 'true';

-  // Use to refresh page
-  const [refreshKey, setRefreshKey] = useState(0);
-
-  const isMockMode = false;
-  const getServiceClass = (state: string, status: string) => {
-    if (state === "running" && status.includes("\(healthy\)")) return "service-card dark-green";
-    if (status.includes("unhealthy")) return "service-card red"
-    if (state === "running") return "service-card green";
-    return "service-card gray";
-  };
-  const getServiceClassDeploying = (state: string, status: string) => {
-    if (state.includes("converged") && status.includes("\(healthy\)")) return "service-card dark-green";
-    if (status.includes("unhealthy")) return "service-card red"
-    if (state.includes("converged")) return "service-card green";
-    return "service-card gray";
-  };
  useEffect(() => {
    const fetchApp = async () => {
      try {
@ -59,17 +38,12 @@ export const AppDetail: React.FC = () => {
            setError('App not found');
          }
        } else {
-          console.log('fetching app...');
          const appsData = await apiService.getAppsGrouped();
          const serverApps = appsData[server || ''];
          const foundApp = serverApps?.apps.find(a => a.appName === appName);
          
          if (foundApp) {
            setApp(foundApp);
-            // when the app is deploying it should handle setting the deploy state itself after success/failure.
-            if (deployState !== "deploying") {
-              setDeployState(foundApp.status === "deployed" ? "deployed" : "undeployed");
-            }
          } else {
            setError('App not found');
          }
@ -82,33 +56,15 @@ export const AppDetail: React.FC = () => {
    };

    fetchApp();
-  }, [server, appName, isMockMode, refreshKey]);
-  // checks status of app containers
-  useEffect(() => {
-    let isMounted = true;
-    const heartbeat = async () => {
-      while (isMounted) {
-        if (deployState === "deployed" && appName) {
-          const services = await apiService.getServices(appName);
-          if (services) {
-            setServices(services);
-          } else {
-            setServices([]);
-          }
-        }
+  }, [server, appName, isMockMode]);

-        await new Promise(resolve => setTimeout(resolve, 10000));
-      }
-    };
-    heartbeat();
-    return () => {
-      isMounted = false;
-    };
-  }, [deployState, appName]);
  const handleAction = async (action: string, version?: string) => {
    if (!app) return;
    
    setActionLoading(action);
+    setTerminalActive(true);
+    setTerminalLogs([]);
+    
    try {
      if (isMockMode) {
        const { mockApiService } = await import('../../services/mockApi');
@ -138,54 +94,10 @@ export const AppDetail: React.FC = () => {
        switch (action) {
          case 'stop':
            await apiService.stopApp(app.appName);
-            setRefreshKey(prev => prev + 1);
            break;
          case 'deploy':
            await apiService.deployApp(app.appName);
-            setDeployState("deploying");
-            console.log("deploying");
-            deployRef.current = apiService.deployLogs(app.appName, 
-              (update) => {
-                if (update.type === "service") {
-                  console.log(update.data.name)
-                  const serviceName = update.data.name.slice(app.appName.length+1)
-                  setServiceState(prev => ({
-                    ...prev,
-                    [serviceName]: {
-                      ...prev[serviceName] ?? {}, 
-                      ...update.data
-                    }
-                  }))
-                }
-                if (update.type === "done") {
-                  console.log("done?");
-                  console.log(update.data.failed, update.data.count);
-                  if (update.data.failed) {
-                    setDeployState('failed');
-                    console.log("Deploy failed?");
-                  } else {
-                    setDeployState("deployed");
-                  }
-                  setRefreshKey(prev => prev + 1);
-                }
-              }
-            )
            break;
-          case 'logs':
-            setTerminalActive(true);
-            setTerminalLogs([]);
-            if (version) {
-              stopRef.current = apiService.getLogs(app.appName, version, 
-                (line) => {
-                  console.log(line);
-                  setTerminalLogs(prev => [...prev, {
-                    type: 'info',
-                    text: `${line}`,
-                    timestamp: new Date()
-                  }]);
-                }
-              )
-            }
        }
      }
    } catch (err) {
@ -224,8 +136,8 @@ export const AppDetail: React.FC = () => {
      </div>
    );
  }
-  // TODO: make sure this makes sense when app.upgrade is unknown
-  const upgradeVersions = (app.upgrade !== 'latest'  && app.upgrade !== 'unknown') ? app.upgrade.split('\n') : [];
+
+  const upgradeVersions = app.upgrade !== 'latest' ? app.upgrade.split('\n') : [];

  return (
    <div className="app-detail-page">
@ -246,7 +158,7 @@ export const AppDetail: React.FC = () => {
              <span className="recipe-badge">{app.recipe}</span>
              <span className={`status-badge status-${app.status}`}>{app.status}</span>
              {app.chaos === 'true' && (
-                <span className="chaos-badge" title="Chaos mode enabled">🔬 Chaos</span>
+                <span className="chaos-badge" title="Chaos mode enabled"> Chaos</span>
              )}
            </div>
          </div>
@ -273,11 +185,7 @@ export const AppDetail: React.FC = () => {
        <Terminal 
          logs={terminalLogs} 
          isActive={terminalActive}
-          onClose={() => {
-            stopRef.current?.();
-            stopRef.current = null;
-            setTerminalActive(false)
-          }}
+          onClose={() => setTerminalActive(false)}
        />

        <div className="content-grid">
@ -328,75 +236,12 @@ export const AppDetail: React.FC = () => {
                <div className="info-item">
                  <label>Chaos Mode</label>
                  <span className={app.chaos === 'true' ? 'chaos-active' : ''}>
-                    {app.chaos === 'true' ? '🔬 Enabled' : 'Disabled'}
+                    {app.chaos === 'true' ? '☠️ Enabled' : 'Disabled'}
                  </span>
                </div>
              </div>
            </section>
-            {(deployState === "deployed" || deployState === "failed") && (
-              <section className="info-card"> 
-                <h2> Service Information </h2>
-                <div className="service-grid">
-                  {services === undefined || services?.length === 0 ? (
-                    <div className="no-services"> Loading services... </div>
-                  ) : (
-                    services.map((service) => (
-                      <div
-                        key={service.service}
-                        className={getServiceClass(service.state, service.status)}
-                      >
-                        <div className="service-name">
-                          <h3> {service.service} </h3>
-                        </div>
-                        <div className="service-row">
-                          <span className="service-value">{service.state}</span>
-                          <span className="service-value">{service.status}</span>
-                        </div>

-                        <button 
-                          className="action-btn"
-                          onClick={() => handleAction('logs', service.service)}
-                          disabled={!!actionLoading}
-                        >
-                          Logs
-                        </button>
-                      </div>
-                    ))
-                  )}
-                </div>
-              </section>)}
-             {(deployState === "deploying") && (
-              <section className="info-card"> 
-                <h2> Service Information </h2>
-                <div className="service-grid">
-                  {serviceState === undefined || Object.keys(serviceState).length === 0 ? (
-                    <div className="no-services"> Preparing services... </div>
-                  ) : (
-                    Object.keys(serviceState).map((name) => (
-                      <div
-                        key={name}
-                        className={getServiceClass(serviceState[name].status, serviceState[name].health)}
-                      >
-                        <div className="service-name">
-                          <h3> {name} </h3>
-                        </div>
-                        <div className="service-row">
-                          <span className="service-value">{serviceState[name].status}</span>
-                          <span className="service-value">{serviceState[name].health}</span>
-                        </div>
-
-                        <button 
-                          className="action-btn"
-                          onClick={() => handleAction('logs', appName)}
-                          disabled={!!actionLoading}
-                        >
-                          Logs
-                        </button>
-                      </div>
-                    ))
-                  )}
-                </div>
-              </section>)}
            <section className="info-card">
              <h2>Version Information</h2>
              
@ -436,18 +281,6 @@ export const AppDetail: React.FC = () => {
                  </div>
                )}

-                {app.upgrade === 'unknown' && (
-                  <div className="version-upgrades">
-                    <label>
-                      Available Upgrades
-                    </label>
-                    <div className="upgrade-list">
-                      <div className="upgrade-item">
-                        <code>None</code>
-                      </div>
-                    </div>
-                  </div>
-                )}
                {app.upgrade === 'latest' && (
                  <div className="version-latest">
                    ✓ Running latest version
--- a/src/routes/Apps/Apps.scss
+++ b/src/routes/Apps/Apps.scss
@ -11,10 +11,44 @@
  @extend .page-content;
 }

+// Compact stats row
+.stats-row {
+  display: flex;
+  align-items: center;
+  gap: $spacing-md;
+  margin-bottom: $spacing-xl;
+  flex-wrap: wrap;
+}
+
+.stat-chip {
+  @include chip();
+
+  &.active {
+    border-color: $primary-dark;
+    background: $bg-primary;
+    box-shadow: 0 0 0 3px rgba($primary-dark, 0.08);
+  }
+
+  .stat-label {
+    color: $text-secondary;
+    font-size: $font-size-sm;
+    font-weight: $font-weight-medium;
+  }
+
+  .stat-value {
+    color: $text-primary;
+    font-size: $font-size-xl;
+    font-weight: $font-weight-bold;
+    min-width: 24px;
+    text-align: center;
+  }
+}
+
+/* reset-filters-btn removed — outline on stat-chip indicates active filters */
+
 // Apps table specific styles
 .apps-table-container {
-  @include card;
-  overflow-x: auto;
+  @include scrollable-card;
  margin-bottom: $spacing-lg;
 }

@ -71,19 +105,19 @@
    font-weight: $font-weight-medium;
    color: $text-primary;
  }
-}
-
-.domain-link {
-  color: $primary;
-  text-decoration: none;
-  transition: color $transition-base;
-
-  &:hover {
-    color: $primary-light;
-    text-decoration: underline;
+  .domain-link {
+    color: $primary-dark;
+    text-decoration: none;
+    transition: color $transition-base;
+  
+    &:hover {
+      color: $primary-light;
+      text-decoration: underline;
+    }
  }
 }

+
 .no-domain {
  color: $text-muted;
  font-style: italic;
@ -112,23 +146,22 @@
  gap: $spacing-sm;

  .action-btn {
-    background: none;
-    border: 1px solid $border-color;
-    padding: $spacing-xs $spacing-sm;
-    border-radius: $radius-sm;
-    cursor: pointer;
-    font-size: $font-size-base;
-    color: $text-primary;
-    transition: all $transition-base;
+    @include action-btn(1px, $radius-sm, $spacing-xs $spacing-md, $font-size-sm);

    &:hover {
-      background-color: $bg-tertiary;
-      transform: scale(1.1);
+      background-color: $primary;
+      color: white;
+      border-color: $primary;
    }

    &.upgrade {
      border-color: $warning;
      color: $warning;
+
+      &:hover {
+        background-color: $warning;
+        color: white;
+      }
    }
  }
-}
+}
--- a/src/routes/Apps/Apps.tsx
+++ b/src/routes/Apps/Apps.tsx
@ -1,3 +1,8 @@
+
+// TODOS:
+// make the two filters non-exlusive
+
+
 import React, { useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { Header } from '../../components/Header/Header';
@ -12,10 +17,10 @@ export const Apps: React.FC = () => {
  const [error, setError] = useState('');
  const [searchTerm, setSearchTerm] = useState('');
  const [filterServer, setFilterServer] = useState<string>('all');
-  const [filterStatus, setFilterStatus] = useState<string>('all');
  const [showUpgradesOnly, setShowUpgradesOnly] = useState(false);
-
-  const isMockMode = false;
+  const [showChaosOnly, setShowChaosOnly] = useState(false);
+  
+  const isMockMode = import.meta.env.VITE_MOCK_AUTH === 'true';

  useEffect(() => {
    const fetchData = async () => {
@ -59,7 +64,7 @@ export const Apps: React.FC = () => {
    return Object.keys(appsData);
  }, [appsData]);

-  // Filter apps
+  // Filter apps (additive filters: upgrades AND chaos can be applied together)
  const filteredApps = useMemo(() => {
    return allApps.filter(app => {
      const matchesSearch = 
@ -68,14 +73,12 @@ export const Apps: React.FC = () => {
        (app.domain || '').toLowerCase().includes(searchTerm.toLowerCase());
      
      const matchesServer = filterServer === 'all' || app.server === filterServer;
-      const matchesChaos = filterStatus === 'all' || 
-        (filterStatus === 'chaos' && app.chaos === 'true') ||
-        (filterStatus === 'stable' && app.chaos === 'false');
+      const matchesChaos = !showChaosOnly || app.chaos === 'true';
      const matchesUpgrade = !showUpgradesOnly || app.upgrade !== 'latest';

      return matchesSearch && matchesServer && matchesChaos && matchesUpgrade;
    });
-  }, [allApps, searchTerm, filterServer, filterStatus, showUpgradesOnly]);
+  }, [allApps, searchTerm, filterServer, showUpgradesOnly, showChaosOnly]);

  const stats = useMemo(() => {
    const total = allApps.length;
@ -86,6 +89,9 @@ export const Apps: React.FC = () => {
    return { total, needsUpgrade, chaosApps, totalServers };
  }, [allApps, servers]);

+  const toggleUpgrades = () => setShowUpgradesOnly(prev => !prev);
+  const toggleChaos = () => setShowChaosOnly(prev => !prev);
+
  if (loading) {
    return (
      <div className="apps-page">
@ -117,32 +123,37 @@ export const Apps: React.FC = () => {
          <p className="subtitle">{stats.total} apps across {stats.totalServers} servers</p>
        </div>

-        {/* Stats Overview */}
-        <div className="stats-grid">
-          <div className="stat-card">
-            <div className="stat-info">
-              <p className="stat-number">{stats.total}</p>
-              <p className="stat-label">Total Apps</p>
-            </div>
-          </div>
-          <div className="stat-card upgrade">
-            <div className="stat-info">
-              <p className="stat-number">{stats.needsUpgrade}</p>
-              <p className="stat-label">Upgrades Available</p>
-            </div>
-          </div>
-          <div className="stat-card chaos">
-            <div className="stat-info">
-              <p className="stat-number">{stats.chaosApps}</p>
-              <p className="stat-label">Chaos Mode</p>
-            </div>
-          </div>
-          <div className="stat-card">
-            <div className="stat-info">
-              <p className="stat-number">{stats.totalServers}</p>
-              <p className="stat-label">Servers</p>
-            </div>
-          </div>
+        {/* Compact Stats Overview */}
+        <div className="stats-row">
+          <button
+            className="stat-chip"
+            onClick={() => navigate('/servers')}
+            title="View servers"
+          >
+            <span className="stat-label">Servers</span>
+            <span className="stat-value">{stats.totalServers}</span>
+          </button>
+          
+          <button
+            className={`stat-chip ${showUpgradesOnly ? 'active' : ''}`}
+            onClick={toggleUpgrades}
+            title="Click to toggle apps with upgrades available"
+            disabled={stats.needsUpgrade === 0}
+          >
+            <span className="stat-label">Upgrades</span>
+            <span className="stat-value">{stats.needsUpgrade}</span>
+          </button>
+          
+          <button
+            className={`stat-chip ${showChaosOnly ? 'active' : ''}`}
+            onClick={toggleChaos}
+            title="Click to toggle chaos mode apps"
+            disabled={stats.chaosApps === 0}
+          >
+            <span className="stat-label">Chaos</span>
+            <span className="stat-value">{stats.chaosApps}</span>
+          </button>
+          
        </div>

        {/* Filters */}
@ -161,21 +172,6 @@ export const Apps: React.FC = () => {
              <option key={server} value={server}>{server}</option>
            ))}
          </select>
-
-          <select value={filterStatus} onChange={(e) => setFilterStatus(e.target.value)}>
-            <option value="all">All Status</option>
-            <option value="stable">Stable</option>
-            <option value="chaos">Chaos Mode</option>
-          </select>
-
-          <label className="checkbox-filter">
-            <input
-              type="checkbox"
-              checked={showUpgradesOnly}
-              onChange={(e) => setShowUpgradesOnly(e.target.checked)}
-            />
-            <span>Show only apps with upgrades</span>
-          </label>
        </div>

        {/* Apps Table */}
--- a/src/routes/Dashboard/Dashboard.tsx
+++ b/src/routes/Dashboard/Dashboard.tsx
@ -12,7 +12,7 @@ export const Dashboard: React.FC = () => {
  const [error, setError] = useState('');
  const navigate = useNavigate();

-  const isMockMode = false;
+  const isMockMode = import.meta.env.VITE_MOCK_AUTH === 'true';

  useEffect(() => {
    const fetchData = async () => {
--- a/src/routes/Dashboard/_Dashboard.scss
+++ b/src/routes/Dashboard/_Dashboard.scss
@ -23,29 +23,21 @@
 }

 .apps-list {
-  display: flex;
-  flex-direction: column;
-  gap: $spacing-md;
+  @include card-list-vertical;
 }

 .app-item {
  @include card;
+  @include card-hover-lift(-2px, $shadow-lg);
  display: flex;
  justify-content: space-between;
  align-items: center;
-  transition: transform $transition-base, box-shadow $transition-base;
  cursor: pointer;

-  &:hover {
-    transform: translateY(-2px);
-    box-shadow: $shadow-lg;
-  }
-
  .app-info {
    flex: 1;

    h4 {
-      margin: 0 0 $spacing-xs;
      font-size: $font-size-lg;
      color: $text-primary;
      font-weight: $font-weight-semibold;
--- a/src/routes/Recipes/RecipeForm.tsx
+++ b/src/routes/Recipes/RecipeForm.tsx
@ -7,18 +7,19 @@ import type { AbraServer } from '../../types';
 function RecipeForm({ recipe, onClose }) {
  const [loading, setLoading] = useState(true);
  const [servers, setServers] = useState<AbraServer[]>([]);
+  const [selectedServer, setSelectedServer] = useState(""); // ❌ only one value
+  const [chaos, setChaos] = useState(false);
+  const [secrets, setSecrets] = useState(false);
  const [error, setError] = useState('');
  
  useEffect(() => {
      const fetchData = async () => {
        try {
-          if (servers.length === 0) {
-            const [serversData] = await Promise.all([
-              apiService.getServers(),
-            ]);
-              
-            setServers(serversData);
-          }
+          const [serversData] = await Promise.all([
+            apiService.getServers(),
+          ]);
+            
+          setServers(serversData);
          
        } catch (err) {
          setError(err instanceof Error ? err.message : 'Failed to load servers');
@ -30,25 +31,21 @@ function RecipeForm({ recipe, onClose }) {
      fetchData();
    });
  const [formData, setFormData] = useState({
-    server: "",
    domain: "",
    chaos: false,
-    secrets: false,
+    secrets: true,
  });

  const handleChange = (e) => {
-    const {name, type, value, checked} = e.target;
-    setFormData((prev) => ({
-      ...prev,
-      [name]: type === "checkbox" ? checked : value,
-    }));
-    console.log(formData);
+    setFormData({
+      ...formData,
+      [e.target.name]: e.target.value,
+    });
  };

  const handleSubmit = (e) => {
    e.preventDefault();
    console.log("Submitting:", formData);
-    apiService.newApp(recipe.name, formData);
    onClose();
  };

@ -61,9 +58,8 @@ function RecipeForm({ recipe, onClose }) {
        <label>
            Choose a server to deploy to: 
            <select
-              name="server"
-              value={formData.server || ""}
-              onChange={handleChange}
+              value={selectedServer}
+              onChange={(e) => setSelectedServer(e.target.value)}
            >
              <option value="">None</option>
              {servers.map((server) => (
@ -79,8 +75,8 @@ function RecipeForm({ recipe, onClose }) {
        <label>
          Domain:
          <input
-            name="domain"
-            value={formData.domain}
+            name="Domain"
+            value={formData.name}
            onChange={handleChange}
          />
        </label>
--- a/src/routes/Recipes/Recipes.scss
+++ b/src/routes/Recipes/Recipes.scss
@ -14,7 +14,7 @@
 // Servers grid
 .recipes-grid {
  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+  grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
  gap: $spacing-xl;
  margin-bottom: $spacing-xl;

@ -26,6 +26,7 @@
 // Server card
 .recipe-card {
  @include card;
+  @include card-dimensions(320px, 180px);
  display: grid;
  grid-template-rows: 1fr 2fr auto 0.9fr;
  transition: transform $transition-base, box-shadow $transition-base;
@ -110,21 +111,7 @@
    gap: $spacing-sm;
    .action-btn {
      flex: 1;
-      padding: $spacing-sm $spacing-md;
-      border: 2px solid $border-color;
-      background: none;
-      color: $text-primary;
-      border-radius: $radius-md;
-      font-size: $font-size-sm;
-      font-weight: $font-weight-medium;
-      cursor: pointer;
-      transition: all $transition-base;
-
-      &:hover {
-        background-color: rgba($primary, 0.1);
-        border-color: $primary;
-        transform: translateY(-1px);
-      }
+      @include action-btn(2px, $radius-md, $spacing-sm $spacing-md, $font-size-sm);

      &.primary {
        background-color: $primary;
--- a/src/routes/Recipes/Recipes.tsx
+++ b/src/routes/Recipes/Recipes.tsx
@ -19,7 +19,7 @@ export const Recipes: React.FC = () => {



-  const isMockMode = false;
+  const isMockMode = import.meta.env.VITE_MOCK_AUTH === 'true';

  useEffect(() => {
    const fetchData = async () => {
@ -72,7 +72,7 @@ export const Recipes: React.FC = () => {
      <div className="apps-page">
        <Header />
        <main className="recipes-content">
-          <div className="loading">Loading recipes...</div>
+          <div className="loading">Loading applications...</div>
        </main>
      </div>
    );
--- a/src/routes/Servers/Server.scss
+++ b/src/routes/Servers/Server.scss
@ -47,25 +47,7 @@

 // Action buttons (shared with App view, could be moved to global)
 .action-btn {
-  padding: $spacing-sm $spacing-lg;
-  border: 2px solid $border-color;
-  border-radius: $radius-md;
-  font-size: $font-size-sm;
-  font-weight: $font-weight-medium;
-  cursor: pointer;
-  transition: all $transition-base;
-  background: white;
-  color: $text-primary;
-
-  &:disabled {
-    opacity: 0.6;
-    cursor: not-allowed;
-  }
-
-  &:hover:not(:disabled) {
-    transform: translateY(-1px);
-    box-shadow: $shadow-md;
-  }
+  @include action-btn(2px, $radius-md, $spacing-sm $spacing-lg, $font-size-sm);

  &.primary {
    background: $primary;
@ -212,9 +194,7 @@
 }

 .apps-list {
-  display: flex;
-  flex-direction: column;
-  gap: $spacing-md;
+  @include card-list-vertical;
 }

 .app-item {
--- a/src/routes/Servers/Server.tsx
+++ b/src/routes/Servers/Server.tsx
@ -29,7 +29,7 @@ export const Server: React.FC = () => {
  const [terminalLogs, setTerminalLogs] = useState<LogEntry[]>([]);
  const [terminalActive, setTerminalActive] = useState(false);

-  const isMockMode = false;
+  const isMockMode = import.meta.env.VITE_MOCK_AUTH === 'true';

  useEffect(() => {
    const fetchServer = async () => {
@ -175,7 +175,7 @@ export const Server: React.FC = () => {
              <span className="host-badge">{server.host}</span>
              {server.upgradeCount > 0 && (
                <span className="upgrade-badge">
-                  ⬆️ {server.upgradeCount} upgrade{server.upgradeCount !== 1 ? 's' : ''}
+                  {server.upgradeCount} upgrade{server.upgradeCount !== 1 ? 's' : ''}
                </span>
              )}
            </div>
@ -187,14 +187,14 @@ export const Server: React.FC = () => {
              onClick={() => handleAction('refresh')}
              disabled={!!actionLoading}
            >
-              {actionLoading === 'refresh' ? 'Refreshing...' : '🔄 Refresh'}
+              {actionLoading === 'refresh' ? 'Refreshing...' : 'Refresh'}
            </button>
            <button 
              className="action-btn primary"
              onClick={() => handleAction('deploy-all')}
              disabled={!!actionLoading}
            >
-              {actionLoading === 'deploy-all' ? 'Deploying...' : '🚀 Deploy All'}
+              {actionLoading === 'deploy-all' ? 'Deploying...' : 'Deploy All'}
            </button>
          </div>
        </div>
@ -280,7 +280,7 @@ export const Server: React.FC = () => {
                            {app.status}
                          </span>
                          {app.chaos === 'true' && (
-                            <span className="chaos-badge">🔬</span>
+                            <span className="chaos-badge">☠️</span>
                          )}
                          {app.upgrade !== 'latest' && (
                            <span className="upgrade-badge">⬆️</span>
@ -335,7 +335,7 @@ export const Server: React.FC = () => {
                  onClick={() => handleAction('upgrade-all')}
                  disabled={!!actionLoading || server.upgradeCount === 0}
                >
-                  <span className="action-text">⬆Upgrade All Apps</span>
+                  <span className="action-text">Upgrade All Apps</span>
                </button>
              </div>
            </section>
--- a/src/routes/Servers/Servers.scss
+++ b/src/routes/Servers/Servers.scss
@ -14,10 +14,12 @@
 // Servers grid
 .servers-grid {
  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(350px, 1fr));
+  grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
  gap: $spacing-xl;
  margin-bottom: $spacing-xl;

+  align-items: stretch;
+
  @media (max-width: 768px) {
    grid-template-columns: 1fr;
  }
@ -26,38 +28,18 @@
 // Server card
 .server-card {
  @include card;
+  @include card-hover-lift(-4px, $shadow-xl);
+  @include card-dimensions(320px, 180px);
  display: flex;
  flex-direction: column;
-  transition: transform $transition-base, box-shadow $transition-base;
  position: relative;
  overflow: hidden;

-  &:hover {
-    transform: translateY(-4px);
-    box-shadow: $shadow-xl;
-  }
-
  .server-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-start;
-    margin-bottom: $spacing-lg;
-    padding-bottom: $spacing-md;
-    border-bottom: 2px solid $bg-secondary;
+    @include card-header-rule;

    .server-title {
-      h3 {
-        margin: 0 0 $spacing-xs;
-        font-size: $font-size-xl;
-        color: $text-primary;
-        font-weight: $font-weight-bold;
-      }
-
-      .server-host {
-        font-size: $font-size-sm;
-        color: $text-muted;
-        font-family: monospace;
-      }
+      @include card-title-stack;
    }

    .server-status {
@ -80,24 +62,12 @@
    margin-bottom: $spacing-lg;

    .stat-row {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: $spacing-sm 0;
-      border-bottom: 1px solid $bg-secondary;
-
-      &:last-child {
-        border-bottom: none;
-      }
+      @include card-stat-row;

      // Highlighted rows
      &.highlight {
+        @include card-row-highlight-bleed;
        background-color: rgba($warning, 0.05);
-        padding: $spacing-sm $spacing-md;
-        margin: $spacing-sm (-$spacing-xl);
-        padding-left: calc($spacing-xl + $spacing-md);
-        padding-right: calc($spacing-xl + $spacing-md);
-        border-bottom: none;

        .stat-label {
          font-weight: $font-weight-semibold;
@ -109,11 +79,8 @@
      }

      &.chaos-row {
+        @include card-row-highlight-bleed(false);
        background-color: rgba($info, 0.05);
-        padding: $spacing-sm $spacing-md;
-        margin: $spacing-sm (-$spacing-xl);
-        padding-left: calc($spacing-xl + $spacing-md);
-        padding-right: calc($spacing-xl + $spacing-md);

        .stat-label {
          font-weight: $font-weight-semibold;
@ -152,21 +119,7 @@

    .action-btn {
      flex: 1;
-      padding: $spacing-sm $spacing-md;
-      border: 2px solid $border-color;
-      background: none;
-      color: $text-primary;
-      border-radius: $radius-md;
-      font-size: $font-size-sm;
-      font-weight: $font-weight-medium;
-      cursor: pointer;
-      transition: all $transition-base;
-
-      &:hover {
-        background-color: rgba($primary, 0.1);
-        border-color: $primary;
-        transform: translateY(-1px);
-      }
+      @include action-btn(2px, $radius-md, $spacing-sm $spacing-md, $font-size-sm);

      &.primary {
        background-color: $primary;
--- a/src/routes/Servers/Servers.tsx
+++ b/src/routes/Servers/Servers.tsx
@ -20,59 +20,47 @@ export const Servers: React.FC = () => {
  const [error, setError] = useState('');
  const [searchTerm, setSearchTerm] = useState('');
  const [sortBy, setSortBy] = useState<'name' | 'apps' | 'upgrades'>('name');
+  const [showUpgradesOnly, setShowUpgradesOnly] = useState(false);
+  const [showChaosOnly, setShowChaosOnly] = useState(false);

-  const isMockMode = false;
+  const isMockMode = import.meta.env.VITE_MOCK_AUTH === 'true';

  useEffect(() => {
    const fetchData = async () => {
      try {
+        let serversData, appsData;
+        
        if (isMockMode) {
          const { mockApiService } = await import('../../services/mockApi');
-          const [serversData, appsData] = await Promise.all([
+          [serversData, appsData] = await Promise.all([
            mockApiService.getServers(),
            mockApiService.getAppsGrouped(),
          ]);
-          
-          // Enrich servers with stats from apps data
-          const enrichedServers = serversData.map(server => {
-            const serverStats = appsData[server.name];
-            const chaosCount = serverStats?.apps.filter(app => app.chaos === 'true').length || 0;
-            
-            return {
-              ...server,
-              appCount: serverStats?.appCount || 0,
-              versionCount: serverStats?.versionCount || 0,
-              latestCount: serverStats?.latestCount || 0,
-              upgradeCount: serverStats?.upgradeCount || 0,
-              chaosCount,
-            };
-          });
-          
-          setServers(enrichedServers);
        } else {
-          const [serversData, appsData] = await Promise.all([
+          [serversData, appsData] = await Promise.all([
            apiService.getServers(),
            apiService.getAppsGrouped(),
          ]);
-          
-          // Enrich servers with stats from apps data
-          const enrichedServers = serversData.map(server => {
-            const serverStats = appsData[server.name];
-            const chaosCount = serverStats?.apps.filter(app => app.chaos === 'true').length || 0;
-            
-            return {
-              ...server,
-              appCount: serverStats?.appCount || 0,
-              versionCount: serverStats?.versionCount || 0,
-              latestCount: serverStats?.latestCount || 0,
-              upgradeCount: serverStats?.upgradeCount || 0,
-              chaosCount,
-            };
-          });
-          
-          setServers(enrichedServers);
        }
+        
+        // Enrich servers with stats from apps data
+        const enrichedServers = serversData.map(server => {
+          const serverStats = appsData[server.name];
+          const chaosCount = serverStats?.apps.filter(app => app.chaos === 'true').length || 0;
+          
+          return {
+            ...server,
+            appCount: serverStats?.appCount || 0,
+            versionCount: serverStats?.versionCount || 0,
+            latestCount: serverStats?.latestCount || 0,
+            upgradeCount: serverStats?.upgradeCount || 0,
+            chaosCount,
+          };
+        });
+        
+        setServers(enrichedServers);
      } catch (err) {
+        console.error('Error loading servers:', err);
        setError(err instanceof Error ? err.message : 'Failed to load servers');
      } finally {
        setLoading(false);
@ -92,28 +80,29 @@ export const Servers: React.FC = () => {
    return { totalServers, totalApps, totalUpgrades, totalChaos };
  }, [servers]);

-  // Filter and sort servers
+  // Filter and sort servers (additive filters allowed)
  const filteredServers = useMemo(() => {
-    const filtered = servers.filter(server =>
+  const filtered = servers.filter(server => {
+    const matchesSearch =
      server.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
-      server.host.toLowerCase().includes(searchTerm.toLowerCase())
-    );
+      server.host.toLowerCase().includes(searchTerm.toLowerCase());
+    const matchesUpgrades = !showUpgradesOnly || server.upgradeCount > 0;
+    const matchesChaos = !showChaosOnly || server.chaosCount > 0;
+    return matchesSearch && matchesUpgrades && matchesChaos;
+  });

-    // Sort
-    filtered.sort((a, b) => {
-      switch (sortBy) {
-        case 'apps':
-          return b.appCount - a.appCount;
-        case 'upgrades':
-          return b.upgradeCount - a.upgradeCount;
-        case 'name':
-        default:
-          return a.name.localeCompare(b.name);
-      }
-    });
+  filtered.sort((a, b) => {
+    switch (sortBy) {
+      case 'apps':
+        return b.appCount - a.appCount;
+      case 'name':
+      default:
+        return a.name.localeCompare(b.name);
+    }
+  });

-    return filtered;
-  }, [servers, searchTerm, sortBy]);
+  return filtered;
+}, [servers, searchTerm, sortBy, showUpgradesOnly]);

  if (loading) {
    return (
@ -146,36 +135,38 @@ export const Servers: React.FC = () => {
          <p className="subtitle">Managing {stats.totalServers} servers with {stats.totalApps} applications</p>
        </div>

-        {/* Stats Overview */}
-        <div className="stats-grid">
-          <div className="stat-card">
-            <div className="stat-icon"></div>
-            <div className="stat-info">
-              <p className="stat-number">{stats.totalServers}</p>
-              <p className="stat-label">Total Servers</p>
-            </div>
-          </div>
-          <div className="stat-card">
-            <div className="stat-icon"></div>
-            <div className="stat-info">
-              <p className="stat-number">{stats.totalApps}</p>
-              <p className="stat-label">Total Apps</p>
-            </div>
-          </div>
-          <div className="stat-card upgrade">
-            <div className="stat-icon"></div>
-            <div className="stat-info">
-              <p className="stat-number">{stats.totalUpgrades}</p>
-              <p className="stat-label">Apps Need Upgrade</p>
-            </div>
-          </div>
-          <div className="stat-card chaos">
-            <div className="stat-icon"></div>
-            <div className="stat-info">
-              <p className="stat-number">{stats.totalChaos}</p>
-              <p className="stat-label">Chaos Apps</p>
-            </div>
-          </div>
+        {/* Compact Stats Row */}
+        <div className="stats-row">
+          <button
+            className="stat-chip"
+            onClick={() => navigate('/apps')}
+            title="View all apps"
+          >
+            <span className="stat-label">Apps</span>
+            <span className="stat-value">{stats.totalApps}</span>
+          </button>
+
+          <button
+            className={`stat-chip ${showUpgradesOnly ? 'active' : ''}`}
+            onClick={() => setShowUpgradesOnly(prev => !prev)}
+            title="Click to filter by servers with upgrades"
+            disabled={stats.totalUpgrades === 0}
+          >
+            <span className="stat-label">Upgrades</span>
+            <span className="stat-value">{stats.totalUpgrades}</span>
+          </button>
+
+          <button
+            className={`stat-chip ${showChaosOnly ? 'active' : ''}`}
+            onClick={() => setShowChaosOnly(prev => !prev)}
+            title="Click to filter servers with chaos apps"
+            disabled={stats.totalChaos === 0}
+          >
+            <span className="stat-label">Chaos</span>
+            <span className="stat-value">{stats.totalChaos}</span>
+          </button>
+
+          {/* Clear filters button removed — use stat-chip outlines for active filters */}
        </div>

        {/* Filters */}
@ -187,12 +178,6 @@ export const Servers: React.FC = () => {
            onChange={(e) => setSearchTerm(e.target.value)}
            className="search-input"
          />
-
-          <select value={sortBy} onChange={(e) => setSortBy(e.target.value as any)}>
-            <option value="name">Sort by Name</option>
-            <option value="apps">Sort by App Count</option>
-            <option value="upgrades">Sort by Upgrades</option>
-          </select>
        </div>

        {/* Server Cards */}
@ -232,13 +217,17 @@ export const Servers: React.FC = () => {
                  </div>
                  {server.upgradeCount > 0 && (
                    <div className="stat-row highlight">
-                      <span className="stat-label">Need Upgrade</span>
+                      <span className="stat-label">
+                        Need Upgrade
+                      </span>
                      <span className="stat-value">{server.upgradeCount}</span>
                    </div>
                  )}
                  {server.chaosCount > 0 && (
                    <div className="stat-row chaos-row">
-                      <span className="stat-label">Chaos Mode</span>
+                      <span className="stat-label">
+                        Chaos Mode
+                      </span>
                      <span className="stat-value">{server.chaosCount}</span>
                    </div>
                  )}
@ -267,7 +256,6 @@ export const Servers: React.FC = () => {

                {server.upgradeCount > 0 && (
                  <div className="server-alert">
-                    <span className="alert-icon">⚠️</span>
                    <span className="alert-text">
                      {server.upgradeCount} app{server.upgradeCount > 1 ? 's' : ''} can be upgraded
                    </span>
@ -284,4 +272,4 @@ export const Servers: React.FC = () => {
      </main>
    </div>
  );
-};
+};
--- a/src/services/api.ts
+++ b/src/services/api.ts
@ -1,4 +1,4 @@
-import type { AbraServer, AbraRecipe, ServerAppsResponse, AbraAppService, DeployEvent } from '../types';
+import type { AbraServer, AbraRecipe, ServerAppsResponse } from '../types';

 // Log entry type
 export type LogEntry = {
@ -37,52 +37,8 @@ class ApiService {
      const error = await response.json().catch(() => ({ message: 'An error occurred' }));
      throw new Error(error.message || `HTTP ${response.status}`);
    }
-    if (response.status === 204) {
-      return undefined as T;
-    }

-    const contentType = response.headers.get('content-type');
-
-    if (contentType?.includes('application/json')) {
-      return response.json();
-    }
-    return response.text() as unknown as T;
-  }
-
-  private stream<T>(
-    endpoint: string,
-    handlers: {
-      onMessage: (data: T) => void;
-      onError?: (err: any) => void;
-      onOpen?: () => void;
-      parser?: (raw: string) => T;
-    }
-  ) {
-    const es = new EventSource(`${API_BASE_URL}${endpoint}`);
-
-    es.onopen = () => {
-      handlers.onOpen?.();
-    };
-    es.onmessage = (event) => {
-      try {
-        const data = handlers.parser
-          ? handlers.parser(event.data)
-          : (event.data as unknown as T);
-
-        handlers.onMessage(data);
-      } catch (err) {
-        handlers.onError?.(err);
-      }
-    };
-    es.onerror = (err) => {
-      handlers.onError?.(err);
-      es.close();
-    };
-    return () => es.close();
-  }
-  // Get Logs for service
-  getLogs(appName: string, serviceName: string, msgHandler: (data: String) => void) {
-    return this.stream(`/apps/${appName}/${serviceName}/logs`, {onMessage: msgHandler})
+    return response.json();
  }

  // Get all apps grouped by server
@ -94,24 +50,21 @@ class ApiService {
  async getServers(): Promise<AbraServer[]> {
    return this.request<AbraServer[]>('/servers');
  }
-  // Get services for app
-  async getServices(appName: string): Promise<AbraAppService[]> {
-    return this.request<AbraAppService[]>(`/apps/${appName}/services`);
-  }

  // App actions with log streaming (websocket future)
-  async deployApp(appName: string): Promise<void> {
-    return this.request<void>(`/apps/${appName}/deploy`, {
+  async deployApp(appName: string, onLog?: (log: LogEntry) => void): Promise<void> {
+    const response = await this.request<{ logs: any[] }>(`/apps/${appName}/deploy`, {
      method: 'POST',
    });
-  }
-  deployLogs(appName: string, msgHandler: (data: DeployEvent) => void) {
-    return this.stream(`/apps/${appName}/deploy`, {parser: JSON.parse, onMessage: msgHandler})
+
+    if (onLog && response.logs) {
+      const logs = processLogResponse(response.logs);
+      logs.forEach(log => onLog(log));
+    }
  }

-
-  async stopApp(appName: string, onLog?: (log: LogEntry) => void): Promise<void> {
-    const response = await this.request<{ logs: any[] }>(`/apps/${appName}/stop`, {
+  async undeployApp(appName: string, onLog?: (log: LogEntry) => void): Promise<void> {
+    const response = await this.request<{ logs: any[] }>(`/apps/${appName}/undeploy`, {
      method: 'POST',
    });

@ -143,16 +96,6 @@ class ApiService {
      logs.forEach(log => onLog(log));
    }
  }
-  async newApp(appName: string, formData: Object): Promise<void> {
-    const response = await this.request<void>(`/apps/${appName}/new`, {
-      method: 'POST',
-      headers: {
-        'Accept': 'application/json'
-      },
-      body: JSON.stringify(formData)
-    });
-    return response
-  }

  // Server actions with log streaming
  async refreshServer(serverName: string, onLog?: (log: LogEntry) => void): Promise<void> {
@ -189,7 +132,7 @@ class ApiService {
  }
  // recipe catalog imports
  async getRecipes(): Promise<AbraRecipe[]> {
-    return this.request<AbraRecipe[]>('/catalogue');
+    return this.request<AbraRecipe[]>('/abra/catalogue');
  }
 }
    
--- a/src/services/mock-logs.json
+++ b/src/services/mock-logs.json
@ -119,7 +119,7 @@
    "logs": [
      {
        "type": "info",
-        "text": "⬆️ Upgrading {appName} to {version}..."
+        "text": "Upgrading {appName} to {version}..."
      },
      {
        "type": "command",
@ -287,7 +287,7 @@
    "logs": [
      {
        "type": "info",
-        "text": "⬆️ Upgrading all apps on {serverName}..."
+        "text": "Upgrading all apps on {serverName}..."
      },
      {
        "type": "command",
--- a/src/types/index.ts
+++ b/src/types/index.ts
@ -37,43 +37,6 @@ export interface AppWithServer extends AbraApp {
    upgradeCount: number;
  };
 }
-
-export interface AbraAppService {
-  service: string;
-  chaos: boolean;
-  created: string;
-  image: string;
-  ports: string;
-  state: string;
-  status: string;
-  version: string;
-}
-export interface AbraServiceState {
-  name: string;
-  err: string;
-  id: string;
-  status: string;
-  retries: number;
-  health: string;
-  rollback: boolean;
-  failed: boolean;
-}
-export interface DeployState {
-  count: number;
-  total: number;
-  failed: boolean;
-  quit: boolean;
-}
-
-export type DeployEvent = 
-  | {
-    type: "service";
-    data: AbraServiceState;
-  }
-  | {
-    type: "done";
-    data: DeployState;
-  }
 export interface Image {
  image: string;
  rating: string
@ -105,4 +68,4 @@ export interface AbraRecipe {
  ssh_url: string;
  versions: RecipeVersions;
  website: string;
-}
+}
Author	SHA1	Message	Date
Matt Beaudoin	46e812d925	remove comments	2026-05-16 13:43:04 -07:00
Matt Beaudoin	5c2ce8b385	remove filter clearing logic	2026-05-16 13:37:49 -07:00
Matt Beaudoin	b36a63d6f9	remove redundant app button	2026-05-16 13:37:01 -07:00
Matt Beaudoin	9313fbb6f0	make cards square for box shadow effect	2026-05-16 13:36:08 -07:00
Matt Beaudoin	1b5907be78	fix filter toggles, fix bad color declarations	2026-05-16 12:18:51 -07:00
Matt Beaudoin	e6f159bbea	first big style pass, consolidate to mixins	2026-05-15 20:00:29 -07:00
Matt Beaudoin	b7e8bab6d1	Add card mixins for consistent styling across server and app components	2026-05-14 22:19:15 -07:00
Matt Beaudoin	08017ad6be	swap skull for microscope	2026-04-24 15:55:04 -07:00
Matt Beaudoin	27bc8de54b	remove silly emoji xd	2026-04-24 15:50:48 -07:00
BornDeleuze	5f5f8305ec	Merge pull request 'smaller stat cards' (#7 ) from recipes into dev Reviewed-on: #7	2026-04-24 22:44:44 +00:00
Matt Beaudoin	a2efaf279d	smaller stat cards	2026-04-24 15:43:18 -07:00