From a0e47e6524a0bd2c6a18a8c6f128e1cbdca993cd Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Sat, 30 Apr 2022 18:07:52 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8A=9C=ED=86=A0=EB=A6=AC=EC=96=BC=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=A0=81=EC=9A=A9-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 48 ++++++-------------
 .../views/ftl/m/include/board_tutorial.ftl    | 45 +++++++----------
 .../views/ftl/m/include/memory_tutorial.ftl   | 45 +++++++----------
 .../views/ftl/m/include/nutrient_tutorial.ftl | 45 +++++++----------
 4 files changed, 66 insertions(+), 117 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a6f4978..880db38 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,29 +9,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="디폴트 선택한 아이 유지안되는 버그 수정-2">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/tutorial/M_Bf_tutorialBO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/tutorial/M_Bf_tutorialBOImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/tutorial/TutorialController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/tutorial/com.backoffice.m.tutorial.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/board_tutorial.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/food_tutorial.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/index_tutorial.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/memory_tutorial.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_tutorial.ftl" afterDir="false" />
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="튜토리얼 기능 적용">
       <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_board/M_Bf_boardController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java" 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/java/com/backoffice/m/bf_growth/M_Bf_growthController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java" 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/java/com/backoffice/m/memory/M_MemoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/appcontext/application_context_generator.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/appcontext/application_context_generator.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/datasource/sql_map_config_mysql.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/datasource/sql_map_config_mysql.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/nutrient_balance.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/nutrient_balance.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/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/include/board_tutorial.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/board_tutorial.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/memory_tutorial.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/memory_tutorial.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_tutorial.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_tutorial.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -261,14 +243,7 @@
       <workItem from="1651149304746" duration="15131000" />
       <workItem from="1651193694137" duration="12076000" />
       <workItem from="1651229947933" duration="3142000" />
-      <workItem from="1651296949782" duration="11707000" />
-    </task>
-    <task id="LOCAL-00004" summary="아이 사진 업로드 오류">
-      <created>1648364237160</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1648364237160</updated>
+      <workItem from="1651296949782" duration="12133000" />
     </task>
     <task id="LOCAL-00005" summary="SNS 탈퇴 로그인 불가 처리 메시지">
       <created>1648370835819</created>
@@ -606,7 +581,14 @@
       <option name="project" value="LOCAL" />
       <updated>1651232993829</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="튜토리얼 기능 적용">
+      <created>1651309230468</created>
+      <option name="number" value="00053" />
+      <option name="presentableId" value="LOCAL-00053" />
+      <option name="project" value="LOCAL" />
+      <updated>1651309230468</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -626,7 +608,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="회원가입 퍼블리싱 페이지 적용-2" />
     <MESSAGE value="아이정보등록 퍼블리싱" />
     <MESSAGE value="D-Day 설정관련 홈화면 오류 수정" />
     <MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용." />
@@ -651,6 +632,7 @@
     <MESSAGE value="추천이유식 레시피 식재료 번호 수정" />
     <MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정" />
     <MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정-2" />
-    <option name="LAST_COMMIT_MESSAGE" value="디폴트 선택한 아이 유지안되는 버그 수정-2" />
+    <MESSAGE value="튜토리얼 기능 적용" />
+    <option name="LAST_COMMIT_MESSAGE" value="튜토리얼 기능 적용" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/board_tutorial.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/board_tutorial.ftl
index 65cc2b8..74c08b5 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/include/board_tutorial.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/include/board_tutorial.ftl
@@ -35,38 +35,27 @@
     </div>
 
     <div class="cont_btn">
-        <div style="cursor:pointer" onclick="fncNext(5,999)" class="btn">시작하기</div>
+        <div style="cursor:pointer" onclick="fncTutorialClose(5)" class="btn">시작하기</div>
     </div>
 </div>
 
 <script>
