Merge branch 'main' of https://github.com/prgrms-web-devcourse-final-project/WEB2_3_9crops_FE into 103-deploy

Author: wldnjs990

.github/workflows/deploy.yml

@@ -0,0 +1,58 @@
+name: MAIN CI
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  Deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+
+      - name: Install pnpm
+        run: |
+          npm install -g pnpm
+
+      - name: Get pnpm store path
+        id: pnpm-cache-path
+        run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_ENV
+
+      - name: Cache pnpm modules
+        id: cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-
+            ${{ runner.os }}-
+
+      - name: Install Dependencies
+        run: |
+          pnpm install --frozen-lockfile
+          pnpm store prune
+
+      - name: Set up .env file
+        run: |
+          echo "VITE_API_URL=${{ secrets.VITE_API_URL }}" > .env.production
+          echo "HTTPS=true" >> .env.production
+
+      - name: Build
+        run: pnpm run build
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Deploy to S3
+        run: aws s3 sync ./dist s3://${{ secrets.AWS_BUCKET_NAME }} --delete
+
+      - name: Invalidate CloudFront Cache
+        run: aws cloudfront create-invalidation --distribution-id ${{ secrets.AWS_DISTRIBUTION_ID }} --paths "/*"

src/main.tsx

@@ -15,11 +15,11 @@ queryClient.setDefaultOptions({
 });
 
 createRoot(document.getElementById('root')!).render(
-  // <StrictMode>
-  <QueryClientProvider client={queryClient}>
-    <BrowserRouter>
-      <App />
-    </BrowserRouter>
-  </QueryClientProvider>,
-  // </StrictMode>
+  <StrictMode>
+    <QueryClientProvider client={queryClient}>
+      <BrowserRouter>
+        <App />
+      </BrowserRouter>
+    </QueryClientProvider>
+  </StrictMode>,
 );

src/pages/LetterBoardDetail/index.tsx

@@ -6,8 +6,8 @@ import {
   getSharePostDetail,
   postShareProposalApproval,
   SharePost,
-  postSharePostLike,
   getSharePostLikeCount,
+  postSharePostLike,
 } from '@/apis/share';
 import BlurImg from '@/assets/images/landing-blur.png';
 import ReportModal from '@/components/ReportModal';
@@ -99,9 +99,9 @@ const LetterBoardDetailPage = ({ confirmDisabled }: ShareLetterPreviewProps) =>
     <>
       {activeReportModal && (
         <ReportModal
-          reportType="POST"
-          letterId={parseInt(sharePostId)}
           onClose={() => setActiveReportModal(false)}
+          reportType={'SHARE_POST'}
+          letterId={parseInt(sharePostId)}
         />
       )}
       <div className="grow bg-white">

src/types/admin.d.ts

@@ -1,5 +1,5 @@
 type Status = 'PENDING' | 'RESOLVED' | 'REJECTED';
-type ReportType = 'LETTER' | 'POST' | 'COMMENT';
+type ReportType = 'LETTER' | 'SHARE_POST' | 'COMMENT';
 type Reason = 'ABUSE' | 'DEFAMATION' | 'HARASSMENT' | 'THREATS' | 'ETC';
 
 interface ReportQueryString {