public profile tweaks

xvvvyz · Oct 30, 2024 · 464c69f · 464c69f
1 parent 360476c
commit 464c69f
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 84 deletions.
diff --git a/app/(pages)/share/[subjectId]/layout.tsx b/app/(pages)/share/[subjectId]/layout.tsx
@@ -52,13 +52,12 @@ const Layout = async ({ children, params }: LayoutProps) => {
           ) : (
             <>
               <span className="text-sm leading-tight text-fg-4">
-                <span className="text-fg-2">llog</span>&mdash;achieve lasting
-                behavior
-                <br />
-                changes with your clients.
+                <span className="text-fg-2">llog</span>&mdash;the app for data
+                collection <br />
+                and real-time progress tracking.
               </span>
-              <Button href="/" size="sm">
-                Request a demo
+              <Button href="/sign-up" size="sm">
+                Sign up
               </Button>
             </>
           )}

diff --git a/app/_components/event-form.tsx b/app/_components/event-form.tsx
@@ -269,7 +269,12 @@ const EventForm = ({
                 control={form.control}
                 name={`inputs.${i}`}
                 render={({ field }) => (
-                  <EventSelect field={field} input={input} />
+                  <EventSelect
+                    field={field}
+                    input={input}
+                    isArchived={isArchived}
+                    isPublic={isPublic}
+                  />
                 )}
               />
             )}

diff --git a/app/_components/event-select.tsx b/app/_components/event-select.tsx
@@ -20,17 +20,24 @@ interface EventSelectProps {
       Pick<Database['public']['Tables']['input_options']['Row'], 'id' | 'label'>
     >;
   };
+  isArchived?: boolean;
+  isPublic?: boolean;
 }
 
