Merge pull request #356 from sharemindteam/dev

[0717] 채팅, 편지 가격 수정으로 인한 재배포
sharemindteam · Jul 17, 2024 · 633b3cb · 633b3cb
2 parents 7bef3f4 + 62774a6
commit 633b3cb
Show file tree

Hide file tree

Showing 22 changed files with 614 additions and 586 deletions.
diff --git a/addIssueNumber.sh b/addIssueNumber.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+COMMIT_MSG_FILE=$1
+
+# 현재 브랜치 이름 가져오기
+branch_name=$(git rev-parse --abbrev-ref HEAD)
+
+# 브랜치 이름에서 마지막 숫자 추출
+issue_number=$(echo ${branch_name} | grep -o '[0-9]*$')
+
+# 커밋 메시지 파일의 첫 번째 줄 읽기
+first_line=$(head -n1 ${COMMIT_MSG_FILE})
+
+# 브랜치 이름에 숫자가 있는 경우에만 이슈 번호를 커밋 메시지 첫 번째 줄 끝에 추가
+if [ -n "$issue_number" ]; then
+    sed -i ".bak" "1s/\$/ (#$issue_number)/" ${COMMIT_MSG_FILE}
+fi
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,6 +40,11 @@
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
+  "husky": {
+    "hooks": {
+      "prepare-commit-msg": "./addIssueNumber.sh $HUSKY_GIT_PARAMS"
+    }
+  },
   "eslintConfig": {
     "extends": [
       "react-app",
@@ -59,6 +64,7 @@
     ]
   },
   "devDependencies": {
-    "@types/react-dom": "^18.2.18"
+    "@types/react-dom": "^18.2.18",
+    "husky": "4"
   }
 }
diff --git a/public/index.html b/public/index.html
@@ -1,6 +1,22 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <!-- Clarity tag -->
+    <script type="text/javascript">
+      (function (c, l, a, r, i, t, y) {
+        c[a] =
+          c[a] ||
+          function () {
+            (c[a].q = c[a].q || []).push(arguments);
+          };
+        t = l.createElement(r);
+        t.async = 1;
+        t.src = 'https://www.clarity.ms/tag/' + i;
+        y = l.getElementsByTagName(r)[0];
+        y.parentNode.insertBefore(t, y);
+      })(window, document, 'clarity', 'script', 'n11jaqdy8d');
+    </script>
+
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta

diff --git a/src/App.Layout.tsx b/src/App.Layout.tsx
@@ -9,6 +9,7 @@ import styled from 'styled-components';
 import { Green } from 'styles/color';
 import { Flex } from 'components/Common/Flex';
 import { useNavigate } from 'react-router-dom';
+import { useViewResize } from 'hooks/useViewResize';
 //
 //
 //
@@ -27,7 +28,7 @@ const GROUND_HEIGHT = '24rem';
 
 const LAYOUT_STYLES = {
   width: '100vw',
-  height: '100vh',
+  height: '  height: calc(var(--vh, 1vh) * 100);',
   display: 'flex',
   backgroundImage: `url(${backgroundImage})`,
   backgroundSize: 'cover',
@@ -92,6 +93,8 @@ const BottomGreenBox = styled.div`
 const AppLayout = ({ children }: AppLayoutProps) => {
   const navigate = useNavigate();
 
+  useViewResize();
+
   //
   //
   //

diff --git a/src/api/delete.ts b/src/api/delete.ts
@@ -1,3 +1,4 @@
+import { axiosDelete } from './axios';
 import { deleteInstance } from './axios.deprecated';
 
 //Auth Controller
@@ -11,9 +12,12 @@ export const deleteSearchWords = async (body: any) =>
 //WishList Controller
 
 //검색 결과 반환
-export const deleteWishLists = async (counselorId: number) =>
+export const deleteWishListsDeprecated = async (counselorId: number) =>
   await deleteInstance(`/wishLists?counselorId=${counselorId}`);
 
+export const deleteWishLists = async (counselorId: number) =>
+  await axiosDelete(`/wishLists?counselorId=${counselorId}`);
+
 // 일대다상담
 // CommentLike Controller
 export const deleteCommentLikes = async (commentId: any) =>

diff --git a/src/api/patch.ts b/src/api/patch.ts
@@ -1,3 +1,4 @@
+import { axiosPatch } from './axios';
 import { patchInstance, patchPublicInstance } from './axios.deprecated';
 //Admin Controller
 //admin 미결제 상담 승인
@@ -81,9 +82,12 @@ export const patchSearchWordsPostsResults = async (
   );
 //Wishlist Controlloer
 //찜하기 추가
-export const patchWishLists = async (counselorId: number) =>
+export const patchWishListsDeprecated = async (counselorId: number) =>
   await patchInstance(`/wishLists?counselorId=${counselorId}`);
 
+export const patchWishLists = async (counselorId: number) =>
+  await axiosPatch(`/wishLists?counselorId=${counselorId}`);
+
 //일대다상담
 
 //Comment Controller