Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
f4fc692
feat: Quick Button UI 제작
elbica Aug 22, 2022
ab96f72
feat: App Bar UI 제작
elbica Aug 23, 2022
704e713
Update issue templates
elbica Aug 23, 2022
3b75104
Delete feature-request.md
elbica Aug 23, 2022
6ea4a03
Update feature-suggest.md
elbica Aug 23, 2022
398147e
Create PULL_REQUEST_TEMPLATE.md
elbica Aug 23, 2022
fe2fcc7
feat: Chat Message UI 제작
elbica Aug 24, 2022
a3bbae6
feat: Chat Input UI 제작
elbica Aug 24, 2022
af65b7e
fix: Navigation UI 버그 수정
elbica Aug 24, 2022
171c034
feat: 채팅 시 scroll bottom 이동
elbica Aug 24, 2022
791f09d
docs: Update Templates
pangthing Aug 25, 2022
2af0398
Merge pull request #3 from PUE-AI-ChatBot/feature/네비게이션-UI
elbica Aug 25, 2022
cb9192b
docs: Update feature-template
pangthing Aug 25, 2022
6262ea6
style: eslint, prettier 적용
elbica Aug 25, 2022
37faf7f
Update issue templates
chanbyeongee Aug 29, 2022
385df4c
refactor: 폴더 구조 변경
elbica Aug 31, 2022
be864fb
Merge pull request #4 from PUE-AI-ChatBot/feature/채팅-프로토타입
elbica Sep 1, 2022
ee4622c
feat : 채팅 비즈니스 로직 설계
elbica Sep 1, 2022
4ac871a
feat : Socket 서버 통신 로직 작성
elbica Sep 2, 2022
110c9ed
#feature/캘린더-UI epic clone -> commit
onejuice98 Sep 3, 2022
5e6fbc5
feat : Socket 서버 연동 테스트 및 로직 수정
elbica Sep 4, 2022
b10ed7b
refactor : 절대 경로 수정
elbica Sep 4, 2022
d8b54c3
feat : 채팅 메세지 시간 추가
elbica Sep 5, 2022
80d575f
Merge pull request #8 from PUE-AI-ChatBot/feature/채팅-비즈니스-로직-개발
elbica Sep 7, 2022
b0bb5df
feat : 커스텀 스타일 추가
elbica Sep 8, 2022
c2e3b76
#feature/캘린더-UI 차트 생성 및 merge
onejuice98 Sep 8, 2022
062e73c
#feature/캘린더-UI epic pull merge
onejuice98 Sep 8, 2022
32f132c
Merge pull request #7 from PUE-AI-ChatBot/feature/캘린더-UI
onejuice98 Sep 8, 2022
0a999a3
feat : 프로필 페이지 개발 (1)
elbica Sep 8, 2022
6a8ce51
feat : 프로필 페이지 개발 완료
elbica Sep 9, 2022
45281cf
Merge branch 'epic/프로토타입-설계' into feature/프로필-페이지-개발
elbica Sep 9, 2022
002d8af
chore : .gitignore, 퀵 버튼 색상 수정
elbica Sep 9, 2022
9cadb3d
style : Meta 컴포넌트 zIndex 수정
elbica Sep 10, 2022
fafc053
Merge pull request #11 from PUE-AI-ChatBot/feature/프로필-페이지-개발
elbica Sep 10, 2022
8bf0ff6
test : jest, testing-library 초기 설정
elbica Sep 10, 2022
db4bcf6
feat : 로그인 페이지 개발
onejuice98 Sep 10, 2022
d5ca6ad
feat : 로그인 페이지 Nav 삭제
onejuice98 Sep 10, 2022
f4b8351
feat : 로그인 페이지 스타일 수정
onejuice98 Sep 10, 2022
4bd9c51
test : 채팅 단위 테스트 코드 작성 (1)
elbica Sep 10, 2022
707b7d6
feat : 로그인 기능
onejuice98 Sep 10, 2022
dd9e4df
test : 채팅 단위 테스트 코드 작성 (2)
elbica Sep 10, 2022
1b5c0a1
feat : 차트 BE 연결 준비
onejuice98 Sep 10, 2022
25ab8e1
test : 채팅 단위 테스트 코드 작성 (3)
elbica Sep 11, 2022
43d99f4
feat : 차트 수정
onejuice98 Sep 11, 2022
1bb0063
feat : 채팅 로그 api 연동
elbica Sep 11, 2022
e1919b7
chore: 오류 코드 주석 처리
L2HYUNN Sep 11, 2022
3ac5968
feat: 메인 페이지 개발
L2HYUNN Sep 11, 2022
3d2dad1
feat : 차트category - color 연결
onejuice98 Sep 12, 2022
b951b2e
feat : 차트 BE 연결
onejuice98 Sep 12, 2022
700d6d4
feat : 차트 BE 연결
onejuice98 Sep 12, 2022
b5ff50a
fix: socket 통신, UI 깨짐 현상 수정
elbica Sep 12, 2022
0cfd918
feat : 차트 오류 수정
onejuice98 Sep 12, 2022
3d4b18b
feat : 캘린더
onejuice98 Sep 12, 2022
73d3d67
feat : 캘린더
onejuice98 Sep 12, 2022
6c68328
Merge pull request #13 from PUE-AI-ChatBot/feature/로그인
onejuice98 Sep 12, 2022
9038648
Merge pull request #17 from PUE-AI-ChatBot/feature/메인페이지
onejuice98 Sep 12, 2022
5d282bb
시연동영상 메인페이지 차트 수정
onejuice98 Sep 12, 2022
b126c5d
conflict 조치
onejuice98 Sep 12, 2022
ca0a0a5
conflict 조치(2)
onejuice98 Sep 12, 2022
725e916
conflict 조치
onejuice98 Sep 12, 2022
b2c9d1a
conflict 조치
onejuice98 Sep 12, 2022
8205938
conflict 조치
onejuice98 Sep 12, 2022
bf30d72
fix: socket > disconnect 테스트 코드 주석 처리
elbica Sep 12, 2022
52ecffb
Merge pull request #19 from PUE-AI-ChatBot/feature/차트-BE
elbica Sep 13, 2022
495d12f
Merge branch 'epic/프로토타입-설계' of https://github.com/PUE-AI-ChatBot/PUE…
onejuice98 Sep 13, 2022
8699722
refactor : CORS 수정
onejuice98 Sep 13, 2022
0f57783
Merge pull request #20 from PUE-AI-ChatBot/feature/캘린더-UI
onejuice98 Sep 13, 2022
a1d1b97
Merge branch 'epic/프로토타입-설계' into feature/채팅-기능-테스트-코드-작성
elbica Sep 13, 2022
64c9ec1
Merge pull request #16 from PUE-AI-ChatBot/feature/채팅-기능-테스트-코드-작성
elbica Sep 13, 2022
c2a12e2
fix: profile UI padding hot fix
elbica Sep 13, 2022
5b82ce6
Merge pull request #21 from PUE-AI-ChatBot/epic/프로토타입-설계
elbica Sep 14, 2022
6c986a9
Update README.md
L2HYUNN Sep 14, 2022
03f6a21
Update README.md
L2HYUNN Sep 14, 2022
02e6ccf
Update README.md
L2HYUNN Sep 15, 2022
95ca423
docs: README.md 수정
elbica Sep 15, 2022
dd81285
Update README.md
elbica Sep 15, 2022
686eb21
Create README.md
L2HYUNN Sep 15, 2022
d6f530a
Update README.md
L2HYUNN Sep 15, 2022
a85a8c7
Update README.md
L2HYUNN Sep 15, 2022
d305908
Merge pull request #22 from PUE-AI-ChatBot/feature/리드미수정
L2HYUNN Sep 15, 2022
132268e
refactor(env): amend env url, key
L2HYUNN Oct 23, 2022
8962bf0
refactor(url): change new url variable
L2HYUNN Oct 23, 2022
497d6e3
CI: CI workflow 작성
elbica Oct 23, 2022
3dd9c01
CI: pull request event 주석 해제
elbica Oct 23, 2022
a5d00c3
CI: test 2번 실행하는 현상 수정 및 린트 비활성
elbica Oct 23, 2022
f0f0cff
refactor
onejuice98 Oct 23, 2022
5be7ce7
infra : dockerfile 작성 및 ec2 구축
elbica Oct 24, 2022
53b39f8
infra : CD 작성 및 docker 빌드 시 env 설정
elbica Oct 24, 2022
0362266
infra : CD workflow 테스트
elbica Oct 24, 2022
0b6e174
infra : CD workflow 테스트 (2)
elbica Oct 24, 2022
6521819
infra : CD workflow 테스트 (3)
elbica Oct 24, 2022
8abf313
infra : CD workflow 테스트 (4)
elbica Oct 24, 2022
1c78f10
infra : 주석 및 테스트 이벤트 정리
elbica Oct 24, 2022
ac694af
Create license
chanbyeongee Oct 26, 2022
f465743
Merge pull request #31 from PUE-AI-ChatBot/add-license-1
elbica Oct 26, 2022
b885e93
refactor: 환경 변수, URI 수정
L2HYUNN Nov 2, 2022
7e8c474
refactor: destination 수정
L2HYUNN Nov 2, 2022
8a22794
refactor
onejuice98 Nov 2, 2022
9e5fcf1
refactor
onejuice98 Nov 2, 2022
79c11b6
Merge pull request #29 from PUE-AI-ChatBot/fix/Layout
onejuice98 Nov 2, 2022
e922ec8
Merge pull request #27 from PUE-AI-ChatBot/feature/CI_CD_workflow_작성
elbica Nov 2, 2022
17cb777
Merge pull request #26 from PUE-AI-ChatBot/fix/Oauth
L2HYUNN Nov 2, 2022
dc43f08
Update CD.yml
elbica Nov 2, 2022
de22e95
Update CI.yml
elbica Nov 2, 2022
82f60a2
Update CD.yml
elbica Nov 2, 2022
c070194
fix: 로그인 버그 해결
L2HYUNN Nov 2, 2022
b2f4707
fix: 로그인 callback url 변경
L2HYUNN Nov 2, 2022
3bf9bed
fix: 패키지 수정
L2HYUNN Nov 2, 2022
d5a02f9
Merge branch 'develop' of https://github.com/PUE-AI-ChatBot/PUE-FE in…
L2HYUNN Nov 2, 2022
ed274f1
Update Dockerfile
elbica Nov 2, 2022
9e0803f
fix: callback url 변경
L2HYUNN Nov 2, 2022
6995a8e
Merge branch 'develop' of https://github.com/PUE-AI-ChatBot/PUE-FE in…
L2HYUNN Nov 2, 2022
bdc7567
fix: callback URL 수정
L2HYUNN Nov 2, 2022
e8a3558
fix : 로그인 상태 확인
onejuice98 Nov 2, 2022
061c407
fix : baseurl env
elbica Nov 2, 2022
4fc38a7
fix : 백엔드 연결
onejuice98 Nov 2, 2022
92f2a6a
fix : CORS 해결
onejuice98 Nov 2, 2022
1457fb6
hotfix : button click 수정
onejuice98 Nov 2, 2022
0b5156b
hotfix : button click 수정
onejuice98 Nov 2, 2022
e1f0acb
fix : next config rewrites proxy 수정
elbica Nov 2, 2022
b27c07a
Merge remote-tracking branch 'origin/develop' into develop
elbica Nov 2, 2022
fffac71
feat: logout 로직 추가
L2HYUNN Nov 2, 2022
1bf7b30
feat: logout authentication 코드 추가
L2HYUNN Nov 2, 2022
2754d89
fix: next/router 문제 해결
L2HYUNN Nov 2, 2022
23c86ef
feat: session data 콘솔 추가
L2HYUNN Nov 2, 2022
99b5e43
hotfix : profile 뒤로가기 / box padding 수정
onejuice98 Nov 7, 2022
5888c7a
fix: charts 오류 수정 및 연민 감정 삭제
onejuice98 Nov 9, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
7 changes: 7 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Dockerfile
.dockerignore
node_modules
npm-debug.log
README.md
.next
.git
51 changes: 51 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"env": {
"browser": true,
"es2021": true
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 2021,
"project": "./tsconfig.json"
},
"extends": [
"plugin:prettier/recommended",
"airbnb-typescript",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:import/recommended",
"plugin:jsx-a11y/recommended",
"plugin:@next/next/recommended"
],
"plugins": [
"react",
"react-hooks",
"prettier",
"testing-library"
],
"rules": {
"react/no-unescaped-entities": "off",
"react/react-in-jsx-scope": "off",
"react/display-name": "off"
},
"settings": {
"import/resolver": {
"typescript": {}
}
},
"ignorePatterns": [
"*.js",
"*.json"
],
"overrides": [
// Only uses Testing Library lint rules in test files
{
"files": [
"**/__tests__/**/*.[jt]s?(x)",
"**/?(*.)+(spec|test).[jt]s?(x)"
],
"extends": ["plugin:testing-library/react"]
}
]
}
44 changes: 44 additions & 0 deletions .github/ISSUE_TEMPLATE/epic-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
---
name: Epic template
about: If you want to create new epic, Describe it in this template
title: "[EPIC]"
labels: epic
assignees: ''

