Skip to content

Commit 536f7e4

Browse files
authored
Merge pull request #17 from LinkyBoard/dev
[WEB] 배포 최신화
2 parents 4d3a8fa + ceea339 commit 536f7e4

8 files changed

Lines changed: 173 additions & 27 deletions

File tree

apps/web/package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
"@linkyboard/utils": "workspace:*",
1414
"@linkyboard/components": "workspace:*",
1515
"@hookform/resolvers": "^5.2.1",
16+
"@linkyboard/components": "workspace:*",
17+
"@linkyboard/hooks": "workspace:*",
18+
"@linkyboard/utils": "workspace:*",
1619
"@next/third-parties": "^15.5.4",
1720
"@tanstack/react-query": "^5.84.1",
1821
"@tiptap/extension-code-block": "^3.1.0",
@@ -40,16 +43,18 @@
4043
"devDependencies": {
4144
"@eslint/eslintrc": "^3",
4245
"@linkyboard/eslint-config": "workspace:*",
46+
"@linkyboard/tailwind-config": "workspace:*",
4347
"@linkyboard/types": "workspace:*",
4448
"@linkyboard/typescript-config": "workspace:*",
45-
"@linkyboard/tailwind-config": "workspace:*",
4649
"@svgr/webpack": "^8.1.0",
50+
"@tailwindcss/postcss": "^4.1.13",
4751
"@tailwindcss/typography": "^0.5.16",
4852
"@types/node": "^20",
4953
"@types/react": "^19",
5054
"@types/react-dom": "^19",
5155
"eslint": "^9",
5256
"eslint-config-next": "15.4.6",
57+
"tailwindcss": "^4",
5358
"typescript": "^5"
5459
}
5560
}

