From f56327fbf3a060172cedf8f7becf0aedaa130ec2 Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Mon, 2 May 2022 19:04:47 +0900
Subject: [PATCH] =?UTF-8?q?-=20=EB=84=A4=EC=9D=B4=EB=B2=84=EC=95=B1?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=BD=94=EB=93=9C=20=EC=9B=90?=
 =?UTF-8?q?=EB=B3=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 28 ++++++++-----------
 .../WEB-INF/views/ftl/m/login/view_login.ftl  |  3 +-
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 92d139f..ee3a49b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,12 +9,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="메모리 &gt; 주간 오류 수정">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="- 아이3명 보기오류 수정&#10;- 아기정보 변경시 생년월이 형식 체크 추가&#10;- 앱 네이버로그인시 코드 수정">
       <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/index/M_IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.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/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -248,14 +244,7 @@
       <workItem from="1651296949782" duration="12479000" />
       <workItem from="1651382880827" duration="4947000" />
       <workItem from="1651421131462" duration="153000" />
-      <workItem from="1651457534351" duration="22078000" />
-    </task>
-    <task id="LOCAL-00007" summary="이유식레시피, 시판이유식 자동검색 적용">
-      <created>1648440207179</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1648440207179</updated>
+      <workItem from="1651457534351" duration="24275000" />
     </task>
     <task id="LOCAL-00008" summary="추천홈메이드이유식 수정">
       <created>1648453690193</created>
@@ -593,7 +582,14 @@
       <option name="project" value="LOCAL" />
       <updated>1651415855454</updated>
     </task>
-    <option name="localTasksCounter" value="56" />
+    <task id="LOCAL-00056" summary="- 아이3명 보기오류 수정&#10;- 아기정보 변경시 생년월이 형식 체크 추가&#10;- 앱 네이버로그인시 코드 수정">
+      <created>1651483285806</created>
+      <option name="number" value="00056" />
+      <option name="presentableId" value="LOCAL-00056" />
+      <option name="project" value="LOCAL" />
+      <updated>1651483285807</updated>
+    </task>
+    <option name="localTasksCounter" value="57" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -613,7 +609,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="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2" />
     <MESSAGE value="아기정보입력 생년월일 형식 수정&#10;추천이유식 &gt; 카트팝업 검색 기능 및 조회 적용" />
     <MESSAGE value="메모리 공유기능 적용 - 카카오, URL복사" />
@@ -638,6 +633,7 @@
     <MESSAGE value="튜토리얼 기능 적용" />
     <MESSAGE value="튜토리얼 기능 적용-2" />
     <MESSAGE value="메모리 &gt; 주간 오류 수정" />
-    <option name="LAST_COMMIT_MESSAGE" value="메모리 &gt; 주간 오류 수정" />
+    <MESSAGE value="- 아이3명 보기오류 수정&#10;- 아기정보 변경시 생년월이 형식 체크 추가&#10;- 앱 네이버로그인시 코드 수정" />
+    <option name="LAST_COMMIT_MESSAGE" value="- 아이3명 보기오류 수정&#10;- 아기정보 변경시 생년월이 형식 체크 추가&#10;- 앱 네이버로그인시 코드 수정" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl
index 308eb83..f610cf9 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl
@@ -103,8 +103,7 @@
         if(l_type == "N") {
             var url = $("#naver_id_login_anchor").attr("href");
             //네어버의 경우 콜백 URL은 네아로에서 지정
-            // window.open(url, 'naverloginpop', 'titlebar=1, resizable=1, scrollbars=yes, width=600, height=550');
-            location.href = url;
+            window.open(url, 'naverloginpop', 'titlebar=1, resizable=1, scrollbars=yes, width=600, height=550');
         } else if(l_type == "K") {
             //카카오는 여기로 바로 redirect 한다.
             Kakao.Auth.login({