From 407e50a13a204ab9b9695f4a96b4cf8ec9a264ac Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Sat, 16 Apr 2022 00:12:12 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EB=AA=A8=EB=A6=AC=20=EA=B3=B5?=
 =?UTF-8?q?=EC=9C=A0=EA=B8=B0=EB=8A=A5=20=EC=A0=81=EC=9A=A9=20-=20?=
 =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4,=20URL=EB=B3=B5=EC=82=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 25 ++++++++++++-------
 .../views/ftl/m/memory/memory_common.ftl      |  2 --
 .../views/ftl/m/memory/memory_daily.ftl       |  2 ++
 .../views/ftl/m/memory/memory_timeline.ftl    |  6 +++--
 .../views/ftl/m/memory/memory_week.ftl        |  2 ++
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index af66641..5f8344a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,12 +9,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아기정보입력 생년월일 형식 수정&#10;추천이유식 &gt; 카트팝업 검색 기능 및 조회 적용">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_food/com.backoffice.m.bf_food.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_food/com.backoffice.m.bf_food.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -217,7 +217,7 @@
       <workItem from="1649917548966" duration="1302000" />
       <workItem from="1649921550394" duration="230000" />
       <workItem from="1649928321125" duration="16823000" />
-      <workItem from="1650020162949" duration="5651000" />
+      <workItem from="1650020162949" duration="8111000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -443,7 +443,14 @@
       <option name="project" value="LOCAL" />
       <updated>1649954272997</updated>
     </task>
-    <option name="localTasksCounter" value="33" />
+    <task id="LOCAL-00033" summary="아기정보입력 생년월일 형식 수정&#10;추천이유식 &gt; 카트팝업 검색 기능 및 조회 적용">
+      <created>1650025938024</created>
+      <option name="number" value="00033" />
+      <option name="presentableId" value="LOCAL-00033" />
+      <option name="project" value="LOCAL" />
+      <updated>1650025938024</updated>
+    </task>
+    <option name="localTasksCounter" value="34" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -463,7 +470,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="추천홈메이드이유식 수정" />
     <MESSAGE value="추천홈메이드이유식 &gt; 팝업 &gt; 연관식품 삭제" />
     <MESSAGE value="예방접종 표시 오류 수정" />
     <MESSAGE value="음악설정 수정&#10;부모정보 변경 삭제" />
@@ -488,6 +494,7 @@
     <MESSAGE value="D-Day 설정관련 홈화면 오류 수정" />
     <MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용." />
     <MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2" />
-    <option name="LAST_COMMIT_MESSAGE" value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2" />
+    <MESSAGE value="아기정보입력 생년월일 형식 수정&#10;추천이유식 &gt; 카트팝업 검색 기능 및 조회 적용" />
+    <option name="LAST_COMMIT_MESSAGE" value="아기정보입력 생년월일 형식 수정&#10;추천이유식 &gt; 카트팝업 검색 기능 및 조회 적용" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl
index d2335c7..11db927 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl
@@ -72,8 +72,6 @@
         $('.modal-wrapper').removeClass('open');
     });
 
-    $(".copy .copy_text").val(window.location.href);
-
     $(".kakao").on("click" , function(e) {
         e.preventDefault();
     });
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl
index 21a5e24..0f7b2e0 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl
@@ -154,5 +154,7 @@
           clickable: true
         }
       });
+
+    $(".copy .copy_text").val(shareURL);
 </script>
 </html>
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl
index b8dc4f7..86afd58 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl
@@ -126,8 +126,8 @@
         kakao_option.content.link.webUrl = shareURL;
         kakao_option.content.link.mobileWebUrl = shareURL;
         kakao_option.content.link.androidExecutionParams = shareURL;
-        kakao_option.buttons[0].link.mobileWebUrl = webURL;
-        kakao_option.buttons[1].link.mobileWebUrl = webURL;
+        kakao_option.buttons[0].link.mobileWebUrl = shareURL;
+        kakao_option.buttons[1].link.mobileWebUrl = shareURL;
 
         Kakao.init("${KAKAO_APP_KEY}");
         Kakao.Link.createDefaultButton(kakao_option);
@@ -145,6 +145,8 @@
           clickable: true
         }
       });
+
+      $(".copy .copy_text").val(shareURL);
     </script>
 </body>
 <#include "/m/include/index_bottom.ftl">
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
index 503c00c..eae6aba 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
@@ -282,6 +282,8 @@
           clickable: true
         }
       });
+
+        $(".copy .copy_text").val(shareURL);
     </script>
 
 </body>