M frontend/components/Logo/index.js → frontend/components/Logo/index.js

@@ -1,11 +1,20 @@ 
 import {makeStyles} from '@material-ui/core/styles';
+import useProfile from '../../hooks/useProfile';
+import useSettings from '../../hooks/useSettings';
 
 const Logo = () => {
   const classes = useStyles();
+  const {user} = useProfile();
+  const settings = useSettings();
+  const appLink = user ? '/dashboard' : settings?.['about_link'] || '';
   return (
     <div className={classes.layout}>
-      <a href="https://caroster.io" className={classes.link}>
-        <img src={'/assets/Caroster_beta.png'} alt="Caroster" className={classes.logo} />
+      <a href={appLink} className={classes.link}>
+        <img
+          src={'/assets/Caroster_beta.png'}
+          alt="Caroster"
+          className={classes.logo}
+        />
       </a>
     </div>
   );

M frontend/containers/EventBar/index.tsx → frontend/containers/EventBar/index.tsx

@@ -109,6 +109,8 @@ const userInfos = user
     ? [{label: user.username, id: 'Email'}, {divider: true}]
     : [];
 
+  const appLink = user ? '/dashboard' : settings?.['about_link'] || '';
+
   const UserIcon = user ? (
     <Avatar className={classes.avatar}>
       {`${user.username[0]}`.toUpperCase()}
@@ -126,7 +128,7 @@ id={(isEditing && 'EditEvent') || (detailsOpen && 'Details') || 'Menu'}
     >
       <Toolbar>
         <div className={classes.name}>
-          <Link href={settings?.['about_link'] || ''}>
+          <Link href={appLink}>
             <img
               className={classes.logo}
               src="/assets/Logo_in_beta.svg"