diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/guff/handlers.cr | 8 | ||||
| -rw-r--r-- | src/guff/views/blog/list-item.cr | 7 | ||||
| -rw-r--r-- | src/guff/views/blog/list.cr | 2 | ||||
| -rw-r--r-- | src/guff/views/posts/blog.cr (renamed from src/guff/views/blog/post.cr) | 4 | ||||
| -rw-r--r-- | src/guff/views/posts/page.cr (renamed from src/guff/views/page.cr) | 6 | ||||
| -rw-r--r-- | src/guff/views/posts/project.cr | 13 | ||||
| -rw-r--r-- | src/guff/views/project.cr | 13 |
7 files changed, 23 insertions, 30 deletions
diff --git a/src/guff/handlers.cr b/src/guff/handlers.cr index 8c3e550..ce52b6a 100644 --- a/src/guff/handlers.cr +++ b/src/guff/handlers.cr @@ -357,7 +357,7 @@ module Guff::Handlers context.response.content_type = "text/html; charset=utf-8" context.response.status_code = 200 - Views::PageView.new(@context, r).to_s(context.response) + Views::Posts::Page.new(@context, r).to_s(context.response) else # unknown page call_next(context) @@ -400,7 +400,7 @@ module Guff::Handlers context.response.content_type = "text/html; charset=utf-8" context.response.status_code = 200 - Views::ProjectView.new(@context, r).to_s(context.response) + Views::Posts::Project.new(@context, r).to_s(context.response) else # redirect to project context.response.headers["location"] = path + "/" @@ -451,7 +451,7 @@ module Guff::Handlers context.response.content_type = "text/html; charset=utf-8" context.response.status_code = 200 - Views::Blog::PostView.new(@context, site_id, r).to_s(context.response) + Views::Posts::Blog.new(@context, site_id, r).to_s(context.response) else # unknown page call_next(context) @@ -505,7 +505,7 @@ module Guff::Handlers context.response.content_type = "text/html; charset=utf-8" context.response.status_code = 200 - Views::Blog::ListView.new(@context, site_id, r).to_s(context.response) + Views::Blog::List.new(@context, site_id, r).to_s(context.response) else # unknown page call_next(context) diff --git a/src/guff/views/blog/list-item.cr b/src/guff/views/blog/list-item.cr deleted file mode 100644 index 12add51..0000000 --- a/src/guff/views/blog/list-item.cr +++ /dev/null @@ -1,7 +0,0 @@ -class Guff::Views::Blog::ListItemView < Guff::Views::HTMLView - def initialize(context : Context, @item : Hash(String, String)) - super(context) - end - - ECR.def_to_s("src/views/blog/list-item.ecr") -end diff --git a/src/guff/views/blog/list.cr b/src/guff/views/blog/list.cr index 00bd587..f97aea6 100644 --- a/src/guff/views/blog/list.cr +++ b/src/guff/views/blog/list.cr @@ -3,7 +3,7 @@ require "../template-html" # # TODO: add y/m/d/page # -class Guff::Views::Blog::ListView < Guff::Views::TemplateHTMLView +class Guff::Views::Blog::List < Guff::Views::TemplateHTMLView TITLE = "Blog List" def initialize( diff --git a/src/guff/views/blog/post.cr b/src/guff/views/posts/blog.cr index 4bc5282..6634bca 100644 --- a/src/guff/views/blog/post.cr +++ b/src/guff/views/posts/blog.cr @@ -1,6 +1,6 @@ require "../template-html" -class Guff::Views::Blog::PostView < Guff::Views::TemplateHTMLView +class Guff::Views::Posts::Blog < Guff::Views::TemplateHTMLView def initialize( context : Context, site_id : Int64, @@ -13,7 +13,7 @@ class Guff::Views::Blog::PostView < Guff::Views::TemplateHTMLView context: context, theme_id: site["theme_id"].as(Int64).to_i32, theme_slug: site["theme_slug"].as(String), - template_id: "blog-post.html", + template_id: "post-blog.html", data: item, ) end diff --git a/src/guff/views/page.cr b/src/guff/views/posts/page.cr index 7d386c2..55f5004 100644 --- a/src/guff/views/page.cr +++ b/src/guff/views/posts/page.cr @@ -1,12 +1,12 @@ -require "./template-html" +require "../template-html" -class Guff::Views::PageView < Guff::Views::TemplateHTMLView +class Guff::Views::Posts::Page < Guff::Views::TemplateHTMLView def initialize(context : Context, @item : Hash(String, String)) super( context: context, theme_id: @item["active_theme_id"].not_nil!.to_i32 as Int32, theme_slug: @item["active_theme_slug"].not_nil!.to_s as String, - template_id: "page.html", + template_id: "post-page.html", data: @item, extra_assets: context.models.page.assets(@item["post_id"].to_i64) as Theme::Assets, ) diff --git a/src/guff/views/posts/project.cr b/src/guff/views/posts/project.cr new file mode 100644 index 0000000..3da0a64 --- /dev/null +++ b/src/guff/views/posts/project.cr @@ -0,0 +1,13 @@ +require "../template-html" + +class Guff::Views::Posts::Project < Guff::Views::TemplateHTMLView + def initialize(context : Context, @item : Hash(String, String)) + super( + context: context, + theme_id: @item["theme_id"].to_i32, + theme_slug: @item["theme_slug"], + template_id: "post-project.html", + data: @item, + ) + end +end diff --git a/src/guff/views/project.cr b/src/guff/views/project.cr deleted file mode 100644 index fc91b5c..0000000 --- a/src/guff/views/project.cr +++ /dev/null @@ -1,13 +0,0 @@ -require "./template-html" - -class Guff::Views::ProjectView < Guff::Views::TemplateHTMLView - def initialize(context : Context, @item : Hash(String, String)) - super( - context: context, - theme_id: @item["theme_id"].not_nil!.to_i32 as Int32, - theme_slug: @item["theme_slug"].not_nil!.to_s as String, - template_id: "project.html", - data: @item, - ) - end -end |