WIP

.github/workflows/test.yml

@@ -0,0 +1,80 @@
+name: Test server CI/CD
+
+on:
+  push:
+    branches: ['main', 'develop']
+  pull_request:
+    branches: ['main', 'develop']
+    types: ['opened', 'reopened', 'synchronize', 'closed']
+
+jobs:
+  CI:
+    name: Test CI!! 😃
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+
+    steps:
+      - name: Checkout 🏁
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16
+
+      - name: Check current directory
+        run: |
+          echo "Current directory:"
+          pwd
+          echo "Directory content:"
+          ls -la
+
+      - name: Change to project dic
+        run: cd /home/runner/work/Peer-Frontend/Peer-Frontend
+
+      - name: Install packages
+        run: npm i /home/runner/work/Peer-Frontend/Peer-Frontend
+
+      - name: Prettier
+        working-directory: /home/runner/work/Peer-Frontend/Peer-Frontend
+        run: npm run format
+
+      - name: Lint
+        working-directory: /home/runner/work/Peer-Frontend/Peer-Frontend
+        run: npm run lint
+
+      - name: Build Test
+        working-directory: /home/runner/work/Peer-Frontend/Peer-Frontend
+        run: npm run build
+
+  CD:
+    name: Test CD 👻
+    if: github.ref == 'refs/heads/develop' && (github.event.pull_request.merged == true || github.event_name == 'push')
+    runs-on: ubuntu-latest
+    needs: CI
+    steps:
+      - name: Checkout 🏁
+        uses: actions/checkout@v2
+
+      - name: Build and push Docker image
+        run: |
+          touch /home/runner/work/Peer-Frontend/Peer-Frontend/.env.production
+          echo "${{ secrets.ENV_FILE }}" >> /home/runner/work/Peer-Frontend/Peer-Frontend/.env.production
+          echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin 
+          docker build -f Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_DEV_TEST_IMAGE }} .
+          docker push ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_DEV_TEST_IMAGE }}
+
+      - name: Deploy
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.DEV_TEST_HOST }}
+          port: 22
+          username: ${{ secrets.DEV_TEST_USERNAME }}
+          password: ${{ secrets.DEV_TEST_KEY }}
+          script: |
+            docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_DEV_TEST_IMAGE }}
+            docker rm -f ${{ secrets.DOCKER_DEV_TEST_IMAGE }}
+            docker run -d -p 3000:3000 ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_DEV_TEST_IMAGE }}
+            docker container prune -f
+            docker image prune -f

next.config.js

@@ -26,14 +26,6 @@ const nextConfig = withPWA({
       'kr1-api-object-storage.nhncloudservice.com',
     ],
   },
-  async rewrites() {
-    return [
-      {
-        source: '/api/:path*',
-        destination: 'https://back.peer-test.co.kr/api/:path*',
-      },
-    ]
-  },
   webpack(config) {
     config.module.rules.push({
       test: /\.svg$/i,

src/api/location.tsx

@@ -297,7 +297,7 @@ export const locationData: ILocation[] = [
     ],
   },
   {
-    name: '제주도',
+    name: '제주특별자치도',
     subArea: ['서귀포시', '제주시'],
   },
   {

src/app/hitchhiking/panel/HitchhikingCard.tsx

@@ -289,9 +289,9 @@ const HitchhikingCard = ({
           ...sx,
           backfaceVisibility: 'hidden',
           transform: 'translate(-50%, 0)',
+          width: isPc ? '90%' : '90vw',
         }}
         onClick={handleMouseUp}
-        cardWidth={cardWidth}
       />
       <HitchhikingCardBack
         postId={postId}

src/app/my-page/homepage-setting/page.tsx

@@ -11,7 +11,7 @@ import useMedia from '@/hook/useMedia'
 
 interface IToast {
   severity: AlertColor | undefined
-  message: string
+  message: React.ReactNode
 }
 
 const HomepageSetting = () => {

src/app/my-page/homepage-setting/panel/KeywordSetting.tsx

@@ -27,7 +27,7 @@ interface IChip {
 
 interface IToastProps {
   severity: AlertColor | undefined
-  message: string
+  message: React.ReactNode
 }
 
 const KeywordAddingField = ({
@@ -68,7 +68,11 @@ const KeywordAddingField = ({
       .then(() => {
         setToastMessage({
           severity: 'success',
-          message: `'${trimmed}'를 알림 키워드 목록에 추가하였습니다.`,
+          message: (
+            <>
+              <b>{trimmed}</b>(이)가 키워드로 등록되었습니다.
+            </>
+          ),
         })
         mutate()
       })
@@ -81,7 +85,11 @@ const KeywordAddingField = ({
         } else {
           setToastMessage({
             severity: 'error',
-            message: `'${trimmed}'를 알림 키워드 목록에 추가하지 못했습니다.`,
+            message: (
+              <>
+                <b>{trimmed}</b>(을)를 알림 키워드 목록에 추가하지 못했습니다.
+              </>
+            ),
           })
         }
       })

src/app/my-page/profile/page.tsx

@@ -14,6 +14,7 @@ import { useRouter } from 'next/navigation'
 import MyInfoCard from './panel/MyInfoCard'
 import useMedia from '@/hook/useMedia'
 import * as style from '../panel/my-page.style'
+import MyPortfolio from './panel/MyPortfolio'
 
 interface IModals {
   introduction: boolean
@@ -121,6 +122,7 @@ const MyProfile = () => {
         handleLogout={handleLogout}
       />
 
+      <MyPortfolio />
       {/* modals */}
       <ProfileBioEditor
         data={{