Skip to content

Commit

Permalink
Merge branch 'develop' into feature/#61
Browse files Browse the repository at this point in the history
  • Loading branch information
Todari committed Jul 29, 2024
2 parents 286ae97 + 4d8697a commit 181e0f3
Show file tree
Hide file tree
Showing 52 changed files with 759 additions and 558 deletions.
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ assignees: ''
## 🚨 버그 λ°œμƒ 상황
μ΅œλŒ€ν•œ μƒμ„Έν•˜κ²Œ μž‘μ„±ν•΄μ£Όμ„Έμš”.

### as-is

ν˜„μž¬ 상황에 λŒ€ν•΄μ„œ μ•Œλ €μ£Όμ„Έμš”.

### to-be

κ΅¬ν˜„μ΄ 된 ν›„ 상황을 μ˜ˆμƒν•΄ μ£Όμ„Έμš”.

## μ˜ˆμƒ κ²°κ³Ό
μ˜ˆμƒν–ˆλ˜ 정상적인 κ²°κ³Όκ°€ μ–΄λ–€ 것인지 μ„€λͺ…ν•΄μ£Όμ„Έμš”.

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backend-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0

- name: Test with Gradle Wrapper
run: ./gradlew test
run: ./gradlew clean build

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand Down Expand Up @@ -68,4 +68,4 @@ jobs:
run: sudo docker pull ${{ secrets.DOCKER_USERNAME }}/haengdong-backend-dev

- name: Docker run
run: sudo docker run -d -p 80:8080 --name haengdong-backend-dev haengdong/haengdong-backend-dev
run: sudo docker run -d -p 8080:8080 --name haengdong-backend-dev ${{ secrets.DOCKER_USERNAME }}/haengdong-backend-dev
61 changes: 61 additions & 0 deletions .github/workflows/design-pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Storybook Deployment
run-name: ${{ github.actor }}의 μŠ€ν† λ¦¬λΆ 배포
on:
pull_request:
branches:
- develop
paths:
- 'HDesign/**'

jobs:
storybook:
runs-on: ubuntu-latest
outputs:
status: ${{ job.status }}

defaults:
run:
shell: bash
working-directory: ./HDesign

steps:
- name: checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: cache dependencies
id: cache
uses: actions/cache@v3
with:
path: "**/node_modules"
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-storybook

- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: '20.15.1'

- name: depedency install
if: steps.cache.outputs.cache-hit != 'true'
run: npm ci

- name: run lint
working-directory: ./HDesign
run: npm run lint

- name: publish to chromatic
working-directory: ./HDesign
id: chromatic
uses: chromaui/action@v1
with:
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}

- name: comment PR
uses: thollander/actions-comment-pull-request@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
message: "πŸš€storybook: ${{ steps.chromatic.outputs.storybookUrl }}"

49 changes: 44 additions & 5 deletions HDesign/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ const compat = new FlatCompat({
export default [
...fixupConfigRules(
compat.extends(
'airbnb',
'airbnb/hooks',
'eslint:recommended',
'plugin:react/recommended',
'plugin:@typescript-eslint/recommended',
Expand Down Expand Up @@ -64,12 +62,38 @@ export default [
},

rules: {
'no-use-before-define': 0,
'prettier/prettier': 'error',
'react/react-in-jsx-scope': 'off',
'react/prop-types': 'off',
'react/jsx-uses-vars': 'error',
'@typescript-eslint/no-use-before-define': ['error'],
'@typescript-eslint/explicit-module-boundary-types': 'error',
'import/prefer-default-export': 0,
'import/no-named-as-default': 0,
'import/namespace': 0,
'import/extensions': 0,
'import/no-cycle': 0,
'react/no-unknown-property': 0,
'react/jsx-filename-extension': [1, {extensions: ['.ts', '.tsx']}],
'react/function-component-definition': 0,
'react/jsx-props-no-spreading': 0,
'react/jsx-key': 0,
'react/button-has-type': 'off',
'no-shadow': 0,
'no-console': 0,
'no-alert': 0,
'react/no-children-prop': 'off',
'react/no-array-index-key': 'off',
'react-hooks/exhaustive-deps': 'off',
'react-hooks/rules-of-hooks': 'off',
'react/jsx-no-useless-fragment': 'off',
'react/jsx-no-constructed-context-values': 'off',
'jsx-a11y/click-events-have-key-events': 'off',
'jsx-a11y/no-static-element-interactions': 'off',

'@typescript-eslint/no-unused-vars': 0,

// 'react/jsx-uses-vars': 'error',
// '@typescript-eslint/no-use-before-define': ['error'],
// '@typescript-eslint/explicit-module-boundary-types': 'error',

'import/order': [
'error',
Expand All @@ -89,6 +113,11 @@ export default [
group: 'internal',
position: 'after',
},
{
pattern: '@layouts/*',
group: 'internal',
position: 'after',
},
{
pattern: '@assets/*',
group: 'internal',
Expand All @@ -104,6 +133,16 @@ export default [
group: 'internal',
position: 'after',
},
{
pattern: '@types/*',
group: 'internal',
position: 'after',
},
{
pattern: '@utils/*',
group: 'internal',
position: 'after',
},
],
},
],
Expand Down
Loading

0 comments on commit 181e0f3

Please sign in to comment.