Merge pull request #112 from HaegyeongKim01/week11-haegyeong

fix: null타임리프 값 안 들어가는 부분
kakao-tech-campus-2nd-step3 · Nov 15, 2024 · cf46f1e · cf46f1e
2 parents a8eb148 + 04ba45a
commit cf46f1e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/src/main/resources/static/js/card/card-share.js b/src/main/resources/static/js/card/card-share.js
@@ -1,23 +1,34 @@
 document.getElementById('kakao-share-btn').addEventListener('click', function () {
-    const cardId = document.getElementById('qr-share-btn').getAttribute('data-card-id');  // cardId를 QR 버튼에서 가져옵니다.
+    if (!cardId) {
+        console.error('Card ID가 제공되지 않았습니다.');
+        handleError('Card ID가 유효하지 않습니다.', 300);
+        return;
+    }
+
+    // 기본 content 설정
+    const content = {
+        title: `${cardName}님의 명함`,
+        imageUrl: 'https://developers.kakao.com/assets/img/about/logos/kakaolink/kakaolink_btn_medium.png',
+        link: {
+            mobileWebUrl: `http://3.34.144.148:8080/cards/${cardId}/view`,
+            webUrl: `http://3.34.144.148:8080/cards/${cardId}/view`
+        }
+    };
+
+    // description이 있는 경우에만 추가
+    if (cardCompany || cardPosition) {
+        content.description = `회사: ${cardCompany || ''}${cardCompany && cardPosition ? ', ' : ''}직책: ${cardPosition || ''}`;
+    }
 
     Kakao.Link.sendDefault({
         objectType: 'feed',
-        content: {
-            title: '[[${card.name}]]님의 명함',
-            description: '회사: [[${card.company}]], 직책: [[${card.position}]]',
-            imageUrl: 'https://developers.kakao.com/assets/img/about/logos/kakaolink/kakaolink_btn_medium.png',
-            link: {
-                mobileWebUrl: 'http://3.34.144.148:8080/cards/' + cardId + '/view',
-                webUrl: 'http://3.34.144.148:8080/cards/' + cardId + '/view'
-            }
-        },
+        content: content,
         buttons: [
             {
                 title: '명함 보기',
                 link: {
-                    mobileWebUrl: 'http://3.34.144.148:8080/cards/' + cardId + '/view',
-                    webUrl: 'http://3.34.144.148:8080/cards/' + cardId + '/view'
+                    mobileWebUrl: `http://3.34.144.148:8080/cards/${cardId}/view`,
+                    webUrl: `http://3.34.144.148:8080/cards/${cardId}/view`
                 }
             }
         ],

diff --git a/src/main/resources/templates/card-detail.html b/src/main/resources/templates/card-detail.html
@@ -93,6 +93,13 @@ <h3>그룹 선택</h3>
         }
     }
 </script>
+<script th:inline="javascript">
+    // 서버 데이터를 Thymeleaf 표현식으로 JavaScript 변수에 전달
+    const cardId = /*[[${card.id}]]*/ null; // 카드 ID
+    const cardName = /*[[${card.name}]]*/ ''; // 카드 이름
+    const cardCompany = /*[[${card.company}]]*/ ''; // 회사 이름
+    const cardPosition = /*[[${card.position}]]*/ ''; // 직책
+</script>
 </body>
 
 <script th:src="@{/js/card/card-detail.js}"></script>