Skip to content

Commit

Permalink
Merge pull request #138 from softeerbootcamp4th/dev
Browse files Browse the repository at this point in the history
1.0 배포
  • Loading branch information
darkdulgi authored Aug 23, 2024
2 parents d56ea83 + 7f2a9f1 commit f2842a5
Show file tree
Hide file tree
Showing 389 changed files with 14,910 additions and 290 deletions.
29 changes: 15 additions & 14 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,26 @@ module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
'eslint:recommended',
'plugin:react/recommended',
'plugin:react/jsx-runtime',
'plugin:react-hooks/recommended',
'plugin:prettier/recommended'
"eslint:recommended",
"plugin:react/recommended",
"plugin:react/jsx-runtime",
"plugin:react-hooks/recommended",
"prettier",
],
ignorePatterns: ['dist', '.eslintrc.cjs', '**/*.config.js'],
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
settings: { react: { version: '18.2' } },
plugins: ['react-refresh'],
ignorePatterns: ["dist", "dist-ssg", ".eslintrc.cjs", "**/*.config.js"],
parserOptions: { ecmaVersion: "latest", sourceType: "module" },
settings: { react: { version: "18.2" } },
plugins: ["react-refresh", "@stylistic/jsx"],
rules: {
'react/jsx-no-target-blank': 'off',
'react-refresh/only-export-components': [
'warn',
"react/jsx-no-target-blank": "off",
"react-refresh/only-export-components": [
"warn",
{ allowConstantExport: true },
],
"react/react-in-jsx-scope": "off",
"react/prop-types": "off",
"react/no-unknown-property": "off",
"prettier/prettier": ["error", { "endOfLine": "auto" }]
"prettier/prettier": "off", // eslint-plugin-prettier 플러그인을 사용하지 않으므로 관련 에러를 off
"brace-style": ["error", "1tbs", { allowSingleLine: true }],
},
}
};
21 changes: 21 additions & 0 deletions .github/workflows/check_lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: check lint
on:
pull_request:
branches:
- "main"
- "dev"
jobs:
check-lint:
runs-on: ubuntu-latest
steps:
- name: pull code to computer
uses: actions/checkout@v4
- name: install node.js
uses: actions/setup-node@v4
with:
node-version: '20.x'
- name: check lint
run: |
npm install
npm run lint
echo "You're code is pretty!"
31 changes: 31 additions & 0 deletions .github/workflows/deploy_admin_preview.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: deploy admin preview
env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_ADMIN_PROJECT_ID }}
on:
push:
branches:
- "dev"
paths:
- "packages/common/**"
- "packages/adminPage/**"
- "public/**"
jobs:
deploy-preview:
runs-on: ubuntu-latest
steps:
- name: pull code to computer
uses: actions/checkout@v4
- name: install node.js
uses: actions/setup-node@v4
with:
node-version: '20.x'
- name: install vercel cli
run: npm install -g vercel
- name: deploy to vercel as preview
run: |
npm install
cd ./packages/adminPage
vercel pull --yes --token=${{ secrets.VERCEL_TOKEN }}
vercel build --token=${{ secrets.VERCEL_TOKEN }}
vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
31 changes: 31 additions & 0 deletions .github/workflows/deploy_admin_production.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: deploy admin preview
env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_ADMIN_PROJECT_ID }}
on:
push:
branches:
- "main"
paths:
- "packages/common/**"
- "packages/adminPage/**"
- "public/**"
jobs:
deploy-preview:
runs-on: ubuntu-latest
steps:
- name: pull code to computer
uses: actions/checkout@v4
- name: install node.js
uses: actions/setup-node@v4
with:
node-version: '20.x'
- name: install vercel cli
run: npm install -g vercel
- name: deploy to vercel as preview
run: |
npm install
cd ./packages/adminPage
vercel pull --yes --token=${{ secrets.VERCEL_TOKEN }}
vercel build --token=${{ secrets.VERCEL_TOKEN }}
vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
31 changes: 31 additions & 0 deletions .github/workflows/deploy_preview.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: deploy preview
env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
on:
push:
branches:
- "dev"
paths:
- "packages/common/**"
- "packages/mainPage/**"
- "public/**"
jobs:
deploy-preview:
runs-on: ubuntu-latest
steps:
- name: pull code to computer
uses: actions/checkout@v4
- name: install node.js
uses: actions/setup-node@v4
with:
node-version: '20.x'
- name: install vercel cli
run: npm install -g vercel
- name: deploy to vercel as preview
run: |
npm install
cd ./packages/mainPage
vercel pull --yes --token=${{ secrets.VERCEL_TOKEN }}
vercel build --token=${{ secrets.VERCEL_TOKEN }}
vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
29 changes: 29 additions & 0 deletions .github/workflows/deploy_production.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: deploy production
env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
on:
push:
branches:
- "main"
paths:
- "packages/common/**"
- "packages/mainPage/**"
- "public/**"
jobs:
deploy-production:
runs-on: ubuntu-latest
steps:
- name: pull code to computer
uses: actions/checkout@v4
- name: install node.js
uses: actions/setup-node@v4
with:
node-version: '20.x'
- name: install vercel cli
run: npm install -g vercel
- name: deploy to vercel as production
run: |
vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
vercel deploy --prod --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lerna-debug.log*

node_modules
dist
dist-ssr
dist-ssg
*.local

