login/logout and demouser buttons working as well as the welcome on d…

…ashboard page.

backend/app/api/routes/auth.py

@@ -147,18 +147,22 @@ def refresh():
 @jwt_required()
 def get_me():
     """Get current user info."""
-    current_user_id = get_jwt_identity()
-    token = get_jwt()
+    try:
+        current_user_id = get_jwt_identity()
+        token = get_jwt()
 
-    # Verify token type
-    if token.get('type') != 'access':
-        raise AuthenticationError('Invalid token type')
+        # Verify token type
+        if token.get('type') != 'access':
+            raise AuthenticationError('Invalid token type')
 
-    with get_db() as db:
-        user = User.get_by_id(db, current_user_id)
-        if not user:
-            raise AuthenticationError('User not found')
-        return jsonify(user.to_dict())
+        with get_db() as db:
+            user = db.query(User).filter(User.id == current_user_id).first()
+            if not user:
+                raise AuthenticationError('User not found')
+            return jsonify(user.to_dict())
+    except Exception as e:
+        logger.error(f"Error fetching user info: {str(e)}", exc_info=True)
+        raise AuthenticationError(f'Failed to fetch user info: {str(e)}')
 
 @auth_bp.route('/me', methods=['PUT'])
 @jwt_required()

backend/app/models/user.py

@@ -36,6 +36,11 @@ class User(BaseModel):
     physics_objects = relationship('PhysicsObject', back_populates='user', cascade='all, delete-orphan')
     ai_models = relationship('AIModel', back_populates='user', cascade='all, delete-orphan')
 
+    @classmethod
+    def get_by_id(cls, db, user_id):
+        """Get user by ID."""
+        return db.query(cls).filter(cls.id == user_id).first()
+
     def set_password(self, password):
         """Set password hash."""
         self.password_hash = get_password_hash(password)
@@ -75,6 +80,7 @@ def to_dict(self):
         """Convert user instance to dictionary."""
         base_dict = super().to_dict()
         user_dict = {
+            'username': self.username,
             'email': self.email,
             'is_active': self.is_active,
             'is_verified': self.is_verified,

frontend/src/components/features/auth/Login.jsx

@@ -7,7 +7,7 @@ import {
   loginSuccess,
 } from '../../../store/slices/authSlice';
 import { openModal } from '../../../store/slices/modalSlice';
-import { api } from '../../../utils/api';
+import { api, endpoints } from '../../../utils/api';
 import { validateEmail, validatePassword } from '../../../utils/validation';
 import Button from '../../common/Button';
 import Input from '../../common/Input';

frontend/src/components/features/dashboard/Dashboard.jsx

@@ -25,7 +25,6 @@ function Dashboard() {
     loading: authLoading,
   } = useSelector(state => state.auth);
 
-  console.log('user', user);
 
   useEffect(() => {
     console.debug('Dashboard mounted, checking auth state');

frontend/src/components/features/home/Home.jsx

@@ -8,7 +8,7 @@ import {
   loginSuccess,
 } from '../../../store/slices/authSlice';
 import { openModal } from '../../../store/slices/modalSlice';
-import { api } from '../../../utils/api';
+import { api, endpoints } from '../../../utils/api';
 import Button from '../../common/Button';
 import './Home.css';