Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: dev branch auto ci process script

on: # 아래 job을 실행시킬 상황
pull_request:
branches: ["main"]

jobs:
deploy:
name: deploy
runs-on: ubuntu-latest # 실행될 인스턴스 OS와 버전

steps:
- name: excuting remote ssh commands
uses: appleboy/ssh-action@v0.1.6 # ssh 접속하는 오픈소스
with:
host: ${{ secrets.EC2_HOST }} # 인스턴스 IP
username: ${{ secrets.EC2_USER }} # 우분투 아이디
key: ${{ secrets.EC2_PRIVATE_KEY }} # ec2 instance pem key
port: ${{ secrets.EC2_SSH_PORT }} # 접속포트
script: | # 실행할 스크립트
cd /home/ubuntu/picnee_front
git pull origin main
pm2 kill
npm i --force
pm2 start npm --name "front-server" -- run dev
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ yarn-error.log*
*.tsbuildinfo
next-env.d.ts

.history
/workflows
1 change: 0 additions & 1 deletion src/app/(route)/travelTalk/_components/SideBarNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import SelectBox from "@/components/common/select/SelectBox";
import { memo } from "react";

const cityOption = [
{ key: 0, value: "전체" },
{ key: 1, value: "도쿄" },
{ key: 2, value: "오사카" },
{ key: 3, value: "교토" },
Expand Down
5 changes: 1 addition & 4 deletions src/app/(route)/travelTalk/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,7 @@ const TravelTalk = () => {
GetTravelTalkListOptions({
boardCategory:
selectCategoryStates === "전체글" ? "" : selectCategoryStates,
region:
selectBoxStates["sideBarRegion"] === "전체"
? ""
: selectBoxStates["sideBarRegion"],
region: selectBoxStates["sideBarRegion"],
sort:
selectedFilter === "최신순"
? "new"
Expand Down
2 changes: 1 addition & 1 deletion src/store/zustand/useTravelTalkStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface PostDetailDataState {
/** 여행토크 셀렉박스 전역상태관리 */
export const useTravelTalkStore = create<MenuState>((set) => ({
selectBoxStates: {
sideBarRegion: "전체",
sideBarRegion: "도쿄",
},
setSelectBoxState: (key, value) =>
set((state) => ({
Expand Down
Loading