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 74c9c32..b5ca32b 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt @@ -32,7 +32,7 @@ class UserController { @GetMapping("/join") fun hello(httpServletRequest: HttpServletRequest): ModelAndView { logService.log("onJoin") - val vm = ModelAndView() + val vm = ModelAndView("/content/user/join") when(System.currentTimeMillis() % 5L) { 0L -> vm.modelMap.put("ENC","T4") 1L -> vm.modelMap.put("ENC","T3") diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5c76b81..b1a8de0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -25,6 +25,12 @@ spring.data.mongodb.authentication-database=admin spring.data.mongodb.database=l spring.thymeleaf.prefix=classpath:/templates/ spring.thymeleaf.suffix=.html +# ?? ???? ??? ?? ? ?? ????. +spring.devtools.livereload.enabled=true +# thymeleaf? ?? ??? ??? ???. cache=false ??(???? true) +spring.thymeleaf.cache=false +# templates ????? ??? ??? ??? ??, ??? ??? ?????. +spring.thymeleaf.check-template-location=true telegram.bot.key=1 telegram.my.id=2 telegram.target.id=3 diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css new file mode 100644 index 0000000..495608d --- /dev/null +++ b/src/main/resources/static/css/common.css @@ -0,0 +1,17 @@ +body, html { + height: 100%; +} + +.header { + background-color: Gray; + height: 20% +} + +.content { + height:60%; +} + +.footer { + background-color: yellow; + height: 20% +} \ No newline at end of file diff --git a/src/main/resources/templates/content/home.html b/src/main/resources/templates/content/home.html new file mode 100644 index 0000000..acb4780 --- /dev/null +++ b/src/main/resources/templates/content/home.html @@ -0,0 +1,22 @@ + + + + + Spring Boot + + + + + + + +
+

This is Content

+
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/content/user/join.html b/src/main/resources/templates/content/user/join.html new file mode 100644 index 0000000..f17d82b --- /dev/null +++ b/src/main/resources/templates/content/user/join.html @@ -0,0 +1,48 @@ + + + + + Spring Boot + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +

회원가입

아이디
비밀번호
비밀번호 확인
이름
생년월일
이메일
@ + +
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html new file mode 100644 index 0000000..c3d4cb3 --- /dev/null +++ b/src/main/resources/templates/fragments/footer.html @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html new file mode 100644 index 0000000..efa95eb --- /dev/null +++ b/src/main/resources/templates/fragments/header.html @@ -0,0 +1,5 @@ + +
+

Header

+
+ \ 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 new file mode 100644 index 0000000..2b83b96 --- /dev/null +++ b/src/main/resources/templates/layout/default_layout.html @@ -0,0 +1,15 @@ + + + + + +
+
+ +
+ +
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/user/join.html b/src/main/resources/templates/user/join.html deleted file mode 100644 index f229c8d..0000000 --- a/src/main/resources/templates/user/join.html +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - Join - - - - - - - - - - - - - - - - - - - - - - - - -

회원가입

아이디
비밀번호
비밀번호 확인
이름
생년월일
이메일
@ - -
- - - \ No newline at end of file