Skip to content

Commit

Permalink
Merge branch 'refs/heads/develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
junseublim committed Jan 26, 2025
2 parents b778d62 + 9321bc3 commit fa88b0f
Show file tree
Hide file tree
Showing 126 changed files with 3,743 additions and 486 deletions.
10 changes: 3 additions & 7 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,11 @@
2,
{ "namedComponents": ["arrow-function", "function-declaration"] }
],
"react/jsx-props-no-spreading": [
"react/jsx-props-no-spreading": "off",
"react/require-default-props": [
"error",
{
"html": "ignore"
}
],
"react/require-default-props": [
"error", {
"functions" : "defaultArguments"
"functions": "defaultArguments"
}
]
}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
run: |
echo "API_HOST=${{ vars.API_HOST }}" >> .env
echo "NODE_ENV=${{ vars.NODE_ENV }}" >> .env
echo "URL=${{ vars.URL }}" >> .env
echo "NEXT_PUBLIC_GA_ID=${{ secrets.NEXT_PUBLIC_GA_ID }}" >> .env
echo "NEXT_PUBLIC_GTM_ID=${{ secrets.NEXT_PUBLIC_GTM_ID }}" >> .env
echo "AUTH_KAKAO_ID=${{secrets.AUTH_KAKAO_ID}}" >> .env
Expand All @@ -45,4 +46,4 @@ jobs:
- name: Delete existing container
run: docker rm -f polabo-fe || true
- name: Run container
run: docker run -d -p 3000:3000 --name polabo-fe ${{ vars.DOCKER_IMAGE }}
run: docker run -d -p 3000:3000 --shm-size=1g --name polabo-fe ${{ vars.DOCKER_IMAGE }}
15 changes: 14 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
FROM node:20-alpine3.19 as builder

# Install necessary dependencies for Puppeteer and Chromium
RUN apk add --no-cache \
chromium \
nss \
freetype \
harfbuzz \
ca-certificates \
ttf-freefont

WORKDIR /app
COPY package*.json ./
RUN npm install
COPY . .
RUN npm run build

# Set environment variable for Puppeteer to use installed Chromium
ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser

EXPOSE 3000
CMD ["npm", "run" , "start"]
CMD ["npm", "run" , "start"]
37 changes: 20 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,26 @@ $ npm run dev

<br/>

## 📱 FE Tech Stack

| 기술 | 설명 |
| ------------ | -------------- |
| Next.js | Web Framework |
| TypeScript | |
| Tailwind | 스타일링 |
| Jest | 테스트 |
| AWS EC2 | 배포 환경 |

<br/>

## 📷 주요 기능

![image](https://github.com/user-attachments/assets/5f922ca5-782d-4700-b982-fe1e8772faab)
![image](https://github.com/user-attachments/assets/271ab611-f45e-411f-8406-1a7f93daf041)
![image](https://github.com/user-attachments/assets/294c04e2-43c9-4d83-9cc9-95ea448dc87e)

<br/>

## 🤝 커밋 규칙

**1. Type**
Expand Down Expand Up @@ -50,23 +70,6 @@ $ npm run dev
<br/>

## 📷 주요 기능

<br/>

## 📱 FE Tech Stack

| 기술 | 설명 |
| ------------ | -------------- |
| Next.js | Web Framework |
| TypeScript | |
| Zustand? | 상태관리 |
| React-query? | 서버 상태 관리 |
| Tailwind | 스타일링 |
| Jest | 테스트 |
| Vercel | 배포 |

<br/>

## 👏 Team Member

Expand Down
Loading

0 comments on commit fa88b0f

Please sign in to comment.