From 58b38716bd2c8b04c53a93f0cddfd34bb38ad8f9 Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Fri, 22 Apr 2022 16:49:01 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?=
 =?UTF-8?q?=EB=B0=B8=EB=A6=AC=EB=8D=B0=EC=9D=B4=EC=85=98=20=EB=B0=8F=20?=
 =?UTF-8?q?=EC=9C=A0=ED=9A=A8=EC=84=B1=EC=B2=B4=ED=81=AC=20=EB=B3=B4?=
 =?UTF-8?q?=EC=99=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                  | 10 +++++++---
 .../WEB-INF/views/ftl/m/member_env/setting.ftl       | 12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a52ca0e..52e68e6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,9 +9,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함.">
+    <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/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" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -74,7 +74,7 @@
     </key>
   </component>
   <component name="RunManager">
-    <configuration name="Tomcat 8.5.73" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.73" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
+    <configuration name="Tomcat 9.0.43" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.43" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
       <option name="OPEN_IN_BROWSER_URL" value="http://devops.lookylooks.ai:14288/bf/" />
       <option name="COMMON_VM_ARGUMENTS" value="-Dfile.encoding=UTF-8" />
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
@@ -223,6 +223,9 @@
       <workItem from="1650385175659" duration="2438000" />
       <workItem from="1650430500051" duration="96000" />
       <workItem from="1650431968073" duration="1154000" />
+      <workItem from="1650593739212" duration="527000" />
+      <workItem from="1650608503578" duration="718000" />
+      <workItem from="1650613105021" duration="532000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -513,6 +516,7 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl
index 85ec0c3..e849f33 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl
@@ -50,6 +50,18 @@
 			<div class="list_item">
 				<a href="${URL_ROOT}/m/bf_notice/list_bf_notice.do?return_url=setting" class="more_item">공지사항</a>
 			</div>
+			<div class="list_item">
+				<a href="${URL_ROOT}/m/member_env/setting_nm.do?return_url=setting&view_nm=view_faq" class="more_item">FAQ</a>
+			</div>
+			<div class="list_item">
+				<a href="${URL_ROOT}/m/member_env/view_device_version.do?return_url=setting" class="more_item">버전 정보</a>
+			</div>
+			<#--				<div class="list_item">-->
+			<#--					<a href="${URL_ROOT}/m/member_env/setting_nm.do?return_url=setting&view_nm=view_faq" class="more_item">FAQ</a>-->
+			<#--				</div>-->
+			<#--				<div class="list_item">-->
+			<#--					<a href="${URL_ROOT}/m/member_env/view_device_version.do?return_url=setting" class="more_item">버전 정보</a>-->
+			<#--				</div>-->
 		</div>
 
 	</main>