From a0e5a03052443ff6c3d2e1a8ddd859fcd9c2370f Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Tue, 9 Jun 2020 10:34:24 +0000 Subject: [PATCH] DRY html modal and head --- src/util.cr | 1 + src/views/components/entry-modal.ecr | 34 ++++++++++++++++++++++++++++ src/views/components/head.ecr | 14 ++++++++++++ src/views/home.ecr | 27 +--------------------- src/views/layout.ecr | 15 +----------- src/views/login.ecr | 14 ++---------- src/views/reader.ecr | 12 ++-------- src/views/title.ecr | 30 +----------------------- 8 files changed, 56 insertions(+), 91 deletions(-) create mode 100644 src/views/components/entry-modal.ecr create mode 100644 src/views/components/head.ecr diff --git a/src/util.cr b/src/util.cr index 901036a..3397aeb 100644 --- a/src/util.cr +++ b/src/util.cr @@ -10,6 +10,7 @@ macro layout(name) if token = env.session.string? "token" is_admin = @context.storage.verify_admin token end + page = {{name}} render "src/views/#{{{name}}}.ecr", "src/views/layout.ecr" rescue e message = e.to_s diff --git a/src/views/components/entry-modal.ecr b/src/views/components/entry-modal.ecr new file mode 100644 index 0000000..c064f4c --- /dev/null +++ b/src/views/components/entry-modal.ecr @@ -0,0 +1,34 @@ + diff --git a/src/views/components/head.ecr b/src/views/components/head.ecr new file mode 100644 index 0000000..cbcbc07 --- /dev/null +++ b/src/views/components/head.ecr @@ -0,0 +1,14 @@ + + + + Mango + + + + + + + + + + diff --git a/src/views/home.ecr b/src/views/home.ecr index 0b361e1..04f1bb8 100644 --- a/src/views/home.ecr +++ b/src/views/home.ecr @@ -57,32 +57,7 @@ <%- end -%> - - +<%= render_component "entry-modal" %> <%- end -%> diff --git a/src/views/layout.ecr b/src/views/layout.ecr index 166b053..8242be5 100644 --- a/src/views/layout.ecr +++ b/src/views/layout.ecr @@ -1,20 +1,7 @@ - - - - Mango - - - - - - - - - - +<%= render_component "head" %>
diff --git a/src/views/login.ecr b/src/views/login.ecr index b4ef4a9..264395b 100644 --- a/src/views/login.ecr +++ b/src/views/login.ecr @@ -1,17 +1,7 @@ - - - - Mango - - - - - - - +<%= render_component "head" %>
@@ -43,4 +33,4 @@ - \ No newline at end of file + diff --git a/src/views/reader.ecr b/src/views/reader.ecr index f402b39..d62513c 100644 --- a/src/views/reader.ecr +++ b/src/views/reader.ecr @@ -1,15 +1,7 @@ - - - - Mango - - - - - +<%= render_component "head" %> @@ -67,4 +59,4 @@ - \ No newline at end of file + diff --git a/src/views/title.ecr b/src/views/title.ecr index 77280f5..d6f70b0 100644 --- a/src/views/title.ecr +++ b/src/views/title.ecr @@ -42,35 +42,7 @@ <% end %>
- +<%= render_component "entry-modal" %>