Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
23dbe48
feat: 스토리북 초기 설정
Hys-Lee May 21, 2025
698ed91
chore: 로컬 환경 설정 gitignore에 추가
Hys-Lee May 21, 2025
b6cb35d
feat: 디자인 토큰 tailwind 적용 설정
Hys-Lee May 22, 2025
55f4a75
Merge branch 'main' of upstream
Hys-Lee May 22, 2025
2763cf3
Merge branch 'main' into design
Hys-Lee May 22, 2025
cf2157a
feat: 스토리북 배포용 공용 컴포넌트 설정
Hys-Lee May 22, 2025
4ec8eaf
feat: tailwind설정에 postcss관련 설정 임시 복원 및 storybook 배포 설정
Hys-Lee May 22, 2025
2b3894e
feat: 스토리북 배포 관련 설정 추가
Hys-Lee May 22, 2025
d1ca615
feat: 디자인 시스템 스토리북 초기 및 테스트용 설정
Hys-Lee May 22, 2025
0a0ea18
feat: 프리티어 및 린트 설치 및 설정 (임시)
Hys-Lee May 22, 2025
eda3e43
style: 린트 및 프리티어로 인한 코드 스타일 변경
Hys-Lee May 22, 2025
86acdfe
feat: 디자인 시스템 스토리북 배포 설정 수정
Hys-Lee May 22, 2025
978b3aa
feat: token 변환 설정파일 수정
Hys-Lee May 24, 2025
a16fd87
docs: 디자인 시스템 관련 리드미 템플릿 수정
Hys-Lee May 24, 2025
ee6afc7
feat: 디자인 시스템 패키지 배포 테스트 성공
Hys-Lee May 24, 2025
70ebaa3
chore: tailwind/postcss 버전 복구
Hys-Lee May 24, 2025
bcc1cd5
feat: 스토리북 스타일 autodocs처리
Hys-Lee May 24, 2025
7d5250b
docs: 디자인 시스템 관련 문서들 정리(임시)
Hys-Lee May 24, 2025
02b17e6
Merge branch 'main' of https://github.com/prography/10th-Motimo-FE
Hys-Lee May 24, 2025
7041351
pull main
Hys-Lee May 24, 2025
5bf678b
feat: 토큰 설정 및 스토리북 배포 설정 수정
Hys-Lee May 24, 2025
5104f2a
Merge branch 'main' of https://github.com/prography/10th-Motimo-FE
Hys-Lee May 25, 2025
df656bb
Merge branch 'main' into design
Hys-Lee May 25, 2025
a5446c8
feat: 빌드 관련 tailwindcss/postcss 버전 수정 및 gitignore 포함
Hys-Lee May 25, 2025
fabde4e
Merge branch 'main' of https://github.com/prography/10th-Motimo-FE
Hys-Lee May 25, 2025
68ce4ea
feat: ci linux환경에서의 스토리북 빌드 관련 패키지 설정 수정
Hys-Lee May 26, 2025
21316d4
Merge branch 'design' into main
Hys-Lee May 26, 2025
272432d
Merge branch 'design'
Hys-Lee May 26, 2025
2e05c03
feat: 디자인 시스템 스토리북 예시 수정
Hys-Lee May 26, 2025
583c613
feat: zustand설치
Hys-Lee May 26, 2025
d29eeff
feat: 상현 개인 레포에서 스토리북 배포 동작하도록 수정
Hys-Lee May 26, 2025
7a7a68a
feat: deploy-storybook path에 자기자신 포함해, 변경 시 동작하도록 수정
Hys-Lee May 26, 2025
3136c68
fix: deploy-storybook path경로 수정
Hys-Lee May 26, 2025
8801660
Merge branch 'main' of https://github.com/prography/10th-Motimo-FE
Hys-Lee Jun 5, 2025
5c7a59d
feat: Chromatic UI 테스팅 github action 실험 적용
Hys-Lee Jun 8, 2025
3dc406c
feat: chromatic 설치
Hys-Lee Jun 8, 2025
b2629d4
feat: chromatic ci 관련 yarn->npm으로 변경
Hys-Lee Jun 8, 2025
dfac342
feat: chromatic 실험용 Test 컴폰너트 ui 변경
Hys-Lee Jun 8, 2025
f065d94
feat: chromatic github action 패키지 버전 수정
Hys-Lee Jun 8, 2025
525b888
feat: chromatic ci 중단 옵션 수정
Hys-Lee Jun 8, 2025
8bf61b6
Merge branch 'main' of https://github.com/prography/10th-Motimo-FE
Hys-Lee Jun 8, 2025
f08aa2a
Merge branch 'main' into design
Hys-Lee Jun 8, 2025
08b4560
feat: upstream PR에 대해 작동하도록 수정
Hys-Lee Jun 8, 2025
ee7a20e
feat: 크로마틱 연동 테스트
Hys-Lee Jun 10, 2025
1eb042b
feat: 스토리북 plop통한 템플릿 생성 기능 추가
Hys-Lee Jun 10, 2025
396aab4
docs: 스토리북 Intro 문서 수정
Hys-Lee Jun 10, 2025
9387475
feat: 크로마틱 연동 upstream에 적용하도록 수정
Hys-Lee Jun 10, 2025
ab5fa12
docs: 스토리북 Intro 문구 수정
Hys-Lee Jun 10, 2025
8ee477b
docs: 스토리북 intro 스타일 다듬기
Hys-Lee Jun 10, 2025
d294635
docs: 스토리북 버전 및 change log관련 문구 수정
Hys-Lee Jun 10, 2025
55a220a
feat: 스토리북 배포 주소 추가
Hys-Lee Jun 10, 2025
f07a016
docs: 스토리북 intro 문서 스타일 수정.
Hys-Lee Jun 10, 2025
e1b6af9
docs: 프로젝트 README에 디자인시스템 배포 페이지 추가
Hys-Lee Jun 10, 2025
891c5e5
docs: 스토리북 Intro 스타일 수정
Hys-Lee Jun 10, 2025
c2f7bec
docs: 프로젝트 README에 디자인시스템 배포 페이지 추가
Hys-Lee Jun 10, 2025
08de64e
Merge branch 'design'
Hys-Lee Jun 11, 2025
a9a7345
fix: 디자인 시스템 chromatic 연결 프로젝트 변경
Hys-Lee Jun 11, 2025
43d3cee
feat: chromatic github action에서 pull request target 방식으로 수정
Hys-Lee Jun 11, 2025
3f3ad2d
Merge branch 'main' of https://github.com/prography/10th-Motimo-FE
Hys-Lee Jun 11, 2025
ee93870
Merge branch 'main' into design
Hys-Lee Jun 11, 2025
2f1b9b4
feat: 디자인 토큰 새로운 형식 대해 파싱 수정
Hys-Lee Jun 11, 2025
cc16c05
feat: 수정된 디자인 토큰 파싱으로 tailwind 토큰 생성
Hys-Lee Jun 11, 2025
444a89f
fix: github action 관련 chromatic 액션 버전 수정
Hys-Lee Jun 11, 2025
3d64154
Merge branch 'main' of https://github.com/prography/10th-Motimo-FE
Hys-Lee Jun 12, 2025
033ba18
Merge branch 'main' into design
Hys-Lee Jun 12, 2025
1560ae9
feat: 로컬 폰트 suit_variable 적용
Hys-Lee Jun 12, 2025
1b1f538
feat: 디자인 토큰 primitive도 추가
Hys-Lee Jun 12, 2025
99ac5b6
Merge branch 'main' of https://github.com/prography/10th-Motimo-FE
Hys-Lee Jun 13, 2025
4f125eb
Merge branch 'main' into design
Hys-Lee Jun 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { Preview } from "@storybook/react";
import "../app/globals.css";
import "./storybook-fonts.css";
import {
Title,
Subtitle,
Expand Down
4 changes: 4 additions & 0 deletions .storybook/storybook-fonts.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@font-face {
font-family: "SUIT Variable";
src: url("../public/fonts/SUIT-Variable.woff2");
}
15 changes: 11 additions & 4 deletions app/globals.css
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
@import "./tokens.css";
@import "tailwindcss";
@config "../tailwind.config.ts";
@import "./tokens.css";

:root {
--background: #ffffff;
--foreground: #171717;
}

/* @font-face {
font-family: "SUIT Variable";
src: url("../public/fonts//SUIT-Variable.woff2");
} */

@theme inline {
--color-background: var(--background);
--color-foreground: var(--foreground);
--font-sans: var(--font-geist-sans);
--font-mono: var(--font-geist-mono);
--font-sans: [var(--font-suit-variable), var(--font-geist-sans)];
--font-mono: [var(--font-suit-variable), var(--font-geist-mono)];
}

@media (prefers-color-scheme: dark) {
Expand All @@ -23,5 +29,6 @@
body {
background: var(--background);
color: var(--foreground);
font-family: Arial, Helvetica, sans-serif;

font-family: var(--font-suit-varialbe), Arial, Helvetica, sans-serif;
}
40 changes: 26 additions & 14 deletions app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
import type { Metadata } from "next";
import { Geist, Geist_Mono } from "next/font/google";
// import { Geist, Geist_Mono } from "next/font/google";
import localFont from "next/font/local";
import "./globals.css";

const geistSans = Geist({
variable: "--font-geist-sans",
subsets: ["latin"],
});
// const geistSans = Geist({
// variable: "--font-geist-sans",
// subsets: ["latin"],
// });

// const geistMono = Geist_Mono({
// variable: "--font-geist-mono",
// subsets: ["latin"],
// });

const geistMono = Geist_Mono({
variable: "--font-geist-mono",
subsets: ["latin"],
export const customFont = localFont({
src: "../public/fonts/SUIT-Variable.woff2",
display: "swap",
variable: "--font-suit-variable",
});

export const metadata: Metadata = {
Expand All @@ -23,12 +30,17 @@ export default function RootLayout({
children: React.ReactNode;
}>) {
return (
<html lang="en">
<body
className={`${geistSans.variable} ${geistMono.variable} antialiased`}
>
{children}
</body>
<html lang="ko" className={`${customFont.className}`}>
<head>
<link
rel="preload"
href="/fonts/SUIT-Variable.woff2"
as="font"
type="font/woff2" // 폰트 파일 형식에 맞게 (woff, ttf 등)
crossOrigin="anonymous" // 일반적으로 폰트에는 추가하는 것이 좋음
/>
</head>
<body className={`${customFont.variable} antialiased`}>{children}</body>
</html>
);
}
83 changes: 83 additions & 0 deletions app/tokens.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,87 @@
@theme {
--color-Color-gray-5: #f7f7f8;
--color-Color-gray-10: #e6e8ea;
--color-Color-gray-20: #cdd1d5;
--color-Color-gray-30: #b1b8be;
--color-Color-gray-40: #8a949e;
--color-Color-gray-50: #6d7882;
--color-Color-gray-60: #58616a;
--color-Color-gray-70: #464c53;
--color-Color-gray-80: #33363d;
--color-Color-gray-90: #1e2124;
--color-Color-gray-95: #111111;
--color-Color-common-black: #000000;
--color-Color-common-white: #ffffff;
--color-Color-red-5: #fde9e8;
--color-Color-red-10: #fbd3d0;
--color-Color-red-20: #f8b9b5;
--color-Color-red-30: #f2847d;
--color-Color-red-40: #ee584f;
--color-Color-red-50: #ea3429;
--color-Color-red-60: #ce1308;
--color-Color-red-70: #890d06;
--color-Color-red-80: #620904;
--color-Color-red-90: #3b0502;
--color-Color-yellow-5: #fff7e5;
--color-Color-yellow-10: #ffe4ad;
--color-Color-yellow-20: #ffd070;
--color-Color-yellow-30: #ffc247;
--color-Color-yellow-40: #ffb114;
--color-Color-yellow-50: #e39902;
--color-Color-yellow-60: #c08102;
--color-Color-yellow-70: #8b5e04;
--color-Color-yellow-80: #634303;
--color-Color-yellow-90: #4a3202;
--color-Color-green-5: #ebfaee;
--color-Color-green-10: #c2f0cc;
--color-Color-green-20: #85e099;
--color-Color-green-30: #48d166;
--color-Color-green-40: #2bab47;
--color-Color-green-50: #228738;
--color-Color-green-60: #1d722f;
--color-Color-green-70: #196228;
--color-Color-green-80: #13491e;
--color-Color-green-90: #0c3114;
--color-Color-blue-5: #e7f4fe;
--color-Color-blue-10: #b6ddfb;
--color-Color-blue-20: #86c7f9;
--color-Color-blue-30: #55b1f6;
--color-Color-blue-40: #1694f3;
--color-Color-blue-50: #0576cc;
--color-Color-blue-60: #045c9f;
--color-Color-blue-70: #03487c;
--color-Color-blue-80: #023a64;
--color-Color-blue-90: #01233c;
--color-Color-primary-5: #e7e7fd;
--color-Color-primary-10: #dadafc;
--color-Color-primary-20: #c7c8fa;
--color-Color-primary-30: #abacf7;
--color-Color-primary-40: #8b8cf4;
--color-Color-primary-50: #5d5fef;
--color-Color-primary-60: #3033e8;
--color-Color-primary-70: #1719cf;
--color-Color-primary-80: #1214a1;
--color-Color-primary-90: #0a0b5c;
--spacing-Number-0: 0rem;
--spacing-Number-1: 0.062rem;
--spacing-Number-2: 0.125rem;
--spacing-Number-4: 0.25rem;
--spacing-Number-8: 0.5rem;
--spacing-Number-12: 0.75rem;
--spacing-Number-14: 0.875rem;
--spacing-Number-16: 1rem;
--spacing-Number-18: 1.125rem;
--spacing-Number-20: 1.25rem;
--spacing-Number-24: 1.5rem;
--spacing-Number-28: 1.75rem;
--spacing-Number-32: 2rem;
--spacing-Number-40: 2.5rem;
--spacing-Number-48: 3rem;
--spacing-Number-56: 3.5rem;
--spacing-Number-64: 4rem;
--spacing-Number-72: 4.5rem;
--spacing-Number-80: 5rem;
--spacing-Number-999: 62.438rem;
--radius-2: 0.125rem;
--radius-4: 0.25rem;
--radius-8: 0.5rem;
Expand Down
Binary file added public/fonts/SUIT-Variable.woff2
Binary file not shown.
18 changes: 10 additions & 8 deletions sd-tokens.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,17 @@ StyleDictionary.registerFormat({
format: function ({ dictionary }) {
return [
"@theme {",
...dictionary.allTokens
.filter((prop) => !prop.name.includes("primitive"))
.map((prop) => {
//test
console.log("prop.name, prop.type: ", prop.name, prop.type);
const nameFromPath = prop.path.slice(1).join("-");

...dictionary.allTokens.map((prop) => {
const isPrimitive = prop.name.includes("primitive");
const nameFromPath = prop.path.slice(1).join("-");

if (isPrimitive) {
const middleName = prop.type === "color" ? "Color-" : "";
return ` --${token2TailwindTypeMap?.[prop.type] ?? "non-mapped"}-${middleName}${nameFromPath}: ${prop.value};`;
} else {
return ` --${token2TailwindTypeMap?.[prop.type] ?? "non-mapped"}-${nameFromPath}: ${prop.value};`;
}),
}
}),
"}",
].join("\n");
},
Expand Down
12 changes: 12 additions & 0 deletions tailwind.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// tailwind.config.js
const defaultTheme = require("tailwindcss/defaultTheme");

module.exports = {
theme: {
extend: {
fontFamily: {
SUIT_Variable: [`var(--font-suit-variable)`],
},
},
},
};