fix (sing): workaround drawer layout shift with mobile keyboard

glencoden · Jan 17, 2025 · 4f28680 · 4f28680
1 parent d3ce1f0
commit 4f28680
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/apps/cloud/app/components/SessionMenu.tsx b/apps/cloud/app/components/SessionMenu.tsx
@@ -4,6 +4,7 @@ import { Session } from '@repo/db'
 import Button from '@repo/ui/components/Button'
 import Spinner from '@repo/ui/components/Spinner'
 import { cn } from '@repo/ui/helpers'
+import Subtitle2 from '@repo/ui/typography/Subtitle2'
 import { CircleDollarSign, House, Lock, LockOpen, Star } from 'lucide-react'
 
 export default function SessionMenu({
@@ -118,6 +119,9 @@ export default function SessionMenu({
 
             <section className='flex items-center gap-7'>
                 {isPending && <Spinner light />}
+                {session.isDemo && !isPending && (
+                    <Subtitle2 className='text-pink-700'>Demo</Subtitle2>
+                )}
 
                 <Button asChild variant='ghost' size='icon'>
                     <Link to='/'>

diff --git a/apps/sing/app/routes/($guestId).tsx b/apps/sing/app/routes/($guestId).tsx
@@ -27,8 +27,6 @@ import { useEffect, useMemo, useRef, useState } from 'react'
 import { useIntl } from 'react-intl'
 import { Drawer } from 'vaul'
 
-type NavigationPage = 'songs' | 'feedback' | 'tip'
-
 type LoaderResponse = {
     guest: Guest | null
     session: Session | null
@@ -87,7 +85,7 @@ export default function Index() {
      */
 
     const pages = useMemo(() => {
-        return ['songs', 'feedback']
+        return ['songs']
         // const navigationPages: NavigationPage[] = ['songs', 'feedback', 'tip']
         // if (session?.hideTipCollection) {
         //     return navigationPages.filter((page) => page !== 'tip')
@@ -184,7 +182,7 @@ export default function Index() {
                                     </H4>
                                 )}
                                 <Link
-                                    to={`${base}/create/${id}`}
+                                    to={`/create/${guest!.id}/${id}`}
                                     className='flex items-center gap-3'
                                 >
                                     <Star

diff --git a/.../app/routes/($guestId).create.$songId.tsx → ...ng/app/routes/create.$guestId.$songId.tsx b/.../app/routes/($guestId).create.$songId.tsx → ...ng/app/routes/create.$guestId.$songId.tsx
@@ -89,7 +89,7 @@ export default function Create() {
     }
 
     return (
-        <Form method='post' className='mb-16 mt-7 flex flex-col gap-3'>
+        <Form method='post' className='mx-6 mb-16 mt-7 flex flex-col gap-3'>
             <H3 className='mb-10 leading-10'>
                 {intl.formatMessage(
                     {