Merge pull request #137 from Clubber2024/dev

서버 배포 분리 작업 운영 클라이언트 환경 적용
Clubber2024 · Oct 14, 2024 · cd8ff87 · cd8ff87
2 parents a6febc4 + ff87cf0
commit cd8ff87
Show file tree

Hide file tree

Showing 25 changed files with 1,076 additions and 601 deletions.
diff --git a/.github/workflows/cd-prod.yml b/.github/workflows/cd-prod.yml
diff --git a/.github/workflows/ci-cd-dev.yml b/.github/workflows/ci-cd-dev.yml
@@ -0,0 +1,44 @@
+# name: CI-CD dev
+
+# on:
+#   push:
+#     branches: 
+#       - dev
+
+# jobs: 
+#   build: 
+#     runs-on: ubuntu-latest
+
+#     strategy: 
+#       matrix:
+#         node-version: [16.16.0] 
+
+#     steps: 
+#       - uses: actions/checkout@v2
+#       - name: Use Node.js ${{ matrix.node-version }}
+#         uses: actions/setup-node@v1
+#         with: 
+#           node-version: ${{ matrix.node-version }} 
+
+#       - name: Set environment variables for staging
+#         if: github.ref == 'refs/heads/dev'
+#         run: echo "${{ secrets.STAGING_ENV }}" > .env
+
+#       - name: docker build and push
+#         run: |
+#           docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+#           docker build -t ${{ secrets.DOCKER_REPO }}/clubber-front-dev .
+#           docker push ${{ secrets.DOCKER_REPO }}/clubber-front-dev
+
+#       - name: executing remote ssh commands using password
+#         uses: appleboy/ssh-action@master
+#         with:
+#           host: ${{ secrets.SSH_HOST }}
+#           username: ${{ secrets.SSH_USERNAME }}
+#           key: ${{ secrets.SSH_KEY }}
+#           port: ${{ secrets.SSH_PORT }}
+#           script: |
+#             sudo docker rm -f $(docker ps -qa)
+#             sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-front-dev
+#             docker-compose up -d
+#             docker image prune -f
diff --git a/.github/workflows/ci-cd-prod.yml b/.github/workflows/ci-cd-prod.yml
@@ -0,0 +1,43 @@
+# name: CI-CD prod
+
+# on:
+#     push:
+#         branches:
+#             - main
+
+# jobs:
+#     build:
+#         runs-on: ubuntu-latest
+
+#         strategy:
+#             matrix:
+#                 node-version: [16.16.0]
+
+#         steps:
+#             - uses: actions/checkout@v2
+#             - name: Use Node.js ${{ matrix.node-version }}
+#               uses: actions/setup-node@v1
+#               with:
+#                   node-version: ${{ matrix.node-version }}
+
+#             - name: Set environment variables for production
+#               run: echo "${{ secrets.PRODUCTION_ENV }}" > .env
+
+#             - name: Docker build and push
+#               run: |
+#                   docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+#                   docker build -t ${{ secrets.DOCKER_REPO }}/clubber-front .
+#                   docker push ${{ secrets.DOCKER_REPO }}/clubber-front
+
+#             - name: Executing remote SSH commands
+#               uses: appleboy/ssh-action@master
+#               with:
+#                   host: ${{ secrets.SSH_HOST_PROD }}
+#                   username: ${{ secrets.SSH_USERNAME }}
+#                   key: ${{ secrets.SSH_KEY_PROD }}
+#                   port: ${{ secrets.SSH_PORT }}
+#                   script: |
+#                       sudo docker rm -f $(docker ps -qa)
+#                       sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-front
+#                       docker-compose up -d
+#                       docker image prune -f
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -0,0 +1,71 @@
+name: CI-CD
+
+on:
+  push:
+    branches: [ "main", "dev" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.16.0]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Set environment variables for staging
+        if: contains(github.ref, 'dev')
+        run: echo "${{ secrets.STAGING_ENV }}" > .env
+
+      - name: Set environment variables for prod
+        if: contains(github.ref, 'main')
+        run: echo "${{ secrets.PRODUCTION_ENV }}" > .env
+
+      - name: Docker build and push to dev
+        if: contains(github.ref, 'dev')
+        run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -t ${{ secrets.DOCKER_REPO }}/clubber-front-dev .
+          docker push ${{ secrets.DOCKER_REPO }}/clubber-front-dev
+
+      - name: Docker build and push to prod
+        if: contains(github.ref, 'main')
+        run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -t ${{ secrets.DOCKER_REPO }}/clubber-front-prod .
+          docker push ${{ secrets.DOCKER_REPO }}/clubber-front-prod
+
+      - name: Deploy to dev
+        if: contains(github.ref, 'dev')
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          port: ${{ secrets.SSH_PORT }}
+          script: |
+            sudo docker rm -f $(docker ps -qa)
+            sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-front-dev
+            sudo docker-compose -f docker-compose-dev.yml up -d
+            docker image prune -f
+
+      - name: Deploy to prod
+        if: contains(github.ref, 'main')
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.SSH_HOST_PROD }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_KEY_PROD }}
+          port: ${{ secrets.SSH_PORT }}
+          script: |
+            sudo docker rm -f $(docker ps -qa)
+            sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-front-prod
+            sudo docker-compose -f docker-compose-prod.yml up -d
+            docker image prune -f
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/src/App.jsx b/src/App.jsx
@@ -31,6 +31,7 @@ import RecruitContent from './component/recruit/RecruitContent';
 import ModifyPassword from './component/mypage/ModifyPassword';
 import AdminRecruitWrite from './component/admin/recruit/AdminRecruitWrite';
 import DetailRecruitList from './component/recruit/DetailRecruitList';
