Merge branch 'main' of https://github.com/mfdavies/mobility-mate

backend/server/src/requirements_mac.txt

@@ -0,0 +1,71 @@
+annotated-types==0.6.0
+anyio==4.2.0
+blinker==1.7.0
+CacheControl==0.13.1
+cachetools==5.3.2
+certifi==2023.11.17
+cffi==1.16.0
+charset-normalizer==3.3.2
+click==8.1.7
+cryptography==41.0.7
+distro==1.9.0
+filelock==3.13.1
+firebase-admin==6.3.0
+Flask==3.0.0
+Flask-Cors==4.0.0
+Flask-Mail==0.9.1
+fsspec==2023.12.2
+google-api-core==2.15.0
+google-api-python-client==2.112.0
+google-auth==2.26.1
+google-auth-httplib2==0.2.0
+google-cloud-core==2.4.1
+google-cloud-firestore==2.14.0
+google-cloud-storage==2.14.0
+google-crc32c==1.5.0
+google-resumable-media==2.7.0
+googleapis-common-protos==1.62.0
+grpcio==1.60.0
+grpcio-status==1.60.0
+h11==0.14.0
+httpcore==1.0.2
+httplib2==0.22.0
+httpx==0.26.0
+idna==3.6
+itsdangerous==2.1.2
+Jinja2==3.1.2
+llvmlite==0.41.1
+load-dotenv==0.1.0
+MarkupSafe==2.1.3
+more-itertools==10.1.0
+mpmath==1.3.0
+msgpack==1.0.7
+networkx==3.2.1
+numba==0.58.1
+numpy==1.26.3
+openai==1.6.1
+openai-whisper==20231117
+proto-plus==1.23.0
+protobuf==4.25.1
+pyasn1==0.5.1
+pyasn1-modules==0.3.0
+pycparser==2.21
+pydantic==2.5.3
+pydantic_core==2.14.6
+PyJWT==2.8.0
+pyparsing==3.1.1
+python-dotenv==1.0.0
+regex==2023.12.25
+requests==2.31.0
+rsa==4.9
+six==1.16.0
+sniffio==1.3.0
+sympy==1.12
+tiktoken==0.5.2
+torch==2.1.2
+tqdm==4.66.1
+typing_extensions==4.9.0
+uritemplate==4.1.1
+urllib3==2.1.0
+Werkzeug==3.0.1
+whisper==1.1.10

frontend/src/views/patient/PatientHome.jsx

@@ -1,8 +1,9 @@
 import Navbar from "./components/Navbar";
 import RecordButton from "./components/RecordButton";
-import Ai3D from './components/Ai3D';
+// import Ai3D from './components/Ai3D';
 import Conversation from './components/Conversation';
 import Exercises from './components/Exercises';
