Merge pull request #21 from mfdavies/updated-endpoints

Remove files from testing deployment and updated apiUrl
mfdavies · Jan 7, 2024 · 6bea89a · 6bea89a
2 parents 23ead67 + ac17412
commit 6bea89a
Show file tree

Hide file tree

Showing 24 changed files with 9 additions and 4,778 deletions.
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,4 @@ settings.py
 backend/settings.py
 .vscode
 __pycache__
-env
+build
diff --git a/.python-version b/.python-version
diff --git a/Procfile b/Procfile
diff --git a/backend/public/assets/index-mLIDEHv1.js b/backend/public/assets/index-mLIDEHv1.js
diff --git a/backend/public/assets/index-rbm1PFqH.css b/backend/public/assets/index-rbm1PFqH.css
diff --git a/backend/public/assets/landingDoodle-2bo-Q0ip.jpeg b/backend/public/assets/landingDoodle-2bo-Q0ip.jpeg
diff --git a/backend/public/assets/mobilityMate-NoBg-lg-Em_qO2jW.png b/backend/public/assets/mobilityMate-NoBg-lg-Em_qO2jW.png
diff --git a/backend/public/assets/signupPractitioner-6pnr10r4.jpeg b/backend/public/assets/signupPractitioner-6pnr10r4.jpeg
diff --git a/backend/public/index.html b/backend/public/index.html
diff --git a/backend/server/src/app.py b/backend/server/src/app.py
diff --git a/backend/server/src/templates/index.html b/backend/server/src/templates/index.html
@@ -3,11 +3,10 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Firebase & Flask</title>
-  <link rel="stylesheet" href="style.css">
+  <title>Flask Endpoint</title>
 </head>
 <body class="full-screen flex-center">
-  <h1 class="text-xl">Flask + Firebase</h1>  
+  <h1 class="text-xl">Flask Endpoint Hub</h1>  
   <h3>{{ context.server_time }}</h3>
 </body>
 </html>
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
diff --git a/frontend/public/assets/index-J9g6jnVt.css b/frontend/public/assets/index-J9g6jnVt.css
diff --git a/frontend/public/assets/index-z9hD1QhJ.js b/frontend/public/assets/index-z9hD1QhJ.js
diff --git a/frontend/public/assets/landingDoodle-2bo-Q0ip.jpeg b/frontend/public/assets/landingDoodle-2bo-Q0ip.jpeg
diff --git a/frontend/public/assets/mobilityMate-NoBg-lg-Em_qO2jW.png b/frontend/public/assets/mobilityMate-NoBg-lg-Em_qO2jW.png
diff --git a/frontend/public/assets/signupPractitioner-6pnr10r4.jpeg b/frontend/public/assets/signupPractitioner-6pnr10r4.jpeg
diff --git a/frontend/public/index.html b/frontend/public/index.html
diff --git a/frontend/src/config.jsx b/frontend/src/config.jsx
@@ -1,3 +1,3 @@
-const apiUrl = process.env.REACT_APP_FLASK_API_URL || 'http://localhost:8080';
-console.log(process.env.REACT_APP_FLASK_API_URL);
+const apiUrl = 'https://mobility-mate-production.up.railway.app';
+// console.log(process.env.REACT_APP_FLASK_API_URL);
 export default apiUrl;
diff --git a/frontend/src/views/patient/PatientHome.jsx b/frontend/src/views/patient/PatientHome.jsx
@@ -5,6 +5,7 @@ import { useState, useEffect, useCallback } from 'react';
 import VoiceAI from './components/VoiceAI';
 import axios from 'axios';
 import Skeleton from './components/Skeleton';
+import apiUrl from "../../config";
 import { LogOut } from 'lucide-react';
 import { useNavigate } from 'react-router-dom';
 
@@ -31,7 +32,7 @@ const PatientHome = () => {
       });
       try {
         const response = await axios.get(
-          `http://localhost:8080/conversation/start?${queryParams.toString()}`
+          `${apiUrl}/conversation/start?${queryParams.toString()}`
         );
         setConvo((prevConvo) => {
           if (prevConvo.gpt === null) {

diff --git a/frontend/src/views/patient/components/VoiceAI.jsx b/frontend/src/views/patient/components/VoiceAI.jsx
@@ -1,5 +1,6 @@
 import { useState, useEffect, useRef } from 'react';
 import axios from 'axios';
+import apiUrl from '../../../config';
 import gsap from 'gsap';
 import React, { Suspense } from 'react';
 
@@ -61,7 +62,7 @@ const VoiceAI = ({ updateUserMessage, updateGptResponse }) => {
       formData.append('audioFile', audioBlob, 'recorded_audio.wav');
 
       const response = await axios.post(
-        `http://localhost:8080/conversation/send_message?${queryParams.toString()}`,
+        `${apiUrl}/conversation/send_message?${queryParams.toString()}`,
         formData
       );
       updateGptResponse(response.data.reply);

diff --git a/main.py b/main.py
diff --git a/requirements.txt b/requirements.txt