Skip to content

Commit

Permalink
Merge pull request #52 from DDD-Community/develop
Browse files Browse the repository at this point in the history
배포 브랜치 활성화
  • Loading branch information
minh0518 authored May 15, 2024
2 parents 243f94d + ba25714 commit 2d601e2
Show file tree
Hide file tree
Showing 243 changed files with 14,967 additions and 599 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
next.config.js
/next.config.js
node_modules
42 changes: 41 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,43 @@
{
"extends": "next/core-web-vitals"
"env": {
"browser": true,
"es2021": true,
"node": true
},
"parser": "@typescript-eslint/parser",
"extends": ["next/core-web-vitals", "plugin:prettier/recommended", "plugin:@typescript-eslint/recommended"],

"overrides": [],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module",
"project": ["./tsconfig.json"]
},
"plugins": ["@typescript-eslint", "prettier"],
"rules": {
"no-var": "error",
"no-console": ["warn", { "allow": ["warn", "error", "info"] }],
"prefer-const": "off",
"@typescript-eslint/consistent-type-imports": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/space-before-function-paren": "off",
"@typescript-eslint/triple-slash-reference": "off",
"@typescript-eslint/restrict-template-expressions": "error",
"@typescript-eslint/no-floating-promises": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-unused-vars": "warn",
"@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/no-misused-promises": [
"error",
{
"checksVoidReturn": false
}
],
"prettier/prettier": [
"error",
{
"endOfLine": "auto"
}
]
}
}
3 changes: 3 additions & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# .gitconfig
[core]
ignorecase = false
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
## 개요

{ 업무에 대한 요약 및 설명 }

<br/>

## 체크리스트

{ 작업 체크리스트 }

- [ ] 리스트 1
- [ ] 리스트 2

<br/>

## 비고

{ 기타 내용, 의존성있는 작업 }
23 changes: 23 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
### 💁‍♂️ PR 개요

- 어떤 이유로 코드를 변경했는지
- #{issue number} (QA이슈)

<br/>

### 📷 스크린 샷 (선택)

- 관련 스크린샷 첨부

<br/>

### 🗣 리뷰어한테 할 말 (선택)

- 집중적으로 리뷰해주었으면 하는 부분 설명

<br/>

### 🧪 테스트 범위 (선택)

- 테스트 계획
- 테스트 완료 사항
37 changes: 37 additions & 0 deletions .github/labels.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[
{
"color": "D4C5F9",
"description": "패키지 매니저 수정, 그 외 기타 수정",
"name": "⚙️CHORE"
},
{
"color": "C5DEF5",
"description": "문서(주석) 수정",
"name": "📝DOCS"
},
{
"color": "FEF2C0",
"description": "기능 구현 관련",
"name": "✨FEAT"
},
{
"color": "F9D0C4",
"description": "기능에 대한 버그 수정",
"name": "🐛FIX"
},
{
"color": "C2E0C6",
"description": "기능의 변화가 아닌 코드 리팩터링 ex) 변수명 변경",
"name": "♻️REFACTOR"
},
{
"color": "E99695",
"description": "코드 스타일, 포맷팅에 대한 수정",
"name": "🎨STYLE"
},
{
"color": "66ff99",
"description": "test 관련",
"name": "✅TEST"
}
]
30 changes: 30 additions & 0 deletions .github/workflows/sync_develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: git push into another repo to deploy to vercel

on:
push:
branches: [develop]

jobs:
build:
runs-on: ubuntu-latest
container: pandoc/latex
steps:
- uses: actions/checkout@v3
- name: Install mustache (to update the date)
run: apk add ruby && gem install mustache
- name: creates output
run: sh ./build.sh
- name: Pushes to another repository
id: push_directory
uses: cpina/github-action-push-to-another-repository@main
env:
API_TOKEN_GITHUB: ${{ secrets.AUTO_SYNC_KEY }}
with:
source-directory: 'output'
destination-github-username: minh0518
destination-repository-name: DDD-10-KKEUNKKEUN-WEB
user-email: ${{ secrets.OFFICIAL_ACCOUNT_EMAIL }}
commit-message: ${{ github.event.commits[0].message }}
target-branch: develop
- name: Test get variable exported by push-to-another-repository
run: echo $DESTINATION_CLONED_DIRECTORY
30 changes: 30 additions & 0 deletions .github/workflows/sync_main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: git push into another repo to deploy to vercel

on:
push:
branches: [main]

jobs:
build:
runs-on: ubuntu-latest
container: pandoc/latex
steps:
- uses: actions/checkout@v3
- name: Install mustache (to update the date)
run: apk add ruby && gem install mustache
- name: creates output
run: sh ./build.sh
- name: Pushes to another repository
id: push_directory
uses: cpina/github-action-push-to-another-repository@main
env:
API_TOKEN_GITHUB: ${{ secrets.AUTO_SYNC_KEY }}
with:
source-directory: 'output'
destination-github-username: minh0518
destination-repository-name: DDD-10-KKEUNKKEUN-WEB
user-email: ${{ secrets.OFFICIAL_ACCOUNT_EMAIL }}
commit-message: ${{ github.event.commits[0].message }}
target-branch: main
- name: Test get variable exported by push-to-another-repository
run: echo $DESTINATION_CLONED_DIRECTORY
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,16 @@ yarn-error.log*
# local env files
.env*.local


# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts


.eslintcache


.env
26 changes: 26 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env sh
# . "$(dirname -- "$0")/_/husky.sh"

# COMMIT_MSG_FILE=$1
# COMMIT_MSG=$(awk '!/^\s*#/' "$COMMIT_MSG_FILE")
# SECOND_LINE=$(echo "$COMMIT_MSG" | sed -n '2p')

# IS_HEADER_FORMAT_VALID='^(:[a-zA-Z_]+: )?(feat|fix|docs|refactor|test|style|chore): .+'
# IS_HEADER_LENGTH_UNDER_50='^(.{1,50}$)'

# # --- header ---
# if ! echo "$COMMIT_MSG" | grep -qP "$IS_HEADER_FORMAT_VALID"; then
# echo "🚨 커밋 메시지는 'feat: ', 'fix: ', 'docs: ', 'refactor: ', 'test: ', 'style: ', 'chore: ' 중 하나로 시작해야 합니다. (띄워쓰기 포함)"
# exit 1
# fi

# if ! echo "$COMMIT_MSG" | grep -qP "$IS_HEADER_LENGTH_UNDER_50"; then
# echo "🚨 커밋 메시지의 첫 줄은 50자를 넘을 수 없습니다."
# exit 1
# fi

# # --- description ---
# if ! [ -z "$SECOND_LINE" ]; then
# echo "🚨 커밋 메시지의 두 번째 줄은 비워야 합니다."
# exit 1
# fi
16 changes: 16 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env sh
# . "$(dirname -- "$0")/_/husky.sh"

# branch_name=$(git branch --show-current)

# # check branch naming
# pattern="^(feat|fix|docs|refactor|test|style|chore)\/.+$"

# if ! echo "$branch_name" | grep -Eq "$pattern"; then
# echo "🚨 브랜치 이름이 규칙에 맞지 않습니다."
# echo "수정 예시: feat/login_cookie, chore/ESLint,prettier 등"
# exit 1
# fi

# check ESlint&prettier before commit
npx lint-staged
4 changes: 4 additions & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
# . "$(dirname -- "$0")/_/husky.sh"

npm run build
13 changes: 13 additions & 0 deletions .lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
// Type check TypeScript files
'**/*.(ts|tsx)': () => 'npx tsc --noEmit',

// Lint & Prettify TS and JS files
'**/*.(ts|tsx)': (filenames) => {
return [
`npx eslint --cache --fix ${filenames.join(' ')}`,
`npx prettier --write ${filenames.join(' ')}`,
// `npx stylelint --ignore-path .gitignore ${filenames.join(' ')}`,
];
},
};
19 changes: 19 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"useTabs": false,
"trailingComma": "all",
"printWidth": 100,
"arrowParens": "always",
"bracketSpacing": true,
"jsxBracketSameLine": false,
"overrides": [
{
"files": "*.json",
"options": {
"printWidth": 150
}
}
]
}
60 changes: 60 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"extends": ["stylelint-config-standard-scss"],
"plugins": ["stylelint-order", "stylelint-prettier"],
"overrides": [
{
"files": ["**/*.scss"],
"customSyntax": "postcss-scss"
}
],
"rules": {
"media-feature-range-notation": "prefix",
"order/properties-order": [
"display",
"align-items",
"justify-content",
"clear",
"float",
"overflow",
"position",
"top",
"right",
"bottom",
"left",
"z-index",
"width",
"height",
"margin",
"padding",
"background",
"background-size",
"border",
"color",
"font-size",
"font-weight",
"text-overflow",
"text-align",
"line-height",
"text-indent",
"transform",
"transition",
"box-sizing",
"white-space"
],
"scss/no-global-function-names": null,
"selector-class-pattern": null,
"selector-pseudo-class-no-unknown": [
true,
{
"ignorePseudoClasses": ["deep"]
}
],
"no-descending-specificity": null,
"font-family-no-missing-generic-family-keyword": [
true,
{
"ignoreFontFamilies": ["Font Awesome 5 Free"]
}
]
}
}
5 changes: 5 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
cd ../
mkdir output
cp -R ./DDD-10-KKEUNKKEUN-WEB/* ./output
cp -R ./output ./DDD-10-KKEUNKKEUN-WEB/
20 changes: 18 additions & 2 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
/** @type {import('next').NextConfig} */
const nextConfig = {}
const nextConfig = {
reactStrictMode: false,
images: {
remotePatterns: [{ protocol: 'http', hostname: '124.49.161.33' }],
},
async rewrites() {
return [
{
source: '/api/:path*',
destination:
process.env.NODE_ENV === 'development'
? `${process.env.NEXT_PUBLIC_BASE_URL_DEV}/api/:path*`
: `${process.env.NEXT_PUBLIC_BASE_URL_PROD}/api/:path*`,
},
];
},
};

module.exports = nextConfig
module.exports = nextConfig;
Loading

0 comments on commit 2d601e2

Please sign in to comment.