Merge branch 'apollo2'

# Conflicts:
#	src/components/ProfileModal.tsx

Author: appo357

package-lock.json

@@ -4,6 +4,7 @@ import type { AlienProfile } from '../data/mockAliens';
 import { useAppContext } from '../context/AppContext';
 import ProfileModal from './ProfileModal';
 import MatchOverlay from './MatchOverlay';
+import { getCompatibility } from '../utils/compatibility';
 
 export default function OrbitSystem() {
   const { preferences, addMatch, matches } = useAppContext();
@@ -25,6 +26,10 @@ export default function OrbitSystem() {
       !activeIds.includes(a.id)
     );
 
+    // Sort available aliens by compatibility descending, so the queue is ordered
+    // from highest match to lowest match. The next alien pulled will always be the highest remaining match.
+    available.sort((a, b) => getCompatibility(b, preferences) - getCompatibility(a, preferences));
+
     let changed = false;
     const newActiveIds = [...activeIds];
 
@@ -159,11 +164,12 @@ export default function OrbitSystem() {
         </div>
 
         {/* Orbit Rings and Aliens */}
-        {activeIds.map((id, i) => {
-          if (!id) return null; // If no alien is available for this slot, don't render it
-          
-          const alien = mockAliens.find(a => a.id === id);
-          if (!alien) return null;
+        {activeIds
+          .map(id => id ? mockAliens.find(a => a.id === id) : null)
+          .filter((a): a is AlienProfile => a !== null && a !== undefined)
+          // Sort by compatibility descending so the highest match is in the innermost track
+          .sort((a, b) => getCompatibility(b, preferences) - getCompatibility(a, preferences))
+          .map((alien, i) => {
 
           // Assign each slot to a distinct track (0 to 4)
           const rx = 120 + (i * 65); 

src/components/OrbitSystem.tsx

@@ -1,6 +1,8 @@
 import { useState, useEffect } from 'react';
 import type { AlienProfile } from '../data/mockAliens';
 import { X, Heart, Info, Globe, Wind } from 'lucide-react';
+import { useAppContext } from '../context/AppContext';
+import { getCompatibility } from '../utils/compatibility';
 
 interface ProfileModalProps {
   alien: AlienProfile;
@@ -11,6 +13,8 @@ interface ProfileModalProps {
 
 export default function ProfileModal({ alien, onClose, onMatch, onDismiss }: ProfileModalProps) {
   const [swipeDirection, setSwipeDirection] = useState<'left' | 'right' | null>(null);
+  const { preferences } = useAppContext();
+  const compatibility = getCompatibility(alien, preferences);
 
   useEffect(() => {
     setSwipeDirection(null);
@@ -119,13 +123,13 @@ export default function ProfileModal({ alien, onClose, onMatch, onDismiss }: Pro
 
             {/* Compatibility Badge */}
             <div style={{ 
-              background: `linear-gradient(135deg, ${alien.compatibilityPercent >= 80 ? 'var(--color-primary), var(--color-secondary)' : 'rgba(234, 222, 218, 0.2), rgba(234, 222, 218, 0.1)'})`,
+              background: `linear-gradient(135deg, ${compatibility >= 80 ? 'var(--color-primary), var(--color-secondary)' : 'rgba(234, 222, 218, 0.2), rgba(234, 222, 218, 0.1)'})`,
               padding: '8px 16px', 
               borderRadius: '20px',
               fontWeight: 'bold',
-              boxShadow: alien.compatibilityPercent >= 80 ? '0 4px 15px rgba(217, 3, 104, 0.4)' : 'none'
+              boxShadow: compatibility >= 80 ? '0 4px 15px rgba(217, 3, 104, 0.4)' : 'none'
             }}>
-              {alien.compatibilityPercent.toFixed(1)}% Match
+              {compatibility.toFixed(1)}% Match
             </div>
           </div>
 

src/components/ProfileModal.tsx

@@ -23,7 +23,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-1",
     name: "Glaxion",
-    alienType: "Neon Synth",
+    alienType: "Alien",
     limbs: 4,
     size: "Medium",
     distanceAU: 4.2,
@@ -39,7 +39,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-2",
     name: "Zorblax",
-    alienType: "Aquatic Siren",
+    alienType: "Alien",
     limbs: 8,
     size: "Small",
     distanceAU: 12.8,
@@ -55,7 +55,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-3",
     name: "Vex'tar",
-    alienType: "Draconian",
+    alienType: "Alien",
     limbs: 4,
     size: "Large",
     distanceAU: 1.5,
@@ -71,7 +71,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-4",
     name: "Crystalia",
-    alienType: "Crystalline Entity",
+    alienType: "Alien",
     limbs: 4,
     size: "Medium",
     distanceAU: 25.4,
@@ -87,7 +87,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-5",
     name: "Spore'rel",
-    alienType: "Fungal Sporeling",
+    alienType: "Alien",
     limbs: 6,
     size: "Small",
     distanceAU: 8.9,
@@ -103,7 +103,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-6",
     name: "Lyra",
-    alienType: "Plasma Being",
+    alienType: "Alien",
     limbs: 0,
     size: "Medium",
     distanceAU: 55.0,
@@ -119,7 +119,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-7",
     name: "Lumina",
-    alienType: "Celestial Guide",
+    alienType: "Hybrid",
     limbs: 4,
     size: "Large",
     distanceAU: 12.4,
@@ -135,7 +135,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-8",
     name: "Zarok",
-    alienType: "High Councilor",
+    alienType: "Hybrid",
     limbs: 4,
     size: "Medium",
     distanceAU: 8.1,
@@ -151,7 +151,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-9",
     name: "Squish",
-    alienType: "Forest Slime",
+    alienType: "Alien",
     limbs: 0,
     size: "Small",
     distanceAU: 3.3,
@@ -167,7 +167,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-10",
     name: "Xeno",
-    alienType: "Apex Predator",
+    alienType: "Alien",
     limbs: 4,
     size: "Colossal",
     distanceAU: 35.0,
@@ -183,7 +183,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-11",
     name: "Cyra",
-    alienType: "Void Walker",
+    alienType: "Hybrid",
     limbs: 4,
     size: "Medium",
     distanceAU: 66.6,
@@ -199,7 +199,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-12",
     name: "Ignis",
-    alienType: "Royal Envoy",
+    alienType: "Human",
     limbs: 4,
     size: "Medium",
     distanceAU: 2.1,
@@ -215,7 +215,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-13",
     name: "Sparky",
-    alienType: "Luminous Sprite",
+    alienType: "Alien",
     limbs: 4,
     size: "Small",
     distanceAU: 18.9,
@@ -231,7 +231,7 @@ export const mockAliens: AlienProfile[] = [
   {
     id: "alien-14",
     name: "Kaelen",
-    alienType: "Jungle Prince",
+    alienType: "Human",
     limbs: 4,
     size: "Medium",
     distanceAU: 9.5,

src/data/mockAliens.ts

@@ -0,0 +1,55 @@
+import type { AlienProfile } from '../data/mockAliens';
+import type { UserPreferences } from '../context/AppContext';
+
+// Size proximity
+const sizeOrder = ['Small', 'Medium', 'Large', 'Colossal'];
+
+// Type proximity
+const typeOrder = ['Human', 'Hybrid', 'Alien'];
+
+export function getCompatibility(alien: AlienProfile, prefs: UserPreferences | null): number {
+  if (!prefs) return 50.0;
+  
+  let score = 40; // Base score
+  
+  // Size Match (max 25)
+  if (prefs.size === alien.size) {
+    score += 25;
+  } else if (prefs.size === 'No preference' || !prefs.size) {
+    score += 20;
+  } else {
+    const userSizeIdx = sizeOrder.indexOf(prefs.size);
+    const alienSizeIdx = sizeOrder.indexOf(alien.size);
+    if (userSizeIdx !== -1 && alienSizeIdx !== -1) {
+      const diff = Math.abs(userSizeIdx - alienSizeIdx);
+      if (diff === 1) score += 15; // Close
+      else if (diff === 2) score += 5; // Farther
+      // diff of 3 is 0 points
+    }
+  }
+
+  // Type Match (max 25)
+  if (prefs.alienType === 'Open to all' || !prefs.alienType) {
+    score += 20;
+  } else if (prefs.alienType === alien.alienType) {
+    score += 25;
+  } else {
+    const userTypeIdx = typeOrder.indexOf(prefs.alienType);
+    const alienTypeIdx = typeOrder.indexOf(alien.alienType);
+    if (userTypeIdx !== -1 && alienTypeIdx !== -1) {
+      const diff = Math.abs(userTypeIdx - alienTypeIdx);
+      if (diff === 1) score += 15; // Human -> Hybrid, or Hybrid -> Alien
+    }
+  }
+
+  // Distance Match (max 10)
+  if (prefs.maxDistanceAU > 0) {
+    const distanceScore = Math.max(0, 1 - (alien.distanceAU / prefs.maxDistanceAU));
+    score += distanceScore * 10;
+  } else {
+    score += 5;
+  }
+
+  // Cap between 10.0 and 99.9
+  return Math.min(99.9, Math.max(10.0, Math.round(score * 10) / 10));
+}