+import "./styles.css";
 
 const PatientHome = () => {
   const messages = [
@@ -27,9 +28,9 @@ const PatientHome = () => {
   return (
     <div className="flex flex-col h-screen">
       <Navbar />
-      <main className="flex-grow p-6 overflow-hidden">
+      <main className="flex-grow pl-6 overflow-hidden">
         <div className="flex h-full">
-          <div className="w-1/2 flex flex-col justify-between h-full">
+          <div className="w-2/3 flex flex-col justify-between h-full left-column">
             <header>
               <h1 className="text-4xl font-medium">Welcome Back</h1>
               <div className="text-3xl">John</div>
@@ -44,15 +45,16 @@ const PatientHome = () => {
             <button className="btn btn-neutral">Prompt</button>
           </form>
           </div>
-          <div className="w-1/2">
+          <div className="w-px mt-40 mb-40 bg-gray-200"></div>
+          <div className="w-1/3 right-column">
             <Exercises />
           </div>
         </div>
       </main>
       <RecordButton />
       <div className="relative">
         <div className="absolute bottom-8 left-1/2 transform -translate-x-1/2">
-          <Ai3D />
+          {/* <Ai3D /> */}
         </div>
       </div>
     </div>

frontend/src/views/patient/components/Conversation.jsx

@@ -4,7 +4,7 @@ const Conversation = ({ messages }) => {
   const endOfMessagesRef = useRef(null);
 
   useEffect(() => {
-    endOfMessagesRef.current?.scrollIntoView({ behavior: 'smooth' });
+    // endOfMessagesRef.current?.scrollIntoView({ behavior: 'smooth' });
   }, [messages]);
 
   return (

frontend/src/views/patient/components/ExerciseCard.jsx

@@ -1,22 +1,51 @@
+import PropTypes from 'prop-types';
+import { useEffect, useState } from 'react';
+
+const ExerciseCard = ({ title, description, imageUrl, instructions, onClick, isExpanded }) => {
+  const [startAnimation, setStartAnimation] = useState(false);
+
+  useEffect(() => {
+    if (isExpanded) {
+
+      const timeoutId = window.setTimeout(() => {
+        setStartAnimation(true);
+      }, 100); // Delay in milliseconds
+
+      return () => window.clearTimeout(timeoutId);
+    }
+  }, [isExpanded]);
+
+  const animationClass = startAnimation ? 'start-animation' : '';
 
-const ExerciseCard = () => {
   return (
-    <div className="card w-96 bg-base-100 shadow-xl">
-      <figure>
-        <img
-          src="https://daisyui.com/images/stock/photo-1606107557195-0e29a4b5b4aa.jpg"
-          alt="Shoes"
-        />
-      </figure>
-      <div className="card-body">
-        <h2 className="card-title">Shoes!</h2>
-        <p>If a dog chews shoes whose shoes does he choose?</p>
-        <div className="card-actions justify-end">
-          <button className="btn btn-primary">Buy Now</button>
+    <div className={`card ${isExpanded ? 'expanded' : ''} ${animationClass}`} onClick={onClick}>
+      <div className="bg-gray-400">
+        <figure>
+          <img src={imageUrl} alt={title} />
+        </figure>
+        <div className="card-body">
+          <h2 className="card-title">{title}</h2>
+          <p>{description}</p>
+          {isExpanded && (
+            <div>
+              {instructions.map((step, index) => (
+                <p key={index}>{step}</p>
+              ))}
+            </div>
+          )}
         </div>
       </div>
     </div>
   );
 };
 
-export default ExerciseCard;
+ExerciseCard.propTypes = {
+  title: PropTypes.string.isRequired,
+  description: PropTypes.string.isRequired,
+  imageUrl: PropTypes.string.isRequired,
+  instructions: PropTypes.arrayOf(PropTypes.string).isRequired,
+  onClick: PropTypes.func.isRequired,
+  isExpanded: PropTypes.bool.isRequired,
+};
+
+export default ExerciseCard;

frontend/src/views/patient/components/Exercises.jsx

@@ -1,10 +1,113 @@
-import Card from "./ExerciseCard";
+import { useState } from 'react';
+// import ExerciseCard from "./ExerciseCard";
+// import PropTypes from 'prop-types';
+import '../styles.css';
+import glutesImage from '../../../assets/raises.webp';
+import circleImage from '../../../assets/circs.png';
+import squatImage from '../../../assets/squat.png'
+import quartSquatImage from '../../../assets/quartSquat.png'
+import singleLegGluteImage from '../../../assets/singleLegGlute.png';
 
 const Exercises = () => {
+  // const [expandedCard, setExpandedCard] = useState(null);
+  const [selectedCard, setSelectedCard] = useState(null);
+
+  const cards = [
+  { 
+    id: 1, 
+    title: "Glutes", 
+    description: "Glute Bridges good for glutes", 
+    imageUrl: glutesImage,
+    instructions: ["Step 1 for Card 1", "Step 2 for Card 1", "Step 3 for Card 1"] 
+  },
+  { 
+    id: 2, 
+    title: "Circs", 
+    description: "Single Leg Circles good for glutes", 
+    imageUrl: circleImage,
+    instructions: ["Step 1 for Card 2", "Step 2 for Card 2", "Step 3 for Card 2"] 
+  },
+  { 
+    id: 3, 
+    title: "Squats", 
+    description: "Description for Card 3", 
+    imageUrl: squatImage, // Placeholder image
+    instructions: ["Step 1 for Card 3", "Step 2 for Card 3", "Step 3 for Card 3"] 
+  },
+  { 
+    id: 4, 
+    title: "Card 4", 
+    description: "Description for Card 4", 
+    imageUrl: quartSquatImage, // Placeholder image
+    instructions: ["Step 1 for Card 4", "Step 2 for Card 4", "Step 3 for Card 4"] 
+  },
+  { 
+    id: 5, 
+    title: "Card 5", 
+    description: "Description for Card 5", 
+    imageUrl: singleLegGluteImage, // Placeholder image
+    instructions: ["Step 1 for Card 5", "Step 2 for Card 5", "Step 3 for Card 5"] 
+  },
+  { 
+    id: 5, 
+    title: "Card 5", 
+    description: "Description for Card 5", 
+    imageUrl: glutesImage, // Placeholder image
+    instructions: ["Step 1 for Card 5", "Step 2 for Card 5", "Step 3 for Card 5"] 
+  },
+  { 
+    id: 5, 
+    title: "Card 5", 
+    description: "Description for Card 5", 
+    imageUrl: glutesImage, // Placeholder image
+    instructions: ["Step 1 for Card 5", "Step 2 for Card 5", "Step 3 for Card 5"] 
+  },
+];
+
+const handleCardClick = (card) => {
+    setSelectedCard(card);
+  };
+
+  const closeModal = () => {
+    setSelectedCard(null);
+  };
+
+  const renderCard = (card) => (
+    <div className="carousel-item" key={card.id}>
+      <div className="card" onClick={() => handleCardClick(card)}>
+        <img src={card.imageUrl} alt={card.title} className="rounded-xl" />
+        <div className="card-body">
+          <h2 className="card-title">{card.title}</h2>
+          <p className="card-description">{card.description}</p>
+        </div>
+      </div>
+    </div>
+  );
+
+  const renderModal = (card) => (
+    <dialog className="modal" open>
+      <div className="modal-box">
+        <img src={card.imageUrl} alt={card.title} className="modal-image rounded-xl" />
+        <div className="text-content">
+          <button className="btn btn-sm btn-circle absolute right-2 top-2" onClick={closeModal}>✕</button>
+          <h3 className="font-bold text-lg">{card.title}</h3>
+          <p className="py-4">{card.description}</p>
+          <ol className="list-decimal pl-5">
+            {card.instructions.map((step, index) => (
+              <li key={index}>{step}</li>
+            ))}
+          </ol>
+        </div>
+      </div>
+    </dialog>
+  );
+
   return (
-    <div className="grid grid-cols-2 gap-4">
-      <Card />
-      <Card />
+    <div className="exercise-container">
+      <div className="carousel carousel-vertical rounded-box">
+        {cards.map(renderCard)}
+      </div>
+      {selectedCard && renderModal(selectedCard)}
     </div>
   );
 };

frontend/src/views/patient/components/Phone.jsx

@@ -0,0 +1,22 @@
+
+const Phone = () => {
+  return (
+    <div className="card w-96 bg-base-100 shadow-xl">
+      <figure>
+        <img
+          src="https://daisyui.com/images/stock/photo-1606107557195-0e29a4b5b4aa.jpg"
+          alt="Shoes"
+        />
+      </figure>
+      <div className="card-body">
+        <h2 className="card-title">Phone!</h2>
+        <p>I broke my phone, whose fault is it?</p>
+        <div className="card-actions justify-end">
+          <button className="btn btn-primary">Trade In</button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default Phone;