update

notion-tools · May 18, 2021 · d679eac · d679eac
1 parent 9ccd9c1
commit d679eac
Show file tree

Hide file tree

Showing 13 changed files with 109 additions and 182 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+test-server/
diff --git a/block/html/index.html b/block/html/index.html
@@ -8,12 +8,12 @@
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
-
   gtag('config', 'G-B71G27CBP0');
 </script>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <script src="https://code.jquery.com/jquery-latest.min.js"></script>
+<script src="../notion-tools-block-module.js"></script>
 <title>노션툴즈 HTML블록</title>
 <style>
     * {
@@ -22,31 +22,18 @@
     }
 
 </style>
-
 </head>
 
 <body>
 <script>
-  function getParameterByName(name) {
-    name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-    var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-      results = regex.exec(location.search);
-    return results === null
-      ? ""
-      : decodeURIComponent(results[1].replace(/\+/g, " "));
-  }
-
   let code = decodeURIComponent(getParameterByName("c"))
   let root = document.getElementById("root")
-
   if (code.slice(-2) == "nt") {
     history.pushState(null,null,"index.html")
     document.write(code.slice(0,-2))
   } else {
     document.write("링크를 다시 생성해주세요. <a href='https://www.notion-tools.com/embeds/html'>노션툴즈</a>")
   }
 </script>
-
 </body>
-
 </html>
diff --git a/block/imglink/index.html b/block/imglink/index.html
@@ -13,12 +13,9 @@
         window.dataLayer = window.dataLayer || [];
         function gtag() { dataLayer.push(arguments); }
         gtag('js', new Date());
-
         gtag('config', 'G-B71G27CBP0');
     </script>
     <style>
-        /* 정식 배포 */
-
         * {
             padding: 0;
             margin: 0;
@@ -47,6 +44,7 @@
             background-color: rgb(255, 255, 255);
         }
     </style>
+    <script src="../notion-tools-block-module.js"></script>
 </head>
 
 <body>
@@ -58,33 +56,13 @@ <h1 style="display: none;">노션툴즈 이미지링크 배포</h1>
     </div>
 
     <script>
-        function getParameterByName(name) {
-            name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-            var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-                results = regex.exec(location.search);
-            return results === null
-                ? ""
-                : decodeURIComponent(results[1].replace(/\+/g, " "));
-        }
-
-        const Theme = getParameterByName("t");
+        apply_theme()
         const Imglink = decodeURIComponent(getParameterByName("i"))
         const Hyperlink = decodeURIComponent(getParameterByName("l"))
-
-        if (Theme == "black") {
-            $("body").addClass("black")
-        } else {
-            $("body").addClass("white")
-        }
-
-        console.log(Imglink)
-        console.log(Hyperlink)
-
         if (Imglink && Hyperlink) {
             $("#img").attr("src", Imglink);
             $("#link").attr("href", Hyperlink);
         }
-
     </script>
 </body>
 

