lots of name fixes to get views to work in the app

This commit is contained in:
2022-11-29 01:13:05 +02:00
parent d063f58636
commit 8ddc7a01c8
30 changed files with 49 additions and 231 deletions

View File

@ -2,25 +2,25 @@ module Merged
class PagesController < MergedController
before_action :set_page, only: %i[ show edit update destroy ]
# GET /merge/pages
# GET /merged/pages
def index
@pages = Merged::Page.all
end
# GET /merge/pages/1
# GET /merged/pages/1
def show
end
# GET /merge/pages/new
# GET /merged/pages/new
def new
@page = Merged::Page.new
end
# GET /merge/pages/1/edit
# GET /merged/pages/1/edit
def edit
end
# POST /merge/pages
# POST /merged/pages
def create
@page = Merged::Page.new(page_params)
@ -31,7 +31,7 @@ module Merged
end
end
# PATCH/PUT /merge/pages/1
# PATCH/PUT /merged/pages/1
def update
if @page.update(page_params)
redirect_to @page, notice: "Page was successfully updated."
@ -40,7 +40,7 @@ module Merged
end
end
# DELETE /merge/pages/1
# DELETE /merged/pages/1
def destroy
@page.destroy
redirect_to page_url, notice: "Page was successfully destroyed."

View File

@ -1,10 +1,10 @@
module Merged
class ViewController < ApplicationController
class ViewController < ::ApplicationController
def view
page = params[:id]
# assert file exists
@data = YAML.load_file(Rails.root.join('merge' , "#{page}.yaml"))
@data = YAML.load_file(Rails.root.join('cms' , "#{page}.yaml"))
#assert data is an array (of hashes?)
end