solidus_static_content 1.0.0 → 2.0.0

data/config/locales/pt-BR.yml

@@ -30,8 +30,9 @@ pt-BR:
     back_to_static_pages_list: "Voltar à lista de páginas estáticas"
     page: Página
     pages: Páginas
-    static_content:
-      editing_page: "Editando página"
-      link: Link
-      new_page: "Nova página"
-      static_pages: "Páginas estáticas"
+    stores: Lojas
+    editing_page: "Editando página"
+    link: Link
+    new_page: "Nova página"
+    static_pages: "Páginas estáticas"
+    add_one: Crie um

data/config/locales/pt.yml

@@ -30,8 +30,10 @@ pt:
     back_to_static_pages_list: "Voltar à lista de páginas estáticas"
     page: Página
     pages: Páginas
-    static_content:
-      editing_page: "Editar página"
-      link: Link
-      new_page: "Nova página"
-      static_pages: "Páginas estáticas"
+    stores: Lojas
+    new_page: "Nova página"
+    editing_page: "Editar página"
+    link: Link
+    new_page: "Nova página"
+    static_pages: "Páginas estáticas"
+    add_one: Crie um

data/config/locales/ro.yml

@@ -24,15 +24,17 @@ ro:
   spree:
     page: Pagină
     pages: Pagine
-    static_content:
-      static_pages: Pagini statice
-      static_pages_desc: Descrierea paginilor statice
-      new_page: Pagină nouă
-      editing_page: Editarea paginii
-      confirm_delete: Sunteți siguri că doriți să ștergeți această pagină?
-      link: Link
-      meta_title: Titlu meta
-      page_navigation_title: Pagini
+    stores: Magazine
+    new_page: Pagină nouă
+    static_pages: Pagini statice
+    static_pages_desc: Descrierea paginilor statice
+    new_page: Pagină nouă
+    editing_page: Editarea paginii
+    confirm_delete: Sunteți siguri că doriți să ștergeți această pagină?
+    link: Link
+    meta_title: Titlu meta
+    page_navigation_title: Pagini
+    add_one: Creeaza una
     back_to_static_pages_list: Înapoi la lista de pagini
     admin:
       tab:

data/config/locales/ru.yml

@@ -27,11 +27,13 @@ ru:
   spree:
     page: "Страница"
     pages: "Страницы"
-    static_content:
-      static_pages: "Статические страницы"
-      new_page: "Новая страница"
-      editing_page: "Редактирование страницы"
-      link: "Ссылка"
+    stores: "магазины"
+    new_page: "Новая страница"
+    static_pages: "Статические страницы"
+    new_page: "Новая страница"
+    editing_page: "Редактирование страницы"
+    link: "Ссылка"
+    add_one: "Создай"
     back_to_static_pages_list: "Назад к списку страниц"
     admin:
       tab:

data/config/locales/sv.yml

@@ -30,8 +30,10 @@ sv:
     back_to_static_pages_list: "Tillbaka till listan med sidor"
     page: Sida
     pages: Sidor
-    static_content:
-      editing_page: "Editera sidan"
-      link: Länk
-      new_page: "Ny sida"
-      static_pages: "Statiska sidor"
+    stores: Butiker
+    new_page: "Ny sida"
+    editing_page: "Editera sidan"
+    link: Länk
+    new_page: "Ny sida"
+    static_pages: "Statiska sidor"
+    add_one: "Skapa en"

data/config/routes.rb

@@ -1,8 +1,15 @@
+# frozen_string_literal: true
+
 Spree::Core::Engine.routes.draw do
   namespace :admin do
-    resources :pages
+    resources :pages do
+      collection do
+        post :update_positions
+      end
+    end
   end
-  constraints(Spree::StaticPage) do
+
+  constraints(SolidusStaticContent::RouteMatcher) do
     get '/(*path)', :to => 'static_content#show', :as => 'static'
   end
 end

data/db/migrate/20081216193152_create_pages.rb

@@ -1,4 +1,4 @@
-class CreatePages < ActiveRecord::Migration
+class CreatePages < SolidusSupport::Migration[4.2]
   def self.up
     create_table :spree_pages do |t|
       t.string :title

data/db/migrate/20090625125735_extend_pages.rb

