Merge remote-tracking branch 'origin/tobi-dev'

.dockerignore

@@ -0,0 +1,65 @@
+# Git
+.git
+.gitignore
+
+# Documentation
+README.md
+LICENSE
+*.md
+
+# Node modules (will be installed in container)
+frontend/node_modules
+node_modules
+
+# Build artifacts
+backend/build
+frontend/build
+backend/.gradle
+backend/bin
+
+# IDE files
+.vscode
+.idea
+*.iml
+
+# OS files
+.DS_Store
+Thumbs.db
+
+# Environment files
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Coverage directory used by tools like istanbul
+coverage/
+
+# Dependency directories
+jspm_packages/
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity

Dockerfile

@@ -0,0 +1,65 @@
+# Multi-stage Dockerfile for Serena (Backend + Frontend)
+
+# Stage 1: Build Frontend
+FROM node:18-alpine AS frontend-builder
+
+WORKDIR /app/frontend
+
+# Copy package files
+COPY frontend/package*.json ./
+
+# Install dependencies
+RUN npm ci --only=production
+
+# Copy frontend source
+COPY frontend/ ./
+
+# Build frontend
+RUN npm run build
+
+# Stage 2: Build Backend
+FROM openjdk:21-jdk-slim AS backend-builder
+
+WORKDIR /app/backend
+
+# Copy Gradle wrapper and build files
+COPY backend/gradlew ./
+COPY backend/gradle/ ./gradle/
+COPY backend/build.gradle ./
+COPY backend/settings.gradle ./
+
+# Copy source code
+COPY backend/src/ ./src/
+
+# Make gradlew executable and build
+RUN chmod +x gradlew
+RUN ./gradlew build --no-daemon -x test
+
+# Stage 3: Runtime
+FROM openjdk:21-jre-slim
+
+WORKDIR /app
+
+# Install curl for health checks
+RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
+
+# Copy built backend JAR
+COPY --from=backend-builder /app/backend/build/libs/*.jar app.jar
+
+# Copy built frontend (will be served by Spring Boot)
+COPY --from=frontend-builder /app/frontend/build/ /app/static/
+
+# Create non-root user
+RUN groupadd -r serena && useradd -r -g serena serena
+RUN chown -R serena:serena /app
+USER serena
+
+# Expose port
+EXPOSE 8080
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
+  CMD curl -f http://localhost:8080/actuator/health || exit 1
+
+# Run the application
+ENTRYPOINT ["java", "-jar", "app.jar"]

README.md

@@ -1,2 +1,124 @@
-# team-5
+# Serena - Collaborative Radio Station Platform
 
+**Serena** is a collaborative radio station platform that enables users to create and join virtual music stations for shared listening experiences. The application features a React frontend and Spring Boot backend, integrating with the Spotify API to provide real-time music playback and queue management.
+
+## 🎵 Features
+
+- **Create & Join Stations**: Users can create radio stations with unique join codes or join existing stations
+- **Collaborative Queuing**: Multiple users can add songs to their preferred queues
+- **Intelligent Recommendations**: Advanced algorithm considers song popularity, tempo similarity, audio features, and user preferences
+- **Real-time Playback**: Spotify integration for seamless music streaming (station owners control playback)
+- **User Authentication**: JWT-based authentication system with owner and client roles
+- **Responsive UI**: Modern React interface with animated backgrounds and intuitive controls
+
+## 🏗️ Architecture
+
+### Backend (Spring Boot)
+- **Language**: Java
+- **Framework**: Spring Boot
+- **Authentication**: JWT tokens
+- **Queue Algorithm**: Multi-factor recommendation system
+- **API**: RESTful endpoints for station and queue management
+
+### Frontend (React)
+- **Language**: JavaScript (JSX)
+- **Framework**: React 19.1.1
+- **Routing**: React Router DOM
+- **Spotify Integration**: Web Playback SDK
+- **Styling**: CSS with animations
+
+### External APIs
+- **Spotify Web API**: Music data and playback control
+- **Spotify Web Playback SDK**: Browser-based music streaming
+
+## 🚀 Quick Start
+
+### Prerequisites
+- Node.js (v16+)
+- Java 11+
+- Gradle
+- Docker (optional)
+- Spotify Premium account (for playback control)
+
+
+### Backend Setup
+```bash
+cd backend
+./gradlew bootRun
+```
+
+The backend will start on `http://localhost:8080`
+
+### Frontend Setup
+```bash
+cd frontend
+npm install
+npm start
+```
+
+The frontend will start on `http://localhost:3000`
+
+### Docker Setup (Alternative)
+```bash
+docker-compose up
+```
+
+## 📖 API Documentation
+
+Detailed API documentation is available in [`backend/API_DOCUMENTATION.md`](backend/API_DOCUMENTATION.md).
+
+### Key Endpoints
+- `POST /api/radio-stations` - Create a new radio station
+- `GET /api/radio-stations` - List all radio stations
+- `POST /api/clients/connect` - Join a station with join code
+- `POST /api/songs/queue` - Add song to client's preferred queue
+- `GET /api/songs/queue/recommended` - Get intelligently sorted queue
+
+## 🎯 How It Works
+
+### Station Creation
+1. User creates a station with name and description
+2. System generates unique station ID and 6-character join code
+3. Creator becomes the station owner with playback control
+
+### Joining Stations
+1. Users join with the station's join code
+2. Receive client authentication token
+3. Can add songs to their preferred queue
+
+### Queue Algorithm
+The intelligent queue system considers:
+- **Preferred Queue Position** (30%): User song preferences
+- **Popularity** (20%): Spotify popularity scores
+- **Tempo Similarity** (20%): BPM matching with current song
+- **Audio Features** (30%): Danceability, energy, valence, etc.
+
+### Playback Control
+- Only station owners can control playback
+- Automatic progression through recommended queue
+- Real-time sync with Spotify Web Playback SDK
+
+## 🔧 Configuration
+
+### Backend Configuration
+Update `backend/src/main/resources/application.properties`:
+```properties
+# Add your Spotify credentials and other settings
+```
+
+### Frontend Configuration
+Update Spotify credentials in `frontend/src/constants/ApiConstants.js`
+
+## 🧪 Testing
+
+### Backend Tests
+```bash
+cd backend
+./gradlew test
+```
+
+### Frontend Tests
+```bash
+cd frontend
+npm test
+```

backend/gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,7 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +112,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,7 +203,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -213,7 +211,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

backend/gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -70,11 +68,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

docker-compose.yml

@@ -0,0 +1,69 @@
+version: '3.8'
+
+services:
+  # Backend Service
+  serena-backend:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: serena-backend
+    ports:
+      - "8080:8080"
+    environment:
+      - SPRING_PROFILES_ACTIVE=docker
+      - SERVER_PORT=8080
+      - SPRING_WEB_CORS_ALLOWED_ORIGINS=http://localhost:3000,http://127.0.0.1:3000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/actuator/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 60s
+    restart: unless-stopped
+    networks:
+      - serena-network
+
+  # Frontend Development Service (alternative to built-in static files)
+  serena-frontend:
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile.dev
+    container_name: serena-frontend
+    ports:
+      - "3000:3000"
+    environment:
+      - REACT_APP_API_URL=http://localhost:8080
+      - CHOKIDAR_USEPOLLING=true
+    volumes:
+      - ./frontend:/app
+      - /app/node_modules
+    depends_on:
+      - serena-backend
+    networks:
+      - serena-network
+    profiles:
+      - development
+
+  # Production Frontend (served by backend)
+  serena-app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: serena-app
+    ports:
+      - "80:8080"
+    environment:
+      - SPRING_PROFILES_ACTIVE=production
+      - SERVER_PORT=8080
+    restart: unless-stopped
+    networks:
+      - serena-network
+    profiles:
+      - production
+
+networks:
+  serena-network:
+    driver: bridge
+
+volumes:
+  node_modules:

frontend/.gitignore

@@ -21,3 +21,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+music/*

frontend/src/components/AudioPlayer.jsx

@@ -0,0 +1,40 @@
+import React, { useRef, useState } from "react";
+
+const SingleAudioPlayer = ({ src }) => {
+  const audioRef = useRef(null);
+  const [isPlaying, setIsPlaying] = useState(false);
+
+  // Early return if no src provided
+  if (!src) {
+    return <div>No audio file available</div>;
+  }
+
+  const togglePlay = () => {
+    const audio = audioRef.current;
+    if (!audio) return;
+
+    if (isPlaying) {
+      audio.pause();
+    } else {
+      audio.play().catch((e) => {
+        console.warn("Playback error:", e);
+      });
+    }
+
+    setIsPlaying(!isPlaying);
+  };
+
+  const handleEnded = () => {
+    setIsPlaying(false);
+  };
+
+  return (
+    <div style={{ display: "flex", alignItems: "center", gap: "1rem" }}>
+      <button onClick={togglePlay}>{isPlaying ? "Pause" : "Play"}</button>
+      <span>{src.split("/").pop()}</span>
+      <audio ref={audioRef} src={src} onEnded={handleEnded} />
+    </div>
+  );
+};
+
+export default SingleAudioPlayer;

frontend/src/components/LoginButton.jsx

@@ -1,30 +0,0 @@
-import React from 'react';
-import { getSpotifyLoginUrl, isLoggedIn, removeAccessToken } from '../utils/spotifyAuth.js';
-
-const LoginButton = () => {
-  const loggedIn = isLoggedIn();
-
-  const handleLogout = () => {
-    removeAccessToken();
-    window.location.reload(); // Refresh to update UI
-  };
-
-  if (loggedIn) {
-    return (
-      <div className="login-status">
-        <span>✓ Connected to Spotify</span>
-        <button onClick={handleLogout} className="logout-btn">
-          Logout
-        </button>
-      </div>
-    );
-  }
-
-  return (
-    <a href={getSpotifyLoginUrl()}>
-      <button className="spotify-login-btn">Login with Spotify</button>
-    </a>
-  );
-};
-
-export default LoginButton;

frontend/src/constants/ApiConstants.js

@@ -3,6 +3,3 @@ export const RADIOSTATION_URL = "http://localhost:8080/api";
 export const CREATE_RADIOSTATION_ENDPOINT = "/radio-stations";
 export const LIST_RADIOSTATIONS_ENDPOINT = "/radio-stations";
 export const ADD_CLIENT_ENDPOINT = "/clients/connect";
-
-export const SPOTIFY_PREMIUM_TOKEN =
-  "BQCEnWrYVdmta4Eekdkewazun99IuocRAyPEbwPSrHuGYgZYg7JGlXG2BLmRL6fwjzPJkrmHiqlTLSn1yqR36awA9Rv4n9dwvTBv1DjAitsuzaEVg7PtYdbUHXqP2HJJ4dDDvTtvUfWIBDY_Afa7WgY1cyRbl-p4VobNHXUR9N3Ye1qBTgH3RZ5ziIbIoNWe_JrxYvcedkvr23zXUVabOyahTgt_YdmnCWt2Iu8XT8sjhSyc8tOCqbs_KqE-Qe1WSPUCrGS8";

frontend/src/screens/AddSongModal.jsx

@@ -1,26 +1,146 @@
-import React from 'react';
+import React, { useState } from 'react';
+import { searchSpotifyTracks, isLoggedIn } from '../utils/spotifyAuth.js';
 
 function AddSongModal({ onClose }) {
+  const [searchQuery, setSearchQuery] = useState('');
+  const [searchResults, setSearchResults] = useState([]);
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState('');
+
   const handleBackdropClick = (e) => {
     if (e.target === e.currentTarget) {
       onClose();
     }
   };
 
+  const handleSearch = async (e) => {
+    const query = e.target.value;
+    setSearchQuery(query);
+    setError('');
+    
+    if (query.length > 2) {
+      if (!isLoggedIn()) {
+        setError('Please login to Spotify to search for songs');
+        return;
+      }
+
+      setIsLoading(true);
+      try {
+        const results = await searchSpotifyTracks(query);
+        setSearchResults(results);
+      } catch (err) {
+        setError(err.message === 'Token expired' ? 'Session expired. Please login again.' : 'Search failed. Please try again.');
+        setSearchResults([]);
+        if (err.message === 'Token expired') {
+          setTimeout(() => window.location.reload(), 2000);
+        }
+      } finally {
+        setIsLoading(false);
+      }
+    } else {
+      setSearchResults([]);
+    }
+  };
+
+  const handleKeyPress = async (e) => {
+    if (e.key === 'Enter' && searchQuery.trim() && searchQuery.length > 2) {
+      if (!isLoggedIn()) {
+        setError('Please login to Spotify to search for songs');
+        return;
+      }
+
+      setIsLoading(true);
+      try {
+        const results = await searchSpotifyTracks(searchQuery);
+        setSearchResults(results);
+        setError('');
+      } catch (err) {
+        setError(err.message === 'Token expired' ? 'Session expired. Please login again.' : 'Search failed. Please try again.');
+        setSearchResults([]);
+      } finally {
+        setIsLoading(false);
+      }
+    }
+  };
+
   return (
-    <div className="modal-backdrop" onClick={handleBackdropClick}>
+    <div className="add-song-modal-backdrop" onClick={handleBackdropClick}>
-      <div className="modal-content">
+      <div className="add-song-modal-content">
-        <div className="modal-header">
+        <div className="add-song-modal-header">
-          <h2>Add Song</h2>
+          <h2>Add Song to Station</h2>
-          <button className="close-btn" onClick={onClose}>
+          <button className="add-song-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">
+        <div className="add-song-modal-body">
-          <p>Song addition functionality coming soon...</p>
+          <div className="add-song-search-container">
+            <div className="add-song-search-box">
+              <svg className="search-icon" width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/>
+              </svg>
+              <input
+                type="text"
+                placeholder="Search for songs, artists, or albums..."
+                value={searchQuery}
+                onChange={handleSearch}
+                onKeyPress={handleKeyPress}
+                autoFocus
+              />
+              {isLoading && (
+                <div className="search-loading">
+                  <div className="loading-spinner"></div>
+                </div>
+              )}
+            </div>
+          </div>
+
+          <div className="add-song-results-container">
+            {error && (
+              <div className="add-song-error">
+                <p>{error}</p>
+              </div>
+            )}
+            {searchQuery.length === 0 ? (
+              <div className="add-song-placeholder">
+                <svg width="48" height="48" viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M12 3v10.55c-.59-.34-1.27-.55-2-.55-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4V7h4V3h-6z"/>
+                </svg>
+                <p>Search for music to add to your station</p>
+                <p className="placeholder-subtitle">Enter song title, artist, or album name</p>
+              </div>
+            ) : searchQuery.length <= 2 ? (
+              <div className="add-song-placeholder">
+                <p>Type at least 3 characters to search</p>
+              </div>
+            ) : searchResults.length === 0 && !isLoading && !error ? (
+              <div className="add-song-placeholder">
+                <p>No results found for "{searchQuery}"</p>
+                <p className="placeholder-subtitle">Try different keywords</p>
+              </div>
+            ) : (
+              <div className="add-song-results-list">
+                {searchResults.map(song => (
+                  <div key={song.id} className="add-song-result-item">
+                    <img src={song.coverUrl} alt={`${song.title} cover`} className="result-song-cover" />
+                    <div className="result-song-info">
+                      <h4>{song.title}</h4>
+                      <p className="result-artist">{song.artist}</p>
+                      <p className="result-album">{song.album}</p>
+                    </div>
+                    <button className="add-song-btn" onClick={() => console.log('Adding song:', song)}>
+                      <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+                      </svg>
+                      Add
+                    </button>
+                  </div>
+                ))}
+              </div>
+            )}
+          </div>
         </div>
       </div>
     </div>

frontend/src/screens/CreateStation.jsx

@@ -1,37 +1,184 @@
 import React, { useState } from "react";
 import { createStation } from "../utils/StationsCreate";
-
+import { useNavigate } from "react-router-dom";
-// I UNDERSTAND THIS!! --Noah
 
 function CreateStation() {
+  const navigate = useNavigate();
   const [name, setName] = useState("");
   const [description, setDescription] = useState("");
   const [joinCode, setJoinCode] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState("");
+  const [isCopied, setIsCopied] = useState(false);
 
-  const handleCreateStation = () => {
+  const handleCreateStation = async () => {
-    setJoinCode(createStation(name, description));
+    if (!name.trim() || !description.trim()) {
+      setError("Please fill in all fields");
+      return;
+    }
+
+    setIsLoading(true);
+    setError("");
+
+    try {
+      const code = await createStation(name, description);
+      setJoinCode(code);
+    } catch (error) {
+      setError(error.message || "Failed to create station");
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleGoToStation = () => {
+    // Navigate to the station or home page
+    navigate("/");
+  };
+
+  const handleCopyCode = async () => {
+    try {
+      await navigator.clipboard.writeText(joinCode);
+      setIsCopied(true);
+      // Reset the animation after 2 seconds
+      setTimeout(() => {
+        setIsCopied(false);
+      }, 2000);
+    } catch (err) {
+      console.error('Failed to copy: ', err);
+    }
   };
 
   return (
-    <div className="create-station">
+    <div className="create-station-container">
-      <header className="create-station-header">
+      <div className="create-station-main">
-        <h1>Create a Station on Serena</h1>
+        {/* Left Section - Vinyl Animation */}
-      </header>
+        <div className="create-station-left-section">
+          <div className="create-station-vinyl-container">
+            <div className="create-station-vinyl-record">
+              <div className="vinyl-center"></div>
+              <div className="vinyl-grooves"></div>
+            </div>
+            
+            {/* Animated Music Notes */}
+            <div className="create-station-music-notes">
+              <div className="music-note note-1">♪</div>
+              <div className="music-note note-2">♫</div>
+              <div className="music-note note-3">♪</div>
+            </div>
+          </div>
+        </div>
 
