java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devs' of https://gitlab.com/big.imcloud/badyfeed/bf.git into devs

Browse Source
dev_bert
kyebyungha 3 years ago
parent 66a8cba1b3 10340e1950
commit 1c8383bda7
4 changed files with 79 additions and 62 deletions
Show Stats Download Patch File Download Diff File

75
.idea/workspace.xml
Unescape View File

@ -9,9 +9,10 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기 - 오류수정&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록. - 오류수정">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="연동완료후 이동 URL 수정">
<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/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -251,35 +252,9 @@
<workItem from="1651659992753" duration="18000" />
<workItem from="1651735183816" duration="1465000" />
<workItem from="1651850876348" duration="8000" />
<workItem from="1651995870891" duration="1488000" />
</task>
<task id="LOCAL-00012" summary="비밀번호 찾기 기능 적용&#10;로그인 회원가입 형식 변경">
<created>1648908705168</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1648908705168</updated>
</task>
<task id="LOCAL-00013" summary="닉네임 변경기능 적용">
<created>1648975038077</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1648975038077</updated>
</task>
<task id="LOCAL-00014" summary="계정 동기화 기능 수정">
<created>1648986499410</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1648986499410</updated>
</task>
<task id="LOCAL-00015" summary="홈화면 퍼블리싱 기능 적용">
<created>1649082140551</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1649082140551</updated>
<workItem from="1651995870891" duration="2261000" />
<workItem from="1652058308312" duration="456000" />
<workItem from="1652060536329" duration="2801000" />
</task>
<task id="LOCAL-00016" summary="카카오,네이버 로그인 연동 설정 - 개발사이트(가온앤 아이디)">
<created>1649163766799</created>
@ -596,7 +571,35 @@
<option name="project" value="LOCAL" />
<updated>1651736465197</updated>
</task>
<option name="localTasksCounter" value="61" />
<task id="LOCAL-00061" summary="메모리 &gt; 주간 중복 동일 카테고리 간격제거">
<created>1651997859461</created>
<option name="number" value="00061" />
<option name="presentableId" value="LOCAL-00061" />
<option name="project" value="LOCAL" />
<updated>1651997859462</updated>
</task>
<task id="LOCAL-00062" summary="연동계정 취소하기시 확인 창">
<created>1652062154219</created>
<option name="number" value="00062" />
<option name="presentableId" value="LOCAL-00062" />
<option name="project" value="LOCAL" />
<updated>1652062154219</updated>
</task>
<task id="LOCAL-00063" summary="연동계정 취소하기시 확인 창">
<created>1652062225892</created>
<option name="number" value="00063" />
<option name="presentableId" value="LOCAL-00063" />
<option name="project" value="LOCAL" />
<updated>1652062225892</updated>
</task>
<task id="LOCAL-00064" summary="연동완료후 이동 URL 수정">
<created>1652066405558</created>
<option name="number" value="00064" />
<option name="presentableId" value="LOCAL-00064" />
<option name="project" value="LOCAL" />
<updated>1652066405558</updated>
</task>
<option name="localTasksCounter" value="65" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -616,9 +619,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="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함." />
<MESSAGE value="d-day 체크리스트 사항 수정" />
<MESSAGE value="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정" />
<MESSAGE value="- 체크리스트 오류사항 수정" />
@ -641,6 +641,9 @@
<MESSAGE value="카카오 소셜로그인 수정" />
<MESSAGE value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록." />
<MESSAGE value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기 - 오류수정&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록. - 오류수정" />
<option name="LAST_COMMIT_MESSAGE" value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기 - 오류수정&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록. - 오류수정" />
<MESSAGE value="메모리 &gt; 주간 중복 동일 카테고리 간격제거" />
<MESSAGE value="연동계정 취소하기시 확인 창" />
<MESSAGE value="연동완료후 이동 URL 수정" />
<option name="LAST_COMMIT_MESSAGE" value="연동완료후 이동 URL 수정" />
</component>
</project>

11
src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl
Unescape View File

@ -22,6 +22,15 @@
</body>
<script>
function fncSyncCancel(del_member_id) {
Swal.fire({
text: "선택하신 계정을 연동 해제 하시겠습니까?",
icon: 'warning',
showConfirmButton: true,
showCancelButton: true,
confirmButtonColor: '#192936',
cancelButtonColor: '#e2ad59'
}).then((result) => {
if (result.value) {
$.ajax({
url:'${URL_ROOT}/m/member_env/ajax_delete_sync.do',
type: 'post',
@ -51,6 +60,8 @@
}.bind('this'),
})
}
})
}
</script>
<#include "/m/include/index_bottom.ftl">

2
src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm_end.ftl
Unescape View File

@ -25,7 +25,7 @@
</#list>
</div>
<div class="m_set_account_btn"><button type="button" onclick="location.href='${URL_ROOT}/m/bf_food/index.do'" id="" name="" class="btns blue_btn">완료</button></div>
<div class="m_set_account_btn"><button type="button" onclick="location.href='${URL_ROOT}/m/member_env/setting_nm.do?view_nm=setting'" id="" name="" class="btns blue_btn">완료</button></div>
</div>
</main>
</div>

3
src/main/webapp/m/css/style.css
Unescape View File

@ -6047,6 +6047,9 @@ main {
color: #999;
font-size: 16px;
line-height: 24px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
.info_title {

Write Preview
Loading…
Cancel
Save