---

---
name: Epic template
about: If you want to create new epic, Describe it in this template
title: "[EPIC]"
labels: epic
assignees: ''

---

---
---
---
### Epic Info
- Person in charge :
- Definition :
- Timeline :

---
### Description

- Summary
이 Epic이 무엇인지 간략하게 설명합니다. 만약 필요하다면 해당 epic을 생성한 story, 계기, 이유 등을 서술합니다.

- Outcomes
이 에픽을 통해 나타내고자 하는 결과를 간단히 설명합니다. 첨부할 설계/구조 혹은 예상 결과물이 있으면 첨부해도 좋습니다.

---
### Measure
- Goal/Acceptance criteria
해당 에픽이 성취해야할 목표 혹은 성공했다고 수용할 수 있는 기준을 서술하십시오.

- Hypothesis
해당 에픽이 성공적으로 위의 목표를 달성하기 위한 대한 당신의 가설은 무엇입니까? 성공 여부를 측정하는 방법과 성공 여부를 팀이 알아야 할 선행 지표에 대해 설명합니다.

---
48 changes: 48 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
---
name: Feature template
about: Describe this issue template's purpose here.
title: "[Feature]"
labels: feature
assignees: ''

---

---
name: Feature template
about: Describe this issue template's purpose here.
title: ''
labels: ''
assignees: ''

