Merge pull request #291 from linkwarden/visual-improvements

Visual improvements

components/DashboardItem.tsx

@@ -0,0 +1,29 @@
+import { IconProp } from "@fortawesome/fontawesome-svg-core";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+type Props = {
+  name: string;
+  value: number;
+  icon: IconProp;
+};
+
+export default function dashboardItem({ name, value, icon }: Props) {
+  return (
+    <div className="flex gap-4 items-end">
+      <div className="p-4 bg-sky-500 bg-opacity-20 dark:bg-opacity-10 rounded-xl select-none">
+        <FontAwesomeIcon
+          icon={icon}
+          className="w-8 h-8 text-sky-500 dark:text-sky-500"
+        />
+      </div>
+      <div className="flex flex-col justify-center">
+        <p className="text-gray-500 dark:text-gray-400 text-sm tracking-wider">
+          {name}
+        </p>
+        <p className="font-thin text-6xl text-sky-500 dark:text-sky-500">
+          {value}
+        </p>
+      </div>
+    </div>
+  );
+}

components/LinkCard.tsx

@@ -165,7 +165,7 @@ export default function LinkCard({ link, count, className }: Props) {
           onClick={() => router.push("/links/" + link.id)}
           className="flex items-start cursor-pointer gap-5 sm:gap-10 h-full w-full p-5"
         >
-          {url && (
+          {url && account.blurredFavicons && (
             <Image
               src={`https://t2.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${url.origin}&size=32`}
               width={64}
@@ -195,7 +195,7 @@ export default function LinkCard({ link, count, className }: Props) {
                 onClick={(e) => {
                   e.stopPropagation();
                 }}
-                className="flex items-center gap-1 max-w-full w-fit my-3 hover:opacity-70 duration-100"
+                className="flex items-center gap-1 max-w-full w-fit my-1 hover:opacity-70 duration-100"
               >
                 <FontAwesomeIcon
                   icon={faFolder}

components/SettingsSidebar.tsx

@@ -20,6 +20,8 @@ import {
 } from "@fortawesome/free-brands-svg-icons";
 
 export default function SettingsSidebar({ className }: { className?: string }) {
+  const LINKWARDEN_VERSION = "v2.1.0";
+
   const { collections } = useCollectionStore();
 
   const router = useRouter();
@@ -136,6 +138,13 @@ export default function SettingsSidebar({ className }: { className?: string }) {
       </div>
 
       <div className="flex flex-col gap-1">
+        <Link
+          href={`https://github.com/linkwarden/linkwarden/releases/tag/${LINKWARDEN_VERSION}`}
+          target="_blank"
+          className="dark:text-gray-300 text-gray-500 text-sm ml-2 hover:opacity-50 duration-100"
+        >
+          Linkwarden {LINKWARDEN_VERSION}
+        </Link>
         <Link href="https://docs.linkwarden.app" target="_blank">
           <div
             className={`hover:bg-slate-200 hover:dark:bg-neutral-700 duration-100 py-2 px-2 cursor-pointer flex items-center gap-2 w-full rounded-md h-8`}

layouts/MainLayout.tsx

@@ -58,9 +58,9 @@ export default function MainLayout({ children }: Props) {
         </div>
 
         <div
-          className={`w-full flex flex-col min-h-screen lg:ml-64 xl:ml-80 ${
-            showAnnouncement ? "mt-10" : ""
-          }`}
+          className={`w-full flex flex-col min-h-${
+            showAnnouncement ? "full" : "screen"
+          } lg:ml-64 xl:ml-80 ${showAnnouncement ? "mt-10" : ""}`}
         >
           <Navbar />
           {children}

lib/api/controllers/users/userId/updateUserById.ts

@@ -132,6 +132,7 @@ export default async function updateUserById(
       archiveAsScreenshot: data.archiveAsScreenshot,
       archiveAsPDF: data.archiveAsPDF,
       archiveAsWaybackMachine: data.archiveAsWaybackMachine,
+      blurredFavicons: data.blurredFavicons,
       password:
         data.newPassword && data.newPassword !== ""
           ? newHashedPassword

package.json

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

pages/collections/index.tsx

@@ -44,7 +44,7 @@ export default function Collections() {
                   Your Collections
                 </p>
 
-                <p className="capitalize text-black dark:text-white">
+                <p className="text-black dark:text-white">
                   Collections you own
                 </p>
               </div>
@@ -150,7 +150,7 @@ export default function Collections() {
                   Other Collections
                 </p>
 
-                <p className="capitalize text-black dark:text-white">
+                <p className="text-black dark:text-white">
                   Shared collections you&apos;re a member of
                 </p>
               </div>

pages/dashboard.tsx

@@ -5,6 +5,9 @@ import {
   faChevronRight,
   faClockRotateLeft,
   faFileImport,
+  faFolder,
+  faHashtag,
+  faLink,
   faThumbTack,
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -22,6 +25,7 @@ import useModalStore from "@/store/modals";
 import { toast } from "react-hot-toast";
 import { MigrationFormat, MigrationRequest } from "@/types/global";
 import ClickAwayHandler from "@/components/ClickAwayHandler";
+import DashboardItem from "@/components/DashboardItem";
 
 export default function Dashboard() {
   const { collections } = useCollectionStore();
@@ -118,44 +122,47 @@ export default function Dashboard() {
   return (
     <MainLayout>
       <div style={{ flex: "1 1 auto" }} className="p-5 flex flex-col gap-5">
-        <div className="flex gap-3 items-center">
-          <div className="flex gap-2">
-            <FontAwesomeIcon
-              icon={faChartSimple}
-              className="sm:w-8 sm:h-8 w-6 h-6 mt-2 text-sky-500 dark:text-sky-500 drop-shadow"
-            />
-            <p className="sm:text-4xl text-3xl text-black dark:text-white font-thin">
+        <div className="flex items-center gap-3">
+          <FontAwesomeIcon
+            icon={faChartSimple}
+            className="sm:w-10 sm:h-10 w-6 h-6 text-sky-500 dark:text-sky-500 drop-shadow"
+          />
+          <div>
+            <p className="text-3xl capitalize text-black dark:text-white font-thin">
               Dashboard
             </p>
+
+            <p className="text-black dark:text-white">
+              A brief overview of your data
+            </p>
           </div>
         </div>
 
-        <div className="flex flex-col md:flex-row md:items-center gap-5">
-          <div className="sky-shadow flex flex-col justify-center items-center gap-2 md:w-full rounded-2xl p-10 border border-sky-100 dark:border-neutral-700 bg-gray-50 dark:bg-neutral-800">
-            <p className="font-bold text-6xl text-sky-500 dark:text-sky-500">
-              {numberOfLinks}
-            </p>
-            <p className="text-black dark:text-white text-xl">
-              {numberOfLinks === 1 ? "Link" : "Links"}
-            </p>
-          </div>
+        <div>
+          <div className="flex justify-between flex-col md:flex-row md:items-center gap-2 md:w-full h-full rounded-2xl p-8 border border-sky-100 dark:border-neutral-700 bg-gray-100 dark:bg-neutral-800">
+            <DashboardItem
+              name={numberOfLinks === 1 ? "Link" : "Links"}
+              value={numberOfLinks}
+              icon={faLink}
+            />
 
-          <div className="sky-shadow flex flex-col justify-center items-center gap-2 md:w-full rounded-2xl p-10 border border-sky-100 dark:border-neutral-700 bg-gray-50 dark:bg-neutral-800">
-            <p className="font-bold text-6xl text-sky-500 dark:text-sky-500">
-              {collections.length}
-            </p>
-            <p className="text-black dark:text-white text-xl">
-              {collections.length === 1 ? "Collection" : "Collections"}
-            </p>
-          </div>
+            <hr className="border-sky-100 dark:border-neutral-700 md:hidden my-5" />
+            <div className="h-full border-1 border-l border-sky-100 dark:border-neutral-700 hidden md:block"></div>
 
-          <div className="sky-shadow flex flex-col justify-center items-center gap-2 md:w-full rounded-2xl p-10 border border-sky-100 dark:border-neutral-700 bg-gray-50 dark:bg-neutral-800">
-            <p className="font-bold text-6xl text-sky-500 dark:text-sky-500">
-              {tags.length}
-            </p>
-            <p className="text-black dark:text-white text-xl">
-              {tags.length === 1 ? "Tag" : "Tags"}
-            </p>
+            <DashboardItem
+              name={collections.length === 1 ? "Collection" : "Collections"}
+              value={collections.length}
+              icon={faFolder}
+            />
+
+            <hr className="border-sky-100 dark:border-neutral-700 md:hidden my-5" />
+            <div className="h-full border-1 border-r border-sky-100 dark:border-neutral-700 hidden md:block"></div>
+
+            <DashboardItem
+              name={tags.length === 1 ? "Tag" : "Tags"}
+              value={tags.length}
+              icon={faHashtag}
+            />
           </div>
         </div>
 

pages/links/index.tsx

@@ -31,7 +31,7 @@ export default function Links() {
                 All Links
               </p>
 
-              <p className="capitalize text-black dark:text-white">
+              <p className="text-black dark:text-white">
                 Links from every Collections
               </p>
             </div>

pages/settings/account.tsx

@@ -9,7 +9,6 @@ import TextInput from "@/components/TextInput";
 import { resizeImage } from "@/lib/client/resizeImage";
 import ProfilePhoto from "@/components/ProfilePhoto";
 import SubmitButton from "@/components/SubmitButton";
-import { useSession, signOut } from "next-auth/react";
 import React from "react";
 import { MigrationFormat, MigrationRequest } from "@/types/global";
 import Link from "next/link";
@@ -17,8 +16,6 @@ import ClickAwayHandler from "@/components/ClickAwayHandler";
 import Checkbox from "@/components/Checkbox";
 
 export default function Account() {
-  const { update, data } = useSession();
-
   const emailEnabled = process.env.NEXT_PUBLIC_EMAIL_PROVIDER;
 
   const [submitLoader, setSubmitLoader] = useState(false);
@@ -154,7 +151,7 @@ export default function Account() {
 
   return (
     <SettingsLayout>
-      <div className="flex flex-col gap-10 justify-between sm:w-[35rem] w-80 mx-auto lg:mx-0">
+      <div className="flex flex-col gap-10">
         <div className="grid sm:grid-cols-2 gap-3 auto-rows-auto">
           <div className="flex flex-col gap-3">
             <div>

pages/settings/appearance.tsx

@@ -2,37 +2,119 @@ import SettingsLayout from "@/layouts/SettingsLayout";
 import { useTheme } from "next-themes";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faSun, faMoon } from "@fortawesome/free-solid-svg-icons";
+import { useState, useEffect } from "react";
+import { faClose } from "@fortawesome/free-solid-svg-icons";
+import useAccountStore from "@/store/account";
+import { AccountSettings } from "@/types/global";
+import { toast } from "react-hot-toast";
+import TextInput from "@/components/TextInput";
+import { resizeImage } from "@/lib/client/resizeImage";
+import ProfilePhoto from "@/components/ProfilePhoto";
+import SubmitButton from "@/components/SubmitButton";
+import React from "react";
+import Checkbox from "@/components/Checkbox";
 
 export default function Appearance() {
   const { theme, setTheme } = useTheme();
 
+  const submit = async () => {
+    setSubmitLoader(true);
+
+    const load = toast.loading("Applying...");
+
+    const response = await updateAccount({
+      ...user,
+    });
+
+    toast.dismiss(load);
+
+    if (response.ok) {
+      toast.success("Settings Applied!");
+    } else toast.error(response.data as string);
+    setSubmitLoader(false);
+  };
+
+  const [submitLoader, setSubmitLoader] = useState(false);
+
+  const { account, updateAccount } = useAccountStore();
+
+  const [user, setUser] = useState<AccountSettings>(
+    !objectIsEmpty(account)
+      ? account
+      : ({
+          // @ts-ignore
+          id: null,
+          name: "",
+          username: "",
+          email: "",
+          emailVerified: null,
+          blurredFavicons: null,
+          image: "",
+          isPrivate: true,
+          // @ts-ignore
+          createdAt: null,
+          whitelistedUsers: [],
+        } as unknown as AccountSettings)
+  );
+
+  function objectIsEmpty(obj: object) {
+    return Object.keys(obj).length === 0;
+  }
+
+  useEffect(() => {
+    if (!objectIsEmpty(account)) setUser({ ...account });
+  }, [account]);
+
   return (
     <SettingsLayout>
-      <p className="mb-3">Select Theme</p>
-      <div className="flex gap-3 w-full">
-        <div
-          className={`w-full text-center outline-solid outline-sky-100 outline dark:outline-neutral-700 h-40 duration-100 rounded-md flex items-center justify-center cursor-pointer select-none bg-black ${
-            theme === "dark"
-              ? "dark:outline-sky-500 text-sky-500"
-              : "text-white"
-          }`}
-          onClick={() => setTheme("dark")}
-        >
-          <FontAwesomeIcon icon={faMoon} className="w-1/2 h-1/2" />
-          <p className="text-2xl">Dark Theme</p>
+      <div className="flex flex-col gap-3">
+        <div>
+          <p className="mb-3">Select Theme</p>
+          <div className="flex gap-3 w-full">
+            <div
+              className={`w-full text-center outline-solid outline-sky-100 outline dark:outline-neutral-700 h-40 duration-100 rounded-md flex items-center justify-center cursor-pointer select-none bg-black ${
+                theme === "dark"
+                  ? "dark:outline-sky-500 text-sky-500"
+                  : "text-white"
+              }`}
+              onClick={() => setTheme("dark")}
+            >
+              <FontAwesomeIcon icon={faMoon} className="w-1/2 h-1/2" />
+              <p className="text-2xl">Dark Theme</p>
 
-          {/* <hr className="my-3 outline-1 outline-sky-100 dark:outline-neutral-700" /> */}
+              {/* <hr className="my-3 outline-1 outline-sky-100 dark:outline-neutral-700" /> */}
+            </div>
+            <div
+              className={`w-full text-center outline-solid outline-sky-100 outline dark:outline-neutral-700 h-40 duration-100 rounded-md flex items-center justify-center cursor-pointer select-none bg-white ${
+                theme === "light"
+                  ? "outline-sky-500 text-sky-500"
+                  : "text-black"
+              }`}
+              onClick={() => setTheme("light")}
+            >
+              <FontAwesomeIcon icon={faSun} className="w-1/2 h-1/2" />
+              <p className="text-2xl">Light Theme</p>
+              {/* <hr className="my-3 outline-1 outline-sky-100 dark:outline-neutral-700" /> */}
+            </div>
+          </div>
         </div>
-        <div
-          className={`w-full text-center outline-solid outline-sky-100 outline dark:outline-neutral-700 h-40 duration-100 rounded-md flex items-center justify-center cursor-pointer select-none bg-white ${
-            theme === "light" ? "outline-sky-500 text-sky-500" : "text-black"
-          }`}
-          onClick={() => setTheme("light")}
-        >
-          <FontAwesomeIcon icon={faSun} className="w-1/2 h-1/2" />
-          <p className="text-2xl">Light Theme</p>
-          {/* <hr className="my-3 outline-1 outline-sky-100 dark:outline-neutral-700" /> */}
+
+        <div>
+          <Checkbox
+            label="Blurred Link Icons"
+            state={user.blurredFavicons}
+            onClick={() =>
+              setUser({ ...user, blurredFavicons: !user.blurredFavicons })
+            }
+          />
         </div>
+
+        <SubmitButton
+          onClick={submit}
+          loading={submitLoader}
+          label="Save"
+          className="mt-2 mx-auto lg:mx-0"
+        />
       </div>
     </SettingsLayout>
   );

pages/settings/billing.tsx

@@ -11,7 +11,7 @@ export default function Billing() {
 
   return (
     <SettingsLayout>
-      <div className=" w-full mx-auto flex flex-col gap-3 justify-between">
+      <div className="w-full mx-auto flex flex-col gap-3 justify-between">
         <p className="text-md text-black dark:text-white">
           To manage/cancel your subsciption, visit the{" "}
           <a

pages/settings/delete.tsx

@@ -134,7 +134,7 @@ export default function Password() {
         ) : undefined}
 
         <button
-          className={`mx-auto lg:mx-0 text-white flex items-center gap-2 py-1 px-3 rounded-md text-lg tracking-wide select-none font-semibold duration-100 w-fit ${
+          className={`mx-auto text-white flex items-center gap-2 py-1 px-3 rounded-md text-lg tracking-wide select-none font-semibold duration-100 w-fit ${
             submitLoader
               ? "bg-red-400 cursor-auto"
               : "bg-red-500 hover:bg-red-400 cursor-pointer"

prisma/migrations/20231110154938_add_blurred_favicons_field/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "blurredFavicons" BOOLEAN NOT NULL DEFAULT true;

prisma/schema.prisma

@@ -33,6 +33,8 @@ model User {
 
   isPrivate               Boolean         @default(false)
 
+  blurredFavicons         Boolean         @default(true)
+
   createdAt               DateTime        @default(now())
   updatedAt               DateTime        @updatedAt @default(now())
 }

styles/globals.css

@@ -176,10 +176,6 @@ body {
   padding: 0;
 }
 
-.sky-shadow {
-  box-shadow: 0px 0px 3px #0ea5e9;
-}
-
 .primary-btn-gradient {
   box-shadow: inset 0px -10px 10px #0071b7;
 }