Merge branch 'listOfMed' into 345-add-rag-to-the-chatbot

Author: sahilds1

README.md

@@ -36,15 +36,29 @@ Tools used for development:
 
 ### Running Balancer for development
 
-Running Balancer:
-- Start Docker Desktop and run `docker compose up --build` 
-- The email and password are set in `server/api/management/commands/createsu.py`
-- Download a sample of papers to upload from [https://balancertestsite.com](https://balancertestsite.com/) 
+Start the Postgres, Django REST, and React services by starting Docker Desktop and running `docker compose up --build` 
 
-Running pgAdmin:
+#### Postgres
+- Download a sample of papers to upload from [https://balancertestsite.com](https://balancertestsite.com/) 
 - The email and password of `pgAdmin` are specified in `balancer-main/docker-compose.yml`
-- The first time you use `pgAdmin` after building the Docker containers you will need to register the server. 
-The `Host name/address`, `Username` and `Password` are specified in  `balancer-main/docker-compose.yml`
+- The first time you use `pgAdmin` after building the Docker containers you will need to register the server.
+    - The `Host name/address` is the Postgres server service name in the Docker Compose file
+    - The `Username` and `Password` are the Postgres server environment variables in the Docker Compose file
+- You can use the below code snippet to  query the database from a Jupyter notebook: 
+
+```
+from sqlalchemy import create_engine
+import pandas as pd
+
+engine = create_engine("postgresql+psycopg2://balancer:balancer@localhost:5433/balancer_dev")
+
+query = "SELECT * FROM api_embeddings;"
+
+df = pd.read_sql(query, engine)
+```
+
+#### Django REST
+- The email and password are set in `server/api/management/commands/createsu.py`
 
 ## Local Kubernetes Deployment
 

frontend/src/App.css

@@ -170,7 +170,7 @@ The heading directly under the nav bar.
 }
 
 .desc1 {
-    @apply mx-auto mt-5 hidden max-w-[75%] text-center  font-satoshi text-lg text-gray-400 sm:text-xl  md:block;
+    @apply mx-auto mt-5 text-center font-satoshi text-lg text-gray-800 sm:text-xl md:block;
     font-size: 100%;
     letter-spacing: 0.03em;
 }

frontend/src/components/Footer/Footer.tsx

@@ -28,11 +28,11 @@ function Footer() {
 
   return (
     // <div className="xl:px-50 mx-auto hidden h-20 items-center justify-between border-t border-gray-300 bg-white  px-4 sm:px-6 md:px-8 lg:flex lg:px-8 2xl:px-56">
-    <div className=" mt-20 flex w-full border-t border-gray-300  ">
+    <div className="mt-20 flex w-full border-t border-gray-300  ">
       {/* <div className="footer-content footer-content mr-5 mt-5 rounded-md border-l border-r border-t border-gray-300 "> */}{" "}
       {/* Added mt-5 and mr-5 */}
       <footer className=" font_body mt-10 w-full ">
-        <div className="m-auto  grid max-w-[900px] grid-cols-2 flex-wrap items-center justify-between gap-5 px-5 py-3 md:grid-cols-5 md:py-12">
+        <div className="m-auto  grid max-w-[900px] sm:justify-center md:grid-cols-6 md:py-12 lg:grid-cols-6 flex-wrap items-center md:justify-between gap-4 px-5 py-3">
           <Link
             to="/"
             className=" flex justify-center text-black hover:border-blue-600 hover:text-blue-600 hover:no-underline"
@@ -61,6 +61,12 @@ function Footer() {
           >
             Leave feedback
           </Link>
+          <a href="https://www.flipcause.com/secure/cause_pdetails/MjMyMTIw"
+            target="_blank"
+            className="flex justify-center text-black hover:border-blue-600 hover:text-blue-600 hover:no-underline"
+          >
+            Donate
+          </a>
           <Link
             to="/help"
             className="flex justify-center text-black hover:border-blue-600 hover:text-blue-600 hover:no-underline"

frontend/src/components/Header/FeatureMenuDropDown.tsx

@@ -1,37 +1,39 @@
-import { Link } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 
 export const FeatureMenuDropDown = () => {
+  const location = useLocation();
+  const currentPath = location.pathname;
   return (
     <div className="h-50 absolute top-full mb-2 mt-2 flex  flex-row items-center rounded-lg border-2 bg-white font-inter text-sm sm:px-6 md:px-8 lg:px-8 xl:px-6 ">
       <div className="mx-3 my-5 ">
         <Link to="/AdminPortal">
-          <ul className=" cursor-pointer  rounded-lg p-3 transition duration-300 hover:bg-gray-100">
-            <span className=" font-bold text-black  ">Manage files</span>
+          <ul className={currentPath === "/AdminPortal" ? "subheader-nav-item subheader-nav-item-selected" : "subheader-nav-item"}>
+            <span className="font-bold">Manage files</span>
 
             <div className="mt-1 font-satoshi text-sm text-gray-400">
-              Mange and chat with files.
+              Manage and chat with files
             </div>
           </ul>
         </Link>
         <Link to="/rulesmanager">
-          <ul className=" cursor-pointer  rounded-lg p-3 transition duration-300 hover:bg-gray-100">
-            <span className=" font-bold text-black  ">Manage rules</span>
+          <ul className={currentPath === "/rulesmanager" ? "subheader-nav-item subheader-nav-item-selected" : "subheader-nav-item"}>
+            <span className="font-bold">Manage rules</span>
 
             <div className="mt-1 font-satoshi text-sm text-gray-400">
               Manage list of rules
             </div>
           </ul>
         </Link>
         <Link to="/ManageMeds">
-          <ul className=" cursor-pointer  rounded-lg p-3 transition duration-300 hover:bg-gray-100">
-            <span className=" font-bold text-black  ">Manage meds</span>
+          <ul className={currentPath === "/ManageMeds" ? "subheader-nav-item subheader-nav-item-selected" : "subheader-nav-item"}>
+            <span className="font-bold">Manage meds</span>
 
             <div className="mt-1 font-satoshi text-sm text-gray-400">
               Manage list of meds
             </div>
           </ul>
         </Link>
-        {/* 
+        {/*
         <Link to="/drugSummary">
           <ul className=" cursor-pointer rounded-lg p-3 transition duration-300 hover:bg-gray-100">
             <span className=" font-bold text-black ">Manage Prompts</span>
@@ -63,4 +65,4 @@ export const FeatureMenuDropDown = () => {
       </div>
     </div>
   );
-};
+};