Merge remote-tracking branch 'origin/HEAD' into noah-dev

frontend/src/App.jsx

@@ -13,6 +13,7 @@ function App() {
           <Route path="/" element={<Home />} />
           <Route path="/create-station" element={<CreateStation />} />
           <Route path="/join-station" element={<JoinStation />} />
+          <Route path="/station" element={<StationPage />} />
         </Routes>
       </Router>
     </div>

frontend/src/index.css

@@ -315,6 +315,351 @@ body {
   box-shadow: none;
 }
 
+/* Station Page Styles */
+.station-page {
+  min-height: 100vh;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  position: relative;
+  overflow-x: hidden;
+}
+
+.animated-background {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  z-index: 1;
+}
+
+.star {
+  position: absolute;
+  background: rgba(255, 255, 255, 0.6);
+  border-radius: 50%;
+  animation: float 6s ease-in-out infinite;
+}
+
+.star:nth-child(odd) {
+  width: 2px;
+  height: 2px;
+  animation-duration: 8s;
+}
+
+.star:nth-child(even) {
+  width: 3px;
+  height: 3px;
+  animation-duration: 6s;
+}
+
+.star:nth-child(3n) {
+  width: 1px;
+  height: 1px;
+  animation-duration: 10s;
+}
+
+.star-1 { top: 10%; left: 20%; animation-delay: 0s; }
+.star-2 { top: 20%; left: 80%; animation-delay: 1s; }
+.star-3 { top: 30%; left: 40%; animation-delay: 2s; }
+.star-4 { top: 40%; left: 10%; animation-delay: 1.5s; }
+.star-5 { top: 50%; left: 70%; animation-delay: 3s; }
+.star-6 { top: 60%; left: 30%; animation-delay: 0.5s; }
+.star-7 { top: 70%; left: 90%; animation-delay: 2.5s; }
+.star-8 { top: 80%; left: 50%; animation-delay: 1.8s; }
+.star-9 { top: 15%; left: 60%; animation-delay: 2.2s; }
+.star-10 { top: 25%; left: 15%; animation-delay: 3.5s; }
+.star-11 { top: 35%; left: 85%; animation-delay: 0.8s; }
+.star-12 { top: 45%; left: 25%; animation-delay: 4s; }
+.star-13 { top: 55%; left: 75%; animation-delay: 1.2s; }
+.star-14 { top: 65%; left: 5%; animation-delay: 2.8s; }
+.star-15 { top: 75%; left: 95%; animation-delay: 0.3s; }
+.star-16 { top: 85%; left: 35%; animation-delay: 3.2s; }
+.star-17 { top: 5%; left: 45%; animation-delay: 1.7s; }
+.star-18 { top: 95%; left: 65%; animation-delay: 2.1s; }
+.star-19 { top: 12%; left: 2%; animation-delay: 3.8s; }
+.star-20 { top: 88%; left: 98%; animation-delay: 0.9s; }
+
+@keyframes float {
+  0%, 100% {
+    transform: translateY(0px) translateX(0px);
+    opacity: 0.6;
+  }
+  50% {
+    transform: translateY(-10px) translateX(5px);
+    opacity: 1;
+  }
+}
+
+.station-content {
+  position: relative;
+  z-index: 2;
+  padding: 20px;
+  max-width: 800px;
+  margin: 0 auto;
+}
+
+.station-header {
+  text-align: center;
+  margin-bottom: 40px;
+  padding-top: 40px;
+}
+
+.station-header h1 {
+  font-size: 2.5rem;
+  font-weight: 700;
+  color: white;
+  margin-bottom: 10px;
+  text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
+
+.station-subtitle {
+  font-size: 1.1rem;
+  color: rgba(255, 255, 255, 0.9);
+  margin: 0;
+}
+
+.media-controls-section {
+  background: rgba(255, 255, 255, 0.95);
+  backdrop-filter: blur(10px);
+  border-radius: 20px;
+  padding: 30px;
+  margin-bottom: 30px;
+  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
+  border: 1px solid rgba(255, 255, 255, 0.2);
+}
+
+.current-song {
+  text-align: center;
+  margin-bottom: 25px;
+}
+
+.current-song h3 {
+  font-size: 1.4rem;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 5px;
+}
+
+.current-song p {
+  font-size: 1rem;
+  color: #666;
+  margin: 0;
+}
+
+.media-controls {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 20px;
+}
+
+.control-btn {
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  border: none;
+  border-radius: 50%;
+  width: 50px;
+  height: 50px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  color: white;
+  box-shadow: 0 4px 15px rgba(102, 126, 234, 0.3);
+}
+
+.control-btn.play-pause {
+  width: 60px;
+  height: 60px;
+  box-shadow: 0 6px 20px rgba(102, 126, 234, 0.4);
+}
+
+.control-btn:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 8px 25px rgba(102, 126, 234, 0.5);
+}
+
+.songs-section {
+  background: rgba(255, 255, 255, 0.95);
+  backdrop-filter: blur(10px);
+  border-radius: 20px;
+  padding: 30px;
+  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
+  border: 1px solid rgba(255, 255, 255, 0.2);
+}
+
+.section-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 25px;
+}
+
+.section-header h2 {
+  font-size: 1.5rem;
+  font-weight: 600;
+  color: #333;
+  margin: 0;
+}
+
+.add-song-btn {
+  background: linear-gradient(135deg, #28a745 0%, #20c997 100%);
+  color: white;
+  border: none;
+  padding: 12px 20px;
+  border-radius: 10px;
+  font-size: 0.9rem;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  box-shadow: 0 4px 15px rgba(40, 167, 69, 0.3);
+}
+
+.add-song-btn:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 6px 20px rgba(40, 167, 69, 0.4);
+}
+
+.songs-list {
+  max-height: 400px;
+  overflow-y: auto;
+  margin: -5px;
+  padding: 5px;
+}
+
+.songs-list::-webkit-scrollbar {
+  width: 6px;
+}
+
+.songs-list::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 3px;
+}
+
+.songs-list::-webkit-scrollbar-thumb {
+  background: #c1c1c1;
+  border-radius: 3px;
+}
+
+.songs-list::-webkit-scrollbar-thumb:hover {
+  background: #a8a8a8;
+}
+
+.song-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 15px 20px;
+  border-radius: 12px;
+  margin-bottom: 8px;
+  transition: all 0.3s ease;
+  cursor: pointer;
+  border: 2px solid transparent;
+}
+
+.song-item:hover {
+  background: rgba(102, 126, 234, 0.05);
+  border-color: rgba(102, 126, 234, 0.2);
+}
+
+.song-info h4 {
+  font-size: 1rem;
+  font-weight: 600;
+  color: #333;
+  margin: 0 0 4px 0;
+}
+
+.song-info p {
+  font-size: 0.9rem;
+  color: #666;
+  margin: 0;
+}
+
+.song-duration {
+  font-size: 0.9rem;
+  color: #888;
+  font-weight: 500;
+}
+
+/* Modal Styles */
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000;
+  padding: 20px;
+}
+
+.modal-content {
+  background: white;
+  border-radius: 20px;
+  width: 100%;
+  max-width: 500px;
+  max-height: 80vh;
+  overflow-y: auto;
+  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.2);
+}
+
+.modal-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 25px 30px 20px;
+  border-bottom: 1px solid #eee;
+}
+
+.modal-header h2 {
+  font-size: 1.4rem;
+  font-weight: 600;
+  color: #333;
+  margin: 0;
+}
+
+.close-btn {
+  background: none;
+  border: none;
+  cursor: pointer;
+  padding: 5px;
+  border-radius: 50%;
+  color: #666;
+  transition: all 0.3s ease;
+}
+
+.close-btn:hover {
+  background: #f5f5f5;
+  color: #333;
+}
+
+.modal-body {
+  padding: 30px;
+}
+
+.modal-body p {
+  text-align: center;
+  color: #666;
+  font-size: 1rem;
+  margin: 0;
+}
+
+/* Empty State Styles */
+.empty-songs-state {
+  text-align: center;
+  padding: 40px 20px;
+  color: #666;
+}
+
+.empty-songs-state p {
+  font-size: 1.1rem;
+  margin: 0;
+  font-style: italic;
+}
+
 /* Mobile Responsive Design */
 @media (max-width: 768px) {
   .content {
@@ -388,6 +733,58 @@ body {
     padding: 16px 24px;
     font-size: 1rem;
   }
+  
+  .station-content {
+    padding: 15px;
+  }
+  
+  .station-header {
+    padding-top: 20px;
+    margin-bottom: 30px;
+  }
+  
+  .station-header h1 {
+    font-size: 2rem;
+  }
+  
+  .station-subtitle {
+    font-size: 1rem;
+  }
+  
+  .media-controls-section {
+    padding: 25px 20px;
+  }
+  
+  .songs-section {
+    padding: 25px 20px;
+  }
+  
+  .section-header {
+    flex-direction: column;
+    align-items: stretch;
+    gap: 15px;
+  }
+  
+  .add-song-btn {
+    align-self: center;
+    min-width: 120px;
+  }
+  
+  .song-item {
+    padding: 12px 15px;
+  }
+  
+  .songs-list {
+    max-height: 300px;
+  }
+  
+  .modal-header {
+    padding: 20px 25px 15px;
+  }
+  
+  .modal-body {
+    padding: 25px;
+  }
 }
 
 @media (max-width: 480px) {
@@ -418,6 +815,44 @@ body {
   .join-station-content {
     padding: 25px 15px;
   }
+  
+  .station-content {
+    padding: 10px;
+  }
+  
+  .station-header h1 {
+    font-size: 1.8rem;
+  }
+  
+  .media-controls-section {
+    padding: 20px 15px;
+  }
+  
+  .songs-section {
+    padding: 20px 15px;
+  }
+  
+  .control-btn {
+    width: 45px;
+    height: 45px;
+  }
+  
+  .control-btn.play-pause {
+    width: 55px;
+    height: 55px;
+  }
+  
+  .modal-backdrop {
+    padding: 15px;
+  }
+  
+  .modal-header {
+    padding: 15px 20px 10px;
+  }
+  
+  .modal-body {
+    padding: 20px;
+  }
 }
 
 /* Larger screens */
@@ -447,4 +882,26 @@ body {
   .join-station-header h1 {
     font-size: 2.5rem;
   }
+  
+  .station-header h1 {
+    font-size: 3rem;
+  }
+  
+  .station-subtitle {
+    font-size: 1.2rem;
+  }
+  
+  .media-controls {
+    gap: 30px;
+  }
+  
+  .control-btn {
+    width: 55px;
+    height: 55px;
+  }
+  
+  .control-btn.play-pause {
+    width: 70px;
+    height: 70px;
+  }
 }

frontend/src/screens/AddSongModal.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+
+function AddSongModal({ onClose }) {
+  const handleBackdropClick = (e) => {
+    if (e.target === e.currentTarget) {
+      onClose();
+    }
+  };
+
+  return (
+    <div className="modal-backdrop" onClick={handleBackdropClick}>
+      <div className="modal-content">
+        <div className="modal-header">
+          <h2>Add Song</h2>
+          <button className="close-btn" onClick={onClose}>
+            <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+              <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
+            </svg>
+          </button>
+        </div>
+        
+        <div className="modal-body">
+          <p>Song addition functionality coming soon...</p>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default AddSongModal;

frontend/src/screens/JoinStation.jsx

@@ -1,11 +1,15 @@
 import React, { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 
 function JoinStation() {
   const [verifyMethod, setVerifyMethod] = useState('');
   const [password, setPassword] = useState('');
+  const navigate = useNavigate();
 
   const handleJoinStation = () => {
     console.log('Joining station with password:', password);
+    // Redirect to station page after joining
+    navigate('/station');
   };
 
   return (

frontend/src/screens/StationPage.jsx

@@ -0,0 +1,115 @@
+import React, { useState } from 'react';
+import AddSongModal from './AddSongModal';
+
+function StationPage() {
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [currentSong, setCurrentSong] = useState({
+    title: "No song playing",
+    artist: "Add songs to get started",
+    isPlaying: false
+  });
+
+  // Empty song list - no songs initially
+  const recommendedSongs = [];
+
+  const handlePlayPause = () => {
+    setCurrentSong(prev => ({ ...prev, isPlaying: !prev.isPlaying }));
+  };
+
+  const handleNext = () => {
+    console.log('Next song');
+  };
+
+  const handlePrevious = () => {
+    console.log('Previous song');
+  };
+
+  const openModal = () => {
+    setIsModalOpen(true);
+  };
+
+  const closeModal = () => {
+    setIsModalOpen(false);
+  };
+
+  return (
+    <div className="station-page">
+      <div className="animated-background">
+        {[...Array(20)].map((_, i) => (
+          <div key={i} className={`star star-${i + 1}`}></div>
+        ))}
+      </div>
+
+      <div className="station-content">
+        <header className="station-header">
+          <h1>Serena Station</h1>
+          <p className="station-subtitle">Collaborative Music Experience</p>
+        </header>
+
+        <div className="media-controls-section">
+          <div className="current-song">
+            <h3>{currentSong.title}</h3>
+            <p>{currentSong.artist}</p>
+          </div>
+          
+          <div className="media-controls">
+            <button className="control-btn" onClick={handlePrevious}>
+              <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+                <path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z"/>
+              </svg>
+            </button>
+            
+            <button className="control-btn play-pause" onClick={handlePlayPause}>
+              {currentSong.isPlaying ? (
+                <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/>
+                </svg>
+              ) : (
+                <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M8 5v14l11-7z"/>
+                </svg>
+              )}
+            </button>
+            
+            <button className="control-btn" onClick={handleNext}>
+              <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+                <path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z"/>
+              </svg>
+            </button>
+          </div>
+        </div>
+
+        <div className="songs-section">
+          <div className="section-header">
+            <h2>Song Queue</h2>
+            <button className="add-song-btn" onClick={openModal}>
+              Add Song
+            </button>
+          </div>
+          
+          <div className="songs-list">
+            {recommendedSongs.length === 0 ? (
+              <div className="empty-songs-state">
+                <p>No songs in queue yet. Add some songs to get started!</p>
+              </div>
+            ) : (
+              recommendedSongs.map(song => (
+                <div key={song.id} className="song-item">
+                  <div className="song-info">
+                    <h4>{song.title}</h4>
+                    <p>{song.artist}</p>
+                  </div>
+                  <span className="song-duration">{song.duration}</span>
+                </div>
+              ))
+            )}
+          </div>
+        </div>
+      </div>
+
+      {isModalOpen && <AddSongModal onClose={closeModal} />}
+    </div>
+  );
+}
+
+export default StationPage;