Merge pull request #375 from linkwarden/dev

Dev
This commit is contained in:
Daniel 2023-12-29 23:59:34 -05:00 committed by GitHub
commit e24ae15a73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 712 additions and 493 deletions

View File

@ -18,6 +18,7 @@ RE_ARCHIVE_LIMIT=
NEXT_PUBLIC_MAX_FILE_SIZE= NEXT_PUBLIC_MAX_FILE_SIZE=
MAX_LINKS_PER_USER= MAX_LINKS_PER_USER=
ARCHIVE_TAKE_COUNT= ARCHIVE_TAKE_COUNT=
BROWSER_TIMEOUT=
# AWS S3 Settings # AWS S3 Settings
SPACES_KEY= SPACES_KEY=

11
.prettierignore Normal file
View File

@ -0,0 +1,11 @@
node_modules
.next
public
*.lock
*.log
.github
data
pgdata

4
.prettierrc.json Normal file
View File

@ -0,0 +1,4 @@
{
"trailingComma": "es5",
"tabWidth": 2
}

View File

@ -22,9 +22,7 @@ export default function FilterSearchDropdown({
role="button" role="button"
className="btn btn-sm btn-square btn-ghost" className="btn btn-sm btn-square btn-ghost"
> >
<i <i className="bi-funnel text-neutral text-2xl"></i>
className="bi-funnel text-neutral text-2xl"
></i>
</div> </div>
<ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-box w-44 mt-1"> <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-box w-44 mt-1">
<li> <li>

View File

@ -1,7 +1,9 @@
import { LinkIncludingShortenedCollectionAndTags } from "@/types/global"; import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
import React from "react"; import React from "react";
export default function LinkDate({ link }: { export default function LinkDate({
link,
}: {
link: LinkIncludingShortenedCollectionAndTags; link: LinkIncludingShortenedCollectionAndTags;
}) { }) {
const formattedDate = new Date(link.createdAt as string).toLocaleString( const formattedDate = new Date(link.createdAt as string).toLocaleString(
@ -10,7 +12,7 @@ export default function LinkDate({ link }: {
year: "numeric", year: "numeric",
month: "short", month: "short",
day: "numeric", day: "numeric",
}, }
); );
return ( return (

View File

@ -49,7 +49,7 @@ export default function DeleteLinkModal({ onClose, activeLink }: Props) {
<p>Are you sure you want to delete this Link?</p> <p>Are you sure you want to delete this Link?</p>
<div role="alert" className="alert alert-warning"> <div role="alert" className="alert alert-warning">
<i className="bi-exclamation-triangle text-xl"/> <i className="bi-exclamation-triangle text-xl" />
<span> <span>
<b>Warning:</b> This action is irreversible! <b>Warning:</b> This action is irreversible!
</span> </span>
@ -64,7 +64,7 @@ export default function DeleteLinkModal({ onClose, activeLink }: Props) {
className={`ml-auto btn w-fit text-white flex items-center gap-2 duration-100 bg-red-500 hover:bg-red-400 hover:dark:bg-red-600 cursor-pointer`} className={`ml-auto btn w-fit text-white flex items-center gap-2 duration-100 bg-red-500 hover:bg-red-400 hover:dark:bg-red-600 cursor-pointer`}
onClick={deleteLink} onClick={deleteLink}
> >
<i className="bi-trash text-xl"/> <i className="bi-trash text-xl" />
Delete Delete
</button> </button>
</div> </div>

View File

@ -86,7 +86,7 @@ export default function EditLinkModal({ onClose, activeLink }: Props) {
title={link.url} title={link.url}
target="_blank" target="_blank"
> >
<i className="bi-link-45deg text-xl"/> <i className="bi-link-45deg text-xl" />
<p>{shortendURL}</p> <p>{shortendURL}</p>
</Link> </Link>
) : undefined} ) : undefined}

View File

@ -102,9 +102,9 @@ export default function PreservedFormatRow({
) : undefined} ) : undefined}
<Link <Link
href={`${isPublic ? "/public" : ""}/preserved/${ href={`${
link?.id isPublic ? "/public" : ""
}?format=${format}`} }/preserved/${link?.id}?format=${format}`}
target="_blank" target="_blank"
className="btn btn-sm btn-square" className="btn btn-sm btn-square"
> >

View File

@ -47,11 +47,11 @@ export default function SearchBar({ placeholder }: Props) {
"/public/collections/" + "/public/collections/" +
router.query.id + router.query.id +
"?q=" + "?q=" +
encodeURIComponent(searchQuery || ""), encodeURIComponent(searchQuery || "")
); );
} else { } else {
return router.push( return router.push(
"/search?q=" + encodeURIComponent(searchQuery), "/search?q=" + encodeURIComponent(searchQuery)
); );
} }
} }

View File

