Merge branch 'fix' into 'master'

Fix See merge request phyeony/cmpt353_proj!15
phyeony · Dec 8, 2022 · 3dbd0d6 · 3dbd0d6
2 parents 010774f + 82b4af8
commit 3dbd0d6
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -0,0 +1,33 @@
+anyio==3.6.2
+certifi==2022.12.7
+click==8.1.3
+dnspython==2.2.1
+email-validator==1.3.0
+fastapi==0.88.0
+h11==0.14.0
+httpcore==0.16.2
+httptools==0.5.0
+httpx==0.23.1
+idna==3.4
+itsdangerous==2.1.2
+Jinja2==3.1.2
+MarkupSafe==2.1.1
+numpy==1.23.5
+orjson==3.8.3
+pandas==1.5.2
+pydantic==1.10.2
+python-dateutil==2.8.2
+python-dotenv==0.21.0
+python-multipart==0.0.5
+pytz==2022.6
+PyYAML==6.0
+rfc3986==1.5.0
+six==1.16.0
+sniffio==1.3.0
+starlette==0.22.0
+typing_extensions==4.4.0
+ujson==5.6.0
+uvicorn==0.20.0
+uvloop==0.17.0
+watchfiles==0.18.1
+websockets==10.4
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -39,8 +39,9 @@ function App() {
   const PUBLIC_TRANSPORTATION = "Public Transportation"
   const TOURISM_CULTURE = "Tourism & Culture"
   const MAX_NUM = 13025
-  const BACKEND_DOMAIN = process.env.BACKEND_DOMAIN ?? "localhost"
-  const BACKEND_PORT = process.env.BACKEND_PORT ?? "8000"
+  const BACKEND_DOMAIN = process.env.REACT_APP_BACKEND_DOMAIN ?? "localhost"
+  const BACKEND_PORT = process.env.REACT_APP_BACKEND_PORT ?? "8000"
+  const HTTPS = process.env.REACT_APP_HTTPS ?? "http"
 
   const [airbnbList, setAirbnbList] = useState([])
   const [state, setState] = useState({
@@ -86,7 +87,7 @@ function App() {
       }
     }
     try {
-      const res = await fetch(`http://${BACKEND_DOMAIN}:${BACKEND_PORT}/api/airbnb_list`, {
+      const res = await fetch(`${HTTPS}://${BACKEND_DOMAIN}:${BACKEND_PORT}/api/airbnb_list`, {
         method: 'POST',
         headers: {
           'Accept': 'application/json',