Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

base comment for shadcn

daniel31x13921d8a3718f3
diff --git a/apps/web/components.json b/apps/web/components.json
new file mode 100644
index 00000000..dcbb1abf
--- /dev/null
+++ b/apps/web/components.json
@@ -0,0 +1,21 @@
+{
+ "$schema": "https://ui.shadcn.com/schema.json",
+ "style": "default",
+ "rsc": false,
+ "tsx": true,
+ "tailwind": {
+ "config": "tailwind.config.js",
+ "css": "styles/globals.css",
+ "baseColor": "neutral",
+ "cssVariables": true,
+ "prefix": ""
+ },
+ "aliases": {
+ "components": "@/components",
+ "utils": "@/lib/utils",
+ "ui": "@/components/ui",
+ "lib": "@/lib",
+ "hooks": "@/hooks"
+ },
+ "iconLibrary": "lucide"
+}
\ No newline at end of file
diff --git a/apps/web/lib/utils.ts b/apps/web/lib/utils.ts
new file mode 100644
index 00000000..bd0c391d
--- /dev/null
+++ b/apps/web/lib/utils.ts
@@ -0,0 +1,6 @@
+import { clsx, type ClassValue } from "clsx"
+import { twMerge } from "tailwind-merge"
+
+export function cn(...inputs: ClassValue[]) {
+ return twMerge(clsx(inputs))
+}
diff --git a/apps/web/package.json b/apps/web/package.json
index 529868a7..33ed3682 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -26,6 +26,7 @@
"@linkwarden/types": "*",
"@phosphor-icons/core": "^2.1.1",
"@phosphor-icons/react": "^2.1.7",
+ "@radix-ui/react-slot": "^1.2.3",
"@stripe/stripe-js": "^1.54.1",
"@tanstack/react-query": "^5.51.15",
"@tanstack/react-query-devtools": "^5.51.15",
@@ -39,7 +40,7 @@
"axios": "^1.5.1",
"bcrypt": "^5.1.0",
"bootstrap-icons": "^1.11.2",
- "class-variance-authority": "^0.7.0",
+ "class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"colorjs.io": "^0.5.2",
"csstype": "^3.1.2",
@@ -55,6 +56,7 @@
"jimp": "^0.22.10",
"jsdom": "^22.1.0",
"jszip": "^3.10.1",
+ "lucide-react": "^0.511.0",
"micro": "^10.0.1",
"next": "13.4.12",
"next-auth": "^4.22.1",
@@ -77,8 +79,9 @@
"rss-parser": "^3.13.0",
"socks-proxy-agent": "^8.0.2",
"stripe": "^12.13.0",
- "tailwind-merge": "^2.3.0",
+ "tailwind-merge": "^3.3.0",
"tailwindcss": "^3.4.17",
+ "tailwindcss-animate": "^1.0.7",
"vaul": "^1.1.1",
"zod": "^3.23.8",
"zustand": "^4.3.8"
diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js
index 45322f5c..d0b5d047 100644
--- a/apps/web/tailwind.config.js
+++ b/apps/web/tailwind.config.js
@@ -1,5 +1,6 @@
/** @type {import('tailwindcss').Config} */
const plugin = require("tailwindcss/plugin");
+const daisyuiColorObj = require("daisyui/src/theming/index");
module.exports = {
daisyui: {
@@ -52,5 +53,64 @@ module.exports = {
plugin(({ addVariant }) => {
addVariant("dark", '&[data-theme="dark"]');
}),
+ require("tailwindcss-animate"),
],
+ theme: {
+ extend: {
+ colors: {
+ border: daisyuiColorObj["base-content"],
+ input: daisyuiColorObj["base-content"],
+ ring: daisyuiColorObj["base-content"],
+ background: daisyuiColorObj["base-100"],
+ foreground: daisyuiColorObj["base-content"],
+ primary: {
+ DEFAULT: daisyuiColorObj["primary"],
+ foreground: daisyuiColorObj["primary-content"],
+ },
+ secondary: {
+ DEFAULT: daisyuiColorObj["secondary"],
+ foreground: daisyuiColorObj["secondary-content"],
+ },
+ destructive: {
+ DEFAULT: daisyuiColorObj["error"],
+ foreground: daisyuiColorObj["error-content"],
+ },
+ muted: {
+ DEFAULT: daisyuiColorObj["base-300"],
+ foreground: daisyuiColorObj["base-content"],
+ },
+ accent: {
+ DEFAULT: daisyuiColorObj["accent"],
+ foreground: daisyuiColorObj["accent-content"],
+ },
+ popover: {
+ DEFAULT: daisyuiColorObj["base-100"],
+ foreground: daisyuiColorObj["base-content"],
+ },
+ card: {
+ DEFAULT: daisyuiColorObj["base-100"],
+ foreground: daisyuiColorObj["base-content"],
+ },
+ },
+ borderRadius: {
+ lg: "var(--rounded-btn)",
+ md: "calc(var(--rounded-btn) - 2px)",
+ sm: "calc(var(--rounded-btn) - 4px)",
+ },
+ keyframes: {
+ "accordion-down": {
+ from: { height: "0" },
+ to: { height: "var(--radix-accordion-content-height)" },
+ },
+ "accordion-up": {
+ from: { height: "var(--radix-accordion-content-height)" },
+ to: { height: "0" },
+ },
+ },
+ animation: {
+ "accordion-down": "accordion-down 0.2s ease-out",
+ "accordion-up": "accordion-up 0.2s ease-out",
+ },
+ },
+ },
};
diff --git a/yarn.lock b/yarn.lock
index 437a90f4..fabd6d54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1579,13 +1579,6 @@
dependencies:
regenerator-runtime "^0.14.0"
-"@babel/runtime@^7.24.1":
- version "7.24.5"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.5.tgz#230946857c053a36ccc66e1dd03b17dd0c4ed02c"
- integrity sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==
- dependencies:
- regenerator-runtime "^0.14.0"
-
"@babel/template@^7.25.0", "@babel/template@^7.25.9", "@babel/template@^7.26.9", "@babel/template@^7.27.0", "@babel/template@^7.3.3":
version "7.27.0"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.0.tgz#b253e5406cc1df1c57dcd18f11760c2dbf40c0b4"
@@ -3436,6 +3429,13 @@
dependencies:
"@radix-ui/react-compose-refs" "1.1.2"
+"@radix-ui/react-slot@^1.2.3":
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.2.3.tgz#502d6e354fc847d4169c3bc5f189de777f68cfe1"
+ integrity sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==
+ dependencies:
+ "@radix-ui/react-compose-refs" "1.1.2"
+
"@radix-ui/[email protected]":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz#bce938ca413675bc937944b0d01ef6f4a6dc5bf1"
@@ -5582,12 +5582,12 @@ cjs-module-lexer@^1.0.0:
resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz#0f79731eb8cfe1ec72acd4066efac9d61991b00d"
integrity sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==
-class-variance-authority@^0.7.0:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/class-variance-authority/-/class-variance-authority-0.7.0.tgz#1c3134d634d80271b1837452b06d821915954522"
- integrity sha512-jFI8IQw4hczaL4ALINxqLEXQbWcNjoSkloa4IaufXCJr6QawJyw7tuRysRsrE8w2p/4gGaxKIt/hX3qz/IbD1A==
+class-variance-authority@^0.7.1:
+ version "0.7.1"
+ resolved "https://registry.yarnpkg.com/class-variance-authority/-/class-variance-authority-0.7.1.tgz#4008a798a0e4553a781a57ac5177c9fb5d043787"
+ integrity sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==
dependencies:
- clsx "2.0.0"
+ clsx "^2.1.1"
clean-stack@^2.0.0:
version "2.2.0"
@@ -5634,11 +5634,6 @@ clone@^1.0.2:
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.0.0.tgz#12658f3fd98fafe62075595a5c30e43d18f3d00b"
- integrity sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==
-
clsx@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
@@ -9441,6 +9436,11 @@ lru-cache@^6.0.0:
dependencies:
yallist "^4.0.0"
+lucide-react@^0.511.0:
+ version "0.511.0"
+ resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.511.0.tgz#1dfef3065c725ac83f5fe0a6f02d1e0b0c36e641"
+ integrity sha512-VK5a2ydJ7xm8GvBeKLS9mu1pVK6ucef9780JVUjw6bAjJL/QXnd4Y0p7SPeOUMC27YhzNCZvm5d/QX0Tp3rc0w==
+
make-dir@^2.0.0, make-dir@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -12422,12 +12422,15 @@ synckit@^0.8.4:
"@pkgr/utils" "^2.3.1"
tslib "^2.5.0"
-tailwind-merge@^2.3.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.3.0.tgz#27d2134fd00a1f77eca22bcaafdd67055917d286"
- integrity sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==
- dependencies:
- "@babel/runtime" "^7.24.1"
+tailwind-merge@^3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-3.3.0.tgz#d9bb4f298801ef6232ced4f97e830fc79bc3d3e7"
+ integrity sha512-fyW/pEfcQSiigd5SNn0nApUOxx0zB/dm6UDU/rEwc2c3sX2smWUNbapHv+QRqLGVp9GWX3THIa7MUGPo+YkDzQ==
+
+tailwindcss-animate@^1.0.7:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz#318b692c4c42676cc9e67b19b78775742388bef4"
+ integrity sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==
tailwindcss@^3.4.17:
version "3.4.17"