pwb 1.2.0 → 1.3.0

data/app/controllers/pwb/api/v1/cms_pages_controller.rb

@@ -1,102 +0,0 @@
-module Pwb
-  # http://localhost:3000/api/v1/cms-pages.json
-  class Api::V1::CmsPagesController < JSONAPI::ResourceController
-    # skip_before_action :verify_content_type_header
-    # Skipping action below allows me to browse to endpoint
-    # without having set mime type
-    skip_before_action :ensure_valid_accept_media_type
-    # skip_before_action :verify_accept_header
-
-    def set_photo
-      # This only creates a content photo
-      # - does not associate it with a cms page yet
-      photo = ContentPhoto.create
-      # TODO: - figure out how to remove orphaned photos
-      if params[:file]
-        photo.image = params[:file]
-      end
-      photo.save!
-      photo.reload
-      render json: photo.to_json
-    end
-
-    def meta
-      @admin_setup = Pwb::CmsPageContainer.where(name: params[:page_name]).first || {}
-      render json: @admin_setup.as_json["attributes"]
-    end
-
-    def create
-      new_page = Comfy::Cms::Page.new(cms_page_create_params["attributes"].except("blocks"))
-      cms_page_create_params[:attributes][:blocks].each do |block_params|
-        new_block = Comfy::Cms::Block.new block_params
-        new_block.identifier = "idd"
-        new_block.save!
-        new_page.blocks << new_block
-      end
-
-      new_page.site_id = 1
-      new_page.layout_id = 1
-      # new_page.slug = "en"
-      byebug
-      new_page.label = "lbl"
-
-      new_page.save!
-
-      serialized_page = JSONAPI::ResourceSerializer.new(Pwb::Api::V1::CmsPageResource).serialize_to_hash(Pwb::Api::V1::CmsPageResource.new(new_page, nil))
-      # updated_caches.push {}
-      # serialized_page[:data]["attributes"]["updated-caches"] = updated_caches
-      render json: serialized_page
-
-    end
-
-    def update
-      updated_caches = []
-      refresh_all_locales = false
-      cms_page_update_params[:attributes][:blocks].each do |block_params|
-        block = Comfy::Cms::Block.find block_params[:id]
-        if block_params[:is_image]
-          # for images I want to update all language variants of the block
-          cross_locale_blocks = Comfy::Cms::Block.where(identifier: block_params[:identifier])
-          cross_locale_blocks.each do |cross_locale_block|
-            cross_locale_block.update block_params.slice :content
-          end
-          refresh_all_locales = true
-        else
-          block.update block_params.slice :content
-        end
-        # blocks.push block
-      end
-
-      if refresh_all_locales
-        pages = Comfy::Cms::Page.where(label: cms_page_update_params[:attributes][:label])
-        pages.each do |page|
-          page.clear_content_cache
-          updated_caches.push({
-                                page_id: page.id,
-                                page_content_cache: page.content_cache
-          })
-        end
-      else
-        page = Comfy::Cms::Page.find cms_page_update_params[:id]
-        page.clear_content_cache
-        # need to call content_cache again for refresh
-        page.content_cache
-      end
-
-      # below ensures valid json_api response is sent:
-      page = Comfy::Cms::Page.find cms_page_update_params[:id]
-      serialized_page = JSONAPI::ResourceSerializer.new(Pwb::Api::V1::CmsPageResource).serialize_to_hash(Pwb::Api::V1::CmsPageResource.new(page, nil))
-      updated_caches.push {}
-      serialized_page[:data]["attributes"]["updated-caches"] = updated_caches
-      # [{id: 22, cc: "dddd"}]
-      render json: serialized_page
-    end
-
-    def cms_page_create_params
-      params.require(:data).permit(attributes: [:slug, :site_id, :label, blocks: [:content, :identifier, :info, :is_image]])
-    end
-    def cms_page_update_params
-      params.require(:data).permit(:id, attributes: [:label, blocks: [:content, :id, :identifier, :info, :is_image]])
-    end
-  end
-end

