Skip to content

Commit 358efa5

Browse files
committed
merge: dev 와 머지
2 parents 05a72a9 + eb82191 commit 358efa5

32 files changed

+3053
-257
lines changed

.eslintrc.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
"next/core-web-vitals",
55
"eslint:recommended",
66
"plugin:@typescript-eslint/recommended",
7-
"plugin:prettier/recommended"
7+
"plugin:prettier/recommended",
8+
"prettier"
89
],
910
"plugins": ["@typescript-eslint", "prettier"],
1011
"parser": "@typescript-eslint/parser",
1112
"rules": {
13+
"import/no-anonymous-default-export": "off",
14+
"@typescript-eslint/no-explicit-any": "off",
1215
"prettier/prettier": [
1316
"error",
1417
{

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,5 @@ next-env.d.ts
4646
storybook-static/
4747
storybook-static/*
4848
build-storybook.log
49+
50+
*storybook.log

.storybook/Configure.mdx

Lines changed: 119 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
11
import { Meta } from "@storybook/blocks";
2+
import Image from "next/image";
23

3-
import Accessibility from "./assets/accessibility.png";
4-
import AddonLibrary from "./assets/addon-library.png";
5-
import Assets from "./assets/assets.png";
6-
import Context from "./assets/context.png";
4+
import Github from "./assets/github.svg";
75
import Discord from "./assets/discord.svg";
6+
import Youtube from "./assets/youtube.svg";
7+
import Tutorials from "./assets/tutorials.svg";
8+
import Styling from "./assets/styling.png";
9+
import Context from "./assets/context.png";
10+
import Assets from "./assets/assets.png";
811
import Docs from "./assets/docs.png";
9-
import FigmaPlugin from "./assets/figma-plugin.png";
10-
import Github from "./assets/github.svg";
1112
import Share from "./assets/share.png";
12-
import Styling from "./assets/styling.png";
13+
import FigmaPlugin from "./assets/figma-plugin.png";
1314
import Testing from "./assets/testing.png";
15+
import Accessibility from "./assets/accessibility.png";
1416
import Theming from "./assets/theming.png";
15-
import Tutorials from "./assets/tutorials.svg";
16-
import Youtube from "./assets/youtube.svg";
17+
import AddonLibrary from "./assets/addon-library.png";
1718

18-
export const RightArrow = () => (
19-
<svg
20-
viewBox="0 0 14 14"
21-
width="8px"
22-
height="14px"
23-
style={{
24-
marginLeft: "4px",
25-
display: "inline-block",
26-
shapeRendering: "inherit",
27-
verticalAlign: "middle",
28-
fill: "currentColor",
29-
"path fill": "currentColor",
19+
export const RightArrow = () => <svg
20+
viewBox="0 0 14 14"
21+
width="8px"
22+
height="14px"
23+
style={{
24+
marginLeft: '4px',
25+
display: 'inline-block',
26+
shapeRendering: 'inherit',
27+
verticalAlign: 'middle',
28+
fill: 'currentColor',
29+
'path fill': 'currentColor'
3030
}}
31-
>
32-
<path d="m11.1 7.35-5.5 5.5a.5.5 0 0 1-.7-.7L10.04 7 4.9 1.85a.5.5 0 1 1 .7-.7l5.5 5.5c.2.2.2.5 0 .7Z" />
33-
</svg>
34-
);
31+
>
32+
<path d="m11.1 7.35-5.5 5.5a.5.5 0 0 1-.7-.7L10.04 7 4.9 1.85a.5.5 0 1 1 .7-.7l5.5 5.5c.2.2.2.5 0 .7Z" />
33+
</svg>
3534

3635
<Meta title="Configure your project" />
3736

@@ -40,13 +39,15 @@ export const RightArrow = () => (
4039
# Configure your project
4140

4241
Because Storybook works separately from your app, you'll need to configure it for your specific stack and setup. Below, explore guides for configuring Storybook with popular frameworks and tools. If you get stuck, learn how you can ask for help from our community.
43-
4442
</div>
4543
<div className="sb-section">
4644
<div className="sb-section-item">
47-
<img
45+
<Image
4846
src={Styling}
4947
alt="A wall of logos representing different styling technologies"
48+
width={0}
49+
height={0}
50+
style={{ width: '100%', height: 'auto' }}
5051
/>
5152
<h4 className="sb-section-item-heading">Add styling and CSS</h4>
5253
<p className="sb-section-item-paragraph">Like with web applications, there are many ways to include CSS within Storybook. Learn more about setting up styling within Storybook.</p>
@@ -56,7 +57,10 @@ export const RightArrow = () => (
5657
>Learn more<RightArrow /></a>
5758
</div>
5859
<div className="sb-section-item">
59-
<img
60+
<Image
61+
width={0}
62+
height={0}
63+
style={{ width: '100%', height: 'auto' }}
6064
src={Context}
6165
alt="An abstraction representing the composition of data for a component"
6266
/>
@@ -68,7 +72,13 @@ export const RightArrow = () => (
6872
>Learn more<RightArrow /></a>
6973
</div>
7074
<div className="sb-section-item">
71-
<img src={Assets} alt="A representation of typography and image assets" />
75+
<Image
76+
width={0}
77+
height={0}
78+
style={{ width: '100%', height: 'auto' }}
79+
src={Assets}
80+
alt="A representation of typography and image assets"
81+
/>
7282
<div>
7383
<h4 className="sb-section-item-heading">Load assets and resources</h4>
7484
<p className="sb-section-item-paragraph">To link static files (like fonts) to your projects and stories, use the
@@ -87,13 +97,18 @@ export const RightArrow = () => (
8797
# Do more with Storybook
8898

8999
Now that you know the basics, let's explore other parts of Storybook that will improve your experience. This list is just to get you started. You can customise Storybook in many ways to fit your needs.
90-
91100
</div>
92101

93102
<div className="sb-section">
94103
<div className="sb-features-grid">
95104
<div className="sb-grid-item">
96-
<img src={Docs} alt="A screenshot showing the autodocs tag being set, pointing a docs page being generated" />
105+
<Image
106+
width={0}
107+
height={0}
108+
style={{ width: '100%', height: 'auto' }}
109+
src={Docs}
110+
alt="A screenshot showing the autodocs tag being set, pointing a docs page being generated"
111+
/>
97112
<h4 className="sb-section-item-heading">Autodocs</h4>
98113
<p className="sb-section-item-paragraph">Auto-generate living,
99114
interactive reference documentation from your components and stories.</p>
@@ -103,7 +118,13 @@ export const RightArrow = () => (
103118
>Learn more<RightArrow /></a>
104119
</div>
105120
<div className="sb-grid-item">
106-
<img src={Share} alt="A browser window showing a Storybook being published to a chromatic.com URL" />
121+
<Image
122+
width={0}
123+
height={0}
124+
style={{ width: '100%', height: 'auto' }}
125+
src={Share}
126+
alt="A browser window showing a Storybook being published to a chromatic.com URL"
127+
/>
107128
<h4 className="sb-section-item-heading">Publish to Chromatic</h4>
108129
<p className="sb-section-item-paragraph">Publish your Storybook to review and collaborate with your entire team.</p>
109130
<a
@@ -112,7 +133,13 @@ export const RightArrow = () => (
112133
>Learn more<RightArrow /></a>
113134
</div>
114135
<div className="sb-grid-item">
115-
<img src={FigmaPlugin} alt="Windows showing the Storybook plugin in Figma" />
136+
<Image
137+
width={0}
138+
height={0}
139+
style={{ width: '100%', height: 'auto' }}
140+
src={FigmaPlugin}
141+
alt="Windows showing the Storybook plugin in Figma"
142+
/>
116143
<h4 className="sb-section-item-heading">Figma Plugin</h4>
117144
<p className="sb-section-item-paragraph">Embed your stories into Figma to cross-reference the design and live
118145
implementation in one place.</p>
@@ -122,7 +149,13 @@ export const RightArrow = () => (
122149
>Learn more<RightArrow /></a>
123150
</div>
124151
<div className="sb-grid-item">
125-
<img src={Testing} alt="Screenshot of tests passing and failing" />
152+
<Image
153+
width={0}
154+
height={0}
155+
style={{ width: '100%', height: 'auto' }}
156+
src={Testing}
157+
alt="Screenshot of tests passing and failing"
158+
/>
126159
<h4 className="sb-section-item-heading">Testing</h4>
127160
<p className="sb-section-item-paragraph">Use stories to test a component in all its variations, no matter how
128161
complex.</p>
@@ -132,7 +165,13 @@ export const RightArrow = () => (
132165
>Learn more<RightArrow /></a>
133166
</div>
134167
<div className="sb-grid-item">
135-
<img src={Accessibility} alt="Screenshot of accessibility tests passing and failing" />
168+
<Image
169+
width={0}
170+
height={0}
171+
style={{ width: '100%', height: 'auto' }}
172+
src={Accessibility}
173+
alt="Screenshot of accessibility tests passing and failing"
174+
/>
136175
<h4 className="sb-section-item-heading">Accessibility</h4>
137176
<p className="sb-section-item-paragraph">Automatically test your components for a11y issues as you develop.</p>
138177
<a
@@ -141,7 +180,13 @@ export const RightArrow = () => (
141180
>Learn more<RightArrow /></a>
142181
</div>
143182
<div className="sb-grid-item">
144-
<img src={Theming} alt="Screenshot of Storybook in light and dark mode" />
183+
<Image
184+
width={0}
185+
height={0}
186+
style={{ width: '100%', height: 'auto' }}
187+
src={Theming}
188+
alt="Screenshot of Storybook in light and dark mode"
189+
/>
145190
<h4 className="sb-section-item-heading">Theming</h4>
146191
<p className="sb-section-item-paragraph">Theme Storybook's UI to personalize it to your project.</p>
147192
<a
@@ -162,13 +207,25 @@ export const RightArrow = () => (
162207
>Discover all addons<RightArrow /></a>
163208
</div>
164209
<div className='sb-addon-img'>
165-
<img src={AddonLibrary} alt="Integrate your tools with Storybook to connect workflows." />
210+
<Image
211+
width={650}
212+
height={347}
213+
src={AddonLibrary}
214+
alt="Integrate your tools with Storybook to connect workflows."
215+
/>
166216
</div>
167217
</div>
168218

169219
<div className="sb-section sb-socials">
170220
<div className="sb-section-item">
171-
<img src={Github} alt="Github logo" className="sb-explore-image"/>
221+
<Image
222+
width={32}
223+
height={32}
224+
layout="fixed"
225+
src={Github}
226+
alt="Github logo"
227+
className="sb-explore-image"
228+
/>
172229
Join our contributors building the future of UI development.
173230

174231
<a
@@ -177,7 +234,14 @@ export const RightArrow = () => (
177234
>Star on GitHub<RightArrow /></a>
178235
</div>
179236
<div className="sb-section-item">
180-
<img src={Discord} alt="Discord logo" className="sb-explore-image"/>
237+
<Image
238+
width={33}
239+
height={32}
240+
layout="fixed"
241+
src={Discord}
242+
alt="Discord logo"
243+
className="sb-explore-image"
244+
/>
181245
<div>
182246
Get support and chat with frontend developers.
183247

@@ -188,7 +252,14 @@ export const RightArrow = () => (
188252
</div>
189253
</div>
190254
<div className="sb-section-item">
191-
<img src={Youtube} alt="Youtube logo" className="sb-explore-image"/>
255+
<Image
256+
width={32}
257+
height={32}
258+
layout="fixed"
259+
src={Youtube}
260+
alt="Youtube logo"
261+
className="sb-explore-image"
262+
/>
192263
<div>
193264
Watch tutorials, feature previews and interviews.
194265

@@ -199,15 +270,21 @@ export const RightArrow = () => (
199270
</div>
200271
</div>
201272
<div className="sb-section-item">
202-
<img src={Tutorials} alt="A book" className="sb-explore-image"/>
273+
<Image
274+
width={33}
275+
height={32}
276+
layout="fixed"
277+
src={Tutorials}
278+
alt="A book"
279+
className="sb-explore-image"
280+
/>
203281
<p>Follow guided walkthroughs on for key workflows.</p>
204282

205283
<a
206284
href="https://storybook.js.org/tutorials/"
207285
target="_blank"
208286
>Discover tutorials<RightArrow /></a>
209287
</div>
210-
211288
</div>
212289

213290
<style>

.storybook/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import type { StorybookConfig } from "@storybook/react-vite";
1+
import type { StorybookConfig } from "@storybook/nextjs";
22

33
const config: StorybookConfig = {
44
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
55
addons: ["@storybook/addon-links", "@storybook/addon-essentials", "@storybook/addon-interactions"],
66
framework: {
7-
name: "@storybook/react-vite",
7+
name: "@storybook/nextjs",
88
options: {},
99
},
1010
async viteFinal(config) {

0 commit comments

Comments
 (0)