diff --git a/README.md b/README.md
index 3070130..620aac4 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
-[Website](https://linkwarden.app) | [Getting Started](https://docs.linkwarden.app) | [Features](https://github.com/linkwarden/linkwarden#features) | [Roadmap](https://github.com/orgs/linkwarden/projects/1) | [Screenshots](https://github.com/linkwarden/linkwarden#screenshots) | [Support ❤](https://github.com/linkwarden/linkwarden#support-)
+[Website](https://linkwarden.app) | [Getting Started](https://docs.linkwarden.app) | [Features](https://github.com/linkwarden/linkwarden#features) | [Roadmap](https://github.com/orgs/linkwarden/projects/1) | [Support ❤](https://github.com/linkwarden/linkwarden#support-)
@@ -21,7 +21,21 @@
Additionally, Linkwarden is designed with collaboration in mind, sharing links with the public and/or allowing multiple users to work together seamlessly.
-
+
+
+
> [!TIP]
> Our official [Cloud](https://linkwarden.app/#pricing) offering provides the simplest way to begin using Linkwarden and it's the preferred choice for many due to its time-saving benefits.
Your subscription supports our hosting infrastructure and ongoing development.
Alternatively, if you prefer [self-hosting](https://docs.linkwarden.app/self-hosting/installation) Linkwarden, no problem! You'll still have access to all the premium features.
@@ -31,7 +45,7 @@ Additionally, Linkwarden is designed with collaboration in mind, sharing links w
Linkwarden has been completely rebuilt and redesigned from ground up, so pretty much the only thing it has in common with its predecessor is the idea behind it - bookmark management.
**What happened to the old version?**
-We highly recommend that you don't use the old version because it is no longer maintained and has far fewer features. However, if you still want to check it out, we've forked the old version from the current repository into [this repo](https://github.com/linkwarden/linkwarden-old).
+We've forked the old version from the current repository into [this repo](https://github.com/linkwarden/linkwarden-old).
@@ -50,6 +64,7 @@ We highly recommend that you don't use the old version because it is no longer m
- 🧩 Browser extension, managed by the community. [Star it here!](https://github.com/linkwarden/browser-extension)
- ⬇️ Import your bookmarks from other browsers.
- ⚡️ Powerful API.
+- ✅ And many more changes!
## Suggestions
@@ -79,16 +94,6 @@ If you want to contribute, Thanks! Start by checking our [public roadmap](https:
If you found a security vulnerability, please do **not** create a public issue, instead send an email to [security@linkwarden.app](mailto:security@linkwarden.app) stating the vulnerability. Thanks!
-## Screenshots
-
-
-
## Support ❤
Other than using our official [Cloud](https://linkwarden.app/#pricing) offering, any [donations](https://opencollective.com/linkwarden) are highly appreciated as well!
diff --git a/assets/collaborators.png b/assets/collaborators.png
deleted file mode 100644
index 0c527e3..0000000
Binary files a/assets/collaborators.png and /dev/null differ
diff --git a/assets/collections.png b/assets/collections.png
deleted file mode 100644
index e7abe9a..0000000
Binary files a/assets/collections.png and /dev/null differ
diff --git a/assets/dashboard.png b/assets/dashboard.png
new file mode 100644
index 0000000..b799e82
Binary files /dev/null and b/assets/dashboard.png differ
diff --git a/assets/light_mode.png b/assets/light_mode.png
new file mode 100644
index 0000000..f5bac36
Binary files /dev/null and b/assets/light_mode.png differ
diff --git a/assets/link_details.png b/assets/link_details.png
deleted file mode 100644
index 418ed56..0000000
Binary files a/assets/link_details.png and /dev/null differ
diff --git a/assets/preserve_links.png b/assets/preserve_links.png
new file mode 100644
index 0000000..efcb64d
Binary files /dev/null and b/assets/preserve_links.png differ
diff --git a/assets/public_page.png b/assets/public_page.png
new file mode 100644
index 0000000..a311b45
Binary files /dev/null and b/assets/public_page.png differ
diff --git a/assets/team_management.png b/assets/team_management.png
new file mode 100644
index 0000000..d25d192
Binary files /dev/null and b/assets/team_management.png differ
diff --git a/assets/view_collections.png b/assets/view_collections.png
new file mode 100644
index 0000000..86700d3
Binary files /dev/null and b/assets/view_collections.png differ
diff --git a/assets/view_links.png b/assets/view_links.png
new file mode 100644
index 0000000..3c459ee
Binary files /dev/null and b/assets/view_links.png differ
diff --git a/components/LinkSidebar.tsx b/components/LinkSidebar.tsx
index 63ddb0a..460ba74 100644
--- a/components/LinkSidebar.tsx
+++ b/components/LinkSidebar.tsx
@@ -42,7 +42,7 @@ export default function LinkSidebar({ className, onClick }: Props) {
useEffect(() => {
if (link)
- setLinkCollection(collections.find((e) => e.id === link?.collection.id));
+ setLinkCollection(collections.find((e) => e.id === link?.collection?.id));
}, [link]);
return (
diff --git a/components/Navbar.tsx b/components/Navbar.tsx
index 57af684..4b34d20 100644
--- a/components/Navbar.tsx
+++ b/components/Navbar.tsx
@@ -93,7 +93,7 @@ export default function Navbar() {
/>
{account.name}
diff --git a/layouts/LinkLayout.tsx b/layouts/LinkLayout.tsx
index 398acda..d45a111 100644
--- a/layouts/LinkLayout.tsx
+++ b/layouts/LinkLayout.tsx
@@ -70,7 +70,7 @@ export default function LinkLayout({ children }: Props) {
useEffect(() => {
if (link)
- setLinkCollection(collections.find((e) => e.id === link?.collection.id));
+ setLinkCollection(collections.find((e) => e.id === link?.collection?.id));
}, [link, collections]);
return (
diff --git a/lib/api/controllers/public/users/getPublicUser.ts b/lib/api/controllers/public/users/getPublicUser.ts
index fff10a5..8e17887 100644
--- a/lib/api/controllers/public/users/getPublicUser.ts
+++ b/lib/api/controllers/public/users/getPublicUser.ts
@@ -31,13 +31,16 @@ export default async function getPublicUser(
if (user?.isPrivate) {
if (requestingId) {
- const requestingUsername = (
- await prisma.user.findUnique({ where: { id: requestingId } })
- )?.username;
+ const requestingUser = await prisma.user.findUnique({
+ where: { id: requestingId },
+ });
if (
- !requestingUsername ||
- !whitelistedUsernames.includes(requestingUsername?.toLowerCase())
+ requestingUser?.id !== requestingId &&
+ (!requestingUser?.username ||
+ !whitelistedUsernames.includes(
+ requestingUser.username?.toLowerCase()
+ ))
) {
return {
response: "User not found or profile is private.",
diff --git a/prisma/migrations/20231120184333_set_blurred_favicon_to_false_as_default/migration.sql b/prisma/migrations/20231120184333_set_blurred_favicon_to_false_as_default/migration.sql
new file mode 100644
index 0000000..0ab9036
--- /dev/null
+++ b/prisma/migrations/20231120184333_set_blurred_favicon_to_false_as_default/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ALTER COLUMN "blurredFavicons" SET DEFAULT false;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 5f4dd23..70ef764 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -46,7 +46,7 @@ model User {
archiveAsWaybackMachine Boolean @default(false)
isPrivate Boolean @default(false)
displayLinkIcons Boolean @default(true)
- blurredFavicons Boolean @default(true)
+ blurredFavicons Boolean @default(false)
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt @default(now())
}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-