diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..6b61141 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,6 @@ +{ + "ExpandedNodes": [ + "" + ], + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/kcgFileManager/v17/.suo b/.vs/kcgFileManager/v17/.suo new file mode 100644 index 0000000..f3ba81c Binary files /dev/null and b/.vs/kcgFileManager/v17/.suo differ diff --git a/.vs/kcgFileManager/v17/workspaceFileList.bin b/.vs/kcgFileManager/v17/workspaceFileList.bin new file mode 100644 index 0000000..378d9d3 Binary files /dev/null and b/.vs/kcgFileManager/v17/workspaceFileList.bin differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000..e3e7cf4 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java b/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java index 5180541..3e53775 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java +++ b/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java @@ -274,7 +274,11 @@ public class BoardService { private String calculationSize(double fileSize){ String[] units = {"bytes", "KB", "MB", "GB", "TB", "PB"}; double unitSelector = Math.floor(Math.log(fileSize)/Math.log(1024)); - return Math.round((fileSize/Math.pow(1024, unitSelector))*100)/100d+" "+units[(int)unitSelector]; + if(fileSize>0){ + return Math.round((fileSize/Math.pow(1024, unitSelector))*100)/100d+" "+units[(int)unitSelector]; + }else{ + return ""; + } } public List selectBoardLogList(BoardLog boardLog) { diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 59046e6..c5534c9 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -14,9 +14,9 @@ spring.thymeleaf.cache=false #mariaDB & log4jdbc spring.datasource.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -spring.datasource.url=ENC(aqLYKJgbP9cnsnvdR27iHExQ6dhwLVin81SAYNE31Rzfl5HC2PsFSxF5xPTfQypC5jk0TEDpBGIDCTPq6W43KZ+g8wrsw4k3PcwxrAhFVNjLInxh4+Xv4BjcqCiIRfMIx/OnjQK1kwVF9/OZauLFdQ==) -spring.datasource.username=ENC(A7iDWZCu8csd0mm0UjqQKA==) -spring.datasource.password=ENC(u4iVHinHq1HOrewYzuMUdlqbpagxmR0/) +spring.datasource.url=ENC(dyWhZaWHoSfJZtAIG3H42B36VasUlkpnnXQ7K1DFIoY+BxgbHAwf9mFSfxoZfn4zU+6uc2n4hK05vDAG2u/oARiQfDZU/y3ATZ8KldP14suXeRHFfnryNGPzEdPzd9Pjd3/HvYOplF+5+B2yUVGawg==) +spring.datasource.username=ENC(+BM/jvdOdi0MtWj44u1nxA==) +spring.datasource.password=ENC(njSsOMalmaUC2YKT4jm2GyYSNXc0hZs4) #spring.datasource.url=jdbc:log4jdbc:mariadb://localhost:3306/kcgFileManager?characterEncoding=UTF-8&serverTimezone=UTC #spring.datasource.username=root #spring.datasource.password=kcg211228 diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 53e09ba..79ff968 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -1,19 +1,13 @@ -/*로그인 폼*/ -.form-signin{ - width: 100%; - max-width: 330px; - padding: 15px; - margin: auto; - position: absolute; - z-index: 200; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} .centerDiv{ max-height: fit-content; } + +/*스크롤기능 있지만 안보이게*/ +body::-webkit-scrollbar { + display: none; +} + /*사이드바 카테고리 트리*/ .btn-toggle:hover, .btn-toggle:focus { color: rgba(0, 0, 0, .85); @@ -48,4 +42,8 @@ top: 50%; transform: translate(-50%, -50%); background-color: #ffffff; +} + +#list-group-line{ + padding-bottom: 52vh; } \ No newline at end of file diff --git a/src/main/resources/static/css/login/login.css b/src/main/resources/static/css/login/login.css new file mode 100644 index 0000000..cbff397 --- /dev/null +++ b/src/main/resources/static/css/login/login.css @@ -0,0 +1,40 @@ +/*로그인 폼*/ +.form-signin{ + width: 100%; + max-width: 330px; + padding: 15px; + margin: auto; + position: absolute; + z-index: 200; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + border-radius: 20px; +} + +body{ + overflow: hidden; +} + +/*스크롤기능 있지만 안보이게*/ +body::-webkit-scrollbar { + display: none; +} + +#logo{ + z-index:300; +} + +footer{ + z-index:200; +} + +#img02{ + transition: all 1s ease-out; + z-index:100; +} + +#img02:hover{ + transform: scale(1.1, 1.1); + transition: all 1s ease-out; +} diff --git a/src/main/resources/templates/admin/main.html b/src/main/resources/templates/admin/main.html index 8edba1c..e31f685 100644 --- a/src/main/resources/templates/admin/main.html +++ b/src/main/resources/templates/admin/main.html @@ -29,7 +29,7 @@
-
+
저장공간
@@ -47,7 +47,7 @@
-
+
전체 이력
diff --git a/src/main/resources/templates/admin/userMgt.html b/src/main/resources/templates/admin/userMgt.html index b7c5190..fc5c4a1 100644 --- a/src/main/resources/templates/admin/userMgt.html +++ b/src/main/resources/templates/admin/userMgt.html @@ -16,7 +16,7 @@
-
+
@@ -142,7 +142,7 @@
-
+