From 0d159912f9c05154432c0adeac157a8fdc7fc057 Mon Sep 17 00:00:00 2001 From: Torsten Date: Fri, 25 Nov 2022 16:17:54 +0200 Subject: [PATCH] bit of pages link cleanup --- app/controllers/cms/pages_controller.rb | 108 ++++++++++++------------ app/models/cms/page.rb | 4 + app/views/cms/pages/edit.html.haml | 4 +- app/views/cms/pages/index.html.haml | 10 ++- app/views/cms/pages/show.html.haml | 2 +- 5 files changed, 68 insertions(+), 60 deletions(-) diff --git a/app/controllers/cms/pages_controller.rb b/app/controllers/cms/pages_controller.rb index 88614c4..ae417d2 100644 --- a/app/controllers/cms/pages_controller.rb +++ b/app/controllers/cms/pages_controller.rb @@ -1,58 +1,60 @@ -class Cms::PagesController < ApplicationController - before_action :set_cms_page, only: %i[ show edit update destroy ] +module Cms + class PagesController < CmsController + before_action :set_cms_page, only: %i[ show edit update destroy ] - # GET /cms/pages - def index - @cms_pages = Cms::Page.all - end - - # GET /cms/pages/1 - def show - end - - # GET /cms/pages/new - def new - @cms_page = Cms::Page.new - end - - # GET /cms/pages/1/edit - def edit - end - - # POST /cms/pages - def create - @cms_page = Cms::Page.new(cms_page_params) - - if @cms_page.save - redirect_to @cms_page, notice: "Page was successfully created." - else - render :new, status: :unprocessable_entity - end - end - - # PATCH/PUT /cms/pages/1 - def update - if @cms_page.update(cms_page_params) - redirect_to @cms_page, notice: "Page was successfully updated." - else - render :edit, status: :unprocessable_entity - end - end - - # DELETE /cms/pages/1 - def destroy - @cms_page.destroy - redirect_to cms_pages_url, notice: "Page was successfully destroyed." - end - - private - # Use callbacks to share common setup or constraints between actions. - def set_cms_page - @cms_page = Cms::Page.find(params[:id]) + # GET /cms/pages + def index + @cms_pages = Cms::Page.all end - # Only allow a list of trusted parameters through. - def cms_page_params - params.fetch(:cms_page, {}) + # GET /cms/pages/1 + def show end + + # GET /cms/pages/new + def new + @cms_page = Cms::Page.new + end + + # GET /cms/pages/1/edit + def edit + end + + # POST /cms/pages + def create + @cms_page = Cms::Page.new(cms_page_params) + + if @cms_page.save + redirect_to @cms_page, notice: "Page was successfully created." + else + render :new, status: :unprocessable_entity + end + end + + # PATCH/PUT /cms/pages/1 + def update + if @cms_page.update(cms_page_params) + redirect_to @cms_page, notice: "Page was successfully updated." + else + render :edit, status: :unprocessable_entity + end + end + + # DELETE /cms/pages/1 + def destroy + @cms_page.destroy + redirect_to cms_pages_url, notice: "Page was successfully destroyed." + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_cms_page + @cms_page = Cms::Page.find(params[:id]) + end + + # Only allow a list of trusted parameters through. + def cms_page_params + params.fetch(:cms_page, {}) + end + end end diff --git a/app/models/cms/page.rb b/app/models/cms/page.rb index cfaffe9..35ea46b 100644 --- a/app/models/cms/page.rb +++ b/app/models/cms/page.rb @@ -33,5 +33,9 @@ module Cms @@files.collect{ |file| Page.new(file) } end + def self.find(name) + Page.new(name + ".yaml") + end + end end diff --git a/app/views/cms/pages/edit.html.haml b/app/views/cms/pages/edit.html.haml index ad8c69d..d0a8f06 100644 --- a/app/views/cms/pages/edit.html.haml +++ b/app/views/cms/pages/edit.html.haml @@ -1,7 +1,7 @@ -%h1 Editing cms_page +%h1 Editing #{@cms_page.name} = render 'form' -= link_to 'Show', @cms_page += link_to 'Show', cms_page_url(@cms_page.name) \| = link_to 'Back', cms_pages_path diff --git a/app/views/cms/pages/index.html.haml b/app/views/cms/pages/index.html.haml index c3d738e..1e2690d 100644 --- a/app/views/cms/pages/index.html.haml +++ b/app/views/cms/pages/index.html.haml @@ -17,15 +17,17 @@ - @cms_pages.each do |cms_page| %tr %td.whitespace-nowrap.px-4.py-2.text-gray-700 - = link_to cms_page.name , cms_page.name + = link_to cms_page.name , cms_page_path(cms_page.name) %td.whitespace-nowrap.px-4.py-2.text-gray-700 = cms_page.template %td.whitespace-nowrap.px-4.py-2.text-gray-700 = cms_page.content.length %td.whitespace-nowrap.px-4.py-2 %strong.rounded.bg-green-100.px-3.text-xs.font-medium.text-green-700{:class => "py-1.5"} - = link_to 'Show', cms_page_path(cms_page , id: cms_page.name) + = link_to 'Show', cms_page_path(cms_page.name) %strong.rounded.bg-amber-100.px-3.text-xs.font-medium.text-amber-700{:class => "py-1.5"} - = link_to 'Edit', edit_cms_page_path(cms_page , id: cms_page.name) + = link_to 'Edit', edit_cms_page_path(cms_page.name) -= link_to 'New Page', new_cms_page_path +%section + %a.inline-block.rounded.border.border-indigo-600.bg-indigo-600.px-12.py-3.text-sm.font-medium.text-white.hover:bg-transparent.hover:text-indigo-600.focus:outline-none.focus:ring.active:text-indigo-500{:href => new_cms_page_path} + New Page diff --git a/app/views/cms/pages/show.html.haml b/app/views/cms/pages/show.html.haml index 16985f5..b331b6c 100644 --- a/app/views/cms/pages/show.html.haml +++ b/app/views/cms/pages/show.html.haml @@ -1,6 +1,6 @@ %p#notice= notice -= link_to 'Edit', edit_cms_page_path(@cms_page) += link_to 'Edit', edit_cms_page_path(@cms_page.name) \| = link_to 'Back', cms_pages_path