Merge branch 'dev' into fix/resource-card-title-fix

chingu-x · Aug 30, 2024 · 9cc1e21 · 9cc1e21
2 parents 33fb5f0 + ea1780f
commit 9cc1e21
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/src/app/(main)/my-voyage/[teamId]/voyage-resources/components/ResourceInput.tsx b/src/app/(main)/my-voyage/[teamId]/voyage-resources/components/ResourceInput.tsx
@@ -70,23 +70,20 @@ export default function ResourceInput() {
       className="flex w-full items-center rounded-xl bg-base-200 p-1 shadow-lg"
       onSubmit={handleSubmit(onSubmit)}
     >
-      <div className="m-4 flex w-3/4 flex-col">
+      <div className="mx-4 mb-1 mt-3 flex w-3/4 flex-col">
         <TextInput
           id="url"
           placeholder="Paste your resource link here."
           ariaLabel="link"
-          errorMessage={
-            errors.url?.type === "invalid_string"
-              ? "Must start with https://"
-              : ""
-          }
+          errorMessage={errors.url?.message}
           {...register("url")}
           inputGroupContent={<LinkIcon />}
         />
         <TextInput
           id="title"
           placeholder="Name your resource here."
           ariaLabel="resource name"
+          errorMessage={errors.title?.message}
           {...register("title")}
         />
       </div>

diff --git a/src/app/(main)/my-voyage/[teamId]/voyage-resources/components/ResourcesContainer.tsx b/src/app/(main)/my-voyage/[teamId]/voyage-resources/components/ResourcesContainer.tsx
@@ -49,21 +49,23 @@ export default function ResourcesContainer({ data }: ResourceContainerProps) {
           isDisabled={!voyageResources?.length}
         />
       </div>
-      {formattedResources?.length ? (
-        formattedResources.map((item) => (
-          <ResourceCard
-            key={item.id}
-            resourceId={item.id}
-            title={item.title}
-            user={item.addedBy.member}
-            date={item.date}
-            userId={item.addedBy.member.id}
-            url={item.url}
-          />
-        ))
-      ) : (
-        <EmptyBanner />
-      )}
+      <div className="flex flex-col gap-y-6">
+        {formattedResources?.length ? (
+          formattedResources.map((item) => (
+            <ResourceCard
+              key={item.id}
+              resourceId={item.id}
+              title={item.title}
+              user={item.addedBy.member}
+              date={item.date}
+              userId={item.addedBy.member.id}
+              url={item.url}
+            />
+          ))
+        ) : (
+          <EmptyBanner />
+        )}
+      </div>
     </>
   );
 }