Merge pull request #44 from yrjarv/main

First name instead of 'Profile' in right corner of header
cybernetisk · Sep 26, 2024 · cee4b41 · cee4b41
2 parents 028e072 + 0b9a317
commit cee4b41
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/app/components/Login/LoginButton.js b/app/components/Login/LoginButton.js
@@ -52,7 +52,17 @@ export default function LoginButton(props) {
     bgcolor: cybTheme.palette.primary.main,
   };
 
-
+  const buttonText = () => {
+    if (session.data != undefined) {
+      let firstName = session.data.user.name.split(" ")[0].replace('-', '‑')
+      // Shorten the first name if it is longer than 15 characters
+      if (firstName.length > 15) {
+        firstName = firstName.slice(0, 12) + "..."
+      }
+      return firstName
+    }
+    return "Login"
+  }
 
   return (
     <>
@@ -84,7 +94,7 @@ export default function LoginButton(props) {
                 }}
                 primary={
                   <Typography variant="caption">
-                    {session.data != undefined ? "Profile" : "Login"}
+                    {buttonText()}
                   </Typography>
                 }
               />
@@ -105,11 +115,10 @@ export default function LoginButton(props) {
             >
               <Typography
                 variant="body1"
-                width="3em"
                 // color={cybTheme.palette.text.secondary}
                 sx={{ display: { xs: "none", md: "flex" } }}
               >
-                {session.data != undefined ? "Profile" : "Login"}
+                {buttonText()}
               </Typography>
 
               {session.status == "authenticated" ? (
@@ -122,7 +131,7 @@ export default function LoginButton(props) {
               ) : (
                 <Avatar sx={{ ...avatarProps }}>
                   <Person
-                    color={cybTheme.palette.background.main}
+                      color={cybTheme.palette.background.main}
                     // color= sx={{
                     //   color: cybTheme.palette.background.main
                     //   }}

diff --git a/app/components/layout/AppBar.js b/app/components/layout/AppBar.js
@@ -83,7 +83,7 @@ export class NavBar extends Component {
               </Box>
             </Grid>
 
-            <Grid item>
+            <Grid item sx={{ flexShrink: 1 }}>
               <SessionProvider>
                 <LoginButton />
               </SessionProvider>

diff --git a/app/pages/main/profile/page.js b/app/pages/main/profile/page.js
@@ -112,9 +112,8 @@ function ProfilePage() {
     }
   }, [session])
 
-  const handleUpdateData = () => {
-
-    prismaRequest({
+  const handleUpdateData = async () => {
+    await prismaRequest({
       model: "user",
       method: "update",
       request: {
@@ -126,8 +125,8 @@ function ProfilePage() {
           lastName: lastName,
         }
       }
-    })
-
+    });
+    window.location.reload();
   }
 
   const handleConfirmSelection = async () => {