Skip to content
This repository has been archived by the owner on May 14, 2024. It is now read-only.

Commit

Permalink
Develop to Main (#250)
Browse files Browse the repository at this point in the history
  • Loading branch information
JangYouJung committed Feb 27, 2024
2 parents 71aeedc + 7ecde1e commit d2d6eb1
Show file tree
Hide file tree
Showing 141 changed files with 11,123 additions and 290 deletions.
13 changes: 0 additions & 13 deletions .env.example

This file was deleted.

19 changes: 18 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ module.exports = {
tsconfigRootDir: __dirname,
sourceType: 'module',
},
plugins: ['@typescript-eslint/eslint-plugin'],
plugins: [
'@typescript-eslint/eslint-plugin'
],
extends: [
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
Expand All @@ -22,4 +24,19 @@ module.exports = {
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',
},
'prettier/prettier': [
'error',
{
arrowSpacing: ['error', { before: true, after: true }],
singleQuote: true,
semi: false,
useTabs: false,
tabWidth: 2,
trailingComma: 'none',
printWidth: 80,
bracketSpacing: true,
arrowParens: 'always',
endOfLine: 'auto', // 이 부분이 lf로 되어있다면 auto로 변경
},
],
};
27 changes: 27 additions & 0 deletions .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Development Server Deploy
on:
push:
branches:
- feature/#32
- develop
pull_request:
branches:
- develop
jobs:
deploy:
name: Deploy
runs-on: ubuntu-latest

steps:
- name: SSH
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.SSH_HOST }}
username: ${{ secrets.SSH_USER }}
password: ${{ secrets.SSH_PASSWORD }}
script: |
cd /root/hereyou
git pull
npm install
npm run build
pm2 restart all
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"CodeGPT.apiKey": "CodeGPT Plus Beta"
}
19 changes: 19 additions & 0 deletions docs/pull-request-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Check

- [ ] 잘 동작하는 코드인가요?
- [ ] 테스트를 충분히 해봤나요?
- [ ] 컨벤션을 준수 했나요?

# Description

어떤 작업을 했나요?

# Key Changes

핵심적인 부분을 간단하게 알려주세요!

# To Reviewers

이런 부분을 집중적으로 봐주세요.

### 아직 해결하지 못한 사항이 있다면 issue에 남기고 팀원들과 공유해주세요~
Loading

0 comments on commit d2d6eb1

Please sign in to comment.