Skip to content

Commit

Permalink
Merge pull request #159 from oduck-team/develop
Browse files Browse the repository at this point in the history
merge develop to main
  • Loading branch information
FaberJoo authored Mar 19, 2024
2 parents 2ab59b2 + b2facec commit b86ef90
Show file tree
Hide file tree
Showing 302 changed files with 22,939 additions and 44 deletions.
8 changes: 8 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.git
*dockerfile*
data
logs
.gitignore
bin
.vscode
.idea
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/todo-issue-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: TODO issue template
about: ์•ž์œผ๋กœ ํ•  ์ผ์„ ์ž‘์„ฑํ•˜๋Š” ์ด์Šˆ ํ…œํ”Œ๋ฆฟ
title: "~~์„ ๊ตฌํ˜„ํ•œ๋‹ค."
labels: ''
assignees: ''

---

## ๐Ÿ“ ๊ฐœ์š”

## โœ… TODO
- [ ] ์ฒดํฌ ๋ฆฌ์ŠคํŠธ
- [ ] ์ฒดํฌ ๋ฆฌ์ŠคํŠธ

## ๐Ÿ’ฌ ๊ธฐํƒ€
17 changes: 17 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
## ๐Ÿ“ ๊ฐœ์š”

(์ด PR์ด ํ•ด๊ฒฐํ•˜๋ ค๋Š” ๋ฌธ์ œ ๋˜๋Š” ์ถ”๊ฐ€ํ•˜๋ ค๋Š” ๊ธฐ๋Šฅ์— ๋Œ€ํ•œ ๊ฐ„๋‹จํ•œ ์š”์•ฝ์„ ์ž‘์„ฑํ•˜์„ธ์š”.)

## ๐Ÿš€ ๋ณ€๊ฒฝ์‚ฌํ•ญ

(์ด PR์— ์˜ํ•ด ๋ณ€๊ฒฝ๋˜๋Š” ์‚ฌํ•ญ์— ๋Œ€ํ•ด ์ž์„ธํžˆ ์„ค๋ช…ํ•ด์ฃผ์„ธ์š”.
๋ณ€๊ฒฝ๋œ ์ฝ”๋“œ์˜ ํŠน์ • ๋ถ€๋ถ„์„ ๊ฐ•์กฐํ•˜๊ฑฐ๋‚˜, ์Šคํฌ๋ฆฐ์ƒท์„ ์ฒจ๋ถ€ํ•˜๋ฉด reviwer์—๊ฒŒ ๋„์›€์ด ๋ฉ๋‹ˆ๋‹ค.)

## ๐Ÿ”— ๊ด€๋ จ ์ด์Šˆ

