From 21ce27ee3ff99425ff22b8c249b0b94a6f3e2c30 Mon Sep 17 00:00:00 2001 From: "hh.jang" Date: Wed, 2 Nov 2022 23:20:00 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#34)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 폴더 구분 임시 페이지 --- .../hyun/musicmark/view/IndexController.java | 6 + .../main/resources/static/css/info-dev.css | 6 +- .../src/main/resources/templates/footer.html | 8 +- .../main/resources/templates/memo/folder.html | 142 ++++++++++++++++++ .../templates/search/search-result.html | 1 + 5 files changed, 159 insertions(+), 4 deletions(-) create mode 100644 backend/src/main/resources/templates/memo/folder.html diff --git a/backend/src/main/java/com/hyun/musicmark/view/IndexController.java b/backend/src/main/java/com/hyun/musicmark/view/IndexController.java index 7a55841..c91d35b 100644 --- a/backend/src/main/java/com/hyun/musicmark/view/IndexController.java +++ b/backend/src/main/java/com/hyun/musicmark/view/IndexController.java @@ -78,4 +78,10 @@ public String saveMusicMarkPage(){ public String memoPage() { return "memo/memo"; } + + @PreAuthorize("isAuthenticated()") + @GetMapping("/folder") + public String folderPage() { + return "memo/folder"; + } } diff --git a/backend/src/main/resources/static/css/info-dev.css b/backend/src/main/resources/static/css/info-dev.css index bcfbc3c..5dede9b 100644 --- a/backend/src/main/resources/static/css/info-dev.css +++ b/backend/src/main/resources/static/css/info-dev.css @@ -1,9 +1,11 @@ html { font-size: 16px; color:#fff; text-decoration: none;} -body {margin:0; background:#1B1B1B; } +body {margin:0; } p, a, h1, h2, h3, h4, h5, h6, ul, li, tr, td, input, select, textarea, button, figure, blockquote { transform: skew(-0.1deg);} .sub_page {position: relative; overflow:hidden; background-color:#1B1B1B; height: 90%;display: grid;grid-template-rows: 1fr 3fr;} +.sub_page_folder {position: relative; overflow:hidden; background-color:#1B1B1B; height: 90%;display: grid;grid-template-rows: 1fr 4fr;} .sub_page_memo {position: relative; overflow:hidden; background-color:#1B1B1B; height: 90%;display: grid;grid-template-rows: 1fr 2fr 4fr;} .top_area {width:100%; padding:66px 30px 30px 30px; box-sizing:border-box;} +.top_area_folder {width:100%; padding:40px 30px 30px 30px; box-sizing:border-box;} .side_header { width:100%; text-align: center; height:80px; overflow:hidden;} .side_header a {text-decoration: none; color:#fff;} .side_header_2 { width:100%; text-align: center; height:40px; overflow:hidden;} @@ -22,7 +24,7 @@ p, a, h1, h2, h3, h4, h5, h6, ul, li, tr, td, input, select, textarea, button, f .album_cover {width:70px; height:70px; border-radius:2px; box-shadow: 0px 4px 10px 3px rgba(0, 0, 0, 0.5); margin:auto; overflow:hidden;} .album_cover > img {display: block; width:100%; height:100%; object-fit: cover;} .bottom_area {background-color:#151515; padding:0 30px;display: grid;grid-template-rows: 1fr 6fr;} -.bottom_area_2 {background: #1b1b1b; padding:0 30px; height: calc(100% - 246px); overflow: hidden;} +.bottom_area_2 {background: #1b1b1b; padding:0 30px; height: calc(100% - 246px); overflow: scroll; height: 100%;} .bottom_area .tab { overflow: hidden; height:70px; border-bottom:1px solid #333;} .bottom_area .tab button { font-size:1.125em; color:#888; background-color: inherit; float: left; border: none; outline: none; cursor: pointer; padding-top: 15px; transition: 0.3s; width:50%; height:70px;} .bottom_area .tab button:hover { font-size:1.125em; font-weight:500; color:#888;} diff --git a/backend/src/main/resources/templates/footer.html b/backend/src/main/resources/templates/footer.html index 34fb2ea..cdf57b3 100644 --- a/backend/src/main/resources/templates/footer.html +++ b/backend/src/main/resources/templates/footer.html @@ -18,8 +18,8 @@ > -
-