diff --git a/build.gradle.kts b/build.gradle.kts index 7814a65..faa89fd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,6 +44,7 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-thymeleaf") implementation("nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect") implementation ("org.jsoup:jsoup:1.18.1") + implementation ("com.drewnoakes:metadata-extractor:2.19.0") implementation("org.springframework.boot:spring-boot-starter-security") compileOnly("org.projectlombok:lombok") runtimeOnly("org.mariadb.jdbc:mariadb-java-client") diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BlogController.kt b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BlogController.kt index 72a0658..5976c19 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BlogController.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BlogController.kt @@ -1,5 +1,7 @@ package kr.lunaticbum.back.lun.controllers +import com.drew.imaging.ImageMetadataReader +import com.drew.metadata.Metadata import com.google.gson.Gson import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse @@ -7,7 +9,6 @@ import kr.lunaticbum.back.lun.configs.GlobalEnvironment import kr.lunaticbum.back.lun.model.CurrentWeather import kr.lunaticbum.back.lun.model.FileSaveResult import kr.lunaticbum.back.lun.model.LocationLogService -import kr.lunaticbum.back.lun.model.ResponceResult import kr.lunaticbum.back.lun.utils.LogService import kr.lunaticbum.back.lun.utils.getFileExtension import org.springframework.beans.factory.annotation.Autowired @@ -156,6 +157,13 @@ class BlogController() { // printWriter.flush() logService.log("imgUploadPath $imgUploadPath") logService.log("imgUploadPath ${File(imgUploadPath).exists()}") + val metadata: Metadata? = ImageMetadataReader.readMetadata(File(imgUploadPath)) + metadata?.let { + it.directories?.forEach { directory -> + logService.log(directory.name) + logService.log(directory.tags.map { tag -> logService.log("tag.tagName >>> ${tag.tagName} || tag.description ${tag.description}")}.joinToString(" \n")) + } + } } catch (e: IOException) { e.printStackTrace() } finally { diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Home.kt b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Home.kt new file mode 100644 index 0000000..5ddd011 --- /dev/null +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Home.kt @@ -0,0 +1,17 @@ +package kr.lunaticbum.back.lun.controllers + +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController +import org.springframework.web.servlet.ModelAndView + +@RestController +@RequestMapping() +class Home { + + @GetMapping("/","/home") + fun home() : ModelAndView { + val vm = ModelAndView("content/blog/write") + return vm + } +} \ No newline at end of file diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Telegram.kt b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Telegram.kt index 4ce18f2..1e994e8 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Telegram.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Telegram.kt @@ -17,6 +17,7 @@ import org.springframework.context.annotation.Bean import org.springframework.scheduling.annotation.Scheduled import org.springframework.web.bind.annotation.* import org.springframework.web.reactive.function.client.WebClient +import java.math.BigDecimal import java.text.SimpleDateFormat import java.util.* @@ -139,7 +140,7 @@ class Telegram { Gson().fromJson(result, CurrentWeather::class.java)?.let { sss -> val client = WebClient.create() client.get() - .uri("https://api.telegram.org/${globalEvv.telegramBotKey}/sendMessage?chat_id=${globalEvv.telegramMyId}&text=${sss.getSummaryInfo()}") + .uri("https://api.telegram.org/${globalEvv.telegramBotKey}/sendMessage?chat_id=${globalEvv.telegramMyId}&text=${sss.getSummaryInfo(BigDecimal(it.mLatitude).setScale(5).toString(),BigDecimal(it.mLongitude).setScale(5).toString())}") .retrieve() .bodyToMono(String::class.java).block() ?: "FAIL" } diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt index 1f55b4e..031ce9c 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt @@ -54,6 +54,7 @@ class UserController { logService.log(file.absolutePath) vm.modelMap.put(EncTypeKey,EncType11) vm.modelMap.put(ApiKeyWordKey,"JOIN") + vm.modelMap.put("title","회원이 들어는 구나~!!") return vm } @@ -120,7 +121,8 @@ class UserController { } } } - val responce = ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(ResponceResult().apply { + val responce = ResponseEntity.ok().headers { + }.contentType(MediaType.APPLICATION_JSON).body(ResponceResult().apply { this.resultCode = lResultCode this.resultMsg = lResultMsg }) diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/model/Weather.kt b/src/main/kotlin/kr/lunaticbum/back/lun/model/Weather.kt index 8099d5c..d4e38f7 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/model/Weather.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/model/Weather.kt @@ -52,7 +52,6 @@ class Location { class CurrentWeather { var location: Location? = null var current: Current? = null - - fun getSummaryInfo() = "지역:${this.location?.name}\n날씨:${this.current?.condition?.text}\n온도:${this.current?.temp_c}\n습도:${this.current?.humidity}\n" + - "체감온도:${this.current?.feelslike_c}\nhttps://www.accuweather.com/ko/search-locations?query=${this.location?.lat},${this.location?.lon}" + fun getSummaryInfo(lat : String,lon : String) = "지역:${this.location?.name}\n날씨:${this.current?.condition?.text}\n온도:${this.current?.temp_c}\n습도:${this.current?.humidity}\n" + + "체감온도:${this.current?.feelslike_c}\nhttps://www.accuweather.com/ko/search-locations?query=${lat},${lon}" } \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ed914b2..63002ed 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -26,6 +26,11 @@ spring.data.mongodb.database=l spring.thymeleaf.prefix=classpath:/templates/ spring.thymeleaf.suffix=.html spring.thymeleaf.enabled=true + +spring.servlet.multipart.max-file-size=1024MB +spring.servlet.multipart.max-request-size=1024MB +spring.servlet.multipart.enabled=true + # ?? ???? ??? ?? ? ?? ????. spring.devtools.livereload.enabled=true # thymeleaf? ?? ??? ??? ???. cache=false ??(???? true) diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 14c67fa..5e717fb 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -1,62 +1,87 @@ :root { - --WindowFull : 100%; + --WindowFull : 99vw; --TopHeight: 160px; --FooterHeight: 160px; --ContentVerticalMargin: 5px; + /*background-image: url("data:image/svg+xml,")*/ } -input, select ,button{ + +html { + margin: 1vh 1vw; + background: #202025ee; +} +body { + align-content: center; + padding: 1vh 1vw; + background-image: url("data:image/svg+xml,") +} + +body > *{ + align-content: center; color: white; - background: #2d2f34; - border: black; - border-width: 1px; - padding: 0; - margin: 0; - position: relative; + padding: 1vh 1vw; } -body, html { - background-color: black; - margin: 0px; - height: 100lvh; + +/*#main_layer {*/ +/* width: 100%;*/ +/* margin: 0 auto;*/ +/* position: relative;*/ +/* background: #F0F0F524;*/ +/* border-radius: 10px;*/ +/*}*/ + +input, select ,button { + align-content: center; + top: 0; + bottom: 0; + color: white; + background: #40404564; + position: relative; + outline-width: thin; + outline-color: #ec914b8f; + border-color: #ec914b8f; + border-style: groove; + border-width: 1px; } header { - width: 100%; - align-content: center; + top: 0; + background: #F0F0F524; + border-top: #ec914b8f; + border-radius: 10px 30px; + border-width: 1px; + height: 8vh; + min-height: 8vh; + display: flex; position: relative; - height: var(--TopHeight); - background-image: url("../blog/post/images/42cc3207-42a4-4ceb-8a2f-f5f7a89496fc.jpg"); - background-repeat: revert; - background-size: contain; - background-origin: revert; } -#content { - margin-left: 2.5%; - margin-right: 2.5%; +#main_layer { + margin: 1vw 1vh; position: relative; overflow-y: auto; overflow-x: clip; - background: black; - min-height: calc((var(--TopHeight) + var(--FooterHeight)) * 2); - height: calc(var(--WindowFull) - calc(var(--FooterHeight) + var(--TopHeight))); - background-image: url("../blog/post/images/bb109b5a-f907-4da1-9c4f-55533395ed6e.jpg"); - background-repeat: revert; - background-size: contain; - background-origin: revert; + height: 70vh; + min-height: 8vh; } +#main_layer > div { + position: relative; +} + + #content > * { - margin-top: var(--ContentVerticalMargin); - margin-bottom: var(--ContentVerticalMargin); + } footer { - width: 100%; - align-content: center; + display: flex; + bottom: 0; + border-top: #ec914b8f; + background: #F0F0F524; + border-radius: 30px 10px; + border-width: 1px; + height: 8vh; + min-height: 8vh; position: relative; - height: var(--FooterHeight); - background-image: url("../blog/post/images/42cc3207-42a4-4ceb-8a2f-f5f7a89496fc.jpg"); - background-repeat: revert; - background-size: contain; - transform: scaleY(-1); } \ No newline at end of file diff --git a/src/main/resources/static/css/toast-ui-dark.css b/src/main/resources/static/css/toast-ui-dark.css index 78c5949..8f5a390 100644 --- a/src/main/resources/static/css/toast-ui-dark.css +++ b/src/main/resources/static/css/toast-ui-dark.css @@ -6,11 +6,11 @@ .toastui-editor-dark .toastui-editor-md-container, .toastui-editor-dark .toastui-editor-ww-container { - background-color: #121212; + background-color: #12121288; } .toastui-editor-dark .toastui-editor-defaultUI-toolbar { - background-color: #232428; + background-color: #23242888; border-bottom-color: #303238; } @@ -20,20 +20,20 @@ } .toastui-editor-dark .toastui-editor-toolbar-icons:not(:disabled):hover { - background-color: #36383f; + background-color: #36383f88; border-color: #36383f; } .toastui-editor-dark .toastui-editor-toolbar-divider { - background-color: #303238; + background-color: #30323888; } .toastui-editor-dark .toastui-editor-tooltip { - background-color: #535662; + background-color: #53566288; } .toastui-editor-dark .toastui-editor-tooltip .arrow { - background-color: #535662; + background-color: #53566288; } .toastui-editor-dark .toastui-editor-defaultUI-toolbar .scroll-sync::before { @@ -45,23 +45,23 @@ } .toastui-editor-dark .toastui-editor-defaultUI-toolbar .switch { - background-color: #2b4455; + background-color: #2b445588; } .toastui-editor-dark .toastui-editor-defaultUI-toolbar input:checked + .switch { - background-color: #2b4455; + background-color: #2b445588; } .toastui-editor-dark .toastui-editor-defaultUI-toolbar .switch::before { - background-color: #8f939f; + background-color: #8f939f88; } .toastui-editor-dark .toastui-editor-defaultUI-toolbar input:checked + .switch::before { - background-color: #67ccff; + background-color: #67ccff88; } .toastui-editor-dark .toastui-editor-main .toastui-editor-md-splitter { - background-color: #303238; + background-color: #30323888; } .toastui-editor-dark .toastui-editor-mode-switch { @@ -71,25 +71,25 @@ .toastui-editor-dark .toastui-editor-mode-switch .tab-item { border-color: #393b42; - background-color: #232428; + background-color: #23242888; color: #757a86; } .toastui-editor-dark .toastui-editor-mode-switch .tab-item.active { border-top-color: #121212; - background-color: #121212; + background-color: #12121288; color: #eee; } .toastui-editor-dark .toastui-editor-popup, .toastui-editor-dark .toastui-editor-context-menu { - background-color: #121212; + background-color: #12121288; box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); border-color: #494c56; } .toastui-editor-dark .toastui-editor-popup-add-heading ul li:hover { - background-color: #36383f; + background-color: #36383f88; } .toastui-editor-dark .toastui-editor-popup-body label { @@ -133,7 +133,7 @@ .toastui-editor-dark .toastui-editor-popup-body .toastui-editor-file-select-button { border-color: #303238; - background-color: #232428; + background-color: #23242888; color: #eee; } @@ -144,7 +144,7 @@ .toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-close-button { color: #eee; border-color: #303238; - background-color: #232428; + background-color: #23242888; } .toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-close-button:hover { @@ -153,22 +153,22 @@ .toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-ok-button { color: #121212; - background-color: #67ccff; + background-color: #67ccff88; } .toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-ok-button:hover { color: #121212; - background-color: #32baff; + background-color: #32baff88; } .toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-cell { border-color: #303238; - background-color: #121212; + background-color: #12121288; } .toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-cell.header { border-color: #303238; - background-color: #232428; + background-color: #23242888; } .toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-selection-layer { @@ -181,19 +181,19 @@ } .toastui-editor-dark .toastui-editor-md-tab-container { - background-color: #232428; + background-color: #23242888; border-bottom-color: #303238; } .toastui-editor-dark .toastui-editor-md-tab-container .tab-item { border-color: #393b42; - background-color: #2d2f34; + background-color: #2d2f3488; color: #757a86; } .toastui-editor-dark .toastui-editor-md-tab-container .tab-item.active { border-bottom-color: #121212; - background-color: #121212; + background-color: #12121288; color: #eee; } @@ -208,7 +208,7 @@ } .toastui-editor-dark .toastui-editor-context-menu li:not(.disabled):hover { - background-color: #36383f; + background-color: #36383f88; } .toastui-editor-dark .toastui-editor-context-menu li.disabled { @@ -217,7 +217,7 @@ .toastui-editor-dark .toastui-editor-dropdown-toolbar { border-color: #494c56; - background-color: #232428; + background-color: #23242888; } .toastui-editor-dark .ProseMirror, @@ -251,7 +251,7 @@ } .toastui-editor-dark .toastui-editor-contents pre { - background-color: #232428; + background-color: #23242888; } .toastui-editor-dark .toastui-editor-contents pre code { @@ -261,7 +261,7 @@ .toastui-editor-dark .toastui-editor-contents code { color: #c1798b; - background-color: #35262a; + background-color: #35262a88; } .toastui-editor-dark .toastui-editor-contents div { @@ -270,7 +270,7 @@ .toastui-editor-dark .toastui-editor-ww-code-block-language { border-color: #303238; - background-color: #121212; + background-color: #12121288; } .toastui-editor-dark .toastui-editor-ww-code-block-language input { @@ -278,7 +278,7 @@ } .toastui-editor-dark .toastui-editor-contents .toastui-editor-ww-code-block:after { - background-color: #232428; + background-color: #23242888; border: 1px solid #393b42; color: #eee; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI1LjIuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IuugiOydtOyWtF8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiCgkgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMzAgMzAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMwIDMwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+Cgkuc3Qwe2ZpbGwtcnVsZTpldmVub2RkO2NsaXAtcnVsZTpldmVub2RkO2ZpbGw6I2ZmZjt9Cjwvc3R5bGU+CjxnPgoJPGc+CgkJPGc+CgkJCTxnPgoJCQkJPGc+CgkJCQkJPHBhdGggY2xhc3M9InN0MCIgZD0iTTE1LjUsMTIuNWwyLDJMMTIsMjBoLTJ2LTJMMTUuNSwxMi41eiBNMTgsMTBsMiwybC0xLjUsMS41bC0yLTJMMTgsMTB6Ii8+CgkJCQk8L2c+CgkJCTwvZz4KCQk8L2c+Cgk8L2c+CjwvZz4KPC9zdmc+Cg=='); @@ -296,13 +296,13 @@ } .toastui-editor-dark .toastui-editor-custom-block-view button { - background-color: #232428; + background-color: #23242888; border-color: #393b42; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI1LjIuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IuugiOydtOyWtF8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiCgkgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMzAgMzAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMwIDMwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+Cgkuc3Qwe2ZpbGwtcnVsZTpldmVub2RkO2NsaXAtcnVsZTpldmVub2RkO2ZpbGw6I2ZmZjt9Cjwvc3R5bGU+CjxnPgoJPGc+CgkJPGc+CgkJCTxnPgoJCQkJPGc+CgkJCQkJPHBhdGggY2xhc3M9InN0MCIgZD0iTTE1LjUsMTIuNWwyLDJMMTIsMjBoLTJ2LTJMMTUuNSwxMi41eiBNMTgsMTBsMiwybC0xLjUsMS41bC0yLTJMMTgsMTB6Ii8+CgkJCQk8L2c+CgkJCTwvZz4KCQk8L2c+Cgk8L2c+CjwvZz4KPC9zdmc+Cg=='); } .toastui-editor-dark .toastui-editor-custom-block-view button:hover { - background-color: #232428; + background-color: #23242888; border-color: #595c68; } @@ -320,7 +320,7 @@ } .toastui-editor-dark .toastui-editor-contents table th { - background-color: #3a3c42; + background-color: #3a3c4288; } .toastui-editor-dark .toastui-editor-contents table td, @@ -352,7 +352,7 @@ } .toastui-editor-dark .toastui-editor-contents ul > li::before { - background-color: #55575f; + background-color: #55575f88; } .toastui-editor-dark .toastui-editor-contents hr { @@ -369,7 +369,7 @@ .toastui-editor-dark .toastui-editor-contents .image-link:hover::before { border-color: #393b42; - background-color: #232428; + background-color: #23242888; background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyMCIgaGVpZ2h0PSIyMCIgdmlld0JveD0iMCAwIDIwIDIwIj4KICAgIDxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIj4KICAgICAgICA8ZyBzdHJva2U9IiNFRUUiIHN0cm9rZS13aWR0aD0iMS41Ij4KICAgICAgICAgICAgPGc+CiAgICAgICAgICAgICAgICA8Zz4KICAgICAgICAgICAgICAgICAgICA8cGF0aCBkPSJNNy42NjUgMTUuMDdsLTEuODE5LS4wMDJjLTEuNDg2IDAtMi42OTItMS4yMjgtMi42OTItMi43NDR2LS4xOTJjMC0xLjUxNSAxLjIwNi0yLjc0NCAyLjY5Mi0yLjc0NGgzLjg0NmMxLjQ4NyAwIDIuNjkyIDEuMjI5IDIuNjkyIDIuNzQ0di4xOTIiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDQ1IC0xNzQzKSB0cmFuc2xhdGUoMTA0MCAxNzM4KSB0cmFuc2xhdGUoNSA1KSBzY2FsZSgxIC0xKSByb3RhdGUoNDUgMzcuMjkzIDApIi8+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTEyLjMyNiA0LjkzNGwxLjgyMi4wMDJjMS40ODcgMCAyLjY5MyAxLjIyOCAyLjY5MyAyLjc0NHYuMTkyYzAgMS41MTUtMS4yMDYgMi43NDQtMi42OTMgMi43NDRoLTMuODQ1Yy0xLjQ4NyAwLTIuNjkyLTEuMjI5LTIuNjkyLTIuNzQ0VjcuNjgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDQ1IC0xNzQzKSB0cmFuc2xhdGUoMTA0MCAxNzM4KSB0cmFuc2xhdGUoNSA1KSBzY2FsZSgxIC0xKSByb3RhdGUoNDUgMzAuOTk2IDApIi8+CiAgICAgICAgICAgICAgICA8L2c+CiAgICAgICAgICAgIDwvZz4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPgo='); box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08); } @@ -424,11 +424,11 @@ } .toastui-editor-dark .toastui-editor-md-code { - background-color: #35262a; + background-color: #35262a88; } .toastui-editor-dark .toastui-editor-md-code-block-line-background { - background-color: #232428; + background-color: #23242888; } .toastui-editor-dark .toastui-editor-md-code-block .toastui-editor-md-meta { @@ -440,7 +440,7 @@ } .toastui-editor-dark .toastui-editor-md-custom-block-line-background { - background-color: #392d31; + background-color: #392d3188; } .toastui-editor-dark .toastui-editor-md-custom-block .toastui-editor-md-delimiter { diff --git a/src/main/resources/templates/content/blog/viewer.html b/src/main/resources/templates/content/blog/viewer.html index 96f3c7a..e328c5e 100644 --- a/src/main/resources/templates/content/blog/viewer.html +++ b/src/main/resources/templates/content/blog/viewer.html @@ -4,7 +4,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/default_layout}" > - + @@ -49,8 +49,8 @@ console.log(editor.getHTML()) } - -
+ +
@@ -60,5 +60,5 @@
-
+ diff --git a/src/main/resources/templates/content/blog/write.html b/src/main/resources/templates/content/blog/write.html index 7b32e75..3c67df7 100644 --- a/src/main/resources/templates/content/blog/write.html +++ b/src/main/resources/templates/content/blog/write.html @@ -4,8 +4,8 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/default_layout}" > - - + + @@ -22,7 +22,7 @@ console.log(style.getPropertyValue('--FooterHeight')) console.log(style.getPropertyValue('--TopHeight')) var editorHeght = ( - document.querySelector('#content').getBoundingClientRect().height - + document.querySelector('#main_layer').getBoundingClientRect().height - ( Number(style.getPropertyValue('--ButtonHegit').replace("px","") * 3) + Number(style.getPropertyValue('--TopHeight').replace("px","")) @@ -32,7 +32,7 @@ editor = new toastui.Editor({ el: document.querySelector('#editor'), previewStyle: 'tab', - height: editorHeght+ 'px', + height: editorHeght + 'px', width:'95%', theme:'dark', usageStatistics : false, @@ -91,18 +91,18 @@ console.log(editor.getHTML()) } - -
-
- + + +
+
+ +
+
+
+ + + +
-
-
- - -
-
- -
-
+ diff --git a/src/main/resources/templates/content/user/join.html b/src/main/resources/templates/content/user/join.html index 7ba6f91..01eb4ff 100644 --- a/src/main/resources/templates/content/user/join.html +++ b/src/main/resources/templates/content/user/join.html @@ -4,7 +4,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/default_layout}" > - + - -
- + + +
@@ -30,5 +30,5 @@