@ -8,7 +8,7 @@ import { SetStateAction, useEffect } from "react";
type Props< type Props<
T extends T extends
| CollectionIncludingMembersAndLinkCount | CollectionIncludingMembersAndLinkCount
| LinkIncludingShortenedCollectionAndTags | LinkIncludingShortenedCollectionAndTags,
> = { > = {
sortBy: Sort; sortBy: Sort;
@ -19,7 +19,7 @@ type Props<
export default function useSort< export default function useSort<
T extends T extends
| CollectionIncludingMembersAndLinkCount | CollectionIncludingMembersAndLinkCount
| LinkIncludingShortenedCollectionAndTags | LinkIncludingShortenedCollectionAndTags,
>({ sortBy, data, setData }: Props<T>) { >({ sortBy, data, setData }: Props<T>) {
useEffect(() => { useEffect(() => {
const dataArray = [...data]; const dataArray = [...data];

View File

@ -17,13 +17,31 @@ type LinksAndCollectionAndOwner = Link & {
}; };
}; };
const BROWSER_TIMEOUT = Number(process.env.BROWSER_TIMEOUT) || 5;
export default async function archiveHandler(link: LinksAndCollectionAndOwner) { export default async function archiveHandler(link: LinksAndCollectionAndOwner) {
const browser = await chromium.launch(); const browser = await chromium.launch({ headless: false });
const context = await browser.newContext(devices["Desktop Chrome"]); const context = await browser.newContext(devices["Desktop Chrome"]);
const page = await context.newPage(); const page = await context.newPage();
const timeoutPromise = new Promise((_, reject) => {
setTimeout(
() =>
reject(
new Error(
`Browser has been open for more than ${BROWSER_TIMEOUT} minutes.`
)
),
BROWSER_TIMEOUT * 60000
);
});
try { try {
const validatedUrl = link.url ? await validateUrlSize(link.url) : undefined; await Promise.race([
(async () => {
const validatedUrl = link.url
? await validateUrlSize(link.url)
: undefined;
if (validatedUrl === null) throw "File is too large to be stored."; if (validatedUrl === null) throw "File is too large to be stored.";
@ -56,8 +74,12 @@ export default async function archiveHandler(link: LinksAndCollectionAndOwner) {
user.archiveAsPDF && !link.pdf?.startsWith("archive") user.archiveAsPDF && !link.pdf?.startsWith("archive")
? "pending" ? "pending"
: undefined, : undefined,
readable: !link.readable?.startsWith("archive") ? "pending" : undefined, readable: !link.readable?.startsWith("archive")
preview: !link.readable?.startsWith("archive") ? "pending" : undefined, ? "pending"
: undefined,
preview: !link.readable?.startsWith("archive")
? "pending"
: undefined,
lastPreserved: new Date().toISOString(), lastPreserved: new Date().toISOString(),
}, },
}); });
@ -202,7 +224,10 @@ export default async function archiveHandler(link: LinksAndCollectionAndOwner) {
if (linkExists) { if (linkExists) {
const processingPromises = []; const processingPromises = [];
if (user.archiveAsScreenshot && !link.image?.startsWith("archive")) { if (
user.archiveAsScreenshot &&
!link.image?.startsWith("archive")
) {
processingPromises.push( processingPromises.push(
page.screenshot({ fullPage: true }).then((screenshot) => { page.screenshot({ fullPage: true }).then((screenshot) => {
return createFile({ return createFile({
@ -243,6 +268,9 @@ export default async function archiveHandler(link: LinksAndCollectionAndOwner) {
}); });
} }
} }
})(),
timeoutPromise,
]);
} catch (err) { } catch (err) {
console.log(err); console.log(err);
console.log("Failed Link details:", link); console.log("Failed Link details:", link);

View File

@ -40,7 +40,10 @@ async function emptyS3Directory(bucket: string, dir: string) {
export default async function removeFolder({ filePath }: { filePath: string }) { export default async function removeFolder({ filePath }: { filePath: string }) {
if (s3Client) { if (s3Client) {
try { try {
await emptyS3Directory(process.env.SPACES_BUCKET_NAME as string, filePath); await emptyS3Directory(
process.env.SPACES_BUCKET_NAME as string,
filePath
);
} catch (err) { } catch (err) {
console.log("Error", err); console.log("Error", err);
} }

View File

@ -42,7 +42,8 @@ export default async function verifyUser({
return null; return null;
} }
if (!user.username && !ssoUser) { // SSO users don't need a username if (!user.username && !ssoUser) {
// SSO users don't need a username
res.status(401).json({ res.status(401).json({
response: "Username not found.", response: "Username not found.",
}); });

View File

@ -15,7 +15,8 @@
"worker:prod": "ts-node --transpile-only --skip-project scripts/worker.ts", "worker:prod": "ts-node --transpile-only --skip-project scripts/worker.ts",
"start": "concurrently \"next start\" \"yarn worker:prod\"", "start": "concurrently \"next start\" \"yarn worker:prod\"",
"build": "next build", "build": "next build",
"lint": "next lint" "lint": "next lint",
"format": "prettier --write \"**/*.{ts,tsx,js,json,md}\""
}, },
"dependencies": { "dependencies": {
"@auth/prisma-adapter": "^1.0.1", "@auth/prisma-adapter": "^1.0.1",
@ -69,6 +70,7 @@
"daisyui": "^4.4.2", "daisyui": "^4.4.2",
"nodemon": "^3.0.2", "nodemon": "^3.0.2",
"postcss": "^8.4.26", "postcss": "^8.4.26",
"prettier": "3.1.1",
"prisma": "^5.1.0", "prisma": "^5.1.0",
"tailwindcss": "^3.3.3", "tailwindcss": "^3.3.3",
"ts-node": "^10.9.2", "ts-node": "^10.9.2",

View File

@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import "@/styles/globals.css"; import "@/styles/globals.css";
import 'bootstrap-icons/font/bootstrap-icons.css'; import "bootstrap-icons/font/bootstrap-icons.css";
import { SessionProvider } from "next-auth/react"; import { SessionProvider } from "next-auth/react";
import type { AppProps } from "next/app"; import type { AppProps } from "next/app";
import Head from "next/head"; import Head from "next/head";

View File

@ -1,238 +1,408 @@
import type { NextApiRequest, NextApiResponse } from 'next'; import type { NextApiRequest, NextApiResponse } from "next";
import * as process from "process"; import * as process from "process";
export type ResponseData = { export type ResponseData = {
credentialsEnabled: string|undefined credentialsEnabled: string | undefined;
emailEnabled: string|undefined emailEnabled: string | undefined;
registrationDisabled: string|undefined registrationDisabled: string | undefined;
buttonAuths: { buttonAuths: {
method: string method: string;
name: string name: string;
}[] }[];
} };
export default function handler(req: NextApiRequest, res: NextApiResponse<ResponseData>) { export default function handler(
req: NextApiRequest,
res: NextApiResponse<ResponseData>
) {
res.json(getLogins()); res.json(getLogins());
} }
export function getLogins() { export function getLogins() {
const buttonAuths = [] const buttonAuths = [];
// 42 School // 42 School
if (process.env.NEXT_PUBLIC_FORTYTWO_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_FORTYTWO_ENABLED === "true") {
buttonAuths.push({method: '42-school', name: process.env.FORTYTWO_CUSTOM_NAME ?? '42 School'}); buttonAuths.push({
method: "42-school",
name: process.env.FORTYTWO_CUSTOM_NAME ?? "42 School",
});
} }
// Apple // Apple
if (process.env.NEXT_PUBLIC_APPLE_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_APPLE_ENABLED === "true") {
buttonAuths.push({method: 'apple', name: process.env.APPLE_CUSTOM_NAME ?? 'Apple'}); buttonAuths.push({
method: "apple",
name: process.env.APPLE_CUSTOM_NAME ?? "Apple",
});
} }
// Atlassian // Atlassian
if (process.env.NEXT_PUBLIC_ATLASSIAN_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_ATLASSIAN_ENABLED === "true") {
buttonAuths.push({method: 'atlassian', name: process.env.ATLASSIAN_CUSTOM_NAME ?? 'Atlassian'}); buttonAuths.push({
method: "atlassian",
name: process.env.ATLASSIAN_CUSTOM_NAME ?? "Atlassian",
});
} }
// Auth0 // Auth0
if (process.env.NEXT_PUBLIC_AUTH0_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_AUTH0_ENABLED === "true") {
buttonAuths.push({method: 'auth0', name: process.env.AUTH0_CUSTOM_NAME ?? 'Auth0'}); buttonAuths.push({
method: "auth0",
name: process.env.AUTH0_CUSTOM_NAME ?? "Auth0",
});
} }
// Authentik // Authentik
if (process.env.NEXT_PUBLIC_AUTHENTIK_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_AUTHENTIK_ENABLED === "true") {
buttonAuths.push({method: 'authentik', name: process.env.AUTHENTIK_CUSTOM_NAME ?? 'Authentik'}); buttonAuths.push({
method: "authentik",
name: process.env.AUTHENTIK_CUSTOM_NAME ?? "Authentik",
});
} }
// Battle.net // Battle.net
if (process.env.NEXT_PUBLIC_BATTLENET_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_BATTLENET_ENABLED === "true") {
buttonAuths.push({method: 'battlenet', name: process.env.BATTLENET_CUSTOM_NAME ?? 'Battle.net'}); buttonAuths.push({
method: "battlenet",
name: process.env.BATTLENET_CUSTOM_NAME ?? "Battle.net",
});
} }
// Box // Box
if (process.env.NEXT_PUBLIC_BOX_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_BOX_ENABLED === "true") {
buttonAuths.push({method: 'box', name: process.env.BOX_CUSTOM_NAME ?? 'Box'}); buttonAuths.push({
method: "box",
name: process.env.BOX_CUSTOM_NAME ?? "Box",
});
} }
// Cognito // Cognito
if (process.env.NEXT_PUBLIC_COGNITO_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_COGNITO_ENABLED === "true") {
buttonAuths.push({method: 'cognito', name: process.env.COGNITO_CUSTOM_NAME ?? 'Cognito'}); buttonAuths.push({
method: "cognito",
name: process.env.COGNITO_CUSTOM_NAME ?? "Cognito",
});
} }
// Coinbase // Coinbase
if (process.env.NEXT_PUBLIC_COINBASE_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_COINBASE_ENABLED === "true") {
buttonAuths.push({method: 'coinbase', name: process.env.COINBASE_CUSTOM_NAME ?? 'Coinbase'}); buttonAuths.push({
method: "coinbase",
name: process.env.COINBASE_CUSTOM_NAME ?? "Coinbase",
});
} }
// Discord // Discord
if (process.env.NEXT_PUBLIC_DISCORD_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_DISCORD_ENABLED === "true") {
buttonAuths.push({method: 'discord', name: process.env.DISCORD_CUSTOM_NAME ?? 'Discord'}); buttonAuths.push({
method: "discord",
name: process.env.DISCORD_CUSTOM_NAME ?? "Discord",
});
} }
// Dropbox // Dropbox
if (process.env.NEXT_PUBLIC_DROPBOX_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_DROPBOX_ENABLED === "true") {
buttonAuths.push({method: 'dropbox', name: process.env.DROPBOX_CUSTOM_NAME ?? 'Dropbox'}); buttonAuths.push({
method: "dropbox",
name: process.env.DROPBOX_CUSTOM_NAME ?? "Dropbox",
});
} }
// Duende IdentityServer6 // Duende IdentityServer6
if (process.env.NEXT_PUBLIC_DUENDE_IDS6_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_DUENDE_IDS6_ENABLED === "true") {
buttonAuths.push({method: 'duende-identityserver6', name: process.env.DUENDE_IDS6_CUSTOM_NAME ?? 'DuendeIdentityServer6'}); buttonAuths.push({
method: "duende-identityserver6",
name: process.env.DUENDE_IDS6_CUSTOM_NAME ?? "DuendeIdentityServer6",
});
} }
// EVE Online // EVE Online
if (process.env.NEXT_PUBLIC_EVEONLINE_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_EVEONLINE_ENABLED === "true") {
buttonAuths.push({method: 'eveonline', name: process.env.EVEONLINE_CUSTOM_NAME ?? 'EVE Online'}); buttonAuths.push({
method: "eveonline",
name: process.env.EVEONLINE_CUSTOM_NAME ?? "EVE Online",
});
} }
// Facebook // Facebook
if (process.env.NEXT_PUBLIC_FACEBOOK_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_FACEBOOK_ENABLED === "true") {
buttonAuths.push({method: 'facebook', name: process.env.FACEBOOK_CUSTOM_NAME ?? 'Facebook'}); buttonAuths.push({
method: "facebook",
name: process.env.FACEBOOK_CUSTOM_NAME ?? "Facebook",
});
} }
// FACEIT // FACEIT
if (process.env.NEXT_PUBLIC_FACEIT_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_FACEIT_ENABLED === "true") {
buttonAuths.push({method: 'faceit', name: process.env.FACEIT_CUSTOM_NAME ?? 'FACEIT'}); buttonAuths.push({
method: "faceit",
name: process.env.FACEIT_CUSTOM_NAME ?? "FACEIT",
});
} }
// Foursquare // Foursquare
if (process.env.NEXT_PUBLIC_FOURSQUARE_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_FOURSQUARE_ENABLED === "true") {
buttonAuths.push({method: 'foursquare', name: process.env.FOURSQUARE_CUSTOM_NAME ?? 'Foursquare'}); buttonAuths.push({
method: "foursquare",
name: process.env.FOURSQUARE_CUSTOM_NAME ?? "Foursquare",
});
} }
// Freshbooks // Freshbooks
if (process.env.NEXT_PUBLIC_FRESHBOOKS_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_FRESHBOOKS_ENABLED === "true") {
buttonAuths.push({method: 'freshbooks', name: process.env.FRESHBOOKS_CUSTOM_NAME ?? 'Freshbooks'}); buttonAuths.push({
method: "freshbooks",
name: process.env.FRESHBOOKS_CUSTOM_NAME ?? "Freshbooks",
});
} }
// FusionAuth // FusionAuth
if (process.env.NEXT_PUBLIC_FUSIONAUTH_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_FUSIONAUTH_ENABLED === "true") {
buttonAuths.push({method: 'fusionauth', name: process.env.FUSIONAUTH_CUSTOM_NAME ?? 'FusionAuth'}); buttonAuths.push({
method: "fusionauth",
name: process.env.FUSIONAUTH_CUSTOM_NAME ?? "FusionAuth",
});
} }
// GitHub // GitHub
if (process.env.NEXT_PUBLIC_GITHUB_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_GITHUB_ENABLED === "true") {
buttonAuths.push({method: 'github', name: process.env.GITHUB_CUSTOM_NAME ?? 'GitHub'}); buttonAuths.push({
method: "github",
name: process.env.GITHUB_CUSTOM_NAME ?? "GitHub",
});
} }
// GitLab // GitLab
if (process.env.NEXT_PUBLIC_GITLAB_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_GITLAB_ENABLED === "true") {
buttonAuths.push({method: 'gitlab', name: process.env.GITLAB_CUSTOM_NAME ?? 'GitLab'}); buttonAuths.push({
method: "gitlab",
name: process.env.GITLAB_CUSTOM_NAME ?? "GitLab",
});
} }
// Google // Google
if (process.env.NEXT_PUBLIC_GOOGLE_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_GOOGLE_ENABLED === "true") {
buttonAuths.push({method: 'google', name: process.env.GOOGLE_CUSTOM_NAME ?? 'Google'}); buttonAuths.push({
method: "google",
name: process.env.GOOGLE_CUSTOM_NAME ?? "Google",
});
} }
// HubSpot // HubSpot
if (process.env.NEXT_PUBLIC_HUBSPOT_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_HUBSPOT_ENABLED === "true") {
buttonAuths.push({method: 'hubspot', name: process.env.HUBSPOT_CUSTOM_NAME ?? 'HubSpot'}); buttonAuths.push({
method: "hubspot",
name: process.env.HUBSPOT_CUSTOM_NAME ?? "HubSpot",
});
} }
// IdentityServer4 // IdentityServer4
if (process.env.NEXT_PUBLIC_IDS4_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_IDS4_ENABLED === "true") {
buttonAuths.push({method: 'identity-server4', name: process.env.IDS4_CUSTOM_NAME ?? 'IdentityServer4'}); buttonAuths.push({
method: "identity-server4",
name: process.env.IDS4_CUSTOM_NAME ?? "IdentityServer4",
});
} }
// Kakao // Kakao
if (process.env.NEXT_PUBLIC_KAKAO_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_KAKAO_ENABLED === "true") {
buttonAuths.push({method: 'kakao', name: process.env.KAKAO_CUSTOM_NAME ?? 'Kakao'}); buttonAuths.push({
method: "kakao",
name: process.env.KAKAO_CUSTOM_NAME ?? "Kakao",
});
} }
// Keycloak // Keycloak
if (process.env.NEXT_PUBLIC_KEYCLOAK_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_KEYCLOAK_ENABLED === "true") {
buttonAuths.push({method: 'keycloak', name: process.env.KEYCLOAK_CUSTOM_NAME ?? 'Keycloak'}); buttonAuths.push({
method: "keycloak",
name: process.env.KEYCLOAK_CUSTOM_NAME ?? "Keycloak",
});
} }
// LINE // LINE
if (process.env.NEXT_PUBLIC_LINE_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_LINE_ENABLED === "true") {
buttonAuths.push({method: 'line', name: process.env.LINE_CUSTOM_NAME ?? 'LINE'}); buttonAuths.push({
method: "line",
name: process.env.LINE_CUSTOM_NAME ?? "LINE",
});
} }
// LinkedIn // LinkedIn
if (process.env.NEXT_PUBLIC_LINKEDIN_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_LINKEDIN_ENABLED === "true") {
buttonAuths.push({method: 'linkedin', name: process.env.LINKEDIN_CUSTOM_NAME ?? 'LinkedIn'}); buttonAuths.push({
method: "linkedin",
name: process.env.LINKEDIN_CUSTOM_NAME ?? "LinkedIn",
});
} }
// MailChimp // MailChimp
if (process.env.NEXT_PUBLIC_MAILCHIMP_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_MAILCHIMP_ENABLED === "true") {
buttonAuths.push({method: 'mailchimp', name: process.env.MAILCHIMP_CUSTOM_NAME ?? 'Mailchimp'}); buttonAuths.push({
method: "mailchimp",
name: process.env.MAILCHIMP_CUSTOM_NAME ?? "Mailchimp",
});
} }
// Mail.ru // Mail.ru
if (process.env.NEXT_PUBLIC_MAILRU_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_MAILRU_ENABLED === "true") {
buttonAuths.push({method: 'mailru', name: process.env.MAILRU_CUSTOM_NAME ?? 'Mail.ru'}); buttonAuths.push({
method: "mailru",
name: process.env.MAILRU_CUSTOM_NAME ?? "Mail.ru",
});
} }
// Naver // Naver
if (process.env.NEXT_PUBLIC_NAVER_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_NAVER_ENABLED === "true") {
buttonAuths.push({method: 'naver', name: process.env.NAVER_CUSTOM_NAME ?? 'Naver'}); buttonAuths.push({
method: "naver",
name: process.env.NAVER_CUSTOM_NAME ?? "Naver",
});
} }
// Netlify // Netlify
if (process.env.NEXT_PUBLIC_NETLIFY_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_NETLIFY_ENABLED === "true") {
buttonAuths.push({method: 'netlify', name: process.env.NETLIFY_CUSTOM_NAME ?? 'Netlify'}); buttonAuths.push({
method: "netlify",
name: process.env.NETLIFY_CUSTOM_NAME ?? "Netlify",
});
} }
// Okta // Okta
if (process.env.NEXT_PUBLIC_OKTA_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_OKTA_ENABLED === "true") {
buttonAuths.push({method: 'okta', name: process.env.OKTA_CUSTOM_NAME ?? 'Okta'}); buttonAuths.push({
method: "okta",
name: process.env.OKTA_CUSTOM_NAME ?? "Okta",
});
} }
// OneLogin // OneLogin
if (process.env.NEXT_PUBLIC_ONELOGIN_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_ONELOGIN_ENABLED === "true") {
buttonAuths.push({method: 'onelogin', name: process.env.ONELOGIN_CUSTOM_NAME ?? 'OneLogin'}); buttonAuths.push({
method: "onelogin",
name: process.env.ONELOGIN_CUSTOM_NAME ?? "OneLogin",
});
} }
// Osso // Osso
if (process.env.NEXT_PUBLIC_OSSO_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_OSSO_ENABLED === "true") {
buttonAuths.push({method: 'osso', name: process.env.OSSO_CUSTOM_NAME ?? 'Osso'}); buttonAuths.push({
method: "osso",
name: process.env.OSSO_CUSTOM_NAME ?? "Osso",
});
} }
// osu! // osu!
if (process.env.NEXT_PUBLIC_OSU_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_OSU_ENABLED === "true") {
buttonAuths.push({method: 'osu', name: process.env.OSU_CUSTOM_NAME ?? 'Osu!'}); buttonAuths.push({
method: "osu",
name: process.env.OSU_CUSTOM_NAME ?? "Osu!",
});
} }
// Patreon // Patreon
if (process.env.NEXT_PUBLIC_PATREON_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_PATREON_ENABLED === "true") {
buttonAuths.push({method: 'patreon', name: process.env.PATREON_CUSTOM_NAME ?? 'Patreon'}); buttonAuths.push({
method: "patreon",
name: process.env.PATREON_CUSTOM_NAME ?? "Patreon",
});
} }
// Pinterest // Pinterest
if (process.env.NEXT_PUBLIC_PINTEREST_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_PINTEREST_ENABLED === "true") {
buttonAuths.push({method: 'pinterest', name: process.env.PINTEREST_CUSTOM_NAME ?? 'Pinterest'}); buttonAuths.push({
method: "pinterest",
name: process.env.PINTEREST_CUSTOM_NAME ?? "Pinterest",
});
} }
// Pipedrive // Pipedrive
if (process.env.NEXT_PUBLIC_PIPEDRIVE_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_PIPEDRIVE_ENABLED === "true") {
buttonAuths.push({method: 'pipedrive', name: process.env.PIPEDRIVE_CUSTOM_NAME ?? 'Pipedrive'}); buttonAuths.push({
method: "pipedrive",
name: process.env.PIPEDRIVE_CUSTOM_NAME ?? "Pipedrive",
});
} }
// Reddit // Reddit
if (process.env.NEXT_PUBLIC_REDDIT_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_REDDIT_ENABLED === "true") {
buttonAuths.push({method: 'reddit', name: process.env.REDDIT_CUSTOM_NAME ?? 'Reddit'}); buttonAuths.push({
method: "reddit",
name: process.env.REDDIT_CUSTOM_NAME ?? "Reddit",
});
} }
// Salesforce // Salesforce
if (process.env.NEXT_PUBLIC_SALESFORCE_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_SALESFORCE_ENABLED === "true") {
buttonAuths.push({method: 'salesforce', name: process.env.SALESFORCE_CUSTOM_NAME ?? 'Salesforce'}); buttonAuths.push({
method: "salesforce",
name: process.env.SALESFORCE_CUSTOM_NAME ?? "Salesforce",
});
} }
// Slack // Slack
if (process.env.NEXT_PUBLIC_SLACK_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_SLACK_ENABLED === "true") {
buttonAuths.push({method: 'slack', name: process.env.SLACK_CUSTOM_NAME ?? 'Slack'}); buttonAuths.push({
method: "slack",
name: process.env.SLACK_CUSTOM_NAME ?? "Slack",
});
} }
// Spotify // Spotify
if (process.env.NEXT_PUBLIC_SPOTIFY_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_SPOTIFY_ENABLED === "true") {
buttonAuths.push({method: 'spotify', name: process.env.SPOTIFY_CUSTOM_NAME ?? 'Spotify'}); buttonAuths.push({
method: "spotify",
name: process.env.SPOTIFY_CUSTOM_NAME ?? "Spotify",
});
} }
// Strava // Strava
if (process.env.NEXT_PUBLIC_STRAVA_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_STRAVA_ENABLED === "true") {
buttonAuths.push({method: 'strava', name: process.env.STRAVA_CUSTOM_NAME ?? 'Strava'}); buttonAuths.push({
method: "strava",
name: process.env.STRAVA_CUSTOM_NAME ?? "Strava",
});
} }
// Todoist // Todoist
if (process.env.NEXT_PUBLIC_TODOIST_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_TODOIST_ENABLED === "true") {
buttonAuths.push({method: 'todoist', name: process.env.TODOIST_CUSTOM_NAME ?? 'Todoist'}); buttonAuths.push({
method: "todoist",
name: process.env.TODOIST_CUSTOM_NAME ?? "Todoist",
});
} }
// Twitch // Twitch
if (process.env.NEXT_PUBLIC_TWITCH_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_TWITCH_ENABLED === "true") {
buttonAuths.push({method: 'twitch', name: process.env.TWITCH_CUSTOM_NAME ?? 'Twitch'}); buttonAuths.push({
method: "twitch",
name: process.env.TWITCH_CUSTOM_NAME ?? "Twitch",
});
} }
// United Effects // United Effects
if (process.env.NEXT_PUBLIC_UNITED_EFFECTS_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_UNITED_EFFECTS_ENABLED === "true") {
buttonAuths.push({method: 'united-effects', name: process.env.UNITED_EFFECTS_CUSTOM_NAME ?? 'United Effects'}); buttonAuths.push({
method: "united-effects",
name: process.env.UNITED_EFFECTS_CUSTOM_NAME ?? "United Effects",
});
} }
// VK // VK
if (process.env.NEXT_PUBLIC_VK_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_VK_ENABLED === "true") {
buttonAuths.push({method: 'vk', name: process.env.VK_CUSTOM_NAME ?? 'VK'}); buttonAuths.push({
method: "vk",
name: process.env.VK_CUSTOM_NAME ?? "VK",
});
} }
// Wikimedia // Wikimedia
if (process.env.NEXT_PUBLIC_WIKIMEDIA_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_WIKIMEDIA_ENABLED === "true") {
buttonAuths.push({method: 'wikimedia', name: process.env.WIKIMEDIA_CUSTOM_NAME ?? 'Wikimedia'}); buttonAuths.push({
method: "wikimedia",
name: process.env.WIKIMEDIA_CUSTOM_NAME ?? "Wikimedia",
});
} }
// Wordpress.com // Wordpress.com
if (process.env.NEXT_PUBLIC_WORDPRESS_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_WORDPRESS_ENABLED === "true") {
buttonAuths.push({method: 'wordpress', name: process.env.WORDPRESS_CUSTOM_NAME ?? 'WordPress.com'}); buttonAuths.push({
method: "wordpress",
name: process.env.WORDPRESS_CUSTOM_NAME ?? "WordPress.com",
});
} }
// Yandex // Yandex
if (process.env.NEXT_PUBLIC_YANDEX_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_YANDEX_ENABLED === "true") {
buttonAuths.push({method: 'yandex', name: process.env.YANDEX_CUSTOM_NAME ?? 'Yandex'}); buttonAuths.push({
method: "yandex",
name: process.env.YANDEX_CUSTOM_NAME ?? "Yandex",
});
} }
// Zitadel // Zitadel
if (process.env.NEXT_PUBLIC_ZITADEL_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_ZITADEL_ENABLED === "true") {
buttonAuths.push({method: 'zitadel', name: process.env.ZITADEL_CUSTOM_NAME ?? 'ZITADEL'}); buttonAuths.push({
method: "zitadel",
name: process.env.ZITADEL_CUSTOM_NAME ?? "ZITADEL",
});
} }
// Zoho // Zoho
if (process.env.NEXT_PUBLIC_ZOHO_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_ZOHO_ENABLED === "true") {
buttonAuths.push({method: 'zoho', name: process.env.ZOHO_CUSTOM_NAME ?? 'Zoho'}); buttonAuths.push({
method: "zoho",
name: process.env.ZOHO_CUSTOM_NAME ?? "Zoho",
});
} }
// Zoom // Zoom
if (process.env.NEXT_PUBLIC_ZOOM_ENABLED === 'true') { if (process.env.NEXT_PUBLIC_ZOOM_ENABLED === "true") {
buttonAuths.push({method: 'zoom', name: process.env.ZOOM_CUSTOM_NAME ?? 'Zoom'}); buttonAuths.push({
method: "zoom",
name: process.env.ZOOM_CUSTOM_NAME ?? "Zoom",
});
} }
return { return {
credentialsEnabled: (process.env.NEXT_PUBLIC_CREDENTIALS_ENABLED === 'true' || process.env.NEXT_PUBLIC_CREDENTIALS_ENABLED === undefined) ? "true" : "false", credentialsEnabled:
emailEnabled: (process.env.NEXT_PUBLIC_EMAIL_PROVIDER === 'true' ? 'true' : 'false'), process.env.NEXT_PUBLIC_CREDENTIALS_ENABLED === "true" ||
registrationDisabled: (process.env.NEXT_PUBLIC_DISABLE_REGISTRATION === 'true' ? 'true' : 'false'), process.env.NEXT_PUBLIC_CREDENTIALS_ENABLED === undefined
buttonAuths: buttonAuths ? "true"
: "false",
emailEnabled:
process.env.NEXT_PUBLIC_EMAIL_PROVIDER === "true" ? "true" : "false",
registrationDisabled:
process.env.NEXT_PUBLIC_DISABLE_REGISTRATION === "true"
? "true"
: "false",
buttonAuths: buttonAuths,
}; };
} }