@@ -1,4 +1,4 @@
-class ExtendPages < ActiveRecord::Migration
+class ExtendPages < SolidusSupport::Migration[4.2]
   class Page < ActiveRecord::Base
   end
 

data/db/migrate/20090814113100_add_visible_to_pages.rb

@@ -1,4 +1,4 @@
-class AddVisibleToPages < ActiveRecord::Migration
+class AddVisibleToPages < SolidusSupport::Migration[4.2]
   class Page < ActiveRecord::Base
   end
 

data/db/migrate/20090814142845_add_default_true_to_visible_for_page.rb

@@ -1,4 +1,4 @@
-class AddDefaultTrueToVisibleForPage < ActiveRecord::Migration
+class AddDefaultTrueToVisibleForPage < SolidusSupport::Migration[4.2]
   def self.up
     change_column :spree_pages, :visible, :boolean, :default=> true
   end

data/db/migrate/20090829000527_add_index_for_page.rb

@@ -1,4 +1,4 @@
-class AddIndexForPage < ActiveRecord::Migration
+class AddIndexForPage < SolidusSupport::Migration[4.2]
   def self.up
     add_index(:spree_pages, :slug)
   end

data/db/migrate/20091219021134_add_meta_fields_to_pages.rb

@@ -1,4 +1,4 @@
-class AddMetaFieldsToPages < ActiveRecord::Migration
+class AddMetaFieldsToPages < SolidusSupport::Migration[4.2]
   def self.up
     add_column :spree_pages, :meta_keywords, :string
     add_column :spree_pages, :meta_description, :string

data/db/migrate/20100204105222_add_layout_to_pages.rb

@@ -1,4 +1,4 @@
-class AddLayoutToPages < ActiveRecord::Migration
+class AddLayoutToPages < SolidusSupport::Migration[4.2]
   def self.up
     add_column :spree_pages, :layout, :string
   end

data/db/migrate/20100323085528_add_show_in_sidebar_option_to_pages.rb

@@ -1,4 +1,4 @@
-class AddShowInSidebarOptionToPages < ActiveRecord::Migration
+class AddShowInSidebarOptionToPages < SolidusSupport::Migration[4.2]
   def self.up
     add_column :spree_pages, :show_in_sidebar, :boolean, :default=> false, :null=>false
   end

data/db/migrate/20110717103112_add_meta_title_to_page.rb

@@ -1,4 +1,4 @@
-class AddMetaTitleToPage < ActiveRecord::Migration
+class AddMetaTitleToPage < SolidusSupport::Migration[4.2]
   def self.up
     add_column :spree_pages, :meta_title, :string
   end

data/db/migrate/20120723144115_add_render_as_partial_for_layout_for_spree_pages.rb

@@ -1,4 +1,4 @@
-class AddRenderAsPartialForLayoutForSpreePages < ActiveRecord::Migration
+class AddRenderAsPartialForLayoutForSpreePages < SolidusSupport::Migration[4.2]
   def up
     unless column_exists? :spree_pages, :render_layout_as_partial
       add_column :spree_pages, :render_layout_as_partial, :boolean, :default => false

data/db/migrate/20140926121757_add_pages_stores.rb

@@ -1,4 +1,4 @@
-class AddPagesStores < ActiveRecord::Migration
+class AddPagesStores < SolidusSupport::Migration[4.2]
 
   def change
     create_table :spree_pages_stores, :id => false do |t|

data/db/migrate/20180305193240_update_spree_page_position.rb

@@ -0,0 +1,13 @@
+class UpdateSpreePagePosition < SolidusSupport::Migration[4.2]
+  def up
+    if column_exists?(:spree_pages, :position)
+      change_column :spree_pages, :position, :integer, default: 0
+    end
+  end
+
+  def down
+    if column_exists?(:spree_pages, :position)
+      change_column :spree_pages, :position, :boolean, default: false
+    end
+  end
+end

data/lib/controllers/backend/spree/admin/pages_controller.rb

@@ -0,0 +1,16 @@
+class Spree::Admin::PagesController < Spree::Admin::ResourceController
+  private
+
+  # Set some default attributes
+  def build_resource
+    super.tap do |resource|
+      if resource.stores.blank?
+        resource.stores << Spree::Store.default
+      end
+    end
+  end
+
+  def collection
+    super.ordered_by_position
+  end
+end

