⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
navbar UI improved
Daniel39abb0900224
diff --git a/components/ImageWithFallback.tsx b/components/ImageWithFallback.tsxdeleted file mode 100644index 44c6f81e..00000000--- a/components/ImageWithFallback.tsx+++ /dev/null@@ -1,27 +0,0 @@-import { ReactNode, useState } from "react";--type Props = {- src: string;- className: string;- children: ReactNode;-};--const ImageWithFallback = ({ src, className, children, ...rest }: Props) => {- const [error, setError] = useState(false);-- return error ? (- <>{children}</>- ) : (- <img- alt=""- {...rest}- src={src}- className={className}- onError={() => {- setError(true);- }}- />- );-};--export default ImageWithFallback;diff --git a/components/Modal/Collection/TeamManagement.tsx b/components/Modal/Collection/TeamManagement.tsxindex e9e3da54..0cba34d5 100644--- a/components/Modal/Collection/TeamManagement.tsx+++ b/components/Modal/Collection/TeamManagement.tsx@@ -3,16 +3,15 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";import {faClose,faPenToSquare,- faUser,faUserPlus,} from "@fortawesome/free-solid-svg-icons";import useCollectionStore from "@/store/collections";import { CollectionIncludingMembers, Member } from "@/types/global";import { useSession } from "next-auth/react";import addMemberToCollection from "@/lib/client/addMemberToCollection";-import ImageWithFallback from "../../ImageWithFallback";import Checkbox from "../../Checkbox";import SubmitButton from "@/components/SubmitButton";+import ProfilePhoto from "@/components/ProfilePhoto";type Props = {toggleCollectionModal: Function;@@ -186,15 +185,7 @@ export default function TeamManagement({}}/><div className="flex items-center gap-2">- <ImageWithFallback- key={i}- src={`/api/avatar/${e.userId}`}- className="h-10 w-10 shadow rounded-full border-[3px] border-sky-100"- >- <div className="text-white bg-sky-500 h-10 w-10 shadow rounded-full border-[3px] border-sky-100 flex items-center justify-center">- <FontAwesomeIcon icon={faUser} className="w-5 h-5" />- </div>- </ImageWithFallback>+ <ProfilePhoto src={`/api/avatar/${e.userId}`} /><div><p className="text-sm font-bold text-sky-500">{e.user.name}diff --git a/components/Navbar.tsx b/components/Navbar.tsxindex 23f3652d..e4927c09 100644--- a/components/Navbar.tsx+++ b/components/Navbar.tsx@@ -16,6 +16,7 @@ import { useRouter } from "next/router";import Search from "@/components/Search";import UserSettings from "./Modal/UserSettings";import useAccountStore from "@/store/account";+import ProfilePhoto from "./ProfilePhoto";export default function () {const { account } = useAccountStore();@@ -71,27 +72,17 @@ export default function () {<div className="relative"><div- className="flex gap-1 group items-center w-fit bg-white cursor-pointer"+ className="flex gap-1 group sm:hover:bg-slate-200 sm:hover:p-1 duration-100 h-10 rounded-full items-center w-fit bg-white cursor-pointer"onClick={() => setProfileDropdown(!profileDropdown)}id="profile-dropdown">- {account.profilePic ? (- <img- src={account.profilePic}- className="h-10 w-10 shadow pointer-events-none rounded-full border-[3px] border-sky-500 group-hover:border-sky-400 duration-100"- alt=""- id="profile-dropdown"- />- ) : (- <FontAwesomeIcon- icon={faCircleUser}- id="profile-dropdown"- className="h-10 w-10 pointer-events-none text-sky-500 group-hover:text-sky-400 duration-100"- />- )}+ <ProfilePhoto+ src={account.profilePic}+ className="sm:group-hover:h-8 sm:group-hover:w-8 duration-100"+ /><divid="profile-dropdown"- className="text-sky-500 group-hover:text-sky-400 duration-100 hidden sm:flex item-center gap-1 max-w-[8rem]"+ className="text-sky-500 duration-100 hidden sm:flex item-center gap-1 max-w-[8rem]"><pid="profile-dropdown"@@ -102,7 +93,7 @@ export default function () {<FontAwesomeIconid="profile-dropdown"icon={faChevronDown}- className="h-3 w-3"+ className="h-3 w-3 text-gray-500"/></div></div>diff --git a/components/ProfilePhoto.tsx b/components/ProfilePhoto.tsxindex 12f86cb3..e319128d 100644--- a/components/ProfilePhoto.tsx+++ b/components/ProfilePhoto.tsx@@ -1,5 +1,4 @@-import React from "react";-import ImageWithFallback from "./ImageWithFallback";+import React, { useEffect, useState } from "react";import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";import { faUser } from "@fortawesome/free-solid-svg-icons";@@ -9,16 +8,26 @@ type Props = {};export default function ProfilePhoto({ src, className }: Props) {- return (- <ImageWithFallback- src={src}- className={`h-10 w-10 shadow rounded-full border-[3px] border-sky-100 ${className}`}+ const [error, setError] = useState(false);++ useEffect(() => {+ console.log(src);+ }, []);++ return error || !src ? (+ <div+ className={`bg-sky-500 text-white h-10 w-10 shadow rounded-full border-[3px] border-slate-200 flex items-center justify-center ${className}`}>- <div- className={`bg-sky-500 text-white h-10 w-10 shadow rounded-full border-[3px] border-sky-100 flex items-center justify-center ${className}`}- >- <FontAwesomeIcon icon={faUser} className="w-5 h-5" />- </div>- </ImageWithFallback>+ <FontAwesomeIcon icon={faUser} className="w-5 h-5" />+ </div>+ ) : (+ <img+ alt=""+ src={src}+ className={`h-10 w-10 shadow rounded-full border-[3px] border-slate-200 ${className}`}+ onError={() => {+ setError(true);+ }}+ />);}diff --git a/components/Search.tsx b/components/Search.tsxindex ed5e3ece..f072680c 100644--- a/components/Search.tsx+++ b/components/Search.tsx@@ -34,6 +34,8 @@ export default function Search() {placeholder="Search for Links"value={searchQuery}onChange={(e) => {+ e.target.value.includes("%") &&+ console.log("The search query should not contain '%'.");setSearchQuery(e.target.value.replace("%", ""));}}onKeyDown={(e) =>@@ -41,7 +43,7 @@ export default function Search() {router.push("/search/" + encodeURIComponent(searchQuery))}autoFocus={searchBox}- className="border border-sky-100 rounded-md pl-10 py-2 pr-2 w-44 sm:w-60 focus:border-sky-500 sm:focus:w-80 hover:border-sky-500 duration-100 outline-none"+ className="border border-sky-100 rounded-md pl-10 py-2 pr-2 w-44 sm:w-60 focus:border-sky-500 md:focus:w-80 hover:border-sky-500 duration-100 outline-none"/></div>);diff --git a/components/Sidebar.tsx b/components/Sidebar.tsxindex 1487e1ab..9e694bbb 100644--- a/components/Sidebar.tsx+++ b/components/Sidebar.tsx@@ -21,7 +21,6 @@ export default function ({ className }: { className?: string }) {const [active, setActive] = useState("");useEffect(() => {- console.log(window.location.hash);setActive(router.asPath);}, [router, collections]);diff --git a/types/global.ts b/types/global.tsindex 4e5c741c..900b3e7e 100644--- a/types/global.ts+++ b/types/global.ts@@ -29,7 +29,7 @@ export interface CollectionIncludingMembers}export interface AccountSettings extends User {- profilePic: string | null;+ profilePic: string;oldPassword?: string;newPassword?: string;}