-      <main className="create-station-content">
+        {/* Right Section - Create Station Form */}
-        <textarea onChange={(e) => setName(e.target.value)} />
+        <div className="create-station-right-section">
-        <textarea onChange={(e) => setDescription(e.target.value)} />
+          <div className="create-station-content">
+            <header className="create-station-header">
+              <h1>Create a Station on Serena</h1>
+              <p className="create-station-subtitle">Start your own collaborative music experience</p>
+            </header>
 
-        <button
+            {!joinCode ? (
-          className="create-station-final-btn"
+              <form className="create-station-form" onSubmit={(e) => e.preventDefault()}>
-          onClick={handleCreateStation}
+                <div className="form-group">
-          disabled={!name || !description}
+                  <label htmlFor="station-name">Station Name</label>
-        >
+                  <input
-          Create Radio Station
+                    id="station-name"
-        </button>
+                    type="text"
+                    placeholder="Enter your station name..."
+                    value={name}
+                    onChange={(e) => setName(e.target.value)}
+                    disabled={isLoading}
+                  />
+                </div>
 
-        <p>your joinCode: {joinCode}</p>
+                <div className="form-group">
-      </main>
+                  <label htmlFor="station-description">Description</label>
+                  <textarea
+                    id="station-description"
+                    placeholder="Describe your station's vibe..."
+                    value={description}
+                    onChange={(e) => setDescription(e.target.value)}
+                    disabled={isLoading}
+                    rows={4}
+                  />
+                </div>
+
+                {error && (
+                  <div className="error-message">
+                    <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                      <path d="M12 2L13.09 8.26L22 9L13.09 9.74L12 16L10.91 9.74L2 9L10.91 8.26L12 2Z"/>
+                    </svg>
+                    {error}
+                  </div>
+                )}
+
+                <button
+                  type="button"
+                  className="create-station-final-btn"
+                  onClick={handleCreateStation}
+                  disabled={!name.trim() || !description.trim() || isLoading}
+                >
+                  {isLoading ? (
+                    <>
+                      <div className="loading-spinner"></div>
+                      Creating Station...
+                    </>
+                  ) : (
+                    <>
+                      <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M12 2L13.09 8.26L22 9L13.09 9.74L12 16L10.91 9.74L2 9L10.91 8.26L12 2Z"/>
+                      </svg>
+                      Create Radio Station
+                    </>
+                  )}
+                </button>
+              </form>
+            ) : (
+              <div className="success-state">
+                <div className="success-icon">
+                  <svg width="60" height="60" viewBox="0 0 24 24" fill="currentColor">
+                    <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
+                  </svg>
+                </div>
+                <h2>Station Created Successfully!</h2>
+                <p>Your station is ready to go. Share this join code with your friends:</p>
+                
+                <div className="join-code-display">
+                  <span className="join-code">{joinCode}</span>
+                  <button 
+                    className={`copy-btn ${isCopied ? 'copied' : ''}`}
+                    onClick={handleCopyCode}
+                  >
+                    {isCopied ? (
+                      <svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
+                      </svg>
+                    ) : (
+                      <svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"/>
+                      </svg>
+                    )}
+                  </button>
+                </div>
+
+                {isCopied && (
+                  <div className="copy-feedback">
+                    <span className="copy-success-message">
+                      <svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
+                      </svg>
+                      Copied to clipboard!
+                    </span>
+                  </div>
+                )}
+
+                <button className="go-to-station-btn" onClick={handleGoToStation}>
+                  Go to Home
+                </button>
+              </div>
+            )}
+          </div>
+        </div>
+      </div>
     </div>
   );
 }