data/app/controllers/pwb/comfy_controller.rb

@@ -1,106 +0,0 @@
-require_dependency 'pwb/application_controller'
-
-module Pwb
-  # based on
-  # comfortable-mexican-sofa/app/controllers/comfy/cms/content_controller.rb
-  class ComfyController < ApplicationController
-    # Comfy::Cms::BaseController
-
-    # Authentication module must have `authenticate` method
-    include ComfortableMexicanSofa.config.public_auth.to_s.constantize
-
-    # Authorization module must have `authorize` method
-    include ComfortableMexicanSofa.config.public_authorization.to_s.constantize
-
-    before_action :load_cms_site
-    # before_action :load_fixtures
-    # before_action :load_cms_page
-    #   :authenticate,
-    #   :authorize,
-    #   :only => :show
-
-    rescue_from ActiveRecord::RecordNotFound, with: :page_not_found
-
-    def show
-      @cms_pages = []
-
-      begin
-        cms_page_container = Pwb::CmsPageContainer.find(params[:page_slug])
-        @title_key = cms_page_container.pageTitleKey
-        cms_page_container.cmsPartsList.each do |cms_part|
-          @cms_page = Comfy::Cms::Page.where({label: cms_part["label"], slug: I18n.locale}).first
-          # @cms_site.pages.published.find_by_full_path!("/about-us/services")
-          @cms_pages.push @cms_page if @cms_page
-        end
-      rescue ActiveHash::RecordNotFound
-      end
-
-      @content_area_cols = Content.where(tag: 'content-area-cols').order('sort_order')
-
-      render "/pwb/sections/cms"
-
-      # cms_page_path =  "/#{params[:page_slug]}-page"
-      # https://github.com/comfy/comfortable-mexican-sofa/wiki/View-rendering
-      # below makes use of Comfy view rendering:
-
-      # return render :cms_page => cms_page_path, :layout => "pwb/application", :cms_blocks => {
-      #   :jumbotron => 'Content About Events'
-      #   # :column_b => { :template => '/events/index' },
-      #   # :column_c => { :partial  => '/events/calendar' }
-      # }
-      # return render @cms_page.content_cache
-      # , layout: "application"
-    end
-
-    def render_sitemap
-      render
-    end
-
-    protected
-
-    def load_cms_site
-      # TODO: - load diff sites depending on locale//
-      @cms_site = ::Comfy::Cms::Site.find_by_locale :es
-      # (::Comfy::Cms::Site.find_by_locale I18n.locale) || (::Comfy::Cms::Site.find_by_locale :en)
-    end
-
-    # def render_page(status = 200)
-    #   # below will ren
-    #   if @cms_layout = @cms_page.layout
-    #     # app_layout = (@cms_layout.app_layout.blank? || request.xhr?) ? false : @cms_layout.app_layout
-    #     app_layout = "application"
-    #     render  :inline       => @cms_page.content_cache,
-    #       :layout       => app_layout,
-    #       :status       => status,
-    #       :content_type => mime_type
-    #   else
-    #     render :plain => I18n.t('comfy.cms.content.layout_not_found'), :status => 404
-    #   end
-    # end
-
-    # it's possible to control mimetype of a page by creating a `mime_type` field
-    def mime_type
-      mime_block = @cms_page.blocks.find_by_identifier(:mime_type)
-      mime_block && mime_block.content || 'text/html'
-    end
-
-    def load_fixtures
-      return unless ComfortableMexicanSofa.config.enable_fixtures
-      ComfortableMexicanSofa::Fixture::Importer.new(@cms_site.identifier).import!
-    end
-
-    def load_cms_page(_page_key)
-      @cms_page = @cms_site.pages.published.find_by_full_path!("/[:cms_path]")
-    end
-
-    def page_not_found
-      @cms_page = @cms_site.pages.published.find_by_full_path!('/404')
-
-      respond_to do |format|
-        format.html { render_page(404) }
-      end
-    rescue ActiveRecord::RecordNotFound
-      raise ActionController::RoutingError, "Page Not Found at: \"#{params[:cms_path]}\""
-    end
-  end
-end

