suggestions

ohcnetwork · Jul 12, 2024 · 913f898 · 913f898
1 parent f6c39b3
commit 913f898
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 10 deletions.
diff --git a/src/Common/hooks/useAuthUser.ts b/src/Common/hooks/useAuthUser.ts
@@ -7,6 +7,7 @@ type SignInReturnType = RequestResult<JwtTokenObtainPair>;
 
 type AuthContextType = {
   user: UserModel | undefined;
+  refetchUser: () => Promise<void>;
   signIn: (creds: LoginCredentials) => Promise<SignInReturnType>;
   signOut: () => Promise<void>;
 };

diff --git a/src/Components/Facility/ConsultationDoctorNotes/index.tsx b/src/Components/Facility/ConsultationDoctorNotes/index.tsx
@@ -144,7 +144,7 @@ const ConsultationDoctorNotes = (props: ConsultationDoctorNotesProps) => {
           isTab2Active={mode === "default-view"}
         />
       </div>
-      <div className="relative mx-3 flex grow flex-col rounded-lg border border-gray-300 bg-white px-2 sm:mx-10 sm:px-5 sm:pt-8">
+      <div className="relative flex grow flex-col rounded-lg border border-gray-300 bg-white px-2 sm:mx-10 sm:px-5 sm:pt-8 md:mx-3">
         <div className="absolute inset-x-0 top-0 z-10 flex bg-gray-200 text-sm shadow-md">
           {Object.values(PATIENT_NOTES_THREADS).map((current) => (
             <button

diff --git a/src/Components/Facility/DoctorNote.tsx b/src/Components/Facility/DoctorNote.tsx
@@ -18,7 +18,7 @@ const DoctorNote = (props: DoctorNoteProps) => {
 
   return (
     <div
-      className="ml-2 mt-4 flex h-[400px] grow flex-col-reverse overflow-y-scroll bg-white"
+      className="mt-4 flex h-[400px] grow flex-col-reverse overflow-y-scroll bg-white sm:ml-2"
       id="patient-notes-list"
     >
       {state.notes.length ? (

diff --git a/src/Components/Facility/PatientNoteCard.tsx b/src/Components/Facility/PatientNoteCard.tsx
@@ -91,7 +91,7 @@ const PatientNoteCard = ({
     setFileState({
       ...file_state,
       open: true,
-      name: data.name as string,
+      name: data.name?.split(".")[0] ?? "file",
       extension,
       isImage: ExtImage.includes(extension),
     });
@@ -150,7 +150,7 @@ const PatientNoteCard = ({
       {" "}
       <div
         className={classNames(
-          "flex flex-col rounded-lg border border-gray-300 bg-white px-3 py-1 text-gray-800",
+          "group flex flex-col rounded-lg border border-gray-300 bg-white px-3 py-1 text-gray-800",
           note.user_type === "RemoteSpecialist" && "border-primary-400",
         )}
       >
@@ -164,7 +164,7 @@ const PatientNoteCard = ({
           fixedWidth={false}
           className="h-[80vh] w-full md:h-screen"
         />
-        <div className="group relative flex items-center gap-2">
+        <div className="relative flex items-center gap-2">
           <div className="flex h-9 w-9 items-center justify-center rounded-full bg-primary text-lg font-semibold text-white">
             {note.created_by_object?.first_name[0]}
           </div>
@@ -219,7 +219,7 @@ const PatientNoteCard = ({
               )
             }
           </div>
-          <div className="gap-2-top-4 absolute right-0 top-0 z-10 flex gap-2 opacity-0 transition-opacity duration-100 group-hover:opacity-100 ">
+          <div className="right-0 top-0 z-10 flex gap-2 transition-opacity duration-100 group-hover:opacity-100 max-sm:flex-col sm:absolute sm:opacity-0 ">
             {!disableEdit &&
               // note.created_by_object.id === authUser.id &&
               !isEditing && (

diff --git a/src/Components/Users/UserProfile.tsx b/src/Components/Users/UserProfile.tsx
@@ -111,7 +111,7 @@ const editFormReducer = (state: State, action: Action) => {
 };
 
 export default function UserProfile() {
-  const { signOut } = useAuthContext();
+  const { signOut, refetchUser } = useAuthContext();
   const [states, dispatch] = useReducer(editFormReducer, initialState);
   const [editProfilePic, setEditProfilePic] = useState(false);
   const [updateStatus, setUpdateStatus] = useState({
@@ -456,7 +456,7 @@ export default function UserProfile() {
     <div>
       <ProfilePicUploadModal
         open={editProfilePic}
-        onSave={() => window.location.reload()}
+        onSave={() => refetchUser()}
         onClose={() => setEditProfilePic(false)}
         onDelete={() => refetchUserData()}
         onRefetch={() => refetchUserData()}

diff --git a/src/Providers/AuthUserProvider.tsx b/src/Providers/AuthUserProvider.tsx
@@ -87,7 +87,14 @@ export default function AuthUserProvider({ children, unauthorized }: Props) {
   }
 
   return (
-    <AuthUserContext.Provider value={{ signIn, signOut, user }}>
+    <AuthUserContext.Provider
+      value={{
+        signIn,
+        signOut,
+        user,
+        refetchUser: refetch as unknown as () => Promise<void>,
+      }}
+    >
       {!res.ok || !user ? unauthorized : children}
     </AuthUserContext.Provider>
   );

diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
@@ -154,7 +154,7 @@ export default function AppRouter() {
             id="pages"
             className="flex-1 overflow-y-scroll pb-4 focus:outline-none md:py-0"
           >
-            <div className="max-w-8xl mx-auto p-3">{pages}</div>
+            <div className="max-w-8xl mx-auto p-1 sm:p-2 md:p-3">{pages}</div>
           </main>
         </div>
       </div>