From 22b70c0c36824fd004c38365aaa549c903b2b110 Mon Sep 17 00:00:00 2001 From: Radgab Date: Wed, 24 May 2023 17:01:16 +0300 Subject: [PATCH 1/9] [#153] add footer login page --- src/main/resources/templates/login.html | 92 ++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index e5e4627a..9fa4b21a 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -28,6 +28,96 @@ - + From ed651dd220e4cc3d73ebb0106ee996e4337bf1af Mon Sep 17 00:00:00 2001 From: amirhraj Date: Thu, 1 Jun 2023 16:00:33 +0300 Subject: [PATCH 2/9] [#153 add footer in login and signup] --- .../resources/templates/account/signup.html | 2 +- .../resources/templates/fragments/footer.html | 96 ++++++++++ src/main/resources/templates/index.html | 181 +++++++++--------- src/main/resources/templates/login.html | 92 +-------- 4 files changed, 189 insertions(+), 182 deletions(-) create mode 100644 src/main/resources/templates/fragments/footer.html diff --git a/src/main/resources/templates/account/signup.html b/src/main/resources/templates/account/signup.html index 602176e1..4dd21003 100644 --- a/src/main/resources/templates/account/signup.html +++ b/src/main/resources/templates/account/signup.html @@ -84,6 +84,6 @@ - +
diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html new file mode 100644 index 00000000..3d47f052 --- /dev/null +++ b/src/main/resources/templates/fragments/footer.html @@ -0,0 +1,96 @@ + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 9e4b8376..cacefedf 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -28,97 +28,98 @@

Hexlet Typo Reporter

- diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 9fa4b21a..22686569 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -28,96 +28,6 @@ - +
From 334be3c65e846db631e8e8150c518a200ff6d5b0 Mon Sep 17 00:00:00 2001 From: Radgab Date: Thu, 1 Jun 2023 16:06:41 +0300 Subject: [PATCH 3/9] [#153] add fotter --- src/main/resources/templates/login.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 22686569..3802e91b 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -29,5 +29,6 @@
+ From cbb9ba44dab84d3674364c3dcee770509063c80e Mon Sep 17 00:00:00 2001 From: Radgab Date: Mon, 5 Jun 2023 14:11:27 +0300 Subject: [PATCH 4/9] [#153] add footer --- src/main/resources/templates/account/acc-info.html | 1 + src/main/resources/templates/account/pass-update.html | 1 + src/main/resources/templates/account/prof-update.html | 1 + src/main/resources/templates/create-workspace.html | 1 + src/main/resources/templates/error-general.html | 1 + src/main/resources/templates/login.html | 1 - src/main/resources/templates/widget/report-typo-error.html | 1 + src/main/resources/templates/widget/report-typo-success.html | 1 + src/main/resources/templates/widget/typo-form.html | 1 + src/main/resources/templates/workspace/wks-info.html | 1 + src/main/resources/templates/workspace/wks-settings.html | 1 + src/main/resources/templates/workspace/wks-typos.html | 1 + src/main/resources/templates/workspace/wks-update.html | 1 + src/main/resources/templates/workspace/wks-users.html | 1 + src/main/resources/templates/workspaces.html | 1 + 15 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/resources/templates/account/acc-info.html b/src/main/resources/templates/account/acc-info.html index 1e3d3839..d20ad2b3 100644 --- a/src/main/resources/templates/account/acc-info.html +++ b/src/main/resources/templates/account/acc-info.html @@ -54,5 +54,6 @@
Workspaces
+
diff --git a/src/main/resources/templates/account/pass-update.html b/src/main/resources/templates/account/pass-update.html index fc25b57b..dd3dfe91 100644 --- a/src/main/resources/templates/account/pass-update.html +++ b/src/main/resources/templates/account/pass-update.html @@ -37,5 +37,6 @@ +
diff --git a/src/main/resources/templates/account/prof-update.html b/src/main/resources/templates/account/prof-update.html index e323b5d6..665d040b 100644 --- a/src/main/resources/templates/account/prof-update.html +++ b/src/main/resources/templates/account/prof-update.html @@ -48,5 +48,6 @@ +
diff --git a/src/main/resources/templates/create-workspace.html b/src/main/resources/templates/create-workspace.html index 2a38070e..8e912479 100644 --- a/src/main/resources/templates/create-workspace.html +++ b/src/main/resources/templates/create-workspace.html @@ -35,5 +35,6 @@ +
diff --git a/src/main/resources/templates/error-general.html b/src/main/resources/templates/error-general.html index bf6e7a0f..65824dff 100644 --- a/src/main/resources/templates/error-general.html +++ b/src/main/resources/templates/error-general.html @@ -5,5 +5,6 @@
Во время работы произошла ошибка. Попробуйте позже.
+
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 3802e91b..22686569 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -29,6 +29,5 @@
- diff --git a/src/main/resources/templates/widget/report-typo-error.html b/src/main/resources/templates/widget/report-typo-error.html index 16972b7e..e2ead7be 100755 --- a/src/main/resources/templates/widget/report-typo-error.html +++ b/src/main/resources/templates/widget/report-typo-error.html @@ -5,5 +5,6 @@
Во время отправки произошла ошибка. Попробуйте позже.
+
diff --git a/src/main/resources/templates/widget/report-typo-success.html b/src/main/resources/templates/widget/report-typo-success.html index 10cf6b9d..275a8210 100755 --- a/src/main/resources/templates/widget/report-typo-success.html +++ b/src/main/resources/templates/widget/report-typo-success.html @@ -5,5 +5,6 @@
Сообщение об ошибке успешно отправлено. Спасибо!
+
diff --git a/src/main/resources/templates/widget/typo-form.html b/src/main/resources/templates/widget/typo-form.html index 7afb601b..49b24e2d 100755 --- a/src/main/resources/templates/widget/typo-form.html +++ b/src/main/resources/templates/widget/typo-form.html @@ -45,5 +45,6 @@ } }; +
diff --git a/src/main/resources/templates/workspace/wks-info.html b/src/main/resources/templates/workspace/wks-info.html index e87ea1de..6d8c4e26 100644 --- a/src/main/resources/templates/workspace/wks-info.html +++ b/src/main/resources/templates/workspace/wks-info.html @@ -54,5 +54,6 @@
+
diff --git a/src/main/resources/templates/workspace/wks-settings.html b/src/main/resources/templates/workspace/wks-settings.html index 1ab3e9ff..b55a5fde 100644 --- a/src/main/resources/templates/workspace/wks-settings.html +++ b/src/main/resources/templates/workspace/wks-settings.html @@ -50,5 +50,6 @@ +
diff --git a/src/main/resources/templates/workspace/wks-typos.html b/src/main/resources/templates/workspace/wks-typos.html index 15af5e12..4756973d 100644 --- a/src/main/resources/templates/workspace/wks-typos.html +++ b/src/main/resources/templates/workspace/wks-typos.html @@ -168,5 +168,6 @@ +
diff --git a/src/main/resources/templates/workspace/wks-update.html b/src/main/resources/templates/workspace/wks-update.html index 71166c4b..206783b4 100644 --- a/src/main/resources/templates/workspace/wks-update.html +++ b/src/main/resources/templates/workspace/wks-update.html @@ -59,5 +59,6 @@ +
diff --git a/src/main/resources/templates/workspace/wks-users.html b/src/main/resources/templates/workspace/wks-users.html index 69283171..c606f332 100644 --- a/src/main/resources/templates/workspace/wks-users.html +++ b/src/main/resources/templates/workspace/wks-users.html @@ -135,5 +135,6 @@ +
diff --git a/src/main/resources/templates/workspaces.html b/src/main/resources/templates/workspaces.html index d12835dd..81f75292 100644 --- a/src/main/resources/templates/workspaces.html +++ b/src/main/resources/templates/workspaces.html @@ -18,5 +18,6 @@
+
From bd31505439ffb76b6413bc7de981022c543c554f Mon Sep 17 00:00:00 2001 From: Radgab Date: Sun, 11 Jun 2023 22:59:30 +0300 Subject: [PATCH 5/9] [#153] fix footer class --- src/main/resources/templates/fragments/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index 3d47f052..49880f63 100644 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -1,7 +1,7 @@ -
+
From 5e6fca80934c321fae142cc7ff5f2fa70cf018a8 Mon Sep 17 00:00:00 2001 From: Radgab Date: Sun, 11 Jun 2023 23:12:24 +0300 Subject: [PATCH 6/9] [#153] fix footer class --- src/main/resources/templates/widget/report-typo-success.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/templates/widget/report-typo-success.html b/src/main/resources/templates/widget/report-typo-success.html index 275a8210..10cf6b9d 100755 --- a/src/main/resources/templates/widget/report-typo-success.html +++ b/src/main/resources/templates/widget/report-typo-success.html @@ -5,6 +5,5 @@
Сообщение об ошибке успешно отправлено. Спасибо!
-
From 99819c71fe1637a6b086a281411f88f6d5f7d5cb Mon Sep 17 00:00:00 2001 From: Radgab Date: Sun, 11 Jun 2023 23:13:53 +0300 Subject: [PATCH 7/9] [#153] fix footer class --- src/main/resources/templates/widget/typo-form.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/templates/widget/typo-form.html b/src/main/resources/templates/widget/typo-form.html index 49b24e2d..7afb601b 100755 --- a/src/main/resources/templates/widget/typo-form.html +++ b/src/main/resources/templates/widget/typo-form.html @@ -45,6 +45,5 @@ } }; -
From bd9ba88b9c400671e6e1db60879141faaf73dd2c Mon Sep 17 00:00:00 2001 From: Radgab Date: Sat, 15 Jul 2023 18:27:10 +0300 Subject: [PATCH 8/9] [#153] add foooter fragments --- pom.xml | 5 + .../thymeleaf/ThymeleafAutoConfiguration.java | 5 + .../resources/templates/account/acc-info.html | 5 +- .../templates/account/pass-update.html | 5 +- .../templates/account/prof-update.html | 5 +- .../resources/templates/account/signup.html | 6 +- .../resources/templates/create-workspace.html | 5 +- .../resources/templates/error-general.html | 5 +- .../resources/templates/fragments/footer.html | 188 +++++++++--------- .../resources/templates/fragments/layout.html | 96 +++++++++ src/main/resources/templates/login.html | 7 +- .../templates/widget/report-typo-error.html | 6 +- .../templates/workspace/wks-info.html | 5 +- .../templates/workspace/wks-settings.html | 5 +- .../templates/workspace/wks-typos.html | 5 +- .../templates/workspace/wks-update.html | 5 +- .../templates/workspace/wks-users.html | 6 +- src/main/resources/templates/workspaces.html | 5 +- 18 files changed, 249 insertions(+), 120 deletions(-) create mode 100644 src/main/resources/templates/fragments/layout.html diff --git a/pom.xml b/pom.xml index 08b1e839..a4f2ecb7 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,11 @@ org.springframework.boot spring-boot-starter-web + + nz.net.ultraq.thymeleaf + thymeleaf-layout-dialect + 3.2.0 + org.springframework.boot diff --git a/src/main/java/io/hexlet/typoreporter/config/thymeleaf/ThymeleafAutoConfiguration.java b/src/main/java/io/hexlet/typoreporter/config/thymeleaf/ThymeleafAutoConfiguration.java index e548214a..d64bfe92 100644 --- a/src/main/java/io/hexlet/typoreporter/config/thymeleaf/ThymeleafAutoConfiguration.java +++ b/src/main/java/io/hexlet/typoreporter/config/thymeleaf/ThymeleafAutoConfiguration.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Configuration; import org.thymeleaf.dialect.springdata.SpringDataDialect; import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect; +// import nz.net.ultraq.thymeleaf.LayoutDialect; @Configuration public class ThymeleafAutoConfiguration { @@ -12,6 +13,10 @@ public class ThymeleafAutoConfiguration { public SpringDataDialect springDataDialect() { return new SpringDataDialect(); } + // @Bean + // public LayoutDialect layoutDialect() { + // return new LayoutDialect(); + // } // Make available Thymeleaf Spring Security Dialect on the templates @Bean diff --git a/src/main/resources/templates/account/acc-info.html b/src/main/resources/templates/account/acc-info.html index d20ad2b3..71821f5c 100644 --- a/src/main/resources/templates/account/acc-info.html +++ b/src/main/resources/templates/account/acc-info.html @@ -1,5 +1,7 @@ - + @@ -54,6 +56,5 @@
Workspaces
-
diff --git a/src/main/resources/templates/account/pass-update.html b/src/main/resources/templates/account/pass-update.html index dd3dfe91..9461981b 100644 --- a/src/main/resources/templates/account/pass-update.html +++ b/src/main/resources/templates/account/pass-update.html @@ -1,5 +1,7 @@ - + @@ -37,6 +39,5 @@
-
diff --git a/src/main/resources/templates/account/prof-update.html b/src/main/resources/templates/account/prof-update.html index 665d040b..6de66ea2 100644 --- a/src/main/resources/templates/account/prof-update.html +++ b/src/main/resources/templates/account/prof-update.html @@ -1,5 +1,7 @@ - + @@ -48,6 +50,5 @@
-
diff --git a/src/main/resources/templates/account/signup.html b/src/main/resources/templates/account/signup.html index 4dd21003..76e0f8e5 100644 --- a/src/main/resources/templates/account/signup.html +++ b/src/main/resources/templates/account/signup.html @@ -1,5 +1,7 @@ - + @@ -84,6 +86,6 @@ -
+ diff --git a/src/main/resources/templates/create-workspace.html b/src/main/resources/templates/create-workspace.html index 8e912479..64e434f5 100644 --- a/src/main/resources/templates/create-workspace.html +++ b/src/main/resources/templates/create-workspace.html @@ -1,5 +1,7 @@ - + @@ -35,6 +37,5 @@ -
diff --git a/src/main/resources/templates/error-general.html b/src/main/resources/templates/error-general.html index 65824dff..e6533b61 100644 --- a/src/main/resources/templates/error-general.html +++ b/src/main/resources/templates/error-general.html @@ -1,10 +1,11 @@ - +
Во время работы произошла ошибка. Попробуйте позже.
-
diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index 49880f63..1c84c0cd 100644 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -1,96 +1,100 @@ - - - - +
+ + + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/layout.html b/src/main/resources/templates/fragments/layout.html new file mode 100644 index 00000000..55ed9e3a --- /dev/null +++ b/src/main/resources/templates/fragments/layout.html @@ -0,0 +1,96 @@ + + +
+
+
+
+ +

© Hexlet

+ + +
+
+

Помощь

+ +
+
+

Другие open-source проекты

+ +
+
+

Дополнительно

+ +
+
+
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 22686569..63ab4956 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,5 +1,9 @@ - + + @@ -28,6 +32,5 @@ -
diff --git a/src/main/resources/templates/widget/report-typo-error.html b/src/main/resources/templates/widget/report-typo-error.html index e2ead7be..0e66bd0b 100755 --- a/src/main/resources/templates/widget/report-typo-error.html +++ b/src/main/resources/templates/widget/report-typo-error.html @@ -1,10 +1,12 @@ - +
Во время отправки произошла ошибка. Попробуйте позже.
-
+ diff --git a/src/main/resources/templates/workspace/wks-info.html b/src/main/resources/templates/workspace/wks-info.html index 6d8c4e26..f93715c6 100644 --- a/src/main/resources/templates/workspace/wks-info.html +++ b/src/main/resources/templates/workspace/wks-info.html @@ -1,5 +1,7 @@ - + @@ -54,6 +56,5 @@
-
diff --git a/src/main/resources/templates/workspace/wks-settings.html b/src/main/resources/templates/workspace/wks-settings.html index b55a5fde..f0ea744f 100644 --- a/src/main/resources/templates/workspace/wks-settings.html +++ b/src/main/resources/templates/workspace/wks-settings.html @@ -1,5 +1,7 @@ - + @@ -50,6 +52,5 @@ -
diff --git a/src/main/resources/templates/workspace/wks-typos.html b/src/main/resources/templates/workspace/wks-typos.html index 4756973d..c9a0265f 100644 --- a/src/main/resources/templates/workspace/wks-typos.html +++ b/src/main/resources/templates/workspace/wks-typos.html @@ -1,5 +1,7 @@ - + @@ -168,6 +170,5 @@ -
diff --git a/src/main/resources/templates/workspace/wks-update.html b/src/main/resources/templates/workspace/wks-update.html index 206783b4..2a7c4ae7 100644 --- a/src/main/resources/templates/workspace/wks-update.html +++ b/src/main/resources/templates/workspace/wks-update.html @@ -1,5 +1,7 @@ - + @@ -59,6 +61,5 @@ -
diff --git a/src/main/resources/templates/workspace/wks-users.html b/src/main/resources/templates/workspace/wks-users.html index c606f332..978f921c 100644 --- a/src/main/resources/templates/workspace/wks-users.html +++ b/src/main/resources/templates/workspace/wks-users.html @@ -1,5 +1,8 @@ - + @@ -135,6 +138,5 @@ -
diff --git a/src/main/resources/templates/workspaces.html b/src/main/resources/templates/workspaces.html index 81f75292..c2c37650 100644 --- a/src/main/resources/templates/workspaces.html +++ b/src/main/resources/templates/workspaces.html @@ -1,5 +1,7 @@ - + @@ -18,6 +20,5 @@
-
From 97873b7dc6668c74cf2d8b1f6bae8148ac418ea0 Mon Sep 17 00:00:00 2001 From: Radgab Date: Sat, 15 Jul 2023 18:49:26 +0300 Subject: [PATCH 9/9] [#153] add layout fragments --- .../resources/templates/account/acc-info.html | 3 +- .../templates/account/pass-update.html | 3 +- .../templates/account/prof-update.html | 3 +- .../resources/templates/account/signup.html | 3 +- .../resources/templates/create-workspace.html | 3 +- .../resources/templates/error-general.html | 3 +- .../resources/templates/fragments/layout.html | 191 ++++++++++-------- src/main/resources/templates/index.html | 1 - src/main/resources/templates/login.html | 4 +- .../templates/widget/report-typo-error.html | 3 +- .../templates/workspace/wks-info.html | 4 +- .../templates/workspace/wks-settings.html | 3 +- .../templates/workspace/wks-typos.html | 4 +- .../templates/workspace/wks-update.html | 3 +- .../templates/workspace/wks-users.html | 3 +- src/main/resources/templates/workspaces.html | 3 +- 16 files changed, 119 insertions(+), 118 deletions(-) diff --git a/src/main/resources/templates/account/acc-info.html b/src/main/resources/templates/account/acc-info.html index 71821f5c..38743cc4 100644 --- a/src/main/resources/templates/account/acc-info.html +++ b/src/main/resources/templates/account/acc-info.html @@ -1,8 +1,7 @@ - +layout:decorate="~{fragments/layout.html}">
diff --git a/src/main/resources/templates/account/pass-update.html b/src/main/resources/templates/account/pass-update.html index 9461981b..5c67eb05 100644 --- a/src/main/resources/templates/account/pass-update.html +++ b/src/main/resources/templates/account/pass-update.html @@ -1,8 +1,7 @@ - +layout:decorate="~{fragments/layout.html}">
diff --git a/src/main/resources/templates/account/prof-update.html b/src/main/resources/templates/account/prof-update.html index 6de66ea2..f3f298d4 100644 --- a/src/main/resources/templates/account/prof-update.html +++ b/src/main/resources/templates/account/prof-update.html @@ -1,8 +1,7 @@ - +layout:decorate="~{fragments/layout.html}">
diff --git a/src/main/resources/templates/account/signup.html b/src/main/resources/templates/account/signup.html index 76e0f8e5..6794df58 100644 --- a/src/main/resources/templates/account/signup.html +++ b/src/main/resources/templates/account/signup.html @@ -1,8 +1,7 @@ - +layout:decorate="~{fragments/layout.html}">
diff --git a/src/main/resources/templates/create-workspace.html b/src/main/resources/templates/create-workspace.html index 64e434f5..82a2650d 100644 --- a/src/main/resources/templates/create-workspace.html +++ b/src/main/resources/templates/create-workspace.html @@ -1,8 +1,7 @@ - +layout:decorate="~{fragments/layout.html}">
diff --git a/src/main/resources/templates/error-general.html b/src/main/resources/templates/error-general.html index e6533b61..84b88465 100644 --- a/src/main/resources/templates/error-general.html +++ b/src/main/resources/templates/error-general.html @@ -1,8 +1,7 @@ - +layout:decorate="~{fragments/layout.html}">
Во время работы произошла ошибка. Попробуйте позже. diff --git a/src/main/resources/templates/fragments/layout.html b/src/main/resources/templates/fragments/layout.html index 55ed9e3a..ab84572e 100644 --- a/src/main/resources/templates/fragments/layout.html +++ b/src/main/resources/templates/fragments/layout.html @@ -1,96 +1,111 @@
-
-
-
- -

© Hexlet

- - -
-
-

Помощь

- -
-
-

Другие open-source проекты

- -
-
-

Дополнительно

- + + + + + + Hexlet Typo Reporter + + + + + + +
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index cacefedf..880dac4f 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -29,7 +29,6 @@

Hexlet Typo Reporter

-