data/app/models/pwb/cms_page_container.rb

@@ -1,9 +0,0 @@
-module Pwb
-  # https://github.com/zilkey/active_hash
-  class CmsPageContainer < ActiveJSON::Base
-    set_root_path "#{Pwb::Engine.root}/config/cms_page_containers"
-    # set_filename "client_setups"
-    use_multiple_files
-    set_filenames "about-us", "sell", "legal", "about", "landing"
-  end
-end

data/app/models/pwb/section.rb

@@ -1,35 +0,0 @@
-module Pwb
-  class Section < ApplicationRecord
-    translates :page_title, fallbacks_for_empty_translations: true
-    translates :link_title, fallbacks_for_empty_translations: true
-    globalize_accessors locales: I18n.available_locales
-    # [:en, :ca, :es, :fr, :ar, :de, :ru, :pt]
-
-    has_many :contents, foreign_key: "section_key", primary_key: "link_path"
-
-    def as_json(options = nil)
-      super({only: [
-               :link_key, :link_path, :visible, :sort_order, :id,
-               :show_in_top_nav, :show_in_footer, :is_page, :details
-             ],
-             methods: [:translation_key, :link_title_es, :page_title_es]
-             }.merge(options || {}))
-    end
-
-    def translation_key
-      return "navbar." + self.link_key
-    end
-
-    # t.string :link_key
-    # t.string :link_path
-    # t.integer :sort_order
-    # t.boolean :visible
-    # t.timestamps null: false
-    # add_column :pwb_sections, :flags, :integer, default: 0, index: true, null: false
-    # add_column :pwb_sections, :details, :json, default: {}
-    # add_column :pwb_sections, :is_page, :boolean, default: false, index: true
-    # add_column :pwb_sections, :show_in_top_nav, :boolean, default: false, index: true
-    # add_column :pwb_sections, :show_in_footer, :boolean, default: false, index: true
-    # add_column :pwb_sections, :key, :string, index: true
-  end
-end

data/app/models/pwb/welcome.rb

@@ -1,4 +0,0 @@
-module Pwb
-  class Welcome < ApplicationRecord
-  end
-end

data/app/resources/pwb/api/v1/cms_block_resource.rb

@@ -1,11 +0,0 @@
-module Pwb
-  class Api::V1::CmsBlockResource < JSONAPI::Resource
-    model_name 'Comfy::Cms::Block'
-    # model_hint model: Pwb::Prop, resource: :lite_properties
-
-    attributes :identifier, :content
-
-    # filters :visible
-    # has_many :blocks
-  end
-end

data/app/resources/pwb/api/v1/cms_page_resource.rb

@@ -1,27 +0,0 @@
-module Pwb
-  class Api::V1::CmsPageResource < JSONAPI::Resource
-    model_name 'Comfy::Cms::Page'
-    # model_hint model: Pwb::Prop, resource: :lite_properties
-
-    attributes :label, :slug, :full_path,
-      :blocks, :tags, :categories,
-      :locale, :content_cache, 
-      # below 2 are not used in admin panel
-      # but need to be populated when creating new page
-      :site_id, :layout
-
-    filters :label, :full_path
-    has_many :cms_blocks
-
-    # TODO - add locale col to Cms::Page
-    def locale
-      # return @model.site.locale
-      return @model.slug
-    end
-
-
-    def self.creatable_fields(context)
-      super - [:locale]
-    end
-  end
-end

data/app/themes/berlin/views/pwb/sections/about_us.html.erb