frontend/src/screens/Home.jsx

@@ -14,25 +14,29 @@ function Home() {
 
   return (
     <div className="home-container">
-      <div className="content">
+      <div className="home-content">
-        <h1 className="title">Radio Station Hub</h1>
+        <div className="home-header">
-        <p className="subtitle">
+          <h1 className="home-title">Serena Station Hub</h1>
-          Create or join a radio station to share music with friends
+          <p className="home-subtitle">
-        </p>
+            Create or join a radio station to share music with friends
+          </p>
+        </div>
 
-        <div className="button-container">
+        <div className="home-actions">
           <button
-            className="action-button primary"
+            className="home-btn home-btn-primary"
             onClick={handleCreateStation}
           >
-            Create Radio Station
+            <span className="btn-icon">🎵</span>
+            Create Station
           </button>
 
           <button
-            className="action-button secondary"
+            className="home-btn home-btn-secondary"
             onClick={handleJoinStation}
           >
-            Join Radio Station
+            <span className="btn-icon">🎧</span>
+            Join Station
           </button>
         </div>
       </div>

frontend/src/screens/JoinStation.jsx

@@ -5,40 +5,108 @@ import { getStations } from "../utils/GetStations";
 function JoinStation() {
   const navigate = useNavigate();
   const [stations, setStations] = useState([]);
+  const [isLoading, setIsLoading] = useState(true);
 
   const handleJoinStation = (stationID) => {
-    // console.log("Joining station with ID:" + stationID);
-
     navigate(`/station/${stationID}`);
   };
 
   useEffect(() => {
     async function fetchStations() {
-      const result = await getStations();
+      setIsLoading(true);
-      setStations(result);
+      try {
+        const result = await getStations();
+        setStations(result);
+      } catch (error) {
+        console.error("Failed to fetch stations:", error);
+      } finally {
+        setIsLoading(false);
+      }
     }
     fetchStations();
   }, []);
 
   return (
-    <div className="join-station">
+    <div className="join-station-container">
-      <header className="join-station-header">
+      <div className="join-station-main">
-        <h1>Join a Station on Serena</h1>
+        {/* Left Section - Vinyl Animation */}
-      </header>
+        <div className="join-station-left-section">
-
+          <div className="join-station-vinyl-container">
-      <main className="join-station-content">
+            <div className="join-station-vinyl-record">
-        {stations.map((station, index) => {
+              <div className="vinyl-center"></div>
-          return (
+              <div className="vinyl-grooves"></div>
-            <div key={index}>
-              <p>Station Name: {station.name}</p>
-              <p>Station Description: {station.description}</p>
-              <button onClick={() => handleJoinStation(station.id)}>
-                join this station
-              </button>
             </div>
-          );
+            
-        })}
+            {/* Animated Music Notes */}
-      </main>
+            <div className="join-station-music-notes">
+              <div className="music-note note-1">♪</div>
+              <div className="music-note note-2">♫</div>
+              <div className="music-note note-3">♪</div>
+            </div>
+          </div>
+        </div>
+
+        {/* Right Section - Join Station Content */}
+        <div className="join-station-right-section">
+          <div className="join-station-content">
+            <header className="join-station-header">
+              <h1>Join a Station on Serena</h1>
+              <p className="join-station-subtitle">Connect to an existing collaborative music experience</p>
+            </header>
+
+            <div className="join-station-body">
+              {isLoading ? (
+                <div className="loading-state">
+                  <div className="loading-spinner"></div>
+                  <p>Loading available stations...</p>
+                </div>
+              ) : stations.length === 0 ? (
+                <div className="empty-state">
+                  <div className="empty-icon">
+                    <svg width="60" height="60" viewBox="0 0 24 24" fill="currentColor">
+                      <path d="M12 3v10.55c-.59-.34-1.27-.55-2-.55-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4V7h4V3h-6z"/>
+                    </svg>
+                  </div>
+                  <h3>No stations available</h3>
+                  <p>There are currently no active stations to join. Create one to get started!</p>
+                  <button 
+                    className="create-station-btn"
+                    onClick={() => navigate('/create-station')}
+                  >
+                    Create Station
+                  </button>
+                </div>
+              ) : (
+                <div className="stations-grid">
+                  <h2>Available Stations</h2>
+                  <div className="stations-list">
+                    {stations.map((station, index) => (
+                      <div key={index} className="station-card">
+                        <div className="station-info">
+                          <h3>{station.name}</h3>
+                          <p className="station-description">{station.description}</p>
+                          <div className="station-meta">
+                            <span className="station-id">ID: {station.id}</span>
+                          </div>
+                        </div>
+                        <button 
+                          className="join-station-btn"
+                          onClick={() => handleJoinStation(station.id)}
+                        >
+                          <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                            <path d="M8 5v14l11-7z"/>
+                          </svg>
+                          Join Station
+                        </button>
+                      </div>
+                    ))}
+                  </div>
+                </div>
+              )}
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   );
 }

frontend/src/screens/StationPage.jsx

@@ -1,48 +1,134 @@
 import { useParams } from "react-router-dom";
 import React, { useState, useEffect } from "react";
-import AddSongModal from "./AddSongModal";
-import LoginButton from "../components/LoginButton";
 import { addClientToStation } from "../utils/AddClientToStation";
+import { getAudioFiles } from "../utils/AudioFiles";
+import SingleAudioPlayer from "../components/AudioPlayer";
 
 function StationPage() {
   const { stationID } = useParams();
   const [clientToken, setClientToken] = useState("");
-  const [isModalOpen, setIsModalOpen] = useState(false);
   const [accessDenied, setAccessDenied] = useState(true);
+  const [currentSong] = useState({ progress: 0, duration: 1 });
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState("");
 
   const [userName, setUserName] = useState("");
   const [joinCode, setJoinCode] = useState("");
 
   const auth = async () => {
+    if (!userName.trim() || !joinCode.trim()) {
+      setError("Please fill in all fields");
+      return;
+    }
+
+    setIsLoading(true);
+    setError("");
+
     try {
       const token = await addClientToStation(userName, joinCode);
       setClientToken(token);
       setAccessDenied(false);
     } catch (error) {
       console.error("Auth failed:", error);
+      setError(error.message || "Failed to join station");
       setAccessDenied(true);
+    } finally {
+      setIsLoading(false);
     }
   };
 
   if (accessDenied) {
     return (
-      <div>
+      <div className="join-station-container">
-        <textarea onChange={(e) => setUserName(e.target.value)} />
+        <div className="join-station-main">
-        <textarea onChange={(e) => setJoinCode(e.target.value)} />
+          {/* Left Section - Vinyl Animation */}
-        <button onClick={auth}>Access RadioTower</button>
+          <div className="join-station-left-section">
+            <div className="join-station-vinyl-container">
+              <div className="join-station-vinyl-record">
+                <div className="vinyl-center"></div>
+                <div className="vinyl-grooves"></div>
+              </div>
+              
+              {/* Animated Music Notes */}
+              <div className="join-station-music-notes">
+                <div className="music-note note-1">♪</div>
+                <div className="music-note note-2">♫</div>
+                <div className="music-note note-3">♪</div>
+              </div>
+            </div>
+          </div>
+
+          {/* Right Section - Authentication Form */}
+          <div className="join-station-right-section">
+            <div className="join-station-content">
+              <header className="join-station-header">
+                <h1>Join Station {stationID}</h1>
+                <p className="join-station-subtitle">Enter your details to access this collaborative music experience</p>
+              </header>
+
+              <form className="create-station-form" onSubmit={(e) => e.preventDefault()}>
+                <div className="form-group">
+                  <label htmlFor="user-name">Your Name</label>
+                  <input
+                    id="user-name"
+                    type="text"
+                    placeholder="Enter your name..."
+                    value={userName}
+                    onChange={(e) => setUserName(e.target.value)}
+                    disabled={isLoading}
+                  />
+                </div>
+
+                <div className="form-group">
+                  <label htmlFor="join-code">Join Code</label>
+                  <input
+                    id="join-code"
+                    type="text"
+                    placeholder="Enter the station join code..."
+                    value={joinCode}
+                    onChange={(e) => setJoinCode(e.target.value)}
+                    disabled={isLoading}
+                  />
+                </div>
+
+                {error && (
+                  <div className="error-message">
+                    <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                      <path d="M12 2L13.09 8.26L22 9L13.09 9.74L12 16L10.91 9.74L2 9L10.91 8.26L12 2Z"/>
+                    </svg>
+                    {error}
+                  </div>
+                )}
+
+                <button
+                  type="button"
+                  className="create-station-final-btn"
+                  onClick={auth}
+                  disabled={!userName.trim() || !joinCode.trim() || isLoading}
+                >
+                  {isLoading ? (
+                    <>
+                      <div className="loading-spinner"></div>
+                      Joining Station...
+                    </>
+                  ) : (
+                    <>
+                      <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M8 5v14l11-7z"/>
+                      </svg>
+                      Join RadioTower
+                    </>
+                  )}
+                </button>
+              </form>
+            </div>
+          </div>
+        </div>
       </div>
     );
   }
 
-  const recommendedSongs = [];
+  const recommendedSongs = getAudioFiles() ?? [];
-
-  const openModal = () => {
-    setIsModalOpen(true);
-  };
-
-  const closeModal = () => {
-    setIsModalOpen(false);
-  };
 
   return (
     <div className="station-page">
@@ -56,15 +142,14 @@ function StationPage() {
         <header className="station-header">
           <h1>Serena Station</h1>
           <p className="station-subtitle">Collaborative Music Experience</p>
-          <LoginButton />
         </header>
+        {recommendedSongs.length > 0 && (
+          <SingleAudioPlayer src={recommendedSongs[0]}></SingleAudioPlayer>
+        )}
 
         <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">
@@ -73,21 +158,11 @@ function StationPage() {
                 <p>No songs in queue yet. Add some songs to get started!</p>
               </div>
             ) : (
-              recommendedSongs.map((song) => (
+              recommendedSongs.map((song) => <p>{song}</p>)
-                <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>
   );
 }

frontend/src/utils/AudioFiles.js

@@ -0,0 +1,5 @@
+const importAll = (r) => r.keys().map(r);
+
+export const getAudioFiles = () => {
+  return importAll(require.context("../../music", false, /\.(mp3|wav)$/));
+};

frontend/src/utils/spotifyAuth.js

@@ -1,40 +0,0 @@
-const CLIENT_ID = 'e1274b6593674771bea12d8366c7978b';
-const REDIRECT_URI = 'http://localhost:3000/callback';
-const SCOPES = [
-  'user-read-private',
-  'user-read-email',
-  'playlist-read-private',
-  'user-library-read',
-];
-
-export const getSpotifyLoginUrl = () => {
-  const scope = SCOPES.join('%20');
-  return `https://accounts.spotify.com/authorize?client_id=${CLIENT_ID}&response_type=token&redirect_uri=${encodeURIComponent(
-    REDIRECT_URI
-  )}&scope=${scope}`;
-};
-
-export const getAccessTokenFromUrl = () => {
-  const hash = window.location.hash;
-  if (hash) {
-    const params = new URLSearchParams(hash.substring(1));
-    return params.get('access_token');
-  }
-  return null;
-};
-
-export const storeAccessToken = (token) => {
-  localStorage.setItem('spotify_access_token', token);
-};
-
-export const getAccessToken = () => {
-  return localStorage.getItem('spotify_access_token');
-};
-
-export const removeAccessToken = () => {
-  localStorage.removeItem('spotify_access_token');
-};
-
-export const isLoggedIn = () => {
-  return !!getAccessToken();
-};