#33 styling and refactor of chat

KrisTheCanadian · Mar 30, 2022 · 2621efb · 2621efb
1 parent f748c1f
commit 2621efb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/src/components/chat/chatroom.css b/src/components/chat/chatroom.css
@@ -15,6 +15,7 @@
 .sent p{
     background: #434ce6;
     color:white;
+    margin:5px;
 }
 
 .sent{

diff --git a/src/components/chat/chatroom.tsx b/src/components/chat/chatroom.tsx
@@ -50,7 +50,7 @@ function ChatRoom(props: PatientData) {
   }, [messages]);
 
   // define reference to chat
-  const chatRef = firestore.collection('chats').doc(state.id);
+  const chatRef = firestore.collection('chats').doc(props.PID);
 
   // save message to firestore
   const sendMessage = async (e: any) => {
@@ -136,7 +136,7 @@ function Chat(props: PatientData) {
   return (
     <Box
       className="Chat"
-      sx={{ maxHeight: 'calc(100vh - 136px)',
+      sx={{ height: 'calc(100vh - 136px)',
         overflowY: 'auto',
         display: 'flex',
         flexDirection: 'column',
@@ -145,7 +145,7 @@ function Chat(props: PatientData) {
 
       }}
     >
-      <Box sx={{ padding: '20px', borderBottom: '1px solid #e7e7e7' }}>
+      <Box sx={{ padding: '15px 20px 15px 20px', borderBottom: '1px solid #e7e7e7' }}>
         <Grid
           container
           spacing={24}

diff --git a/src/components/dashboard/MedicalView/PatientInfo/PatientInfo.tsx b/src/components/dashboard/MedicalView/PatientInfo/PatientInfo.tsx
@@ -91,23 +91,6 @@ export type PatientData = {
   initHelpFormData: HelpFormData[],
 }
 
-const initPatientData: PatientData = {
-  PID: '',
-  name: '',
-  age: 0,
-  sex: '',
-  healthCardNumber: '',
-  status: '',
-  latestTestResult: undefined,
-  latestSymptoms: undefined,
-  history: undefined,
-  medicalConditions: undefined,
-  phone: undefined,
-  bmi: 0,
-  score: undefined,
-  initHelpFormData: [],
-};
-
 export function caseSeverity(score: number | undefined): string {
   if (score !== undefined) {
     if (score > 2.5) return ('Severe');
@@ -118,6 +101,22 @@ export function caseSeverity(score: number | undefined): string {
 }
 
 function PatientInfo({ PID }: Props) {
+  const initPatientData: PatientData = {
+    PID,
+    name: '',
+    age: 0,
+    sex: '',
+    healthCardNumber: '',
+    status: '',
+    latestTestResult: undefined,
+    latestSymptoms: undefined,
+    history: undefined,
+    medicalConditions: undefined,
+    phone: undefined,
+    bmi: 0,
+    score: undefined,
+    initHelpFormData: [],
+  };
   const [modalOpen, setModalOpen] = React.useState(false);
   const handleOpen = () => setModalOpen(true);
   const handleClose = () => setModalOpen(false);