data/{app/controllers → lib/controllers/frontend}/spree/static_content_controller.rb

@@ -1,11 +1,15 @@
 class Spree::StaticContentController < Spree::StoreController
-  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-
   helper 'spree/products'
   layout :determine_layout
 
   def show
-    @page = Spree::Page.by_store(current_store).visible.find_by_slug!(request.path)
+    @page = Spree::Page.by_store(current_store).visible.find_by_slug!(request.path_info)
+
+    # Assign static_content to let solidus recognize it as the current
+    # controller resource, this is used by meta tags and in other places.
+    @static_content = @page
+
+    @taxonomies = Spree::Taxonomy.includes(root: :children)
   end
 
   private

data/lib/generators/solidus_static_content/install/install_generator.rb

@@ -1,22 +1,24 @@
+# frozen_string_literal: true
+
 module SolidusStaticContent
   module Generators
     class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, type: :boolean, default: false
 
       def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_static_content\n", before: /\*\//, verbose: true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_static_content\n", before: %r{\*/}, verbose: true # rubocop:disable Metrics/LineLength
       end
 
       def add_migrations
-        run 'bundle exec rake railties:install:migrations FROM=solidus_static_content'
+        run 'bin/rails railties:install:migrations FROM=solidus_static_content'
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask 'Would you like to run the migrations now? [Y/n]')
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Metrics/LineLength
         if run_migrations
-          run 'bundle exec rake db:migrate'
+          run 'bin/rails db:migrate'
         else
-          puts 'Skipping rake db:migrate, don\'t forget to run it!'
+          puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
         end
       end
     end

data/lib/solidus_static_content.rb

@@ -1,21 +1,9 @@
+# frozen_string_literal: true
+
 require 'solidus_core'
-require 'solidus_frontend'
-require 'solidus_backend'
+require 'solidus_support'
 require 'deface'
-require 'spree_static_content/engine'
-require 'coffee_script'
-require 'sass/rails'
-
-module StaticPage
-  def self.remove_spree_mount_point(path)
-    regex = Regexp.new '\A' + Rails.application.routes.url_helpers.spree_path
-    path.sub( regex, '').split('?')[0]
-  end
-end
 
-class Spree::StaticPage
-  def self.matches?(request)
-    return false if request.path =~ /(^\/+(admin|account|cart|checkout|content|login|pg\/|orders|products|s\/|session|signup|shipments|states|t\/|tax_categories|user)+)/
-    !Spree::Page.visible.find_by_slug(request.path).nil?
-  end
-end
+require 'solidus_static_content/version'
+require 'solidus_static_content/route_matcher'
+require 'solidus_static_content/engine'

data/lib/solidus_static_content/engine.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spree/core'
+require 'solidus_static_content'
+
+module SolidusStaticContent
+  class Engine < Rails::Engine
+    include SolidusSupport::EngineExtensions
+
+    isolate_namespace ::Spree
+
+    engine_name 'solidus_static_content'
+
+    # use rspec for tests
+    config.generators do |g|
+      g.test_framework :rspec
+    end
+
+    def self.menu_item
+      @menu_item ||= Spree::Backend::Config.class::MenuItem.new(
+        [:pages],
+        'file-text',
+        condition: -> { can?(:admin, Spree::Page) },
+      )
+    end
+
+    def self.activate_menu_items
+      return if Spree::Backend::Config.menu_items.include?(menu_item)
+
+      Spree::Backend::Config.menu_items << menu_item
+    end
+
+    config.to_prepare(&method(:activate_menu_items))
+  end
+end

data/lib/solidus_static_content/factories.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :page, class: Spree::Page do
+    sequence(:title) { |n| "Page #{n}" }
+    body { 'This is the body of the page' }
+
+    sequence(:slug) { |n| "/page#{n}" }
+
+    trait :with_foreign_link do
+      foreign_link do
+        "http://example.com"
+      end
+    end
+
+    stores { [build(:store)] }
+  end
+end

data/lib/solidus_static_content/route_matcher.rb