회원가입
-
+ \ No newline at end of file diff --git a/src/main/resources/templates/content/user/login.html b/src/main/resources/templates/content/user/login.html index 8f49afa..fccc952 100644 --- a/src/main/resources/templates/content/user/login.html +++ b/src/main/resources/templates/content/user/login.html @@ -4,28 +4,25 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/default_layout}"> - + Spring Boot - - - - +> -
+
- +
아이디
비밀번호
diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index 5e4da93..0da8044 100644 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -1,6 +1,6 @@ -
- asdasdasd -
+ +
+ \ No newline at end of file diff --git a/src/main/resources/templates/fragments/head.html b/src/main/resources/templates/fragments/head.html deleted file mode 100644 index 27386a3..0000000 --- a/src/main/resources/templates/fragments/head.html +++ /dev/null @@ -1,4 +0,0 @@ - -
-
- \ No newline at end of file diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html index 1346e69..c4f2285 100644 --- a/src/main/resources/templates/fragments/header.html +++ b/src/main/resources/templates/fragments/header.html @@ -1,6 +1,8 @@ -
- header.html -
+ +
+ +
+ \ No newline at end of file diff --git a/src/main/resources/templates/fragments/includes.html b/src/main/resources/templates/fragments/includes.html new file mode 100644 index 0000000..f4cd19c --- /dev/null +++ b/src/main/resources/templates/fragments/includes.html @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/title.html b/src/main/resources/templates/fragments/title.html new file mode 100644 index 0000000..239a18a --- /dev/null +++ b/src/main/resources/templates/fragments/title.html @@ -0,0 +1,6 @@ + + + + Bum's + + \ No newline at end of file diff --git a/src/main/resources/templates/layout/default_layout.html b/src/main/resources/templates/layout/default_layout.html index 751fe07..2ae77ce 100644 --- a/src/main/resources/templates/layout/default_layout.html +++ b/src/main/resources/templates/layout/default_layout.html @@ -1,24 +1,24 @@ - - + - - - - - - - + + + + + + + -
- -
- -
+ + + + + + + \ No newline at end of file