---
---
---
---

### Feature Info
- Person in charge :
- Definition :
- Timeline :
---
### Description
- Summary/Behavior
이 Feature이 무엇인지 간략하게 설명하고, 어떻게 작동해야 하는지 서술합니다.

- Necessity
해당 Feature가 필요한 이유, Epic에 어떤 영향을 미치는 지 서술합니다.

- Outcomes
이 Feature을 통해 나타내고자 하는 결과를 간단히 설명합니다.

---

### Parent Epic
해당 feature를 포괄하는 상위 epic과 그 epic의 issue number를 기입하세요.

Example)

[Epic] 마케팅 조사

#1

---
19 changes: 19 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
## Description
- Describe your changes in detail

## Related Issue
- This project only accepts pull requests related to open issues
- If suggesting a new feature or change, please discuss it in an issue first
- If fixing a bug, there should be an issue describing it with steps to reproduce
- Please link to the issue here:

## Motivation and Context
- Why is this change required? What problem does it solve?
- If it fixes an open issue, please link to the issue here.

## How Has This Been Tested?
- Please describe in detail how you tested your changes.
- Include details of your testing environment, and the tests you ran to see how your change affects other areas of the code, etc.

## Screenshots

55 changes: 55 additions & 0 deletions .github/workflows/CD.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: CD