diff --git a/block/notion-tools-block-module.js b/block/notion-tools-block-module.js
@@ -0,0 +1,38 @@
+function getParameterByName(name) {
+    name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+    var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+        results = regex.exec(location.search);
+    return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
+}
+
+function copylink() {
+    var copyText = document.getElementById('output_link');
+    copyText.select();
+    copyText.setSelectionRange(0, 99999);
+    document.execCommand("copy");
+}
+
+function apply_theme() {
+    let theme = getParameterByName('t');
+    if (theme != "black") {
+        $("body").addClass("white");
+    } else {
+        $("body").addClass("black");
+    }
+}
+
+if (window.location != window.parent.location) {
+    $.ajax({
+        url: 'https://api2.notion-tools.com/embed',
+        data: {
+            in: document.location.href,
+            out: document.referrer
+        },
+        type: "POST",
+        dataType: "json"
+    }).done(json => {
+        console.log("Server connection successful")
+    }).fail((xhr, status, errorThrown) => {
+        console.log(`Server connect fail ${status} ${errorThrown}`)
+    } )
+}
diff --git a/block/style.css b/block/style.css
@@ -46,15 +46,11 @@ body {
 
 .memu {
     font-size: 30px;
-    /* width: 40px;
-    height: 40px; */
     position: fixed;
-    /* display: none; */
     right: 10px;
     bottom: -40px;
     transition: 0.5s;
     cursor: pointer;
-
 }
 
 .show {

diff --git a/block/table/index.html b/block/table/index.html
@@ -16,6 +16,7 @@
         gtag('config', 'G-B71G27CBP0');
     </script>
     <script src="table.js"></script>
+    <script src="../notion-tools-block-module.js"></script>
     <style>
         .black {
             background-color: rgb(47, 52, 55);
@@ -42,17 +43,13 @@
         table {
             box-sizing: border-box;
             width: 100%;
-            /* border: 1px solid rgba(0, 0, 0, 0.3); */
-            /* border-top: 1px solid rgb(223, 223, 222); */
-            /* box-shadow: white -3px 0px 0px, rgb(223, 223, 222) 0px 1px 0px; */
             line-height: 1.5;
             border-collapse: collapse;
             font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol";
             -webkit-font-smoothing: auto;
         }
 
         td {
-            /* border: 1px solid rgba(0, 0, 0, 0.3); */
             border: 1px solid rgba(55, 53, 47, 0.09);
             box-sizing: border-box;
             padding: 5px 10px;
@@ -74,22 +71,7 @@
     </div>
 
     <script>
-        function getParameterByName(name) {
-            name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-            var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-                results = regex.exec(location.search);
-            return results === null
-                ? ""
-                : decodeURIComponent(results[1].replace(/\+/g, " "));
-        }
-
-        let theme = getParameterByName('t')
-        if (theme == "black") {
-            $("body").addClass("black")
-        } else {
-            $("body").addClass("white")
-        }
-
+        apply_theme()
 
         let text = getParameterByName('tb')
         if (text) {
@@ -102,10 +84,6 @@
         } else {
             document.getElementById('main').innerHTML = "테이블 정보를 찾을 수 없습니다. <a href='https://www.notion-tools.com/embeds/table'>Notion Tools</a>에서 테이블 블록을 제작해주세요.<br>Table info not found. Please make a Table Block in <a href='https://www.notion-tools.com/embeds/table'>Notion Tools</a>"
         }
-
-
-
-
     </script>
 </body>
 

diff --git a/block/template/index.html b/block/template/index.html
diff --git a/block/자주쓰는 코드.md b/block/자주쓰는 코드.md
@@ -1,6 +1,6 @@
 # Notion Tools 자주 사용하는 코드
 
-*파라미터 가져오기
+* 파라미터 가져오기
 
 ```js
   function getParameterByName(name) {
@@ -13,7 +13,7 @@
   }
 ```
 
-*복사하기 (id 변경 필요)
+* 복사하기 (id 변경 필요)
 
 ```js
 function copylink() {
@@ -24,7 +24,7 @@ function copylink() {
 }
 ```
 
-*색상 테마
+* 색상 테마
 
 ```js
 if (theme != "black") {
@@ -34,7 +34,7 @@ if (theme != "black") {
   }
 ```
 
-*글자 방향
+* 글자 방향
 
 ```js
 if (align == "left") {
@@ -47,3 +47,16 @@ if (align == "left") {
     $("#wcii").css("text-align", "center");
 }
 ```
+
+* 구글 애널리틱스
+```html
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-B71G27CBP0"></script>
+<script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag() { dataLayer.push(arguments); }
+    gtag('js', new Date());
+    gtag('config', 'G-B71G27CBP0');
+</script>
+```
+
diff --git a/make/html/index.html b/make/html/index.html
@@ -8,6 +8,7 @@
     <script src="https://code.jquery.com/jquery-latest.min.js"></script>
     <link rel="stylesheet" href="../style.css">
     <link rel="stylesheet" href="../modal.css">
+    <script src="../module.js"></script>
     <!-- Global site tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=G-B71G27CBP0"></script>
 <script>
@@ -48,6 +49,7 @@
             const htmlCode = encodeURIComponent($("#code").val() + "nt");
             const url = "https://embed.notion-tools.com/block/html/?c=" + htmlCode;
             $("#output_link").val(url);
+            make_embed(url)
         }
 
         const linkCopy = () => {
@@ -58,29 +60,6 @@
                 modal("링크 복사 완료", "good")
             }
         }
-
-        const modal = (modal, mode) => {
-            $(".modal_text").text(modal);
-            if (mode === "good") {
-                $("#modal").css("background-color", "#5691d4")
-                $("#modal").addClass("modal_show");
-            } else if (mode === "bad") {
-                $("#modal").css("background-color", "#df5151")
-                $("#modal").addClass("modal_show");
-            }
-
-            setTimeout(() => {
-                $("#modal").removeClass("modal_show");
-            }, 3000)
-        }
-
-        function copylink() {
-            var copyText = document.getElementById("output_link");
-            copyText.select();
-            copyText.setSelectionRange(0, 99999);
-            document.execCommand("copy");
-        }
-
     </script>
 </body>