# Editor directories and files
Expand All @@ -22,3 +22,4 @@ dist-ssr
*.njsproj
*.sln
*.sw?
.vercel
9 changes: 9 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"jsxSingleQuote": false,
"singleQuote": false,
"trailingComma": "all",
"semi": true,
"tabWidth": 2,
"useTabs": false,
"printWidth": 100
}
52 changes: 39 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Team6-AwesomeOrange

> 백엔드 레포는 여기로! => [백엔드 레포](https://github.com/softeerbootcamp4th/Team6-AwesomeOrange-BE)
## Contributors
| [@lybell-art](https://github.com/lybell-art) | [@darkdulgi](https://github.com/darkdulgi) | [@ahra1221](https://github.com/blaxsior) | [@win-luck](https://github.com/win-luck) |
| [@lybell-art](https://github.com/lybell-art) | [@darkdulgi](https://github.com/darkdulgi) | [@blaxsior](https://github.com/blaxsior) | [@win-luck](https://github.com/win-luck) |
|:---------------------------------------------------------:|:-------------------------------------------------------:|:-------------------------------------------------------:|:-----------------------------------------------------------------:|
| <img width="400" src="https://github.com/lybell-art.png"> | <img width="400" src="https://github.com/darkdulgi.png"> | <img width="400" src="https://github.com/blaxsior.png"> | <img width="400" src="https://github.com/win-luck.png"> |
| **Front-End** | **Front-End** | **Back-End** | **Back-End** |
Expand All @@ -14,21 +16,45 @@
[Convention](https://github.com/softeerbootcamp4th/Team6-AwesomeOrange-BE/wiki/%08%5BTeam-Convention%5D)

## Plan & Design Link
[Plan & Design Link(Figma)](https://www.figma.com/design/XieJv765qFmU9dFuQAG7tQ/%EC%96%B4%EC%8D%B8%EC%98%A4%EB%A0%8C%EC%A7%80_Hand-off_%EC%B5%9C%EC%A2%85(07%2F24)?node-id=33-1157)

## Schedule
**Front-End**

| 1주차 | 공통 커스텀 훅 및 인터랙션 인터페이스 추가, 메인 페이지의 인트로, 헤더, 차량 기본정보, QnA, 푸터 구현 |
| --- | --- |
| 2주차 | 인터랙션 페이지, 인터랙션 모달, 각각의 인터랙션 구현 |
| 3주차 | 각각의 인터랙션 구현, 기대평 구현 |
| 4주차 | 선착순 이벤트 구현, 시간 남을 시 어드민 페이지(로그인, 이벤트목록) 구현 |
| 5주차 | 어드민 페이지(이벤트 등록수정, 이벤트 관리, 기대평 관리) 구현 및 리팩토링, 발표자료 제작 |

**Back-End**

| 1주차 | JPA Entity 구축, 배포 등 인프라 설정, 유저 로그인, 선착순 이벤트 프로토타입 구현 |
| --- | --- |
| 2주차 | 기대평, 어드민 시스템, 가중치 반영 추첨 구현 (+단위 테스트) |
| 3주차 | 선착순 이벤트 최적화, 서비스 확장성 개선, 테스트코드 작성 |
| 4주차 | 버그 수정, 부하 테스트 기반 서비스 최적화 |

## Backlog
### Front-End
![image](https://github.com/user-attachments/assets/3fec291d-4aed-4f04-895b-7b2686aecc59)

### Back-End
![image](https://github.com/user-attachments/assets/d7444775-cbad-48a2-a278-fd73368a1b6e)

## ERD
<img width="686" alt="image" src="https://github.com/user-attachments/assets/eece7379-ad7b-4b29-b0bb-ae4bc20a7104">

## Tech Stack

### Front-End
- Javascript ES2020+
- React
- Tailwindcss
- Vite
- Zustand
<img src="https://img.shields.io/badge/JavaScript-F7DF1E?style=for-the-badge&logo=JavaScript&logoColor=black"><img src="https://img.shields.io/badge/React-61DAFB?style=for-the-badge&logo=React&logoColor=black"><img src="https://img.shields.io/badge/TailwindCSS-06B6D4?style=for-the-badge&logo=Tailwind CSS&logoColor=white"><img src="https://img.shields.io/badge/Vite-646CFF?style=for-the-badge&logo=Vite&logoColor=purple"><img src="https://img.shields.io/badge/Zustand-DDA0DD?style=for-the-badge&logo=Zustand&logoColor=purple">

### Back-End
- Spring Boot 3.2.2
- Java 17
- MySQL 8.0
- Redis
- AWS EC2
- AssertJ
- Docker
<img src="https://img.shields.io/badge/Spring Boot-6DB33F?style=for-the-badge&logo=Spring Boot&logoColor=black"><img src="https://img.shields.io/badge/MySQL-4479A1?style=for-the-badge&logo=MySQL&logoColor=black"><img src="https://img.shields.io/badge/Redis-FF4438?style=for-the-badge&logo=Redis&logoColor=black"><img src="https://img.shields.io/badge/Docker-2496ED?style=for-the-badge&logo=Docker&logoColor=black"><img src="https://img.shields.io/badge/Grafana-F46800?style=for-the-badge&logo=Grafana&logoColor=black"><img src="https://img.shields.io/badge/Apache JMeter-D22128?style=for-the-badge&logo=Apache JMeter&logoColor=black">

## Issue & TroubleShooting
[Issue & TroubleShooting](https://github.com/softeerbootcamp4th/Team6-AwesomeOrange-BE/wiki/%5BIssue-&-TroubleShooting%5D)

## Project Archeitecture
13 changes: 0 additions & 13 deletions index.html

This file was deleted.

Loading

0 comments on commit f2842a5

Please sign in to comment.