View File

@ -57,9 +57,7 @@ export default function Delete() {
href="/settings/account" href="/settings/account"
className="absolute top-4 left-4 btn btn-ghost btn-square btn-sm" className="absolute top-4 left-4 btn btn-ghost btn-square btn-sm"
> >
<i <i className="bi-chevron-left text-neutral text-xl"></i>
className="bi-chevron-left text-neutral text-xl"
></i>
</Link> </Link>
<div className="flex items-center gap-2 w-full rounded-md h-8"> <div className="flex items-center gap-2 w-full rounded-md h-8">
<p className="text-red-500 dark:text-red-500 truncate w-full text-3xl text-center"> <p className="text-red-500 dark:text-red-500 truncate w-full text-3xl text-center">

View File

@ -1,4 +1,4 @@
import { defineConfig, devices } from '@playwright/test'; import { defineConfig, devices } from "@playwright/test";
/** /**
* Read environment variables from file. * Read environment variables from file.
@ -10,7 +10,7 @@ import { defineConfig, devices } from '@playwright/test';
* See https://playwright.dev/docs/test-configuration. * See https://playwright.dev/docs/test-configuration.
*/ */
export default defineConfig({ export default defineConfig({
testDir: './e2e', testDir: "./e2e",
/* Run tests in files in parallel */ /* Run tests in files in parallel */
fullyParallel: true, fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */ /* Fail the build on CI if you accidentally left test.only in the source code. */
@ -20,31 +20,31 @@ export default defineConfig({
/* Opt out of parallel tests on CI. */ /* Opt out of parallel tests on CI. */
workers: process.env.CI ? 1 : undefined, workers: process.env.CI ? 1 : undefined,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */ /* Reporter to use. See https://playwright.dev/docs/test-reporters */
reporter: 'html', reporter: "html",
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
use: { use: {
/* Base URL to use in actions like `await page.goto('/')`. */ /* Base URL to use in actions like `await page.goto('/')`. */
// baseURL: 'http://127.0.0.1:3000', // baseURL: 'http://127.0.0.1:3000',
/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */ /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
trace: 'on-first-retry', trace: "on-first-retry",
}, },
/* Configure projects for major browsers */ /* Configure projects for major browsers */
projects: [ projects: [
{ {
name: 'chromium', name: "chromium",
use: { ...devices['Desktop Chrome'] }, use: { ...devices["Desktop Chrome"] },
}, },
{ {
name: 'firefox', name: "firefox",
use: { ...devices['Desktop Firefox'] }, use: { ...devices["Desktop Firefox"] },
}, },
{ {
name: 'webkit', name: "webkit",
use: { ...devices['Desktop Safari'] }, use: { ...devices["Desktop Safari"] },
}, },
/* Test against mobile viewports. */ /* Test against mobile viewports. */

View File

@ -3,4 +3,4 @@ module.exports = {
tailwindcss: {}, tailwindcss: {},
autoprefixer: {}, autoprefixer: {},
}, },
} };

View File

@ -1,9 +1,9 @@
import { create } from "zustand"; import { create } from "zustand";
import {ViewMode} from "@/types/global"; import { ViewMode } from "@/types/global";
type LocalSettings = { type LocalSettings = {
theme?: string; theme?: string;
viewMode?: string viewMode?: string;
}; };
type LocalSettingsStore = { type LocalSettingsStore = {

View File

@ -12,6 +12,7 @@ declare global {
NEXT_PUBLIC_MAX_FILE_SIZE?: string; NEXT_PUBLIC_MAX_FILE_SIZE?: string;
MAX_LINKS_PER_USER?: string; MAX_LINKS_PER_USER?: string;
ARCHIVE_TAKE_COUNT?: string; ARCHIVE_TAKE_COUNT?: string;
NEXT_PUBLIC_MAX_FILE_SIZE?: string;
SPACES_KEY?: string; SPACES_KEY?: string;
SPACES_SECRET?: string; SPACES_SECRET?: string;