...

2024-10-25 18:28:25 +09:00
parent 5979281bab
commit 2e7192f91b
16 changed files with 188 additions and 102 deletions
@@ -17,8 +17,8 @@
        document.addEventListener("DOMContentLoaded", onLoaded);
        function onLoaded() {
            baseData.id = [[${srcPost.id}]];
-            baseData.title = [[${srcPost.title}]];
-            baseData.content = [[${srcPost.content}]];
+            baseData.title = urldecode([[${srcPost.title}]]);
+            baseData.content = urldecode([[${srcPost.content}]]);
            baseData.firstPostLat = [[${srcPost.firstPostLat}]];
            baseData.firstPostLon = [[${srcPost.firstPostLon}]];
            baseData.writeTime = [[${srcPost.writeTime}]];
@@ -44,26 +44,7 @@
                theme:'dark',
                usageStatistics : false,
                toolbar:null,
-                initialValue:
-                    "# 제목 " +"\n" +
-                    "평문 사이에 **볼드체** *이탤릭체*"+"\n" +
-                    "~~어디쓰지~~"+"\n" +
-                    "***"+"\n" +
-                    "### 모라모라 " +"\n" +
-                    "> 으흐흠..." +"\n" +
-                    "* 쓸까?" +"\n" +
-                    "1. 첫번째" +"\n" +
-                    "* [x] 체크하자" +"\n" +
-                    "* [ ] 체크하자" +"\n" +
-                    "    \|dd\|cc\|ff\|\n" +
-                    "    \|\-\-\-\|\-\-\-\|\-\-\-\|\n" +
-                    "    \|aa\|s\|s\|" +"\n" +
-                    "[링크다](https://youtube.com)" +"\n" +
-                    "`var test = 'real test'`" +"\n" +
-                    "```\n" +
-                    "let test= = 'real test'\n" +
-                    "```"
-                ,
+                initialValue:baseData.content,
                theme:"dark",
                initialEditType:"wysiwyg",
                hooks: {
@@ -43,7 +43,7 @@
                        <div class="post_item" th:onclick="goToEditor([[${path}]],[[${post.id}]],[[${SK}]])" >
                            <span id="postTitle" class="post_attr" th:text="${post.title}"></span>
                            <div id="content" class="post_attr content" th:attr="data=${post.content}"></div>
-                            <span id="writeDate" class="post_attr" th:text="${#dates.format(post.writeTime, 'dd/MMM/yyyy HH:mm')}"></span>
+                            <span id="writeDate" class="post_attr" th:text="${#dates.format(post.writeTime, 'yyyy.MM.dd HH:mm:ss')}"></span>
                            <span id="postId" class="post_attr" th:text="${post.id}"></span>
                        </div>
                    </th:block>
@@ -7,12 +7,15 @@
 <th:block layout:fragment="head">
    <script type="text/javascript" th:src="@{/js/toast-ui-view.js}"></script>
    <link th:href="@{/css/toast-ui-dark.css}" rel="stylesheet" />
-    <!--    <link rel="stylesheet" href="https://uicdn.toast.com/editor/latest/toastui-editor-dark.css" />-->
+    <script type="text/javascript" th:src="@{/js/blog.js}"></script>
+    <link th:href="@{/css/blog.css}" rel="stylesheet" />
    <script th:inline="javascript">
        let editor
        let onChange = () => {console.log(editor.getMarkdown())}
        document.addEventListener("DOMContentLoaded", onLoaded);
        function onLoaded() {
+            baseData.title = urldecode([[${srcPost.title}]]);
+            baseData.content = urldecode([[${srcPost.content}]]);
            var h = document.querySelector('#main_layer').getBoundingClientRect().height + 'px'
            editor = new toastui.Editor({
                el: document.querySelector('#editor'),
@@ -20,26 +23,7 @@
                width:'100%',
                viewer: true,
                usageStatistics : false,
-                initialValue:
-                    "# 제목 " +"\n" +
-                    "평문 사이에 **볼드체** *이탤릭체*"+"\n" +
-                    "~~어디쓰지~~"+"\n" +
-                    "***"+"\n" +
-                    "### 모라모라 " +"\n" +
-                    "> 으흐흠..." +"\n" +
-                    "* 쓸까?" +"\n" +
-                    "1. 첫번째" +"\n" +
-                    "* [x] 체크하자" +"\n" +
-                    "* [ ] 체크하자" +"\n" +
-                    "    \|dd\|cc\|ff\|\n" +
-                    "    \|\-\-\-\|\-\-\-\|\-\-\-\|\n" +
-                    "    \|aa\|s\|s\|" +"\n" +
-                    "[링크다](https://youtube.com)" +"\n" +
-                    "`var test = 'real test'`" +"\n" +
-                    "```\n" +
-                    "let test= = 'real test'\n" +
-                    "```"
-                ,
+                initialValue:baseData.content,
                theme:"dark",
            });
        }
@@ -4,9 +4,46 @@
        xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
        layout:decorate="~{layout/default_layout}">
 <th:block layout:fragment="head">
+    <script type="text/javascript" th:src="@{/js/blog.js}"></script>
+    <link th:href="@{/css/blog.css}" rel="stylesheet" />
+    <script type="text/javascript" th:src="@{/js/toast-ui-view.js}"></script>
+    <link th:href="@{/css/toast-ui-dark.css}" rel="stylesheet" />
+    <script th:inline="javascript">
+        let editor
+        document.addEventListener("DOMContentLoaded", onLoaded);
+        function onLoaded() {
+            var els = document.getElementsByClassName('content')
+            for (i=0;i<els.length;i++) {
+                var item = $(els[i])
+                console.log(item[0])

+                console.log(item.attr("data"))
+                new toastui.Editor({
+                    el: item[0],
+                    width : (item[0].getBoundingClientRect().width * 0.8) + 'px',
+                    height : (item[0].getBoundingClientRect().width * 0.8) + 'px',
+                    viewer: true,
+                    usageStatistics : false,
+                    initialValue: item.attr("data"),
+                    theme:"dark",
+                });
+            }
+        }
+    </script>
 </th:block>
 <th:block layout:fragment="content" id="content">
-    <div id="main_layer"></div>
+    <div id="main_layer">
+
+        <div class="post_layer">
+            <th:block class="posts_layer"    id="posts" th:each="post : ${Posts}">
+                <div class="post_item" th:onclick="goToView([[${path}]],[[${post.id}]])" >
+                    <span id="postTitle" class="post_attr" th:text="${post.title}"></span>
+                    <div id="content" class="post_attr content" th:attr="data=${post.content}"></div>
+                    <span id="writeDate" class="post_attr" th:text="${#dates.format(post.writeTime, 'yyyy.MM.dd HH:mm:ss')}"></span>
+                    <span id="postId" class="post_attr" th:text="${post.id}"></span>
+                </div>
+            </th:block>
+        </div>
+    </div>
 </th:block>
 </html>
@@ -4,17 +4,21 @@
        xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
        layout:decorate="~{layout/default_layout}">
 <th:block layout:fragment="head">
-
+  <link th:href="@{/css/private.css}" rel="stylesheet" />
 </th:block>
 <th:block layout:fragment="content" id="content">
-  <table id="main_layer">
-    <tr id="where" th:each="location : ${locations}">
-      <td class="where_item"><span th:text="${location.timeString}"></span></td>
-      <td class="where_item"><span th:text="${location.mAddressLines}"></span></td>
-      <td class="where_item"><span th:text="${location.mCountryName}"></span></td>
-      <td class="where_item"><span th:text="${location.mLatitude}"></span></td>
-      <td class="where_item"><span th:text="${location.mLongitude}"></span></td>
-    </tr>
-  </table>
+  <div id="main_layer">
+    <div class="layer">
+      <th:block id="where" th:each="location : ${locations}">
+        <div class="where_item">
+          <span th:text="${location.timeString}"> </span>
+          <span th:text="${location.mAddressLines}"> </span>
+          <span th:text="${location.mCountryName}"> </span>
+          <span th:text="${location.mLatitude}"> </span>
+          <span th:text="${location.mLongitude}"> </span>
+        </div>
+      </th:block>
+    </div>
+  </div>
 </th:block>
 </html>
@@ -6,11 +6,7 @@

 <head>
    <title>Spring Boot</title>
-    <script th:inline="javascript">
-        function loginClick() {
-            onclickLogin([[${enc}]],[[${key}]])
-        }
-    </script>
+
    <script type="text/javascript" th:src="@{/js/user.js}"></script>
 </head>>
 <body onload="checkDebug()">
@@ -22,7 +18,7 @@
        <tr><td><input id="user_id" type="text" class="text"></td></tr>
        <tr><td>비밀번호</td></tr>
        <tr><td><input id="user_pw" type="password" class="text"></td></tr>
-        <tr><td><input type="submit" value="로그인" class="btn" onclick="loginClick()"></td></tr>
+        <tr><td><input type="submit" value="로그인" class="btn" th:onclick="onclickLogin([[${enc}]],[[${key}]])"></td></tr>
    </table>
 </div>

@@ -4,8 +4,8 @@
  <footer>
    <table >
      <tr id="bottom">
-        <td><h2><a aria-label="licenses" style="color: white" href="../licenses" title="Gmail">licenses</a></h2></td>
-        <td><h2><a aria-label="sendToMe" style="color: white" href="mailto:lunaticbum@gmail.com" title="Gmail">lunaticbum@gmail.com</a></h2></td>
+        <td><h3><a aria-label="licenses" style="color: white" href="../licenses" title="Gmail">licenses</a></h3></td>
+        <td><h3><a aria-label="sendToMe" style="color: white" href="mailto:lunaticbum@gmail.com" title="Gmail">lunaticbum@gmail.com</a></h3></td>
      </tr>
    </table>
  </footer>
@@ -1,12 +1,25 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/html">
 <th:block th:fragment="header">
    <header>
-        <table >
-            <tr id="top">
-                <td><h2><a aria-label="licenses" style="color: white" href="javascript:mainPath()" title="Gmail">HOME</a></h2></td>
-            </tr>
-        </table>
+        <div id="top">
+            <td><h3><a aria-label="licenses" style="color: white" href="javascript:mainPath()" title="Gmail">HOME</a></h3></td>
+        </div>
+
+        <th:block th:if="${PERMISSION != 'OK'}">
+            <script th:inline="javascript">
+                document.addEventListener("DOMContentLoaded", addListen);
+                function tryLogin() {if(document.getElementById("user_id").value.length > 0 && document.getElementById("user_pw").value.length > 0) {onclickLogin(null,null)}}
+                function addListen(){document.getElementById("user_id").addEventListener("keyup", ({key}) => {if (key === "Enter")tryLogin()});document.getElementById("user_pw").addEventListener("keyup", ({key}) => {if (key === "Enter")tryLogin()})}
+            </script>
+            <div class="user_info" >
+                <input th:class="login_input" placeholder="ID" enterkeyhint="next" id="user_id" type="text" class="text">
+                <input th:class="login_input" id="user_pw"  placeholder="PW" enterkeyhint="send" type="password" class="text">
+            </div>
+        </th:block>
+        <th:block th:if="${PERMISSION == 'OK'}">
+            <!--                <div><h2><a aria-label="licenses" style="color: white" href="javascript:gotoLogin()" title="Gmail">HOME</a></h2></div>-->
+        </th:block>
    </header>
 </th:block>
 </html>