From d53dd93bb7a6657c50c1c59fa78f248f36c50c5b Mon Sep 17 00:00:00 2001 From: daniel31x13 Date: Sat, 25 Nov 2023 05:39:56 -0500 Subject: [PATCH] swapped some gray colors with neutral --- components/CollectionCard.tsx | 8 ++++---- components/DashboardItem.tsx | 4 +--- components/LinkCard.tsx | 8 +++----- components/LinkPreview.tsx | 6 +++--- components/LinkSidebar.tsx | 9 +++------ components/Modal/Collection/TeamManagement.tsx | 18 +++++++----------- components/Modal/Collection/ViewTeam.tsx | 8 ++------ components/Modal/Link/AddOrEditLink.tsx | 2 +- components/Modal/Link/PreservedFormats.tsx | 10 +++++----- components/Modal/index.tsx | 2 +- components/Navbar.tsx | 2 +- components/PublicPage/PublicLinkCard.tsx | 4 ++-- components/Sidebar.tsx | 14 +++++++------- layouts/LinkLayout.tsx | 10 +++++----- layouts/SettingsLayout.tsx | 4 ++-- pages/choose-username.tsx | 4 ++-- pages/collections/[id].tsx | 4 ++-- pages/collections/index.tsx | 4 ++-- pages/dashboard.tsx | 4 ++-- pages/forgot.tsx | 2 +- pages/links/[id].tsx | 2 +- pages/links/index.tsx | 2 +- pages/links/pinned.tsx | 4 ++-- pages/login.tsx | 9 ++------- pages/public/collections/[id].tsx | 6 +++--- pages/public/links/[id].tsx | 2 +- pages/register.tsx | 8 +++----- pages/search.tsx | 4 ++-- pages/settings/account.tsx | 6 +++--- pages/settings/delete.tsx | 2 +- pages/subscribe.tsx | 6 ++---- pages/tags/[id].tsx | 8 ++++---- 32 files changed, 81 insertions(+), 105 deletions(-) diff --git a/components/CollectionCard.tsx b/components/CollectionCard.tsx index a639bd5..177f590 100644 --- a/components/CollectionCard.tsx +++ b/components/CollectionCard.tsx @@ -59,7 +59,7 @@ export default function CollectionCard({ collection, className }: Props) { ) : undefined} {collection._count && collection._count.links} -
+

{formattedDate}