@@ -0,0 +1,11 @@
+module SolidusStaticContent::RouteMatcher
+  EXCLUDED_PATHS = /^\/+(admin|account|cart|checkout|content|login|pg\/|orders|products|s\/|session|signup|shipments|states|t\/|tax_categories|user)+/
+
+  def self.matches?(request)
+    path = request.path_info
+
+    return false if EXCLUDED_PATHS.match? path
+
+    Spree::Page.visible.where(slug: path).exists?
+  end
+end

data/lib/solidus_static_content/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module SolidusStaticContent
+  VERSION = '2.0.0'
+end

data/lib/views/backend/spree/admin/pages/_form.html.erb

@@ -0,0 +1,119 @@
+<div data-hook='admin_page_form_fields'>
+  <div class='row'>
+    <div class='col-12'>
+      <%= f.field_container :title do %>
+        <%= f.label :title, class: 'required' %>
+        <%= f.text_field :title, required: true, class: 'fullwidth title' %>
+        <%= f.error_message_on :title %>
+      <% end %>
+    </div>
+
+    <div class='col-12'>
+      <%= f.field_container :slug do %>
+        <%= f.label :slug, class: 'required' %>
+        <%= f.text_field :slug, required: true, class: 'fullwidth title' %>
+        <%= f.error_message_on :slug %>
+      <% end %>
+    </div>
+
+    <div class='col-12'>
+      <%= f.field_container :body do %>
+        <%= f.label :body, class: 'required' %>
+        <%= f.text_area :body, class: 'fullwidth', rows: 12 %>
+        <%= f.error_message_on :body %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class='row'>
+    <div class='col-6'>
+      <%= f.field_container :layout do %>
+        <%= f.label :layout %>
+        <%= f.text_field :layout, class: 'fullwidth title' %>
+      <% end %>
+    </div>
+
+    <div class='col-6'>
+      <%= f.field_container :foreign_link do %>
+        <%= f.label :foreign_link %>
+        <%= f.text_field :foreign_link, class: 'fullwidth title' %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class='row'>
+    <div class='col-2'>
+      <%= f.field_container :show_in_sidebar do %>
+        <%= f.check_box :show_in_sidebar %>
+        <%= f.label :show_in_sidebar %>
+      <% end %>
+    </div>
+
+    <div class='col-2'>
+      <%= f.field_container :show_in_header do %>
+        <%= f.check_box :show_in_header %>
+        <%= f.label :show_in_header %>
+      <% end %>
+    </div>
+
+    <div class='col-2'>
+      <%= f.field_container :show_in_footer do %>
+        <%= f.check_box :show_in_footer %>
+        <%= f.label :show_in_footer %>
+      <% end %>
+    </div>
+
+    <div class='col-2'>
+      <%= f.field_container :visible do %>
+        <%= f.check_box :visible %>
+        <%= f.label :visible %>
+      <% end %>
+    </div>
+
+    <div class='col-2'>
+      <%= f.field_container :render_layout_as_partial do %>
+        <%= f.check_box :render_layout_as_partial %>
+        <%= f.label :render_layout_as_partial %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class='row'>
+    <div class='col-2'>
+      <%= f.field_container :stores do %>
+        <%= f.label :stores, t("spree.stores") %>
+        <br>
+        <% Spree::Store.all.each do |store| %>
+          <%= check_box_tag 'page[store_ids][]', store.id, @page.stores.include?(store) %>
+          <%= label_tag store.name %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class='row'>
+    <div class='col-12'>
+      <%= f.field_container :meta_title do %>
+        <%= f.label :meta_title %>
+        <%= f.text_field :meta_title, class: 'fullwidth title' %>
+        <%= f.error_message_on :meta_title %>
+      <% end %>
+    </div>
+
+    <div class='col-12'>
+      <%= f.field_container :meta_keywords do %>
+        <%= f.label :meta_keywords %>
+        <%= f.text_field :meta_keywords, class: 'fullwidth title' %>
+        <%= f.error_message_on :meta_keywords %>
+      <% end %>
+    </div>
+
+    <div class='col-12'>
+      <%= f.field_container :meta_description do %>
+        <%= f.label :meta_description %>
+        <%= f.text_field :meta_description, class: 'fullwidth title' %>
+        <%= f.error_message_on :meta_description %>
+      <% end %>
+    </div>
+  </div>
+</div>