Skip to content

Commit

Permalink
Merge pull request #33 from 8princesses/develop
Browse files Browse the repository at this point in the history
1차 dev->main
  • Loading branch information
ckhe1215 authored Oct 25, 2023
2 parents 0d75d12 + 269087f commit c18811b
Show file tree
Hide file tree
Showing 195 changed files with 8,864 additions and 662 deletions.
2 changes: 2 additions & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
NEXT_PUBLIC_API_URL=https://api.modumozu.com/
NEXT_PUBLIC_KAKAO_KEY="5d83cd0432c767f46c20dceb0f8f3947"
2 changes: 1 addition & 1 deletion .env.production
Original file line number Diff line number Diff line change
@@ -1 +1 @@
NEXT_PUBLIC_API_URL=URL
NEXT_PUBLIC_API_URL=https://api.modumozu.com/
6 changes: 2 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"extends": [
"next/core-web-vitals",
"plugin:storybook/recommended"
]
"extends": ["next/core-web-vitals", "plugin:storybook/recommended"],
"ignorePatterns": ["src/stories"]
}
26 changes: 26 additions & 0 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Workflow name
name: "Chromatic Deployment"

# Event for the workflow
on:
push:
branches:
- develop

# List of jobs
jobs:
test:
# Operating System
runs-on: ubuntu-latest
# Job steps
steps:
- uses: actions/checkout@v1
- run: npm i -g pnpm
- run: pnpm install
#👇 Adds Chromatic as a step in the workflow
- uses: chromaui/action@v1
# Options required for Chromatic's GitHub Action
with:
#👇 Chromatic projectToken, see https://storybook.js.org/tutorials/intro-to-storybook/react/ko/deploy/ to obtain it
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
14 changes: 14 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { StorybookConfig } from "@storybook/nextjs";
import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";

const config: StorybookConfig = {
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
Expand All @@ -7,6 +8,7 @@ const config: StorybookConfig = {
"@storybook/addon-essentials",
"@storybook/addon-onboarding",
"@storybook/addon-interactions",
"@storybook/addon-viewport",
],
framework: {
name: "@storybook/nextjs",
Expand All @@ -15,5 +17,17 @@ const config: StorybookConfig = {
docs: {
autodocs: "tag",
},
staticDirs: ["../src/app"],
webpackFinal: async (config) => {
if (config.resolve) {
config.resolve.plugins = [
...(config.resolve.plugins || []),
new TsconfigPathsPlugin({
extensions: config.resolve.extensions,
}),
];
}
return config;
},
};
export default config;
15 changes: 0 additions & 15 deletions .storybook/preview.ts

This file was deleted.

30 changes: 30 additions & 0 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import type { Preview } from "@storybook/react";
import React from "react";
import { INITIAL_VIEWPORTS } from "@storybook/addon-viewport/preview";
import "../src/app/globals.css";

const preview: Preview = {
parameters: {
actions: { argTypesRegex: "^on[A-Z].*" },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/,
},
},
viewport: {
viewports: INITIAL_VIEWPORTS,
defaultViewport: "iphone12",
},
},

decorators: [
(Story) => (
<>
<Story />
</>
),
],
};

export default preview;
408 changes: 408 additions & 0 deletions build-storybook.log

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
/** @type {import('next').NextConfig} */
const nextConfig = {}
const nextConfig = {
compiler: {
styledComponents: true,
},
images: {
domains: ["d2u3dcdbebyaiu.cloudfront.net", "teamblindstatics.s3.ap-northeast-1.amazonaws.com"],
},
};

module.exports = nextConfig
module.exports = nextConfig;
17 changes: 14 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,23 @@
"lint": "next lint",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build",
"preinstall": "npx only-allow pnpm"
"preinstall": "npx only-allow pnpm",
"chromatic": "npx chromatic --project-token=chpt_a2dbd92234c64c2"
},
"dependencies": {
"@storybook/addon-viewport": "^7.4.0",
"@tanstack/react-query": "^4.36.1",
"@types/node": "20.4.10",
"@types/react": "18.2.20",
"@types/react-dom": "18.2.7",
"axios": "^1.4.0",
"dayjs": "^1.11.10",
"eslint": "8.47.0",
"eslint-config-next": "13.4.13",
"korean-business-day": "^3.1.0",
"next": "13.4.13",
"react": "18.2.0",
"react-datepicker": "^4.19.0",
"react-dom": "18.2.0",
"recoil": "^0.7.7",
"styled-components": "^6.0.7",
Expand All @@ -35,7 +41,12 @@
"@storybook/react": "^7.2.3",
"@storybook/test-runner": "^0.13.0",
"@storybook/testing-library": "^0.2.0",
"@types/react-datepicker": "^4.15.1",
"chromatic": "^6.23.0",
"eslint-plugin-storybook": "^0.6.13",
"storybook": "^7.2.3"
}
"storybook": "^7.2.3",
"tsconfig-paths-webpack-plugin": "^4.1.0"
},
"readme": "ERROR: No README data found!",
"_id": "[email protected]"
}
Loading

0 comments on commit c18811b

Please sign in to comment.