-const EventSelect = ({ field, input }: EventSelectProps) => {
+const EventSelect = ({
+  field,
+  input,
+  isArchived,
+  isPublic,
+}: EventSelectProps) => {
   const inputSettings = input.settings as InputSettingsJson;
   const router = useRouter();
 
   return (
     <InputRoot>
       <Label.Root>{input.label}</Label.Root>
       <Select
-        isCreatable={inputSettings?.isCreatable}
+        isCreatable={!isArchived && !isPublic && inputSettings?.isCreatable}
         isMulti={input.type === 'multi_select'}
         onChange={field.onChange}
         onCreateOption={async (label: string) => {

diff --git a/app/_components/insight-menu.tsx b/app/_components/insight-menu.tsx
@@ -1,88 +1,41 @@
-'use client';
-
 import * as Drawer from '@/_components/drawer';
 import DrawerDeleteButton from '@/_components/drawer-delete-button';
-import Tip from '@/_components/tip';
 import deleteInsight from '@/_mutations/delete-insight';
-import CheckIcon from '@heroicons/react/24/outline/CheckIcon';
-import ClipboardDocumentIcon from '@heroicons/react/24/outline/ClipboardDocumentIcon';
 import EllipsisVerticalIcon from '@heroicons/react/24/outline/EllipsisVerticalIcon';
 import PencilIcon from '@heroicons/react/24/outline/PencilIcon';
-import { useCopyToClipboard, useToggle } from '@uidotdev/usehooks';
-import { useRef } from 'react';
 
 interface InsightMenuProps {
   insightId: string;
   subjectId: string;
 }
 
-const InsightMenu = ({ insightId, subjectId }: InsightMenuProps) => {
-  const [, copyToClipboard] = useCopyToClipboard();
-  const [hasCopiedLink, toggleHasCopiedLink] = useToggle(false);
-  const linkTimeoutRef = useRef<NodeJS.Timeout>();
-
-  return (
-    <Drawer.Root>
-      <Drawer.Trigger>
-        <div className="group flex items-center justify-center px-1.5 text-fg-3 transition-colors hover:text-fg-2">
-          <div className="rounded-full p-2 transition-colors group-hover:bg-alpha-1">
-            <EllipsisVerticalIcon className="w-5" />
-          </div>
+const InsightMenu = ({ insightId, subjectId }: InsightMenuProps) => (
+  <Drawer.Root>
+    <Drawer.Trigger>
+      <div className="group flex items-center justify-center px-1.5 text-fg-3 transition-colors hover:text-fg-2">
+        <div className="rounded-full p-2 transition-colors group-hover:bg-alpha-1">
+          <EllipsisVerticalIcon className="w-5" />
         </div>
-      </Drawer.Trigger>
-      <Drawer.Portal>
-        <Drawer.Overlay />
-        <Drawer.Content>
-          <Drawer.Title>Insight menu</Drawer.Title>
-          <Drawer.Description />
-          <Drawer.Button
-            href={`/subjects/${subjectId}/insights/${insightId}/edit`}
-          >
-            <PencilIcon className="w-5 text-fg-4" />
-            Edit
-          </Drawer.Button>
-          <div className="relative">
-            <Drawer.Button
-              className="w-full"
-              onClick={async () => {
-                clearTimeout(linkTimeoutRef.current);
-
-                void copyToClipboard(
-                  `${location.origin}/subjects/${subjectId}/insights/${insightId}`,
-                );
-
-                linkTimeoutRef.current = setTimeout(
-                  () => toggleHasCopiedLink(false),
-                  2000,
-                );
-
-                toggleHasCopiedLink(true);
-              }}
-            >
-              {hasCopiedLink ? (
-                <>
-                  <CheckIcon className="w-5 text-fg-4" />
-                  Copied, share it!
-                </>
-              ) : (
-                <>
-                  <ClipboardDocumentIcon className="w-5 text-fg-4" />
-                  Copy link
-                </>
-              )}
-            </Drawer.Button>
-            <Tip align="end" className="absolute right-3 top-2.5">
-              Clients and team members have permission to view this insight.
-            </Tip>
-          </div>
-          <DrawerDeleteButton
-            confirmText="Delete insight"
-            onConfirm={() => deleteInsight(insightId)}
-          />
-        </Drawer.Content>
-      </Drawer.Portal>
-    </Drawer.Root>
-  );
-};
+      </div>
+    </Drawer.Trigger>
+    <Drawer.Portal>
+      <Drawer.Overlay />
+      <Drawer.Content>
+        <Drawer.Title>Insight menu</Drawer.Title>
+        <Drawer.Description />
+        <Drawer.Button
+          href={`/subjects/${subjectId}/insights/${insightId}/edit`}
+        >
+          <PencilIcon className="w-5 text-fg-4" />
+          Edit
+        </Drawer.Button>
+        <DrawerDeleteButton
+          confirmText="Delete insight"
+          onConfirm={() => deleteInsight(insightId)}
+        />
+      </Drawer.Content>
+    </Drawer.Portal>
+  </Drawer.Root>
+);
 
 export default InsightMenu;
diff --git a/app/_components/spinner.tsx b/app/_components/spinner.tsx
@@ -21,7 +21,7 @@ const Spinner = ({
       aria-busy
       aria-label={loadingText}
       className={twMerge(
-        'h-[0.9rem] w-[0.9rem] animate-spin rounded-full border-[1.5px]',
+        'h-[0.9rem] w-[0.9rem] animate-spin rounded-full border-2',
         color,
         'border-l-transparent',
       )}

diff --git a/supabase/migrations/20241030232414_update-get-public-subject-data.sql b/supabase/migrations/20241030232414_update-get-public-subject-data.sql
@@ -0,0 +1,18 @@
+create or replace function public.get_public_subject(public_subject_id uuid)
+  returns json
+  language plpgsql
+  security definer
+  as $$
+  begin
+    return (
+      select json_build_object(
+        'data', s.data,
+        'id', s.id,
+        'image_uri', s.image_uri,
+        'name', s.name
+      )
+      from subjects s
+      where s.id = public_subject_id and s.public = true
+    );
+  end;
+  $$;