From 27d81c2c29f05acbffef476d2bfb33b790504143 Mon Sep 17 00:00:00 2001
From: jocloud <dhkq92@icloud.com>
Date: Tue, 26 May 2020 12:09:17 +0000
Subject: [PATCH] =?utf8?q?=ED=8E=98=EC=9D=B4=EC=8A=A4=EB=B6=81=20=ED=94=BD?=
 =?utf8?q?=EC=85=80=20=EC=95=95=EC=B6=95=EC=9A=94=EC=B2=AD=20=EA=B8=B0?=
 =?utf8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 ZipProject/Views/Shared/_Layout.cshtml   | 22 +++----------
 ZipProject/wwwroot/js/Zip/partial_zip.js |  6 ++++
 ZipProject/wwwroot/js/site.js            | 39 ++++++++++++++++++++++--
 3 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/ZipProject/Views/Shared/_Layout.cshtml b/ZipProject/Views/Shared/_Layout.cshtml
index e7b92fe..34c945e 100644
--- a/ZipProject/Views/Shared/_Layout.cshtml
+++ b/ZipProject/Views/Shared/_Layout.cshtml
@@ -40,24 +40,9 @@
   
   <script src="/static/lib:bootstrap:dist:js:bootstrap.js"></script>
   <script src="/static/js:site.js" asp-append-version="true"></script>
+  <noscript><img height="1" width="1" style="display:none"src="https://www.facebook.com/tr?id=680343789480538&ev=PageView&noscript=1"/></noscript>
   <script src="https://code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
-  <!-- Facebook Pixel Code -->
-  <script>
-    !function(f,b,e,v,n,t,s)
-    {if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-    n.callMethod.apply(n,arguments):n.queue.push(arguments)};
-    if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
-    n.queue=[];t=b.createElement(e);t.async=!0;
-    t.src=v;s=b.getElementsByTagName(e)[0];
-    s.parentNode.insertBefore(t,s)}(window, document,'script',
-    'https://connect.facebook.net/en_US/fbevents.js');
-    fbq('init', '680343789480538');
-    fbq('track', 'PageView');
-  </script>
-  <noscript><img height="1" width="1" style="display:none"
-    src="https://www.facebook.com/tr?id=680343789480538&ev=PageView&noscript=1"
-  /></noscript>
-  <!-- End Facebook Pixel Code -->
+  
   <style>
     .navbar-default {
       background-color: #353535; 
@@ -66,6 +51,9 @@
 
   <!-- language section -->
   <script>
+    //픽셀전송
+    SendFixel_fb('PageView', {});
+
     if((window.location+"").split('?').length != 0){
       history.pushState(null, null, "/");
     }
diff --git a/ZipProject/wwwroot/js/Zip/partial_zip.js b/ZipProject/wwwroot/js/Zip/partial_zip.js
index b666529..e18742d 100644
--- a/ZipProject/wwwroot/js/Zip/partial_zip.js
+++ b/ZipProject/wwwroot/js/Zip/partial_zip.js
@@ -333,6 +333,11 @@ function RequestCompress() {
     }
     fileKeyPair += "}";
 
+    var filesname_json= new Array();
+    for (var i=0; i< files.keys().length; i++){
+      filesname_json.push(files.get(i).get('file').name);
+    }
+
     //데이터 폼 생성후 파일들과 각종 정포 담기
     var formdata = new FormData();
     var uuid = GetUUID();
@@ -375,6 +380,7 @@ function RequestCompress() {
             a.download = directories.get(0) + "." + format;
             a.click();
             window.URL.revokeObjectURL(url);
+            SendFixel_fb('RequestCompress', {'files': filesname_json, 'dirs': dirList, 'pair': fileKeyPair});
           }
         }
       });
diff --git a/ZipProject/wwwroot/js/site.js b/ZipProject/wwwroot/js/site.js
index 5d5083e..f1f55f0 100644
--- a/ZipProject/wwwroot/js/site.js
+++ b/ZipProject/wwwroot/js/site.js
@@ -1,4 +1,4 @@
-// Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
+// Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
 // for details on configuring this project to bundle and minify static web assets.
 
 // Write your JavaScript code.
@@ -19,6 +19,15 @@ String.format = function() {
   return theString;
 }
 
+function GetIP(){
+  $.ajax({
+    type: 'get',
+    url: 'https://api.ipify.org?format=json',
+    async: false
+  }).done(function(json){
+    return(json['ip']);
+  })
+}
 
 function $id(type, id) {
   if (type == "jq")
@@ -78,4 +87,30 @@ Map.prototype = {
       }
       return count;
     }
-};
\ No newline at end of file
+};
+
+!function(f,b,e,v,n,t,s)
+{if(f.fbq)return;n=f.fbq=function(){n.callMethod?
+n.callMethod.apply(n,arguments):n.queue.push(arguments)};
+if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
+n.queue=[];t=b.createElement(e);t.async=!0;
+t.src=v;s=b.getElementsByTagName(e)[0];
+s.parentNode.insertBefore(t,s)}(window, document,'script',
+'https://connect.facebook.net/en_US/fbevents.js');
+fbq('init', '680343789480538');
+
+function SendFixel_fb(mode, data){
+  switch(mode){
+    case "PageView":
+      fbq('track', 'PageView');
+      break;
+    case "RequestCompress":
+      fbq('track', 'RequestCompress', {
+        'division': GetIP(),
+        'files': data['files'],
+        'dirs': data['dirs'],
+        'pair': data['pair']
+      });
+      break;
+  }
+}
\ No newline at end of file
-- 
2.43.0