Skip to content

Commit

Permalink
feat: 2차 + 질의응답게시판 + 자료집 (#429)
Browse files Browse the repository at this point in the history
## 1️⃣ 작업 내용 Summary

2차 + 질의응답게시판 + 자료집이 개발된 develop 브랜치 사항을 main으로 merge합니다

## 2️⃣ 추후 작업할 내용

## 3️⃣ 체크리스트

- [x] `develop` 브랜치의 최신 코드를 `pull` 받았나요?

---------

Co-authored-by: ParkSumin <fhsjdvs@gmail.com>
Co-authored-by: naraeng <nauurr@naver.com>
Co-authored-by: nebulaBdj <dongdung5070@gmail.com>
Co-authored-by: Hyomin Koo <me@eatsteak.dev>
Co-authored-by: nebulaBdj <114459629+nebulaBdj@users.noreply.github.com>
Co-authored-by: 김혜령 <92776341+h-ye-ryoung@users.noreply.github.com>
Co-authored-by: 박수민 <141231525+ssumai-kr@users.noreply.github.com>
  • Loading branch information
8 people authored Feb 27, 2025
1 parent 5839595 commit bc82477
Show file tree
Hide file tree
Showing 236 changed files with 7,369 additions and 2,842 deletions.
18 changes: 3 additions & 15 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,8 @@

- resolved #(issue_num)

### 기존 코드에 영향을 미치지 않는 변경사항
## 2️⃣ 추후 작업할 내용

### 기존 코드에 영향을 미치는 변경사항
## 3️⃣ 체크리스트

### 버그 픽스

### ✚ 피그마

### ✚ 관련 문서

## 2️⃣ 리뷰어에게..

## 3️⃣ 추후 작업할 내용

## 4️⃣ 체크리스트

- [ ] `main` 브랜치의 최신 코드를 `pull` 받았나요?
- [ ] `develop` 브랜치의 최신 코드를 `pull` 받았나요?
38 changes: 38 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Lint & Build

on:
pull_request:
branches:
- develop
- main

jobs:
build:
runs-on: ubuntu-latest
environment: develop
steps:
- name: Repository checkout
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
- name: Retrive caches
uses: actions/cache@v4
with:
path: node_modules
key: ${{ hashFiles('yarn.lock') }}
- name: Enable corepack
run: corepack enable
- name: Install project
run: yarn install --immutable
- name: Check Prettier
run: yarn prettier:check
- name: Lint
run: yarn lint
- name: Build
run: yarn build
env:
VITE_API_URL: ${{ vars.VITE_API_URL }}
VITE_REDIRECT_URI: ${{ vars.VITE_REDIRECT_URI }}
VITE_REST_API_KEY: ${{ secrets.VITE_REST_API_KEY }}
55 changes: 55 additions & 0 deletions .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Deployment (Develop)

on:
push:
branches:
- develop

jobs:
build:
runs-on: ubuntu-latest
environment: develop
steps:
- name: Repository checkout
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
- name: Retrive caches
uses: actions/cache@v4
with:
path: node_modules
key: ${{ hashFiles('yarn.lock') }}
- name: Enable corepack
run: corepack enable
- name: Install project
run: yarn install --immutable
- name: Build
run: yarn build
env:
VITE_API_URL: ${{ vars.VITE_API_URL }}
VITE_REDIRECT_URI: ${{ vars.VITE_REDIRECT_URI }}
VITE_REST_API_KEY: ${{ secrets.VITE_REST_API_KEY }}
- name: Compress build artifacts
run: tar -cvf ./dist.tar ./dist
- name: Upload with SCP
uses: appleboy/scp-action@v0.1.7
with:
username: ubuntu
host: ${{ secrets.SSH_HOST }}
key: ${{ secrets.SSH_KEY }}
source: 'dist.tar'
target: '/home/ubuntu/'
- name: Extract artifact with SSH
uses: appleboy/ssh-action@v1.2.0
with:
username: ubuntu
host: ${{ secrets.SSH_HOST }}
key: ${{ secrets.SSH_KEY }}
script: |
tar -xvf ./dist.tar ./dist
sudo rm -rf /var/www/homepage-frontend
sudo mv ./dist /var/www/homepage-frontend
rm -rf ./dist
rm -f ./dist.tar
83 changes: 45 additions & 38 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,48 +1,55 @@
name: Deploy
name: Deployment (Production)

on:
push:
branches: ['main']
branches:
- main

jobs:
build:
runs-on: ubuntu-latest

container: pandoc/latex

environment: prod
steps:
- uses: actions/checkout@v2

- name: Install mustache (to update the date)

run: apk add ruby && gem install mustache

- name: creates output

run: sh ./build.sh

- name: Pushes to another repository

id: push_directory

uses: cpina/github-action-push-to-another-repository@main

- name: Repository checkout
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
- name: Retrive caches
uses: actions/cache@v4
with:
path: node_modules
key: ${{ hashFiles('yarn.lock') }}
- name: Enable corepack
run: corepack enable
- name: Install project
run: yarn install --immutable
- name: Build
run: yarn build
env:
API_TOKEN_GITHUB: ${{ secrets.AUTO_ACTIONS }}

VITE_API_URL: ${{ vars.VITE_API_URL }}
VITE_REDIRECT_URI: ${{ vars.VITE_REDIRECT_URI }}
VITE_REST_API_KEY: ${{ secrets.VITE_REST_API_KEY }}
- name: Compress build artifacts
run: tar -cvf ./dist.tar ./dist
- name: Upload with SCP
uses: appleboy/scp-action@v0.1.7
with:
source-directory: 'output'

destination-github-username: ssu-it-support

destination-repository-name: homepage-frontend

user-email: ${{ secrets.EMAIL }}

commit-message: ${{ github.event.commits[0].message }}

target-branch: main

- name: Test get variable exported by push-to-another-repository

run: echo $DESTINATION_CLONED_DIRECTORY
username: ubuntu
host: ${{ secrets.SSH_HOST }}
key: ${{ secrets.SSH_KEY }}
source: 'dist.tar'
target: '/home/ubuntu/'
- name: Extract artifact with SSH
uses: appleboy/ssh-action@v1.2.0
with:
username: ubuntu
host: ${{ secrets.SSH_HOST }}
key: ${{ secrets.SSH_KEY }}
script: |
tar -xvf ./dist.tar ./dist
sudo rm -rf /var/www/homepage-frontend
sudo mv ./dist /var/www/homepage-frontend
rm -rf ./dist
rm -f ./dist.tar
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"trailingComma": "es5",
"printWidth": 120,
"plugins": ["prettier-plugin-tailwindcss"]
}
}
2 changes: 1 addition & 1 deletion components.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
"components": "@/components",
"utils": "@/libs/utils"
}
}
}
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html lang="ko" translate="no">
<html lang="ko">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
Expand Down
16 changes: 12 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"build": "tsc && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"prettier": "prettier --write --config ./.prettierrc \"**/*.{ts,tsx,md}\""
"prettier": "prettier --write --config ./.prettierrc \"**/*.{ts,tsx,md}\"",
"prettier:check": "prettier --check --config ./.prettierrc \"**/*.{ts,tsx,md}\""
},
"dependencies": {
"@hookform/resolvers": "^3.9.0",
Expand Down Expand Up @@ -38,22 +39,26 @@
"eslint-config-prettier": "^9.1.0",
"gh-pages": "^6.1.1",
"history": "5.3.0",
"i18next": "^24.2.2",
"i18next-browser-languagedetector": "^8.0.3",
"lucide-react": "^0.363.0",
"next-themes": "^0.3.0",
"react": "^18.2.0",
"react-cookie": "^7.2.2",
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.3",
"react-hook-form": "^7.51.2",
"react-i18next": "^15.4.1",
"react-router-dom": "^6.22.3",
"react-slick": "0.30.2",
"recoil": "^0.7.7",
"recoil-persist": "5.1.0",
"slick-carousel": "^1.8.1",
"sonner": "^1.4.41",
"tailwind-merge": "^2.2.2",
"tailwind-scrollbar-hide": "^2.0.0",
"tailwindcss-animate": "^1.0.7",
"vaul": "^0.9.0",
"vite-plugin-svgr": "^4.3.0",
"zod": "^3.23.8"
},
"devDependencies": {
Expand All @@ -75,12 +80,15 @@
"prettier-plugin-tailwindcss": "^0.5.9",
"tailwindcss": "^3.4.3",
"typescript": "^5.2.2",
"vite": "^5.2.0"
"vite": "^6.0.7"
},
"resolutions": {
"rollup": "4.24.0",
"react": "^18.3.0",
"@types/react": "^18.3.0"
},
"packageManager": "yarn@4.5.3"
"packageManager": "yarn@4.5.3",
"engines": {
"node": ">=20"
}
}
3 changes: 3 additions & 0 deletions public/image/arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/image/default/thumbnail/thumbnail.webp
Binary file not shown.
Binary file added public/image/mypage/arrow_down.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/image/mypage/profile_img.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 0 additions & 28 deletions src/apis/getBoardDataPostSearch.ts

This file was deleted.

65 changes: 0 additions & 65 deletions src/apis/getBoardDataPosts.ts

This file was deleted.

Loading

0 comments on commit bc82477

Please sign in to comment.