Merge pull request #384 from linkwarden/dev

replaced link outer component with <Link> tag for better accessibility

components/LinkViews/LinkCard.tsx

@@ -81,68 +81,75 @@ export default function LinkGrid({ link, count, className }: Props) {
       ref={ref}
       className="border border-solid border-neutral-content bg-base-200 shadow-md hover:shadow-none duration-100 rounded-2xl relative"
     >
-      <div className="relative rounded-t-2xl h-40 overflow-hidden">
+      <Link
-        {previewAvailable(link) ? (
+        href={link.url || ""}
-          <Image
+        target="_blank"
-            src={`/api/v1/archives/${link.id}?format=${ArchivedFormat.jpeg}&preview=true`}
+        className="rounded-2xl cursor-pointer"
-            width={1280}
+      >
-            height={720}
+        <div className="relative rounded-t-2xl h-40 overflow-hidden">
-            alt=""
+          {previewAvailable(link) ? (
-            className="rounded-t-2xl select-none object-cover z-10 h-40 w-full shadow opacity-80 scale-105"
+            <Image
-            style={{ filter: "blur(2px)" }}
+              src={`/api/v1/archives/${link.id}?format=${ArchivedFormat.jpeg}&preview=true`}
-            draggable="false"
+              width={1280}
-            onError={(e) => {
+              height={720}
-              const target = e.target as HTMLElement;
+              alt=""
-              target.style.display = "none";
+              className="rounded-t-2xl select-none object-cover z-10 h-40 w-full shadow opacity-80 scale-105"
-            }}
+              style={{ filter: "blur(2px)" }}
-          />
+              draggable="false"
-        ) : link.preview === "unavailable" ? (
+              onError={(e) => {
-          <div className="bg-gray-50 duration-100 h-40 bg-opacity-80"></div>
+                const target = e.target as HTMLElement;
-        ) : (
+                target.style.display = "none";
-          <div className="duration-100 h-40 bg-opacity-80 skeleton rounded-none"></div>
+              }}
-        )}
+            />
-        <div
+          ) : link.preview === "unavailable" ? (
-          style={
+            <div className="bg-gray-50 duration-100 h-40 bg-opacity-80"></div>
-            {
+          ) : (
-              // background:
+            <div className="duration-100 h-40 bg-opacity-80 skeleton rounded-none"></div>
-              //   "radial-gradient(circle, rgba(255, 255, 255, 0.5), transparent)",
+          )}
+          <div
+            style={
+              {
+                // background:
+                //   "radial-gradient(circle, rgba(255, 255, 255, 0.5), transparent)",
+              }
             }
-          }
+            className="absolute top-0 left-0 right-0 bottom-0 rounded-t-2xl flex items-center justify-center shadow rounded-md"
-          className="absolute top-0 left-0 right-0 bottom-0 rounded-t-2xl flex items-center justify-center shadow rounded-md"
+          >
-        >
+            <LinkIcon link={link} />
-          <LinkIcon link={link} />
-        </div>
-      </div>
-
-      <hr className="divider my-0 last:hidden border-t border-neutral-content h-[1px]" />
-
-      <div className="p-3 mt-1">
-        <p className="truncate w-full pr-8 text-primary">
-          {unescapeString(link.name || link.description) || link.url}
-        </p>
-
-        <Link
-          href={link.url || ""}
-          target="_blank"
-          title={link.url || ""}
-          className="w-fit"
-        >
-          <div className="flex gap-1 item-center select-none text-neutral mt-1 hover:opacity-60 duration-100">
-            <i className="bi-link-45deg text-lg mt-[0.15rem] leading-none"></i>
-            <p className="text-sm truncate">{shortendURL}</p>
           </div>
-        </Link>
-      </div>
-
-      <hr className="divider mt-2 mb-1 last:hidden border-t border-neutral-content h-[1px]" />
-      <div className="flex justify-between text-xs text-neutral px-3 pb-1">
-        <div className="cursor-pointer w-fit">
-          {collection ? (
-            <LinkCollection link={link} collection={collection} />
-          ) : undefined}
         </div>
-        <LinkDate link={link} />
+
-      </div>
+        <hr className="divider my-0 last:hidden border-t border-neutral-content h-[1px]" />
+
+        <div className="p-3 mt-1">
+          <p className="truncate w-full pr-8 text-primary">
+            {unescapeString(link.name || link.description) || link.url}
+          </p>
+
+          <Link
+            href={link.url || ""}
+            target="_blank"
+            title={link.url || ""}
+            className="w-fit"
+          >
+            <div className="flex gap-1 item-center select-none text-neutral mt-1">
+              <i className="bi-link-45deg text-lg mt-[0.15rem] leading-none"></i>
+              <p className="text-sm truncate">{shortendURL}</p>
+            </div>
+          </Link>
+        </div>
+
+        <hr className="divider mt-2 mb-1 last:hidden border-t border-neutral-content h-[1px]" />
+
+        <div className="flex justify-between text-xs text-neutral px-3 pb-1">
+          <div className="cursor-pointer w-fit">
+            {collection ? (
+              <LinkCollection link={link} collection={collection} />
+            ) : undefined}
+          </div>
+          <LinkDate link={link} />
+        </div>
+      </Link>
 
       {showInfo ? (
         <div className="p-3 absolute z-30 top-0 left-0 right-0 bottom-0 bg-base-200 rounded-2xl fade-in overflow-y-auto">

components/LinkViews/LinkComponents/LinkCollection.tsx

@@ -17,7 +17,7 @@ export default function LinkCollection({
   return (
     <div
       onClick={(e) => {
-        e.stopPropagation();
+        e.preventDefault();
         router.push(`/collections/${link.collection.id}`);
       }}
       className="flex items-center gap-1 max-w-full w-fit hover:opacity-70 duration-100"

components/LinkViews/LinkList.tsx

@@ -55,8 +55,9 @@ export default function LinkCardCompact({ link, count, className }: Props) {
           !showInfo ? "hover:bg-base-300" : ""
         } duration-200 rounded-lg`}
       >
-        <div
+        <Link
-          onClick={() => link.url && window.open(link.url || "", "_blank")}
+          href={link.url || ""}
+          target="_blank"
           className="flex items-center cursor-pointer py-3 px-3"
         >
           <div className="shrink-0">
@@ -91,7 +92,7 @@ export default function LinkCardCompact({ link, count, className }: Props) {
               <LinkDate link={link} />
             </div>
           </div>
-        </div>
+        </Link>
 
         <LinkActions
           link={link}

components/SettingsSidebar.tsx

@@ -4,7 +4,7 @@ import { useRouter } from "next/router";
 import React, { useEffect, useState } from "react";
 
 export default function SettingsSidebar({ className }: { className?: string }) {
-  const LINKWARDEN_VERSION = "v2.4.5";
+  const LINKWARDEN_VERSION = "v2.4.6";
 
   const { collections } = useCollectionStore();
 

lib/api/controllers/dashboard/getDashboardData.ts

@@ -14,7 +14,7 @@ export default async function getDashboardData(
   else if (query.sort === Sort.DescriptionZA) order = { description: "desc" };
 
   const pinnedLinks = await prisma.link.findMany({
-    take: 6,
+    take: 8,
     where: {
       AND: [
         {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkwarden",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "main": "index.js",
   "repository": "https://github.com/linkwarden/linkwarden.git",
   "author": "Daniel31X13 <daniel31x13@gmail.com>",