(์ด PR๊ณผ ๊ด€๋ จ๋œ ์ด์Šˆ ๋ฒˆํ˜ธ๋ฅผ ์ œ๊ณตํ•ด์ฃผ์„ธ์š”. <ex> #123)

## โž• ๊ธฐํƒ€

(reviwer๊ฐ€ ์•Œ์•„์•ผ ํ•  ์ถ”๊ฐ€์ ์ธ ์ •๋ณด๊ฐ€ ์žˆ๋‹ค๋ฉด ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”.)

43 changes: 0 additions & 43 deletions .github/workflows/ci.yml

This file was deleted.

58 changes: 58 additions & 0 deletions .github/workflows/dev_ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle

name: server_dev_ci

on:
push:
branches:
- develop
pull_request:
branches:
- develop

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest

services:
redis:
image: redis:latest
ports:
- 6379:6379

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
- name: Build with Gradle
uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
with:
arguments: build
env:
aws_access_key: ${{ secrets.AWS_ACCESS_KEY }}
aws_secret_key: ${{ secrets.AWS_SECRET_KEY }}
aws_region: ${{ secrets.AWs_REGION }}

- name: docker image build
run: docker build -f dockerfile-dev -t ${{ secrets.DOCKERHUB_USERNAME }}/oduckio-spring .

- name: docker login
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: docker Hub push
run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/oduckio-spring

58 changes: 58 additions & 0 deletions .github/workflows/prod_ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle

name: server_prod_ci

on:
push:
branches:
- main
pull_request:
branches:
- main

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest

services:
redis:
image: redis:latest
ports:
- 6379:6379

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
- name: Build with Gradle
uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
with:
arguments: build
env:
aws_access_key: ${{ secrets.AWS_ACCESS_KEY }}
aws_secret_key: ${{ secrets.AWS_SECRET_KEY }}
aws_region: ${{ secrets.AWs_REGION }}

- name: docker image build
run: docker build -f dockerfile-dev -t ${{ secrets.DOCKERHUB_USERNAME }}/oduckio-spring:${{ secrets.PROD_VERSION }} .

- name: docker login
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: docker Hub push
run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/oduckio-spring:${{ secrets.PROD_VERSION }}

44 changes: 44 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
HELP.md
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/
.DS_Store
*/.DS_Store
*.log
*.gz
*.tmp
src/main/resources/static/docs/index.html
.env.spring

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/

### VS Code ###
.vscode/
129 changes: 128 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,128 @@
# oduck-server
# oduck-server

<div align="center">
<div>
<a href="https://oduck.io">
<img
src="https://avatars.githubusercontent.com/u/140365011?s=200&v=4"
alt="Oduck"
height="64"
/>
</a>
</div>
<h3>
<b>
Oduck
</b>
</h3>
<p>
์˜ค๋• | ์• ๋‹ˆ ๋ฆฌ๋ทฐ ยท ์• ๋‹ˆ ํ‰๊ฐ€ ์„œ๋น„์Šค
</p>


<br />
<div>
<a href="https://oduck.io" display=flex>
<img height=300 alt="oduck landing" src="https://github.com/oduck-team/oduck-client/assets/105474635/174bbd10-ca3e-48c0-a2d0-ded8858c20de">
<img height=300 alt="oduck review" src="https://github.com/oduck-team/oduck-client/assets/105474635/40015256-5144-48c5-84d8-bc49d83b4fc7">
</a>
</div>
</div>

## ์ธ์›(์†Œ๊ฐœ)

<table>
<tr>
<td align="center"><b>FE</b></td>
<td align="center"><b>FE</b></td>
<td align="center"><b>FE</b></td>
<td align="center"><b>BE</b></td>
<td align="center"><b>BE</b></td>
<td align="center"><b>BE</b></td>
</tr>
<tr>
<td>
<a href="https://github.com/a-ryang">
<img src="https://avatars.githubusercontent.com/u/105474635?v=4" width="100px" />
</a>
</td>
<td>
<a href="https://github.com/imdaxsz">
<img src="https://avatars.githubusercontent.com/u/80813703?v=4" width="100px" />
</a>
</td>
<td>
<a href="https://github.com/presentKey">
<img src="https://avatars.githubusercontent.com/u/115006670?v=4" width="100px" />
</a>
</td>
<td>
<a href="https://github.com/FaberJoo">
<img src="https://avatars.githubusercontent.com/u/79781818?v=4" width="100px" />
</a>
</td>
<td>
<a href="https://github.com/jaykayBaek">
<img src="https://avatars.githubusercontent.com/u/113520315?v=4" width="100px" />
</a>
</td>
<td>
<a href="https://github.com/hanyMK">
<img src="https://avatars.githubusercontent.com/u/119990091?v=4" width="100px" />
</a>
</td>
</tr>

<tr>
<td align="center"><a href="https://github.com/a-ryang">a-ryang</a></td>
<td align="center"><a href="https://github.com/imdaxsz">imdaxsz</a></td>
<td align="center"><a href="https://github.com/presentKey">presentKey</a></td>
<td align="center"><a href="https://github.com/FaberJoo">FaberJoo</a></td>
<td align="center"><a href="https://github.com/jaykayBaek">jaykayBaek</a></td>
<td align="center"><a href="https://github.com/hanyMK">hanyMK</a></td>
</tr>
</table>

## ๐Ÿ’ฌ ์ปค๋ฐ‹ ๋ฉ”์„ธ์ง€ ์ปจ๋ฒค์…˜

### ์ปค๋ฐ‹ ํ˜•์‹

์ปค๋ฐ‹ ๋ฉ”์„ธ์ง€ ํ˜•์‹์€ ๋‹ค์Œ์„ ๋”ฐ๋ฆ…๋‹ˆ๋‹ค:

```bash
type: subject #issue-number

body

footer
```

- `type` : ์ปค๋ฐ‹์˜ ์ข…๋ฅ˜๋ฅผ ๋‚˜ํƒ€๋ƒ…๋‹ˆ๋‹ค. ์ข…๋ฅ˜๋Š” ๋‹ค์Œ ํ•ญ๋ชฉ์„ ์ฐธ๊ณ ํ•ด์ฃผ์„ธ์š”.
- `subject` : ์ปค๋ฐ‹์˜ ์š”์•ฝ์„ ๋‚˜ํƒ€๋ƒ…๋‹ˆ๋‹ค.
- `iuuse-number` : ๊ด€๋ จ๋œ ์ด์Šˆ ๋ฒˆํ˜ธ๋ฅผ ๋‚˜ํƒ€๋ƒ…๋‹ˆ๋‹ค.
- `body` : ์ปค๋ฐ‹์˜ ์ž์„ธํ•œ ๋‚ด์šฉ์„ ๋‚˜ํƒ€๋ƒ…๋‹ˆ๋‹ค. (์„ ํƒ)
- `footer` : ์ปค๋ฐ‹๊ณผ ๊ด€๋ จ๋œ ์ด์Šˆ๋ฅผ ๋‹ซ๊ฑฐ๋‚˜, ์–ด๋–ค ๋ณ€๊ฒฝ์„ ๊ฐ€์ ธ์˜ค๋Š”์ง€ ๋“ฑ ์ถ”๊ฐ€์ ์ธ ์ •๋ณด๋ฅผ ๋‚˜ํƒ€๋ƒ…๋‹ˆ๋‹ค. (์„ ํƒ)

์˜ˆ์‹œ๋Š” ๋‹ค์Œ๊ณผ ๊ฐ™์Šต๋‹ˆ๋‹ค:

> Header ์ปดํฌ๋„ŒํŠธ๋ฅผ ๊ฐœ๋ฐœ, ์ด์— ๋”ฐ๋ฅธ ์Šคํƒ€์ผ์„ ๋ณ€๊ฒฝํ•จ
```bash
feat: Header ์ปดํฌ๋„ŒํŠธ ๊ตฌํ˜„ ๋ฐ ์Šคํƒ€์ผ ์ˆ˜์ • #123

* ํ—ค๋” ์ปดํฌ๋„ŒํŠธ๋ฅผ ๊ฐœ๋ฐœํ•ฉ๋‹ˆ๋‹ค. ์ƒˆ ์ปดํฌ๋„ŒํŠธ์— ๋งž๊ฒŒ style.css๋ฅผ ์ˆ˜์ •ํ–ˆ์Šต๋‹ˆ๋‹ค.

* Close #123
```

### ์ปค๋ฐ‹ ์ข…๋ฅ˜ (type)

- `feat` : ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ
- `fix` : ๋ฒ„๊ทธ ์ˆ˜์ •
- `docs` : ๋ฌธ์„œ๋งŒ ๋ณ€๊ฒฝ
- `style` : ์ฝ”๋“œ์— ์˜ํ–ฅ์„ ์ฃผ์ง€ ์•Š๋Š” ๋ณ€๊ฒฝ (๊ณต๋ฐฑ, ์„ธ๋ฏธ์ฝœ๋ก , css ๋“ฑ)
- `refactor` : ์ฝ”๋“œ ๋ฆฌํŒฉํ† ๋ง. ์ฝ”๋“œ์˜ ๊ธฐ๋Šฅ ๋ณ€๊ฒฝ์ด ์•„๋‹Œ ๊ฐ€๋…์„ฑ์„ ๋†’์ด๊ฑฐ๋‚˜ ์žฌ์‚ฌ์šฉ์„ฑ ํ–ฅ์ƒ, ์ฃผ์„ ์ถ”๊ฐ€ ๋“ฑ
- `test` : ํ…Œ์ŠคํŠธ ์ถ”๊ฐ€, ๊ธฐ์กด ํ…Œ์ŠคํŠธ ์ˆ˜์ • ๋“ฑ
- `cleanup` : ๋ถˆํ•„์š” ํŒŒ์ผ ์‚ญ์ œ, ์ฝ”๋“œ ์‚ญ์ œ
- `rename` : ํŒŒ์ผ, ํด๋” ์ด๋ฆ„ ๋ณ€๊ฒฝ
- `chore` : ํ”„๋กœ์ ํŠธ ์šด์˜(์œ ์ง€๋ณด์ˆ˜, ๊ฐœ์„ ) ์—…๋ฐ์ดํŠธ. ๋นŒ๋“œ ์„ค์ •, ์˜์กด์„ฑ ๋ณ€๊ฒฝ, ์Šคํฌ๋ฆฝํŠธ ์ถ”๊ฐ€ ๋“ฑ
Loading

0 comments on commit b86ef90

Please sign in to comment.