Skip to content

Commit

Permalink
Merge branch 'main' into feature/checkbox
Browse files Browse the repository at this point in the history
  • Loading branch information
merx88 authored Sep 27, 2024
2 parents 005813f + 0b85112 commit 4fc92e1
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 16 deletions.
8 changes: 2 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,5 @@ dist
# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
# vite build output
.vite/build
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"url": "https://github.com/waktaplay/ui.git"
},
"files": [
"dist"
"dist/**"
],
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"build": "tsup && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"prepublish": "tsup"
Expand Down Expand Up @@ -46,5 +46,5 @@
"vite-plugin-svgr": "^4.2.0",
"vite-tsconfig-paths": "^5.0.1"
},
"packageManager": "pnpm@9.9.0+sha512.60c18acd138bff695d339be6ad13f7e936eea6745660d4cc4a776d5247c540d0edee1a563695c183a66eb917ef88f2b4feb1fc25f32a7adcadc7aaf3438e99c1"
"packageManager": "pnpm@9.11.0+sha512.0a203ffaed5a3f63242cd064c8fb5892366c103e328079318f78062f24ea8c9d50bc6a47aa3567cabefd824d170e78fa2745ed1f16b132e16436146b7688f19b"
}
9 changes: 2 additions & 7 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import Youtube from "@assets/icons/youtube.svg"
import Link from "@assets/icons/link.svg"
import SpacewakTextLogo from "@assets/logo/spacewak-text-logo.svg"
import WaktaplayTextLogo from "@assets/logo/waktaplay-text-logo.svg"
import ChunsikSVG from "@assets/icons/members/gwakchunsik.svg"
import WaktaverseSVG from "@assets/icons/group/waktaverse.svg"

import { IElementProps } from "@components/List/types"
Expand Down Expand Up @@ -324,6 +323,7 @@ const App = () => {
<section>
{/* 체크되면 글자색이 바뀝니다 */}
<H3 isChecked={isChecked}>CheckBox</H3>

<CheckBox
id="testId"
text="checkbox"
Expand All @@ -337,6 +337,7 @@ const App = () => {
handleAllCheckbox()
}}
/>

</section>

<section>
Expand Down Expand Up @@ -380,12 +381,6 @@ const App = () => {
alert(`${value} selected`)
}}
/>
<Chip.Small
item={{ icon: ChunsikSVG, label: "곽춘식", value: "chunsik", iconBgColor: "#1e301e" }}
onClick={(value: string) => {
alert(`${value} selected`)
}}
/>
<Chip.Medium
item={{ icon: WaktaverseSVG, label: "왁타버스", value: "waktaverse" }}
onClick={(value: string) => {
Expand Down
3 changes: 3 additions & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ import svgr from "vite-plugin-svgr"
// https://vitejs.dev/config/
export default defineConfig({
plugins: [react(), tsconfigPaths(), svgr()],
build: {
outDir: ".vite/build",
},
})

0 comments on commit 4fc92e1

Please sign in to comment.