Merge pull request #599 from 1ifeworld/0xTranqui/newchannel-home-fix

logic fix for showing new channel
1ifeworld · Apr 20, 2024 · c65c71a · c65c71a
2 parents 4d25bee + 5bc490e
commit c65c71a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 10 deletions.
diff --git a/apps/site/components/client/ChannelDialog.tsx b/apps/site/components/client/ChannelDialog.tsx
@@ -105,16 +105,24 @@ export function ChannelDialog({ trigger, hideTrigger }: ChannelDialogProps) {
 
   return (
     <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
-      {!authenticated || !username || `/${username}` !== pathname ? (
-        <Button
-          className={hideTrigger ? 'hidden' : ''}
-          variant="link"
-          onClick={login}
-        >
-          <Typography>+&nbsp;Channel</Typography>
-        </Button>
+      {/* 
+          Logic for showing trigger:
+          - hide trigger variable is used for optionally hiding trigger in header on mobile
+          - always show trigger on desktop (hide trigger == false)
+          - if user not authed, prompt log in, if not, prompt new channel
+      */}
+      {!hideTrigger ? (
+        <>
+          {!authenticated || !username ? (
+            <Button variant="link" onClick={login}>
+              <Typography>+&nbsp;Channel</Typography>
+            </Button>
+          ) : (
+            trigger
+          )}
+        </>
       ) : (
-        trigger
+        <>{`/${username}` !== pathname ? <></> : trigger}</>
       )}
       <DialogPortal>
         <DialogContent

diff --git a/apps/site/components/client/Header.tsx b/apps/site/components/client/Header.tsx
@@ -116,9 +116,12 @@ export function Header() {
                   hideTrigger={false}
                   trigger={
                     <DialogTrigger>
+                      {/* <Button variant="link"> */}
                       <Typography className="hover:underline hover:underline-offset-2 transition-all">
+                        {/* <Typography className=""> */}
                         +&nbsp;Channel
                       </Typography>
+                      {/* </Button> */}
                     </DialogTrigger>
                   }
                 />

diff --git a/apps/site/components/client/MenuDialog.tsx b/apps/site/components/client/MenuDialog.tsx
@@ -49,6 +49,24 @@ export function MenuDialog() {
             </DialogClose>
           </DialogHeader>
           <Stack className="h-full w-full pt-[52px] items-start gap-y-6">
+          <DialogClose asChild>
+              <Button
+                variant="link"
+                className="w-full h-5 justify-start rounded-none"
+                onClick={() => setDialogOpen(false)}
+              >
+                <Link href={'/'} className="rounded-none flex w-full">
+                  <Flex className="w-full justify-between items-center">
+                    <Typography className="text-primary-foreground">
+                      Home
+                    </Typography>
+                    <Typography className="text-secondary-foreground text-[14px]">
+                      ›
+                    </Typography>
+                  </Flex>
+                </Link>
+              </Button>
+            </DialogClose>            
             <DialogClose asChild>
               <Button
                 variant="link"
@@ -90,7 +108,7 @@ export function MenuDialog() {
             </DialogClose>
             {!authenticated ? (
               <>
-                <Separator orientation="vertical" className="h-4 border-none" />
+                <Separator orientation="vertical" className="h-4 border-none bg-0" />
                 <DialogClose asChild>
                   <Button
                     variant="link"