-    //다음 튜터리얼 이동
-    function fncNext(p_menu_id, toturial_idx) {
-        if(toturial_idx == 999) {
-            $(".tutorial").hide();
+    function fncTutorialClose(p_menu_id) {
+        $(".tutorial").hide();
 
-
-            $.ajax({
-                url:'${URL_ROOT}/api/tutorial/ajax_tutorial_confirm.do?1=1',
-                type:'post',
-                data: {
-                    "menu_id": p_menu_id
-                },
-                dataType:'json',
-                error:function(request,status,error){
-                    is_loading = false;
-                    alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
-                },
-                success:function(result){
-                    // console.log(result);
-                    // var RESULT = result.RESULT;
-                    // var RESULT_MSG = result.RESULT_MSG;
-                    is_loading = false;
-                }
-            });
-        } else {
-            $("#tutorial_" + (toturial_idx-1)).hide();
-            $("#tutorial_" + toturial_idx).show();
-        }
+        $.ajax({
+            url:'${URL_ROOT}/api/tutorial/ajax_tutorial_confirm.do?1=1',
+            type:'post',
+            data: {
+                "menu_id": p_menu_id
+            },
+            dataType:'json',
+            error:function(request,status,error){
+                is_loading = false;
+                alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+            },
+            success:function(result){
+            }
+        });
     }
 </script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/memory_tutorial.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/memory_tutorial.ftl
index 30cf55d..a31c578 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/include/memory_tutorial.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/include/memory_tutorial.ftl
@@ -15,38 +15,27 @@
         </div>
     </div>
     <div class="cont_btn">
-        <div style="cursor:pointer" onclick="fncNext(4,999)" class="btn">시작하기</div>
+        <div style="cursor:pointer" onclick="fncTutorialClose(4)" class="btn">시작하기</div>
     </div>
 </div>
 
 <script>
-    //다음 튜터리얼 이동
-    function fncNext(p_menu_id, toturial_idx) {
-        if(toturial_idx == 999) {
-            $(".tutorial").hide();
+    function fncTutorialClose(p_menu_id) {
+        $(".tutorial").hide();
 
-
-            $.ajax({
-                url:'${URL_ROOT}/api/tutorial/ajax_tutorial_confirm.do?1=1',
-                type:'post',
-                data: {
-                    "menu_id": p_menu_id
-                },
-                dataType:'json',
-                error:function(request,status,error){
-                    is_loading = false;
-                    alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
-                },
-                success:function(result){
-                    // console.log(result);
-                    // var RESULT = result.RESULT;
-                    // var RESULT_MSG = result.RESULT_MSG;
-                    is_loading = false;
-                }
-            });
-        } else {
-            $("#tutorial_" + (toturial_idx-1)).hide();
-            $("#tutorial_" + toturial_idx).show();
-        }
+        $.ajax({
+            url:'${URL_ROOT}/api/tutorial/ajax_tutorial_confirm.do?1=1',
+            type:'post',
+            data: {
+                "menu_id": p_menu_id
+            },
+            dataType:'json',
+            error:function(request,status,error){
+                is_loading = false;
+                alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+            },
+            success:function(result){
+            }
+        });
     }
 </script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_tutorial.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_tutorial.ftl
index 75b124d..5b73296 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_tutorial.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_tutorial.ftl
@@ -21,39 +21,28 @@
         </div>
     </div>
     <div class="cont_btn">
-        <div style="cursor:pointer" onclick="fncNext(3,999)" class="btn">시작하기</div>
+        <div style="cursor:pointer" onclick="fncTutorialClose(3)" class="btn">시작하기</div>
     </div>
 </div>
 
 
 <script>
-    //다음 튜터리얼 이동
-    function fncNext(p_menu_id, toturial_idx) {
-        if(toturial_idx == 999) {
-            $(".tutorial").hide();
+    function fncTutorialClose(p_menu_id) {
+        $(".tutorial").hide();
 
-
-            $.ajax({
-                url:'${URL_ROOT}/api/tutorial/ajax_tutorial_confirm.do?1=1',
-                type:'post',
-                data: {
-                    "menu_id": p_menu_id
-                },
-                dataType:'json',
-                error:function(request,status,error){
-                    is_loading = false;
-                    alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
-                },
-                success:function(result){
-                    // console.log(result);
-                    // var RESULT = result.RESULT;
-                    // var RESULT_MSG = result.RESULT_MSG;
-                    is_loading = false;
-                }
-            });
-        } else {
-            $("#tutorial_" + (toturial_idx-1)).hide();
-            $("#tutorial_" + toturial_idx).show();
-        }
+        $.ajax({
+            url:'${URL_ROOT}/api/tutorial/ajax_tutorial_confirm.do?1=1',
+            type:'post',
+            data: {
+                "menu_id": p_menu_id
+            },
+            dataType:'json',
+            error:function(request,status,error){
+                is_loading = false;
+                alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+            },
+            success:function(result){
+            }
+        });
     }
 </script>
\ No newline at end of file