From: jocloud <dhkq92@icloud.com>
Date: Mon, 18 May 2020 12:44:52 +0000 (+0000)
Subject: 오랜만에 css등 많이 바꿈
X-Git-Url: https://git.insang.kr/gitweb/?a=commitdiff_plain;h=bb6457d364b2d5877a7e029903fe0ecadff87636;p=ZipProject.git

오랜만에 css등 많이 바꿈
---

diff --git a/ZipProject/Controllers/WebZipController.cs b/ZipProject/Controllers/WebZipController.cs
index 1d07e8e..dad008b 100644
--- a/ZipProject/Controllers/WebZipController.cs
+++ b/ZipProject/Controllers/WebZipController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -51,6 +51,8 @@ namespace ZipProject.Controllers {
       Dictionary<string, object> data = new Dictionary<string, object> ();
       ZipModel zipModel = new ZipModel ();
 
+      Dictionary<string, string> test= new Dictionary<string, string> ();
+
       string[] listDir = dirList.Split (',');
       string filename = listDir[0] + "." + format;
 
diff --git a/ZipProject/Program.cs b/ZipProject/Program.cs
index b874439..6e6e835 100644
--- a/ZipProject/Program.cs
+++ b/ZipProject/Program.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -11,7 +11,7 @@ using Microsoft.Extensions.Logging;
 namespace ZipProject {
   public class Program {
     public static void Main (string[] args) {
-      CreateWebHostBuilder (args).UseUrls ("http://localhost:5001").Build ().Run ();
+      CreateWebHostBuilder (args).UseUrls ("http://localhost:9999").Build ().Run ();
     }
 
     public static IWebHostBuilder CreateWebHostBuilder (string[] args) =>
diff --git a/ZipProject/Properties/PublishProfiles/FolderProfile.pubxml b/ZipProject/Properties/PublishProfiles/FolderProfile.pubxml
index 83d5458..2be616d 100644
--- a/ZipProject/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/ZipProject/Properties/PublishProfiles/FolderProfile.pubxml
@@ -6,7 +6,7 @@
     <LastUsedPlatform>AnyCPU</LastUsedPlatform>
     <publishUrl>_publish</publishUrl>
     <DeleteExistingFiles>false</DeleteExistingFiles>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <SelfContained>false</SelfContained>
     <_IsPortable>true</_IsPortable>
   </PropertyGroup>
diff --git a/ZipProject/Views/Shared/_Navbar.cshtml b/ZipProject/Views/Shared/_Navbar.cshtml
index 15bc04d..f2db693 100644
--- a/ZipProject/Views/Shared/_Navbar.cshtml
+++ b/ZipProject/Views/Shared/_Navbar.cshtml
@@ -1,4 +1,4 @@
-@*
+@*
   For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 *@
 @{
diff --git a/ZipProject/Views/WebZip/Index.cshtml b/ZipProject/Views/WebZip/Index.cshtml
index fbae7e9..6d8c9cd 100644
--- a/ZipProject/Views/WebZip/Index.cshtml
+++ b/ZipProject/Views/WebZip/Index.cshtml
@@ -1,4 +1,4 @@
-@*
+@*
   For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 *@
 @{
@@ -22,13 +22,14 @@
 
   <div class="webzip-section-zipbutton">
     <div class="btn-group btn-group-toggle" data-toggle="buttons">
-      <label class="btn btn-danger btn-secondary" id="partial_zip" style="outline: none; width: 120px; color: #879292; background-color: #e5e5e5;
-            border: 1.5px solid #e5e5e5; font-weight: 500; font-size: 16px; border-top-left-radius: 10px; border-bottom-left-radius: 10px;">
+      <label class="btn btn-danger btn-secondary" id="partial_zip" 
+            style="outline: none; width: 115px; color: black; background-color: #e5e5e5;
+            border: 1.5px solid #e5e5e5; font-weight: bold; font-size: 16px; border-top-left-radius: 10px; border-bottom-left-radius: 10px;">
         <input type="radio" name="options" autocomplete="off" /> @LanguagePack.GetText(lang, "zip")
       </label>
       <label class="btn btn-danger btn-secondary" id="partial_unzip"
-             style="outline: none; width: 120px; color: #879292; background-color: #e5e5e5;
-            border: 1.5px solid #e5e5e5; font-weight: 500; font-size: 16px; border-top-right-radius: 10px; border-bottom-right-radius: 10px;">
+          style="outline: none; width: 115px; color: black; background-color: #e5e5e5;
+          border: 1.5px solid #e5e5e5; font-weight: bold; font-size: 16px; border-top-right-radius: 10px; border-bottom-right-radius: 10px;">
         <input type="radio" name="options" autocomplete="off" /> @LanguagePack.GetText(lang, "unzip")
       </label> 
     </div>
@@ -49,4 +50,142 @@
   
   <script src="~/js/Zip/Index.js" asp-append-version="true"></script>
 
+<!-- #region 모바일 클릭, 더블클릭, 드래그(메뉴소환) 이벤트 -->
+  <script>
+    var bStartEvent= false;
+    var bMoveEvent= false;
+
+    htClickInfo= { //더블탭 판단하기위한 해시
+      sType: null,
+      nX: -1,
+      nY: -1,
+      nTime: 0
+    }
+
+    htDragInfo= {
+      startX: -1,
+      endX: -1,
+      startY: -1,
+      endY: -1
+    }
+
+    var nDoubleTapDuration= 200; //더블탭을 판단하는 기준 시간(ms)
+    var nTapThreshold= 5; //더블탭을 판단하는 거리
+    var oTapEventTimer= null; //탭-더블탭 대기 타이머
+
+    var filter = "win16|win32|win64|mac";
+    if(navigator.platform){
+      if(-1 == filter.indexOf(navigator.platform.toLowerCase()) || true){ //모바일접속일경우
+        document.addEventListener('touchstart', this.onStart.bind(this), false);
+        document.addEventListener('touchmove', this.onMove.bind(this), false);
+        document.addEventListener('touchend', this.onEnd.bind(this), false)
+      }
+    }
+    function initClearInfo(){
+      htClickInfo.sType= null;
+    }
+    function onStart(e) {
+      bStartEvent= true;
+      htDragInfo.startX= e.changedTouches[0].pageX;
+      htDragInfo.startY= e.changedTouches[0].pageY;
+    }
+    function onMove(e) {
+      if(!bStartEvent) {
+        return;
+      }
+      var nX= e.changedTouches[0].pageX;
+      var nY= e.changedTouches[0].pageY;
+
+      // 현재 touchmove에서 사용자 터치에 대한 움직임을 판단
+      nMoveType= getMoveType(nX, nY);
+
+      //수직스크롤
+      if (nMoveType == 1){
+      } else {
+      }
+    }
+    function getMoveType(x, y) {
+      //0은 수평, 1은 수직
+      var nMoveType= 1;
+      var nX= Math.abs(htClickInfo.nX-x);
+      var nY= Math.abs(htClickInfo.nY-y);
+      var nDis= nX + nY;
+
+
+      //현재 움직인 거리가 기준거리보다 적을땐 방향 판단하지않음
+      if (nDis< 25) {return nMoveType}
+
+      //수평 방향을 판단하는 기준 기울기
+      var nHSlope= ((window.innerHeight / 2) / window.innerWidth).toFixed(2) * 1;
+
+      //현재 터치의 기울기
+      var nSlope= parseFloat((nY / nX).toFixed(2), 10);
+
+      if(nSlope > nHSlope){
+        nMoveType= 1;
+      } else {
+        nMoveType= 0;
+      }
+      return nMoveType;
+    }
+    function onEnd(e) {
+      var nX= e.changedTouches[0].pageX;
+      var nY= e.changedTouches[0].pageY;
+      var nTime= e.timeStamp;
+
+      if ((htDragInfo.startY - nY <= 10 && htDragInfo.startY - nY >= -10) && htDragInfo.startX - nX < -30){
+        var menuX= parseInt($("#zipExplore").offset().top) + parseInt($("#toolbar_zipExplore").height()) + 5;
+        var menuY= parseInt($("#zipExplore").offset().left) + parseInt($("#zipExplore").width()) * 0.5;
+        HideContextmenu();
+        event.preventDefault();
+        HideContextmenu();
+        $(GetMenu("mobile"))
+          .appendTo("body")
+          .css({ top: menuX + "px", left: menuY + "px", 'z-index': '99999999' });
+      }
+
+      if(bStartEvent && !bMoveEvent) {
+        //이전 탭 이벤트와 시간차가 200ms 이하일경우
+        if(htClickInfo.sType == "tap" && (nTime - htClickInfo.nTime) <= nDoubleTapDuration){
+          if ((Math.abs(htClickInfo.nX - nX) <= nTapThreshold) && (Math.abs(htClickInfo.nY-nY) <= nTapThreshold)){
+            //더블탭으로 판단 (탭이 발생하지않게 타이머 초기화)
+            clearTimeout(oTapEventTimer);
+            //터치시 선택한 element에 id추가 (jquery selector를 사용하기위함)
+            if(e.path[0].tagName == 'LABEL'){
+              e.path[0].id= 'touchedElement';
+              $touchedElement= $("#touchedElement");
+
+              tagName= $touchedElement.prop('tagName');
+              prevElement= $touchedElement.prev().attr('is');
+              if (tagName == 'LABEL' && 'open|close'.indexOf(prevElement) != -1) {
+                AddDbclickEvent($touchedElement);
+              }
+            }
+          }
+        } else {
+          //탭 이벤트로 판단
+          //현재 탭 이벤트에 대한 정보를 업데이트
+          oTapEventTimer = setTimeout(function(){
+            // alert('tap')
+          }.bind(this), 300);
+          htClickInfo.sType= "tap";
+          htClickInfo.nX= nX;
+          htClickInfo.nY= nY;
+          htClickInfo.nTime= nTime;
+        }
+      } else {
+        //탭 이벤트가 아니므로 정보를 초기화
+        initClearInfo();
+      }
+
+
+      bStartEvent= false;
+      bMoveEvent= false;
+      $("#touchedElement").attr('id', '');
+    }
+
+  </script>
+  <!-- #endregion -->
+  <!-- #endregion -->
+
 }
diff --git a/ZipProject/Views/WebZip/partial_zip.cshtml b/ZipProject/Views/WebZip/partial_zip.cshtml
index 31d6ac1..007dcf0 100644
--- a/ZipProject/Views/WebZip/partial_zip.cshtml
+++ b/ZipProject/Views/WebZip/partial_zip.cshtml
@@ -1,4 +1,4 @@
-@* zip page *@
+@* zip page *@
 @{
   string lang = (string)ViewData["lang"];
 }
@@ -68,7 +68,7 @@
 <div class="col-sm-12 webzip-section-sidezip webzip-section-explore" id="zipExplore"
      style="border: 0px solid lightgray; overflow-x: auto; white-space: nowrap; text-align: left; padding: 0; background-color: #f9f9f9f9;
      border-radius: 10px;">
-  <div style="background-color: lightgray; padding-left: 10px; padding-right: 10px; height: 25px; line-height: 2; margin-bottom: 5px; position: sticky; top: 0px;">
+  <div style="background-color: lightgray; padding-left: 10px; padding-right: 10px; height: 25px; line-height: 2; margin-bottom: 5px; position: sticky; top: 0px;" id="toolbar_zipExplore">
     <i class="fas fa-dot-circle" style="color: rgb(251, 64, 65);"></i>
     <i class="fas fa-circle" style="color: rgb(223, 181, 33);"></i>
     <i class="fas fa-circle" style="color: rgb(70, 186, 33);"></i>
diff --git a/ZipProject/_publish/ZipProject.runtimeconfig.json b/ZipProject/_publish/ZipProject.runtimeconfig.json
index 304ba52..1a601d5 100644
--- a/ZipProject/_publish/ZipProject.runtimeconfig.json
+++ b/ZipProject/_publish/ZipProject.runtimeconfig.json
@@ -1,9 +1,9 @@
 {
   "runtimeOptions": {
-    "tfm": "netcoreapp2.1",
+    "tfm": "netcoreapp3.1",
     "framework": {
       "name": "Microsoft.AspNetCore.App",
-      "version": "2.1.1"
+      "version": "3.1.2"
     },
     "configProperties": {
       "System.GC.Server": true
diff --git a/ZipProject/_publish/wwwroot/js/Zip/Index.js b/ZipProject/_publish/wwwroot/js/Zip/Index.js
index 6ffe063..f388641 100644
--- a/ZipProject/_publish/wwwroot/js/Zip/Index.js
+++ b/ZipProject/_publish/wwwroot/js/Zip/Index.js
@@ -1,4 +1,4 @@
-if (partial_page == "partial_zip") {
+if (partial_page == "partial_zip") {
   $(".webzip-section-zipbutton .btn").css("background-color", "#e5e5e5");
   $(".webzip-section-zipbutton .btn").css("color", "#879292");
   $("#" + partial_page).css("background-color", "#e5e5e5");
diff --git a/ZipProject/wwwroot/css/site.css b/ZipProject/wwwroot/css/site.css
index ad295f2..09ab4d5 100644
--- a/ZipProject/wwwroot/css/site.css
+++ b/ZipProject/wwwroot/css/site.css
@@ -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. */
 body {
   padding-top: 50px;
@@ -60,6 +60,13 @@ body {
 
 .webzip-bodycontainer {
   text-align: center;
+  margin: auto;
+  width: 80%;
+}
+@media (min-width: 1300px){
+  .webzip-bodycontainer {
+    width: 1200px;
+  }
 }
 
 .webzip-ad-body {
@@ -141,7 +148,10 @@ ul {
 }
 
 .webzip-explore-placeholder {
-  border: 1px solid red;
+  border: 1px solid gray;
+  background-color: gray;
+  height: 21px;
+
 }
 
 .webzip-explore-liEmpty {
@@ -221,9 +231,7 @@ ul {
   z-index: 1000;
 }
 .webzip-btn-customMenu div {
-  padding: 1px;
-  padding-left: 10px;
-  padding-right: 10px;
+  padding: 5px 15px;
 }
 .webzip-btn-complate {
   float:right;
@@ -232,9 +240,10 @@ ul {
   padding-left: 5px; 
   padding-right: 5px; 
   margin-right: 5px; 
-  position: sticky; 
+  position: relative; 
   text-align: center;
-  top: 420px;
+  top: 375px;
+  right: 20px;
 }
 .webzip-btn-complate div {
   background-color: rgb(255, 100, 100);
@@ -243,4 +252,18 @@ ul {
   padding-left: 10px;
   padding-right: 10px;
   border-radius: 5px;
+}
+@media (max-width: 768px){
+  .navbar-right {
+    float: right !important;
+    margin-right: -15px;
+    position: fixed;
+    right: 30px;
+    top: 0px;
+  }
+  .collapse {
+    display: block !important;
+    position: absolute;
+    top: -1px;
+  }
 }
\ No newline at end of file
diff --git a/ZipProject/wwwroot/js/Zip/Index.js b/ZipProject/wwwroot/js/Zip/Index.js
index 6ffe063..4d85dc2 100644
--- a/ZipProject/wwwroot/js/Zip/Index.js
+++ b/ZipProject/wwwroot/js/Zip/Index.js
@@ -1,14 +1,14 @@
-if (partial_page == "partial_zip") {
+if (partial_page == "partial_zip") {
   $(".webzip-section-zipbutton .btn").css("background-color", "#e5e5e5");
   $(".webzip-section-zipbutton .btn").css("color", "#879292");
   $("#" + partial_page).css("background-color", "#e5e5e5");
-  $("#" + partial_page).css("color", "#1f8ecd");
+  $("#" + partial_page).css("color", "black");
   $("#" + partial_page).addClass("active");
 } else {
   $(".webzip-section-zipbutton .btn").css("background-color", "#e5e5e5");
   $(".webzip-section-zipbutton .btn").css("color", "#879292");
   $("#" + partial_page).css("background-color", "#e5e5e5");
-  $("#" + partial_page).css("color", "#1f8ecd");
+  $("#" + partial_page).css("color", "black");
   $("#" + partial_page).addClass("active");
 }
 
diff --git a/ZipProject/wwwroot/js/Zip/partial_zip.js b/ZipProject/wwwroot/js/Zip/partial_zip.js
index a330cc9..cba1557 100644
--- a/ZipProject/wwwroot/js/Zip/partial_zip.js
+++ b/ZipProject/wwwroot/js/Zip/partial_zip.js
@@ -1,4 +1,4 @@
-var selected = $("#zipExplore directory:first ul:first"); //기본변수
+var selected = $("#zipExplore directory:first ul:first"); //기본변수
 var selected_nameChange; //폴더명 바꿀때 반응하는 라벨객체 선택변수
 var bullet_directory = '<i class="fas fa-folder"></i>'; //폰트어썸
 var bullet_directory_open = '<i class="fas fa-folder-open"></i>'; //폰트어썸
@@ -94,7 +94,7 @@ function AddFile($elem) {
     filesSize += frontfiles[i].size;
     var lab =
       '\
-    <li class="sort-file">\
+    <li class="sort-file" style="overflow: hidden; white-space: nowrap; text-overflow: ellipsis; margin-right: 15px;">\
       <bullet is="file"></bullet>\
       <label onmousedown="Clicked($(this))" key="">' +
       name +
@@ -293,6 +293,7 @@ function isTooLongFileName(val) {
 //압축 시작(백단에 파일들과 파일정보 map 전송)
 function RequestCompress() {
   if (parseInt(filesSize, 10) === 0) {
+    // alert(_Language["nofilesadded"]);
     alert(_Language["nofilesadded"]);
     $(".modal").css("display", "none");
     return false;
@@ -421,7 +422,8 @@ function NameFormToggle() {
   selected_nameChange.next().focus();
 }
 
-function GetMenu() {
+function GetMenu(gubun) {
+  $(".webzip-btn-customMenu").remove();
   var result = "";
   var first = '<div class="webzip-btn-customMenu">';
   var last = "</div>";
@@ -434,9 +436,15 @@ function GetMenu() {
     _Language["addFile"] +
     "</div>";
   var rename =
-    '<div class="webzip-btn" onclick="NameFormToggle();HideContextmenu();">' +
-    _Language["renameDir"] +
-    "</div>";
+    '<div class="webzip-btn" onclick="NameFormToggle();HideContextmenu();">';
+    if (selected_nameChange != undefined && selected_nameChange.prev().attr('is') == 'zip'){
+      rename += _Language["renameZip"];
+    } else {
+      rename += _Language["renameDir"];
+    }
+    rename += "</div>";
+
+
 
   result += first;
   if (selected_nameChange != undefined) {
@@ -444,7 +452,9 @@ function GetMenu() {
       result += rename;
     }
   }
-  result += addFolder;
+  if (gubun == undefined){
+    result += addFolder;
+  }
   result += chooseFiles;
   result += last;
 
@@ -491,3 +501,4 @@ directories.put(0, "example");
 // socket.onerror = function(e) {
 //   console.error(e.data);
 // };
+
diff --git a/packages-microsoft-prod.deb b/packages-microsoft-prod.deb
new file mode 100644
index 0000000..97fffd3
Binary files /dev/null and b/packages-microsoft-prod.deb differ