Skip to content

Commit

Permalink
Merge pull request #49 from ConceptBe/front-cd
Browse files Browse the repository at this point in the history
chore: front CD 추가
  • Loading branch information
parkmuhyeun authored Mar 5, 2024
2 parents fbaf194 + 2d2e2c2 commit c3138e1
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 4 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/conceptbe-fe-cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: conceptbe-fe-cd

on:
pull_request:
branches: [develop]

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout source code.
uses: actions/checkout@v3

- name: Install dependencies
run: npm install

- name: Generate build
run: npm run build

- name: Docker Image Build
run: docker build -t pjhg410/conceptbe-fe .

- name: Docker Hub Login
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Docker Hub push
run: docker push pjhg410/conceptbe-fe

- name: Docker Pull And run
uses: appleboy/[email protected]
with:
host: ${{ secrets.WAS_HOST }}
username: ${{ secrets.WAS_USERNAME }}
password: ${{ secrets.WAS_PASSWORD }}
port: ${{ secrets.WAS_SSH_PORT }}
script: |
docker stop frontend
docker rm frontend
docker pull pjhg410/conceptbe-fe
docker run -d -p 3000:3000 --name frontend pjhg410/conceptbe-fe
2 changes: 1 addition & 1 deletion src/pages/Feed/Feed.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import NewIdeaCardListSection from './components/NewIdeaCardListSection/NewIdeaC
import { getUserNickname } from './utils/getUserNickname';
import Padding from '../../components/Padding';
import Logo from '../../layouts/Logo';
import { useWritingInfoQuery } from '../write/hooks/queries/useWritingInfoQuery';
import { useWritingInfoQuery } from '../Write/hooks/queries/useWritingInfoQuery';

const Feed = () => {
const [isFilterBottomSheetOpen, setIsFilterBottomSheetOpen] = useState(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {
useRadio,
} from 'concept-be-design-system';

import RecruitmentPlaceSection from '../../../write/components/RecruitmentPlaceSection';
import { Idea } from '../../../write/types';
import RecruitmentPlaceSection from '../../../Write/components/RecruitmentPlaceSection';
import { Idea } from '../../../Write/types';
import { useFilterParams } from '../../context/filterContext';

const cooperationWays = [
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Feed/hooks/mutations/useDeleteBookmarkIdea.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';

import { http } from '../../../../api/http';
import { memberId } from '../../../profile/utils/memberId';
import { memberId } from '../../../Profile/utils/memberId';

const _deleteBookmarkIdea = (ideaId: number) => {
return http.delete(`/bookmark/${ideaId}`);
Expand Down

0 comments on commit c3138e1

Please sign in to comment.