apps/web/src/app/globals.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
@import "@linkyboard/tailwind-config/tailwind-config.css";
1+
@source "../../../../packages/components/src/**/*.{ts,tsx}";
2+
3+
@import "@linkyboard/tailwind-config";
24
@import "@xyflow/react/dist/style.css";
35
@plugin "@tailwindcss/typography";
46

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
"private": true,
44
"scripts": {
55
"build": "turbo run build",
6-
"build:web": "turbo run build --filter=web --filter=@linkyboard/types --filter=@linkyboard/components",
7-
"build:extension": "turbo run build --filter=extension --filter=@linkyboard/types --filter=@linkyboard/components",
6+
"build:web": "turbo run build --filter=web --filter=@linkyboard/types",
7+
"build:extension": "turbo run build --filter=extension --filter=@linkyboard/types",
88
"dev": "turbo run dev",
99
"lint": "turbo lint --filter=extension --filter=web",
1010
"format": "prettier --write \"**/*.{ts,tsx,md}\"",
1111
"check-types": "turbo run check-types",
12-
"dev:extension": "turbo dev --filter=extension --filter=@linkyboard/types --filter=@linkyboard/components",
13-
"dev:web": "turbo dev --filter=web --filter=@linkyboard/types --filter=@linkyboard/components",
12+
"dev:extension": "turbo dev --filter=extension --filter=@linkyboard/types",
13+
"dev:web": "turbo dev --filter=web --filter=@linkyboard/types",
1414
"prepare": "husky"
1515
},
1616
"devDependencies": {
17-
"@tailwindcss/postcss": "^4.1.11",
1817
"husky": "^9.1.7",
1918
"prettier": "^3.6.2",
2019
"prettier-plugin-tailwindcss": "^0.6.14",

packages/components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
},
1010
"devDependencies": {
1111
"@linkyboard/eslint-config": "workspace:*",
12+
"@linkyboard/tailwind-config": "workspace:*",
1213
"@linkyboard/typescript-config": "workspace:*",
1314
"@types/node": "^22.15.3",
1415
"@types/react": "^19",
@@ -18,7 +19,6 @@
1819
},
1920
"dependencies": {
2021
"@linkyboard/hooks": "workspace:*",
21-
"@linkyboard/tailwind-config": "workspace:*",
2222
"@linkyboard/utils": "workspace:*",
2323
"@radix-ui/react-slot": "^1.2.3",
2424
"@radix-ui/react-tooltip": "^1.2.8",

packages/tailwind-config/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
"version": "0.0.0",
44
"private": true,
55
"exports": {
6-
"./tailwind-config.css": "./tailwind-config.css"
6+
".": "./shared-styles.css",
7+
"./postcss": "./postcss.config.mjs"
78
},
89
"dependencies": {
910
"tailwind-merge": "^3.3.1"
1011
},
1112
"devDependencies": {
13+
"@tailwindcss/postcss": "^4.1.13",
1214
"tailwindcss": "^4",
1315
"tw-animate-css": "^1.3.6"
1416
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const config = {
2-
plugins: ["@tailwindcss/postcss"],
1+
export const postcssConfig = {
2+
plugins: {
3+
"@tailwindcss/postcss": {},
4+
},
35
};
4-
5-
export default config;
Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
@import "tailwindcss";
2+
@import "tw-animate-css";
3+
4+
@theme inline {
5+
--color-background: var(--background);
6+
--color-foreground: var(--foreground);
7+
--font-sans: var(--font-geist-sans);
8+
--font-mono: var(--font-geist-mono);
9+
--color-sidebar-ring: var(--sidebar-ring);
10+
--color-sidebar-border: var(--sidebar-border);
11+
--color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
12+
--color-sidebar-accent: var(--sidebar-accent);
13+
--color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
14+
--color-sidebar-primary: var(--sidebar-primary);
15+
--color-sidebar-foreground: var(--sidebar-foreground);
16+
--color-sidebar: var(--sidebar);
17+
--color-chart-5: var(--chart-5);
18+
--color-chart-4: var(--chart-4);
19+
--color-chart-3: var(--chart-3);
20+
--color-chart-2: var(--chart-2);
21+
--color-chart-1: var(--chart-1);
22+
--color-ring: var(--ring);
23+
--color-input: var(--input);
24+
--color-border: var(--border);
25+
--color-destructive: var(--destructive);
26+
--color-accent-foreground: var(--accent-foreground);
27+
--color-accent: var(--accent);
28+
--color-muted-foreground: var(--muted-foreground);
29+
--color-muted: var(--muted);
30+
--color-secondary-foreground: var(--secondary-foreground);
31+
--color-secondary: var(--secondary);
32+
--color-primary-foreground: var(--primary-foreground);
33+
--color-primary: var(--primary);
34+
--color-popover-foreground: var(--popover-foreground);
35+
--color-popover: var(--popover);
36+
--color-card-foreground: var(--card-foreground);
37+
--color-card: var(--card);
38+
--radius-sm: calc(var(--radius) - 4px);
39+
--radius-md: calc(var(--radius) - 2px);
40+
--radius-lg: var(--radius);
41+
--radius-xl: calc(var(--radius) + 4px);
42+
}
43+
44+
:root {
45+
--radius: 0.625rem;
46+
--background: oklch(0.98 0 0);
47+
--foreground: oklch(0.25 0 0);
48+
--card: oklch(1 0 0);
49+
--card-foreground: oklch(0.25 0 0);
50+
--popover: oklch(1 0 0);
51+
--popover-foreground: oklch(0.25 0 0);
52+
--primary: oklch(0.55 0.2 295);
53+
--primary-foreground: oklch(0.98 0 0);
54+
--secondary: oklch(0.95 0.03 295);
55+
--secondary-foreground: oklch(0.3 0.2 295);
56+
--muted: oklch(0.96 0 0);
57+
--muted-foreground: oklch(0.5 0 0);
58+
--accent: oklch(0.9 0.05 295);
59+
--accent-foreground: oklch(0.3 0.2 295);
60+
--destructive: oklch(0.75 0.2 25);
61+
--destructive-foreground: oklch(0.98 0 0);
62+
--border: oklch(0.9 0 0);
63+
--input: oklch(0.9 0 0);
64+
--ring: oklch(0.55 0.2 295);
65+
--chart-1: oklch(0.55 0.2 295);
66+
--chart-2: oklch(0.65 0.25 260);
67+
--chart-3: oklch(0.6 0.25 220);
68+
--chart-4: oklch(0.55 0.25 180);
69+
--chart-5: oklch(0.5 0.25 140);
70+
--sidebar: oklch(0.98 0 0);
71+
--sidebar-foreground: oklch(0.25 0 0);
72+
--sidebar-primary: oklch(0.55 0.2 295);
73+
--sidebar-primary-foreground: oklch(0.98 0 0);
74+
--sidebar-accent: oklch(0.9 0.05 295);
75+
--sidebar-accent-foreground: oklch(0.3 0.2 295);
76+
--sidebar-border: oklch(0.9 0 0);
77+
--sidebar-ring: oklch(0.55 0.2 295);
78+
--font-sans: "Poppins", sans-serif;
79+
--font-serif: "Merriweather", serif;
80+
--font-mono: "JetBrains Mono", monospace;
81+
--radius: 0.5rem;
82+
--shadow-2xs: 0 1px 2px rgba(0, 0, 0, 0.05);
83+
--shadow-xs: 0 1px 3px rgba(0, 0, 0, 0.05);
84+
--shadow-sm: 0 1px 3px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.06);
85+
--shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
86+
--shadow-md: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
87+
--shadow-lg: 0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04);
88+
--shadow-xl: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
89+
--shadow-2xl: 0 35px 60px -15px rgba(0, 0, 0, 0.3);
90+
--tracking-normal: 0em;
91+
--spacing: 0.25rem;
92+
93+
--radius-sm: calc(var(--radius) - 2px);
94+
--radius-md: var(--radius);
95+
--radius-lg: calc(var(--radius) + 2px);
96+
--radius-xl: calc(var(--radius) + 4px);
97+
}
98+
99+
@layer base {
100+
* {
101+
@apply border-border outline-ring/50;
102+
}
103+
body {
104+
@apply bg-background text-foreground;
105+
}
106+
}
107+
108+
/* Custom Animations */
109+
@keyframes fadeInUp {
110+
from {
111+
opacity: 0;
112+
transform: translateY(30px);
113+
}
114+
to {
115+
opacity: 1;
116+
transform: translateY(0);
117+
}
118+
}
119+
120+
.animate-fade-in-up {
121+
animation: fadeInUp 0.6s ease-out;
122+
}
123+
124+
button {
125+
cursor: pointer;
126+
&:disabled {
127+
cursor: not-allowed;
128+
}
129+
}

pnpm-lock.yaml

Lines changed: 23 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)