diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..118e626 --- /dev/null +++ b/.github/workflows/main.yml @@ -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 diff --git a/.gitignore b/.gitignore index 484e330..d7aab23 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,4 @@ yarn-error.log* *.tsbuildinfo next-env.d.ts -.history \ No newline at end of file +/workflows diff --git a/src/app/(route)/travelTalk/_components/SideBarNav.tsx b/src/app/(route)/travelTalk/_components/SideBarNav.tsx index d2f5d8f..08da461 100644 --- a/src/app/(route)/travelTalk/_components/SideBarNav.tsx +++ b/src/app/(route)/travelTalk/_components/SideBarNav.tsx @@ -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: "교토" }, diff --git a/src/app/(route)/travelTalk/page.tsx b/src/app/(route)/travelTalk/page.tsx index 0d43ea7..c555da4 100644 --- a/src/app/(route)/travelTalk/page.tsx +++ b/src/app/(route)/travelTalk/page.tsx @@ -41,10 +41,7 @@ const TravelTalk = () => { GetTravelTalkListOptions({ boardCategory: selectCategoryStates === "전체글" ? "" : selectCategoryStates, - region: - selectBoxStates["sideBarRegion"] === "전체" - ? "" - : selectBoxStates["sideBarRegion"], + region: selectBoxStates["sideBarRegion"], sort: selectedFilter === "최신순" ? "new" diff --git a/src/store/zustand/useTravelTalkStore.ts b/src/store/zustand/useTravelTalkStore.ts index f227e58..2c4a883 100644 --- a/src/store/zustand/useTravelTalkStore.ts +++ b/src/store/zustand/useTravelTalkStore.ts @@ -18,7 +18,7 @@ interface PostDetailDataState { /** 여행토크 셀렉박스 전역상태관리 */ export const useTravelTalkStore = create((set) => ({ selectBoxStates: { - sideBarRegion: "전체", + sideBarRegion: "도쿄", }, setSelectBoxState: (key, value) => set((state) => ({