+import AdminRecruitContent from './component/admin/recruit/AdminRecruitContent';
 
 function App() {
     const appStyle = {
@@ -84,6 +85,7 @@ function App() {
                         <Route path="/admin/mypage/pending" element={<PendingList />} />
                         <Route path="/admin/recruit" element={<AdminRecruitList />} />
                         <Route path="/admin/recruit/edit" element={<AdminRecruitWrite />} />
+                        <Route path="/admin/recruit/:recruitId" element={<AdminRecruitContent />} />
                         <Route path="/admin/password" element={<ModifyPassword />} />
                     </Routes>
                     <Footer />
@@ -125,6 +127,7 @@ function App() {
 
                         <Route path="/admin/recruit" element={<AdminRecruitList />} />
                         <Route path="/admin/recruit/edit" element={<AdminRecruitWrite />} />
+                        <Route path="/admin/recruit/:recruitId" element={<AdminRecruitContent />} />
                         <Route path="/admin/password" element={<ModifyPassword />} />
                     </Routes>
 

diff --git a/src/component/admin/AdminIntroductionpage.jsx b/src/component/admin/AdminIntroductionpage.jsx
@@ -6,7 +6,6 @@ export default function AdminIntroductionPage({
     department,
     introduction,
     instagram,
-    //imgUrl,
     leader,
     activity,
     room,
@@ -27,7 +26,7 @@ export default function AdminIntroductionPage({
     const NewLines = ({ text }) => {
         return <div>{handleNewLines(text)}</div>;
     };
-
+    console.log(activity);
     return (
         <>
             <div className={styles.detailBody}>
@@ -42,9 +41,14 @@ export default function AdminIntroductionPage({
                 <p className={styles.p_style}>{introduction}</p>
                 <br></br>
                 <strong>📌 인스타</strong>
-                <a href={instagram} target="_blank" rel="noopener noreferrer">
-                    <img className={styles.InstaIcon} src="/buttons/instagram_icon.png" alt="instagram" />
-                </a>
+                {instagram !== null ? (
+                    <a href={instagram} target="_blank" rel="noopener noreferrer">
+                        <img className={styles.InstaIcon} src="/buttons/instagram_icon.png" alt="instagram" />
+                    </a>
+                ) : (
+                    ''
+                )}
+
                 <br></br>
                 <strong>📌 대표 활동</strong>
                 <p className={styles.p_style}>