diff --git a/components/DashboardItem.tsx b/components/DashboardItem.tsx index 43ee677..bb9e016 100644 --- a/components/DashboardItem.tsx +++ b/components/DashboardItem.tsx @@ -14,9 +14,7 @@ export default function dashboardItem({ name, value, icon }: Props) {
-

- {name} -

+

{name}

{value}

diff --git a/components/LinkCard.tsx b/components/LinkCard.tsx index dd0ebec..2b7b546 100644 --- a/components/LinkCard.tsx +++ b/components/LinkCard.tsx @@ -185,9 +185,7 @@ export default function LinkCard({ link, count, className }: Props) {
-

- {count + 1} -

+

{count + 1}

{unescapeString(link.name || link.description)}

@@ -233,12 +231,12 @@ export default function LinkCard({ link, count, className }: Props) { onClick={(e) => { e.stopPropagation(); }} - className="flex items-center gap-1 max-w-full w-fit text-gray-500 dark:text-gray-300 hover:opacity-70 duration-100" + className="flex items-center gap-1 max-w-full w-fit text-neutral hover:opacity-70 duration-100" >

{shortendURL}

-
+

{formattedDate}

diff --git a/components/LinkPreview.tsx b/components/LinkPreview.tsx index 858d6d3..3525521 100644 --- a/components/LinkPreview.tsx +++ b/components/LinkPreview.tsx @@ -74,7 +74,7 @@ export default function LinkPreview({ link, className, settings }: Props) {
-

{1}

+

{1}

{unescapeString(link.name as string)}

@@ -92,12 +92,12 @@ export default function LinkPreview({ link, className, settings }: Props) { onClick={(e) => { e.stopPropagation(); }} - className="flex items-center gap-1 max-w-full w-fit text-gray-500 dark:text-gray-300 hover:opacity-70 duration-100" + className="flex items-center gap-1 max-w-full w-fit text-neutral hover:opacity-70 duration-100" >

{shortendURL}

-
+

{formattedDate}

diff --git a/components/LinkSidebar.tsx b/components/LinkSidebar.tsx index 08f1ef9..19c4986 100644 --- a/components/LinkSidebar.tsx +++ b/components/LinkSidebar.tsx @@ -71,10 +71,7 @@ export default function LinkSidebar({ className, onClick }: Props) { }} className={`hover:opacity-60 duration-100 py-2 px-2 cursor-pointer flex items-center gap-4 w-full rounded-md h-8`} > - +

Edit

@@ -97,7 +94,7 @@ export default function LinkSidebar({ className, onClick }: Props) { >

Preserved Formats

@@ -120,7 +117,7 @@ export default function LinkSidebar({ className, onClick }: Props) { >

Delete

diff --git a/components/Modal/Collection/TeamManagement.tsx b/components/Modal/Collection/TeamManagement.tsx index 49417cb..50d63aa 100644 --- a/components/Modal/Collection/TeamManagement.tsx +++ b/components/Modal/Collection/TeamManagement.tsx @@ -112,7 +112,7 @@ export default function TeamManagement({ } /> -

+

This will let Anyone to view this collection.

@@ -181,7 +181,7 @@ export default function TeamManagement({ {collection?.members[0]?.user && ( <> -

+

(All Members have Read access to this collection.)

@@ -196,7 +196,7 @@ export default function TeamManagement({ {permissions === true && ( { const updatedMembers = collection.members.filter( @@ -218,9 +218,7 @@ export default function TeamManagement({ />

{e.user.name}

-

- @{e.user.username} -

+

@{e.user.username}

@@ -233,7 +231,7 @@ export default function TeamManagement({ Permissions

{permissions === true && ( -

+

(Click to toggle.)

)} @@ -243,7 +241,7 @@ export default function TeamManagement({ !e.canCreate && !e.canUpdate && !e.canDelete ? ( -

+

Has no permissions.

) : ( @@ -409,9 +407,7 @@ export default function TeamManagement({ className="w-3 h-3 text-yellow-500" />
-

- @{collectionOwner.username} -

+

@{collectionOwner.username}

diff --git a/components/Modal/Collection/ViewTeam.tsx b/components/Modal/Collection/ViewTeam.tsx index c34d8b5..9a941db 100644 --- a/components/Modal/Collection/ViewTeam.tsx +++ b/components/Modal/Collection/ViewTeam.tsx @@ -52,9 +52,7 @@ export default function ViewTeam({ collection }: Props) { Admin
-

- @{collectionOwner.username} -

+

@{collectionOwner.username}

@@ -77,9 +75,7 @@ export default function ViewTeam({ collection }: Props) { />

{e.user.name}

-

- @{e.user.username} -

+

@{e.user.username}

diff --git a/components/Modal/Link/AddOrEditLink.tsx b/components/Modal/Link/AddOrEditLink.tsx index 936750f..d115ac6 100644 --- a/components/Modal/Link/AddOrEditLink.tsx +++ b/components/Modal/Link/AddOrEditLink.tsx @@ -138,7 +138,7 @@ export default function AddOrEditLink({
{method === "UPDATE" ? (
diff --git a/components/Modal/Link/PreservedFormats.tsx b/components/Modal/Link/PreservedFormats.tsx index 0a15736..a4575be 100644 --- a/components/Modal/Link/PreservedFormats.tsx +++ b/components/Modal/Link/PreservedFormats.tsx @@ -107,7 +107,7 @@ export default function PreservedFormats() { >
@@ -118,7 +118,7 @@ export default function PreservedFormats() { >
@@ -142,7 +142,7 @@ export default function PreservedFormats() { > @@ -153,7 +153,7 @@ export default function PreservedFormats() { > @@ -183,7 +183,7 @@ export default function PreservedFormats() { "" )}`} target="_blank" - className={`text-gray-500 dark:text-gray-300 duration-100 hover:opacity-60 flex gap-2 w-fit items-center text-sm ${ + className={`text-neutral duration-100 hover:opacity-60 flex gap-2 w-fit items-center text-sm ${ link?.pdfPath && link?.screenshotPath && link?.pdfPath !== "pending" && diff --git a/components/Modal/index.tsx b/components/Modal/index.tsx index 05088e3..9a249f5 100644 --- a/components/Modal/index.tsx +++ b/components/Modal/index.tsx @@ -23,7 +23,7 @@ export default function Modal({ toggleModal, className, children }: Props) { > {children} diff --git a/components/Navbar.tsx b/components/Navbar.tsx index 8e45fb9..dfd2f85 100644 --- a/components/Navbar.tsx +++ b/components/Navbar.tsx @@ -53,7 +53,7 @@ export default function Navbar() {
diff --git a/components/PublicPage/PublicLinkCard.tsx b/components/PublicPage/PublicLinkCard.tsx index 1734f56..18e3b30 100644 --- a/components/PublicPage/PublicLinkCard.tsx +++ b/components/PublicPage/PublicLinkCard.tsx @@ -64,7 +64,7 @@ export default function LinkCard({ link, count }: Props) { ))}
-
+

{formattedDate}

ยท

Read

{ setCollectionDisclosure(!collectionDisclosure); }} - className="flex items-center justify-between text-sm w-full text-left mb-2 pl-2 font-bold text-gray-500 dark:text-gray-300 mt-5" + className="flex items-center justify-between text-sm w-full text-left mb-2 pl-2 font-bold text-neutral mt-5" >

Collections

@@ -169,10 +169,10 @@ export default function Sidebar({ className }: { className?: string }) { ) : undefined} -
+
{e._count?.links}
@@ -183,7 +183,7 @@ export default function Sidebar({ className }: { className?: string }) {
-

+

You Have No Collections...

@@ -196,7 +196,7 @@ export default function Sidebar({ className }: { className?: string }) { onClick={() => { setTagDisclosure(!tagDisclosure); }} - className="flex items-center justify-between text-sm w-full text-left mb-2 pl-2 font-bold text-gray-500 dark:text-gray-300 mt-5" + className="flex items-center justify-between text-sm w-full text-left mb-2 pl-2 font-bold text-neutral mt-5" >

Tags

{e.name}

-
+
{e._count?.links}
@@ -243,7 +243,7 @@ export default function Sidebar({ className }: { className?: string }) {
-

+

You Have No Tags...

diff --git a/layouts/LinkLayout.tsx b/layouts/LinkLayout.tsx index b1bc511..9bcce8d 100644 --- a/layouts/LinkLayout.tsx +++ b/layouts/LinkLayout.tsx @@ -86,7 +86,7 @@ export default function LinkLayout({ children }: Props) {
{/*
*/} @@ -103,7 +103,7 @@ export default function LinkLayout({ children }: Props) { router.push(`/dashboard`); } }} - className="inline-flex gap-1 hover:opacity-60 items-center select-none cursor-pointer p-2 lg:p-0 lg:px-1 lg:my-2 text-gray-500 dark:text-gray-300 rounded-md duration-100" + className="inline-flex gap-1 hover:opacity-60 items-center select-none cursor-pointer p-2 lg:p-0 lg:px-1 lg:my-2 text-neutral rounded-md duration-100" > Back{" "} @@ -138,7 +138,7 @@ export default function LinkLayout({ children }: Props) { >
) : undefined} @@ -159,7 +159,7 @@ export default function LinkLayout({ children }: Props) { >
@@ -179,7 +179,7 @@ export default function LinkLayout({ children }: Props) { >
) : undefined} diff --git a/layouts/SettingsLayout.tsx b/layouts/SettingsLayout.tsx index 7a9a2af..2e4f5d3 100644 --- a/layouts/SettingsLayout.tsx +++ b/layouts/SettingsLayout.tsx @@ -53,14 +53,14 @@ export default function SettingsLayout({ children }: Props) {
diff --git a/pages/choose-username.tsx b/pages/choose-username.tsx index 9ef137c..0c7c0fd 100644 --- a/pages/choose-username.tsx +++ b/pages/choose-username.tsx @@ -60,7 +60,7 @@ export default function ChooseUsername() { />
diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx index 4a7dbf8..7154d83 100644 --- a/pages/collections/[id].tsx +++ b/pages/collections/[id].tsx @@ -132,7 +132,7 @@ export default function Index() { @@ -154,7 +154,7 @@ export default function Index() { icon={faEllipsis} id="expand-dropdown" title="More" - className="w-5 h-5 text-gray-500 dark:text-gray-300" + className="w-5 h-5 text-neutral" /> {expandDropdown ? ( diff --git a/pages/collections/index.tsx b/pages/collections/index.tsx index c08d9a4..b9ea717 100644 --- a/pages/collections/index.tsx +++ b/pages/collections/index.tsx @@ -56,7 +56,7 @@ export default function Collections() { @@ -95,7 +95,7 @@ export default function Collections() { diff --git a/pages/dashboard.tsx b/pages/dashboard.tsx index 2c8557b..d76e5b3 100644 --- a/pages/dashboard.tsx +++ b/pages/dashboard.tsx @@ -186,7 +186,7 @@ export default function Dashboard() {

View Your Recently Added Links Here!

-

+

This section will view your latest added Links across every Collections you have access to.

@@ -323,7 +323,7 @@ export default function Dashboard() {

Pin Your Favorite Links Here!

-

+

You can Pin your favorite Links by clicking on the three dots on each Link and clicking{" "} Pin to Dashboard. diff --git a/pages/forgot.tsx b/pages/forgot.tsx index 93cee68..cb25194 100644 --- a/pages/forgot.tsx +++ b/pages/forgot.tsx @@ -56,7 +56,7 @@ export default function Forgot() { account. Make sure to change your password in the profile settings afterwards.

-

+

You wont get logged in if you haven't created an account yet.

diff --git a/pages/links/[id].tsx b/pages/links/[id].tsx index 8650578..12c8377 100644 --- a/pages/links/[id].tsx +++ b/pages/links/[id].tsx @@ -185,7 +185,7 @@ export default function Index() { /> )} -
+

{link?.createdAt ? new Date(link?.createdAt).toLocaleString("en-US", { diff --git a/pages/links/index.tsx b/pages/links/index.tsx index dc247e4..6401d99 100644 --- a/pages/links/index.tsx +++ b/pages/links/index.tsx @@ -42,7 +42,7 @@ export default function Links() {

diff --git a/pages/links/pinned.tsx b/pages/links/pinned.tsx index e844c25..637425b 100644 --- a/pages/links/pinned.tsx +++ b/pages/links/pinned.tsx @@ -42,7 +42,7 @@ export default function PinnedLinks() {
@@ -69,7 +69,7 @@ export default function PinnedLinks() {

Pin Your Favorite Links Here!

-

+

You can Pin your favorite Links by clicking on the three dots on each Link and clicking{" "} Pin to Dashboard. diff --git a/pages/login.tsx b/pages/login.tsx index d4a45f1..16a8607 100644 --- a/pages/login.tsx +++ b/pages/login.tsx @@ -97,10 +97,7 @@ export default function Login() { /> {emailEnabled && (

- + Forgot Password?
@@ -125,9 +122,7 @@ export default function Login() { {process.env.NEXT_PUBLIC_DISABLE_REGISTRATION === "true" ? undefined : (
-

- New here? -

+

New here?

Sign Up diff --git a/pages/public/collections/[id].tsx b/pages/public/collections/[id].tsx index 3512ebc..3a2deb5 100644 --- a/pages/public/collections/[id].tsx +++ b/pages/public/collections/[id].tsx @@ -184,7 +184,7 @@ export default function PublicCollections() {
) : null} -

+

By {collectionOwner.name} {collection.members.length > 0 ? ` and ${collection.members.length} others` @@ -215,7 +215,7 @@ export default function PublicCollections() { @@ -237,7 +237,7 @@ export default function PublicCollections() { diff --git a/pages/public/links/[id].tsx b/pages/public/links/[id].tsx index 1d21ff2..9e2a60b 100644 --- a/pages/public/links/[id].tsx +++ b/pages/public/links/[id].tsx @@ -185,7 +185,7 @@ export default function Index() { /> )} -

+

{link?.createdAt ? new Date(link?.createdAt).toLocaleString("en-US", { diff --git a/pages/register.tsx b/pages/register.tsx index 21e0a18..7afe736 100644 --- a/pages/register.tsx +++ b/pages/register.tsx @@ -190,7 +190,7 @@ export default function Register() { {process.env.NEXT_PUBLIC_STRIPE ? (

-

+

By signing up, you agree to our{" "} .

-

+

Need help?{" "} Sign Up

-

- Already have an account? -

+

Already have an account?

Login diff --git a/pages/search.tsx b/pages/search.tsx index 1745639..9f908c1 100644 --- a/pages/search.tsx +++ b/pages/search.tsx @@ -63,7 +63,7 @@ export default function Search() {
@@ -85,7 +85,7 @@ export default function Search() {
diff --git a/pages/settings/account.tsx b/pages/settings/account.tsx index 5daaf20..eec6f4d 100644 --- a/pages/settings/account.tsx +++ b/pages/settings/account.tsx @@ -178,7 +178,7 @@ export default function Account() {

Email

{user.email !== account.email && process.env.NEXT_PUBLIC_STRIPE === "true" ? ( -

+

Updating this field will change your billing email as well

) : undefined} @@ -327,14 +327,14 @@ export default function Account() { onClick={() => setUser({ ...user, isPrivate: !user.isPrivate })} /> -

+

This will limit who can find and add you to new Collections.

{user.isPrivate && (

Whitelisted Users

-

+

Please provide the Username of the users you wish to grant visibility to your profile. Separated by comma.

diff --git a/pages/settings/delete.tsx b/pages/settings/delete.tsx index 2d44685..f00429f 100644 --- a/pages/settings/delete.tsx +++ b/pages/settings/delete.tsx @@ -57,7 +57,7 @@ export default function Password() {
diff --git a/pages/subscribe.tsx b/pages/subscribe.tsx index f85aea2..9f2ef00 100644 --- a/pages/subscribe.tsx +++ b/pages/subscribe.tsx @@ -77,9 +77,7 @@ export default function Subscribe() {

${plan === Plan.monthly ? "4" : "3"} - - /mo - + /mo

Billed {plan === Plan.monthly ? "Monthly" : "Yearly"} @@ -108,7 +106,7 @@ export default function Subscribe() {

signOut()} - className="w-fit mx-auto cursor-pointer text-gray-500 dark:text-gray-400 font-semibold " + className="w-fit mx-auto cursor-pointer text-neutral font-semibold " > Sign Out
diff --git a/pages/tags/[id].tsx b/pages/tags/[id].tsx index 276f28e..0afff45 100644 --- a/pages/tags/[id].tsx +++ b/pages/tags/[id].tsx @@ -127,7 +127,7 @@ export default function Index() {
@@ -157,7 +157,7 @@ export default function Index() {
@@ -202,7 +202,7 @@ export default function Index() {