@@ -1,59 +0,0 @@
-<% page_title @current_agency.company_name  %>
-<%= render '/pwb/meta_tags' %>
-<section id="top-container" style="<%= bg_image @header_image, height: 800, crop: "scale", quality: "auto" %>">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-12">
-        <div class="top-container-inner">
-          <h2>
-            <%= I18n.t("aboutUs") %>
-          </h2>
-          <div>
-            <ol class="breadcrumb">
-              <li>
-                <a href="/">
-                  <%= I18n.t("webContentSections.home") %>
-                </a>
-              </li>
-              <li class="active">
-                <%= I18n.t("aboutUs") %>
-              </li>
-            </ol>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</section>
-<section id="aa-main">
-  <div class="container">
-    <div class="col-md-12">
-      <div class="aa-main-area">
-        <div class="row">
-          <div class="col-md-6">
-            <%= opt_image_tag(@content.default_photo, :quality => "auto", height: 600, crop: "scale", class: "img-responsive about-us-img") %>
-          </div>
-          <div class="col-md-6">
-            <div class="section-title-wr mt-40">
-              <h3 class="section-title left">
-                <span>
-                  <%= I18n.t("aboutUs") %>
-                </span>
-              </h3>
-            </div>
-            <div>
-              <p>
-                <%== @content.raw %>
-              </p>
-            </div>
-            <div>
-              <% if @is_subdomain_admin  %>
-                <%= link_to I18n.t("labels.edit"), "#{ "/" + I18n.locale.to_s + @content.urls['adminUrl'] }"  %>
-              <% end %>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</section>

data/app/themes/berlin/views/pwb/sections/cms.html.erb

@@ -1,34 +0,0 @@
-<% page_title @current_agency.company_name  %>
-<!-- MAIN CONTENT -->
-<div class="pg-opt">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-6">
-        <h2>
-          <%= I18n.t(@title_key) %>
-        </h2>
-      </div>
-      <div class="col-md-6" style="">
-        <ol class="breadcrumb">
-          <li><a href="/">
-              <%= I18n.t("webContentSections.home") %>
-            </a></li>
-          <li class="active">
-            <%= I18n.t(@title_key) %>
-          </li>
-        </ol>
-      </div>
-    </div>
-  </div>
-</div>
-
-<%# render '/pwb/welcome/content_area_cols' %>
-
-
-<% @cms_pages.each do |cms_page| %>
-  <%== cms_page.content_cache %>  
-<% end %>
-
-
-
-<!-- FOOTER -->

data/app/themes/berlin/views/pwb/sections/static.html.erb

@@ -1,58 +0,0 @@
-<% page_title @current_agency.company_name  %>
-<%= render '/pwb/meta_tags' %>
-<section id="top-container" style="<%= bg_image @header_image, height: 800, crop: "scale", quality: "auto" %>">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-12">
-        <div class="top-container-inner">
-          <h2>
-            <%= I18n.t(@title_key) %>
-          </h2>
-          <div>
-            <ol class="breadcrumb">
-              <li>
-                <a href="/">
-                  <%= I18n.t("webContentSections.home") %>
-                </a>
-              </li>
-              <li class="active">
-                <%= I18n.t(@title_key) %>
-              </li>
-            </ol>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</section>
-<section id="aa-main">
-  <div class="container">
-    <div class="col-md-12">
-      <div class="aa-main-area">
-        <div class="row">
-          <div class="col-md-11">
-            <div class="section-title-wr mt-40">
-              <h3 class="section-title left">
-                <span>
-                  <%# I18n.t(@title_key) %>
-                </span>
-              </h3>
-            </div>
-            <div>
-              <p>
-                <%== @content.raw %>
-              </p>
-            </div>
-            <div>
-              <% if @is_subdomain_admin  %>
-                <%= link_to I18n.t("labels.edit"), "#{ "/" + I18n.locale.to_s + @content.urls['adminUrl'] }"  %>
-              <% end %>
-            </div>
-          </div>
-          <div class="col-md-1">
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</section>