on:
push:
branches:
- master
pull_request:
branches:
- master

workflow_dispatch:

jobs:
job-docker:
name: Build Next App
runs-on: ubuntu-latest

steps:
- name: Checkout current commit (${{ github.sha }})
uses: actions/checkout@v3

- name: Login to Docker
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_USER_TOKEN }}

- name: Set env
run: echo "${{ secrets.PROJECT_ENV }}" > .env.local

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Build and push
uses: docker/build-push-action@v3
with:
context: .
push: true
tags: ${{secrets.DOCKER_USER}}/pue_fe:latest
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Deploy with SSH
uses: appleboy/ssh-action@master
id: deploy-prod
with:
host: ${{ secrets.EC2_HOST }}
username: ${{ secrets.EC2_USERNAME }}
key: ${{ secrets.EC2_PRIVATE_KEY }}
script: |
docker stop pue_fe
docker rm pue_fe
sudo docker pull ${{ secrets.DOCKER_USER }}/pue_fe
docker run -d --name pue_fe -p 80:3000 ${{ secrets.DOCKER_USER }}/pue_fe
docker rmi -f $(docker images -f "dangling=true" -q)
42 changes: 42 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: CI

on:
pull_request:
branches:
- epic/**
- develop
- master
workflow_dispatch:

jobs:
job-install:
name: Install dependencies
runs-on: ubuntu-latest

steps:
- name: Checkout current commit (${{ github.sha }})
uses: actions/checkout@v3

- name: Caching dependencies
id: cache-dependencies
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-build-

- name: Install Dependencies
if: steps.cache-dependencies.output.cache-hit != 'true'
run: npm install

# - name: Run Lint
# run: npm run lint

- name: Run Test
run: npx jest --ci --json --coverage --testLocationInResults --outputFile=report.json

- uses: ArtiomTr/jest-coverage-report-action@v2
with:
coverage-file: report.json
base-coverage-file: report.json
2 changes: 2 additions & 0 deletions front-end/.gitignore → .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ yarn-error.log*
# typescript
*.tsbuildinfo
next-env.d.ts

pue_fe_pem.pem
44 changes: 44 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# node:alpine으로 설정 시 node 17버전이 설치되는데 오류가 발생합니다.
# node:16-alpine 설정하시길 권장합니다.
FROM node:16-alpine AS deps
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk add --no-cache libc6-compat
WORKDIR /app
COPY package.json package-lock.json ./
RUN npm install

# deps 에서 설치한 파일중 node_modules만 가져온걸 볼 수 있다.
FROM node:16-alpine AS builder
WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules
COPY . .
RUN npm run build

# Production image, copy all the files and run next
FROM node:16-alpine AS runner
WORKDIR /app

ENV NODE_ENV production

# os 사용자 추가
RUN addgroup -g 1001 -S nodejs
RUN adduser -S nextjs -u 1001

COPY .env.local ./

RUN export $(cat .env.local | xargs)

# builder 에서 복사해야할 파일이 있다면 추가하면 된다.
COPY --from=builder /app/public ./public

COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static

USER nextjs

# 외부 포트 사용한다는 알림 없어도 상관없음
EXPOSE 3000

ENV PORT 3000

CMD ["node","server.js"]
Loading