From bb6457d364b2d5877a7e029903fe0ecadff87636 Mon Sep 17 00:00:00 2001 From: jocloud Date: Mon, 18 May 2020 12:44:52 +0000 Subject: [PATCH] =?utf8?q?=EC=98=A4=EB=9E=9C=EB=A7=8C=EC=97=90=20css?= =?utf8?q?=EB=93=B1=20=EB=A7=8E=EC=9D=B4=20=EB=B0=94=EA=BF=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ZipProject/Controllers/WebZipController.cs | 4 +- ZipProject/Program.cs | 4 +- .../PublishProfiles/FolderProfile.pubxml | 2 +- ZipProject/Views/Shared/_Navbar.cshtml | 2 +- ZipProject/Views/WebZip/Index.cshtml | 149 +++++++++++++++++- ZipProject/Views/WebZip/partial_zip.cshtml | 4 +- .../_publish/ZipProject.runtimeconfig.json | 4 +- ZipProject/_publish/wwwroot/js/Zip/Index.js | 2 +- ZipProject/wwwroot/css/site.css | 37 ++++- ZipProject/wwwroot/js/Zip/Index.js | 6 +- ZipProject/wwwroot/js/Zip/partial_zip.js | 25 ++- packages-microsoft-prod.deb | Bin 0 -> 3132 bytes 12 files changed, 207 insertions(+), 32 deletions(-) create mode 100644 packages-microsoft-prod.deb 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 data = new Dictionary (); ZipModel zipModel = new ZipModel (); + Dictionary test= new Dictionary (); + 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 @@ AnyCPU _publish false - netcoreapp2.1 + netcoreapp3.1 false <_IsPortable>true 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 @@
-
@@ -49,4 +50,142 @@ + + + + + } 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 @@
-
+
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 = ''; //폰트어썸 var bullet_directory_open = ''; //폰트어썸 @@ -94,7 +94,7 @@ function AddFile($elem) { filesSize += frontfiles[i].size; var lab = '\ -
  • \ +
  • \ \
    • "; var rename = - '
    ' + - _Language["renameDir"] + - "
    "; + '
    '; + if (selected_nameChange != undefined && selected_nameChange.prev().attr('is') == 'zip'){ + rename += _Language["renameZip"]; + } else { + rename += _Language["renameDir"]; + } + rename += "
    "; + + 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 0000000000000000000000000000000000000000..97fffd3c1efefab02e493a694d425254a0bc19bf GIT binary patch literal 3132 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 F{0ATl^LYRO literal 0 HcmV?d00001 -- 2.43.0