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

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 (