maglevcms 1.1.7 → 1.2.0

data/app/frontend/editor/spec/__mocks__/section.js

@@ -18,7 +18,7 @@ export const simpleContentSection = {
         width: 516,
         height: 320,
         filename: 'img-91-3.jpg',
-        byte_size: 41683,
+        byteSize: 41683,
       },
     },
     { id: 'button', value: { url: '#', text: 'Click here' } },
@@ -48,7 +48,7 @@ export const normalizedSimpleContentSection = {
               width: 516,
               height: 320,
               filename: 'img-91-3.jpg',
-              byte_size: 41683,
+              byteSize: 41683,
             },
           },
           { id: 'button', value: { url: '#', text: 'Click here' } },
@@ -69,7 +69,7 @@ export const navContentSection = {
       settings: [
         {
           id: 'link',
-          value: { href: '#', text: 'Home', link_type: 'url' },
+          value: { href: '#', text: 'Home', linkType: 'url' },
         },
       ],
     },
@@ -79,7 +79,7 @@ export const navContentSection = {
       settings: [
         {
           id: 'link',
-          value: { href: '#', text: 'About us', link_type: 'url' },
+          value: { href: '#', text: 'About us', linkType: 'url' },
         },
       ],
     },
@@ -93,11 +93,11 @@ export const navContentSection = {
             href: '//contact',
             text: 'Contact',
             email: null,
-            link_id: 9,
-            link_type: 'page',
-            link_label: 'Contact us',
-            section_id: null,
-            open_new_window: false,
+            linkId: 9,
+            linkType: 'page',
+            linkLabel: 'Contact us',
+            sectionId: null,
+            openNewWindow: false,
           },
         },
       ],
@@ -112,11 +112,11 @@ export const navContentSection = {
             href: '/products',
             text: 'Products #1',
             email: null,
-            link_id: 'd870133f9a075477a96a58e7639d40c5',
-            link_type: 'page',
-            link_label: 'Products',
-            section_id: null,
-            open_new_window: true,
+            linkId: 'd870133f9a075477a96a58e7639d40c5',
+            linkType: 'page',
+            linkLabel: 'Products',
+            sectionId: null,
+            openNewWindow: true,
           },
         },
       ],
@@ -131,7 +131,7 @@ export const navContentSection = {
         width: 572,
         height: 290,
         filename: 'Screen Shot 2021-06-30 at 3.44.04 PM.png',
-        byte_size: 35070,
+        byteSize: 35070,
       },
     },
   ],
@@ -144,7 +144,7 @@ export const normalizedNavContentSection = {
         id: 'RiEo8C3f',
         type: 'navbar_item',
         settings: [
-          { id: 'link', value: { href: '#', text: 'Home', link_type: 'url' } },
+          { id: 'link', value: { href: '#', text: 'Home', linkType: 'url' } },
         ],
       },
       P1fGieWs: {
@@ -153,7 +153,7 @@ export const normalizedNavContentSection = {
         settings: [
           {
             id: 'link',
-            value: { href: '#', text: 'About us', link_type: 'url' },
+            value: { href: '#', text: 'About us', linkType: 'url' },
           },
         ],
       },
@@ -167,11 +167,11 @@ export const normalizedNavContentSection = {
               href: '//contact',
               text: 'Contact',
               email: null,
-              link_id: 9,
-              link_type: 'page',
-              link_label: 'Contact us',
-              section_id: null,
-              open_new_window: false,
+              linkId: 9,
+              linkType: 'page',
+              linkLabel: 'Contact us',
+              sectionId: null,
+              openNewWindow: false,
             },
           },
         ],
@@ -186,11 +186,11 @@ export const normalizedNavContentSection = {
               href: '/products',
               text: 'Products #1',
               email: null,
-              link_id: 'd870133f9a075477a96a58e7639d40c5',
-              link_type: 'page',
-              link_label: 'Products',
-              section_id: null,
-              open_new_window: true,
+              linkId: 'd870133f9a075477a96a58e7639d40c5',
+              linkType: 'page',
+              linkLabel: 'Products',
+              sectionId: null,
+              openNewWindow: true,
             },
           },
         ],
@@ -210,7 +210,7 @@ export const normalizedNavContentSection = {
               width: 572,
               height: 290,
               filename: 'Screen Shot 2021-06-30 at 3.44.04 PM.png',
-              byte_size: 35070,
+              byteSize: 35070,
             },
           },
         ],
@@ -226,7 +226,7 @@ export const navContentSectionBlock = {
   settings: [
     {
       id: 'link',
-      value: { href: '#', text: 'Foo', link_type: 'url' },
+      value: { href: '#', text: 'Foo', linkType: 'url' },
     },
   ],
 }

data/app/helpers/maglev/editor_helper.rb

@@ -16,7 +16,7 @@ module Maglev
     end
 
     def api_base_path
-      "#{root_path}api"
+      api_root_path
     end
 
     def editor_window_title

data/app/helpers/maglev/page_preview_helper.rb

@@ -16,11 +16,15 @@ module Maglev
     # rubocop:enable Rails/OutputSafety
 
     def render_maglev_section(type, site: nil, theme: nil, page: nil, page_sections: nil)
+      sections = (page_sections || maglev_page_sections).find_all do |section|
+        (section['type'] || section[:type]).start_with?(type.to_s)
+      end
+
       render_maglev_sections(
         site: site,
         theme: theme,
         page: page,
-        page_sections: (page_sections || maglev_page_sections).find_all { |section| section['type'] == type.to_s }
+        page_sections: sections
       )
     end
 

data/app/helpers/maglev/sitemap_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Maglev
+  module SitemapHelper
+    def sitemap_url(host, page, locale = nil)
+      path = maglev_services.get_page_fullpath.call(page: page, locale: locale)
+
+      return path if path =~ %r{^https?://}
+
+      [host, path].join
+    end
+  end
+end

data/app/models/concerns/maglev/sections_concern.rb

@@ -11,6 +11,16 @@ module Maglev::SectionsConcern
     end
   end
 
+  def prepare_sections_translations
+    return if sections_translations.blank?
+
+    sections_translations.each_key do |locale|
+      Maglev::I18n.with_locale(locale) do
+        prepare_sections
+      end
+    end
+  end
+
   private
 
   def prepare_section(section)

data/app/models/maglev/page/path_concern.rb

@@ -27,7 +27,14 @@ module Maglev::Page::PathConcern
   end
 
   def path=(value)
-    current_path.value = value
+    unless value.respond_to?(:each_pair)
+      current_path.value = value
+      return
+    end
+
+    value.each_pair do |locale, new_path|
+      Maglev::I18n.with_locale(locale) { self.path = new_path }
+    end
   end
 
   def current_path

data/app/models/maglev/site/locales_concern.rb

@@ -24,6 +24,14 @@ module Maglev::Site::LocalesConcern
     locales.map { |locale| locale.prefix.to_sym }
   end
 
+  def each_locale
+    locale_prefixes.each do |locale|
+      Maglev::I18n.with_locale(locale) do
+        yield(locale)
+      end
+    end
+  end
+
   class LocalesSerializer
     def self.dump(array)
       (array || []).map(&:as_json)

data/app/services/concerns/maglev/get_page_sections/transform_collection_item_concern.rb

@@ -3,6 +3,11 @@
 # rubocop:disable Style/ClassAndModuleChildren
 module Maglev::GetPageSections::TransformCollectionItemConcern
   def transform_collection_item_content_setting(content, setting)
+    # the content might come from the default value of the collection_item setting
+    # rubocop:disable Style/StringHashKeys
+    content['value'] = { 'id' => 'any' } if content&.dig('value') == 'any'
+    # rubocop:enable Style/StringHashKeys
+
     item_id = content&.dig('value', 'id')
     return if item_id.blank?
 
@@ -11,6 +16,8 @@ module Maglev::GetPageSections::TransformCollectionItemConcern
       id: item_id
     )
 
+    return unless item
+
     content['value']['label'] = item.label
     content['value']['item'] = item.source
   end

data/app/services/maglev/app_container.rb

@@ -31,6 +31,8 @@ module Maglev
     dependency :persist_section_screenshot, class: Maglev::PersistSectionScreenshot,
                                             depends_on: %i[fetch_theme fetch_section_screenshot_path]
 
+    dependency :change_site_locales,        class: Maglev::ChangeSiteLocales
+
     dependency :fetch_page,                 class: Maglev::FetchPage, depends_on: :fetch_site
     dependency :get_page_fullpath,          class: Maglev::GetPageFullpath, depends_on: %i[fetch_site get_base_url]
     dependency :get_page_sections,          class: Maglev::GetPageSections,

data/app/services/maglev/persist_page.rb

@@ -25,15 +25,31 @@ module Maglev
 
     def persist_page!
       page.attributes = page_attributes
-      page.prepare_sections
+
+      # the sections_translations attribute is put by the SetupPages service
+      # when we generate a brand new site
+      if page_attributes.key?(:sections_translations)
+        page.prepare_sections_translations
+      else
+        page.prepare_sections
+      end
+
       page.save!
     end
 
     def persist_site!
       return unless can_persist_site?
 
-      site.attributes = site_attributes_with_consistent_sections
-      site.prepare_sections
+      # the sections_translations attribute is put by the SetupPages service
+      # when we generate a brand new site
+      if site_attributes.key?(:sections_translations)
+        site.attributes = site_attributes
+        site.prepare_sections_translations
+      else
+        site.attributes = site_attributes_with_consistent_sections
+        site.prepare_sections
+      end
+
       site.save!
     end
 
@@ -68,7 +84,10 @@ module Maglev
     end
 
     def can_persist_site?
-      site_attributes.present? && site_attributes[:sections].present?
+      site_attributes.present? && (
+        site_attributes[:sections].present? ||
+        site_attributes[:sections_translations].present?
+      )
     end
   end
 end

data/app/services/maglev/setup_pages.rb

@@ -13,7 +13,9 @@ module Maglev
 
     def call
       pages&.map do |page_attributes|
-        create_page(page_attributes)
+        create_page(
+          attributes_in_all_locales(page_attributes.with_indifferent_access)
+        )
       end
     end
 
@@ -34,12 +36,46 @@ module Maglev
     end
 
     def site_attributes_from(page_attributes)
+      if page_attributes.include?(:sections_translations)
+        { sections_translations: site_sections_translations(page_attributes) }
+      else
+        { sections: select_site_scoped_sections(page_attributes[:sections]) }
+      end.compact || {}
+    end
+
+    def site_sections_translations(page_attributes)
+      sections_translations = page_attributes[:sections_translations].transform_values do |sections|
+        select_site_scoped_sections(sections)
+      end
+      sections_translations.any? { |_, sections| sections.blank? } ? nil : sections_translations
+    end
+
+    def attributes_in_all_locales(attributes)
       {
-        sections: (page_attributes[:sections] || []).find_all do |section|
-          definition = theme.sections.find(section['type'])
-          definition.site_scoped?
-        end
+        title_translations: value_in_all_locales(attributes[:title]),
+        sections_translations: value_in_all_locales(attributes[:sections]),
+        path: value_in_all_locales(attributes[:path])
       }
     end
+
+    def value_in_all_locales(value)
+      if value.respond_to?(:each_pair)
+        default_value = value[site.default_locale_prefix]
+        fill_translations(default_value).merge(value)
+      else
+        fill_translations(value)
+      end
+    end
+
+    def fill_translations(value)
+      site.locale_prefixes.index_with { |_locale| value }
+    end
+
+    def select_site_scoped_sections(sections)
+      (sections || []).find_all do |section|
+        definition = theme.sections.find(section['type'])
+        definition.site_scoped?
+      end
+    end
   end
 end

data/app/views/maglev/api/pages/_show.json.jbuilder

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-json.sections services.get_page_sections.call(page: page)
-
 json.key_format! camelize: :lower
 json.deep_format_keys!
 
@@ -20,5 +18,6 @@ json.og_image_url page.og_image_url
 json.preview_url services.get_page_fullpath.call(page: page, preview_mode: true, locale: content_locale)
 json.live_url services.get_page_fullpath.call(page: page, preview_mode: false, locale: content_locale)
 json.section_names services.get_page_section_names.call(page: page)
+json.sections services.get_page_sections.call(page: page)
 json.lock_version page.lock_version
 json.translated page.path.present?

data/app/views/maglev/sitemap/index.xml.builder

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+xml.instruct!
+
+xml.urlset xmlns: 'http://www.google.com/schemas/sitemap/0.9', "xmlns:xhtml": 'http://www.w3.org/1999/xhtml' do
+  @pages.each do |page|
+    xml.url do
+      xml.loc sitemap_url(@host, page, maglev_site.default_locale_prefix)
+      xml.lastmod page.updated_at.strftime('%Y-%m-%d')
+
+      if maglev_site.locales.size > 1
+        maglev_site.locales.each do |locale|
+          xml.xhtml :link,
+                    rel: 'alternate',
+                    hreflang: locale.prefix,
+                    href: sitemap_url(@host, page, locale.prefix)
+        end
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -5,6 +5,7 @@ Maglev::Engine.routes.draw do
   # API
   constraints format: :json do
     namespace :api do
+      root to: proc { [200, {}, ['{}']] }
       resource :site, only: :show
       resources :pages do
         resources :clones, controller: :page_clones, only: :create

data/lib/generators/maglev/install_generator.rb

@@ -29,6 +29,7 @@ module Maglev
       inject_into_file 'config/routes.rb', before: /^end/ do
         <<-CODE
   mount Maglev::Engine => '/maglev'
+  get '/sitemap', to: 'maglev/sitemap#index', defaults: { format: 'xml' }
   get '(*path)', to: 'maglev/page_preview#index', defaults: { path: 'index' }, constraints: Maglev::PreviewConstraint.new
         CODE
       end
@@ -38,8 +39,8 @@ module Maglev
       $stdout.puts <<~INFO
         Done! 🎉
 
-        You can now tweak /config/initializers/maglev.rb.
-        You can also modify your theme (in /app/theme and /app/views/theme)
+        You can now tweak config/initializers/maglev.rb
+        You can also modify your theme (in app/theme and app/views/theme)
         and generate new sections with rails g maglev:section.
 
         👉 The next step is to create a site using `rails maglev:create_site`.

data/lib/generators/maglev/section_generator.rb

@@ -109,7 +109,7 @@ module Maglev
         when 'text' then label
         when 'image' then '"/theme/image-placeholder.jpg"'
         when 'checkbox' then true
-        when 'link' then '{ text: "Link", url: "#" }'
+        when 'link' then '{ text: "Link", href: "#" }'
         when 'color' then '#E5E7EB'
         when 'radio', 'select' then 'option_1'
         when 'icon' then 'default-icon-class'

data/lib/generators/maglev/templates/section/app/theme/sections/%category%/%file_name%.yml.tt

@@ -12,7 +12,7 @@ category: <%= category %>
 # insert_button: false
 
 # Insert this section at the top or the bottom of the page (default: nil)
-# insert_at: top 
+# insert_at: top
 
 # One single instance per page?
 # singleton: true
@@ -33,7 +33,7 @@ settings:
   <%- when 'link' -%>
   with_text: true
   <%- when 'select', 'radio' -%>
-  options:
+  select_options:
   - label: Option 1
     value: option_1
   - label: Option 2
@@ -48,7 +48,7 @@ settings:
 <%- end -%>
 # Definition of the blocks.
 # You can define as many types of blocks as you want.
-blocks: <%- if blocks.blank? -%>[]
+blocks:<%- if blocks.blank? -%> []
 <% end %>
 <%- blocks.each do |(type, settings)| -%>
 - name: "<%= type.humanize %>"
@@ -66,7 +66,7 @@ blocks: <%- if blocks.blank? -%>[]
     <%- when 'link' -%>
     with_text: true
     <%- when 'select', 'radio' -%>
-    options:
+    select_options:
     - label: Option 1
       value: option_1
     - label: Option 2
@@ -84,12 +84,12 @@ blocks: <%- if blocks.blank? -%>[]
 # The title can be changed with the following property:
 # blocks_label: "My list of items"
 
-# By default, blocks are presented as a list in the editor UI. 
-# If you like to use blocks to build a menu with sub menu items, 
+# By default, blocks are presented as a list in the editor UI.
+# If you like to use blocks to build a menu with sub menu items,
 # consider using the tree presentation
 # blocks_presentation: "tree"
 
-# In order to get a section with "meaning" content for the editors, 
+# In order to get a section with "meaning" content for the editors,
 # you can set the default content of a new instance of this section.
 # (it's also be useful when taking a screenshot of the section).
 # sample:
@@ -98,13 +98,13 @@ blocks: <%- if blocks.blank? -%>[]
 #     <% if setting.value? -%><%= setting.id %>: <%= setting.default %><% end -%>
 
     <%- end -%>
-#   blocks: <%- if blocks.blank? -%>[]
+#   blocks:<%- if blocks.blank? -%> []
   <% end %>
   <%- blocks.each do |(type, settings)| -%>
 #   - type: <%= type %>
 #     settings:
        <%- settings.each do |setting| -%>
 #       <% if setting.value? -%><%= setting.id %>: <%= setting.default %><% end -%>
-        
+
        <%- end -%>
   <%- end -%>

data/lib/maglev/engine.rb

@@ -52,13 +52,19 @@ module Maglev
         app.middleware.insert_after ActionDispatch::Static,
                                     Rack::Static,
                                     urls: ["/#{vite_ruby.config.public_output_dir}"],
-                                    root: root.join(vite_ruby.config.public_dir)
+                                    root: root.join(vite_ruby.config.public_dir),
+                                    header_rules: [
+                                      [:all, { "Access-Control-Allow-Origin": '*' }]
+                                    ]
       else
         # mostly when running the application in production behind NGINX or APACHE
         app.middleware.insert_before 0,
                                      Rack::Static,
                                      urls: ["/#{vite_ruby.config.public_output_dir}"],
-                                     root: root.join(vite_ruby.config.public_dir)
+                                     root: root.join(vite_ruby.config.public_dir),
+                                     header_rules: [
+                                       [:all, { "Access-Control-Allow-Origin": '*' }]
+                                     ]
       end
     end
 

data/lib/maglev/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Maglev
-  VERSION = '1.1.7'
+  VERSION = '1.2.0'
 end

data/package.json

@@ -32,11 +32,11 @@
     "jsdom": "^20.0.2",
     "postcss": "^8.4.18",
     "prettier": "^2.3.2",
-    "sass": "^1.55.0",    
+    "sass": "^1.55.0",
     "tailwindcss": "^3.2.1",
-    "vite": "^3.2.0",
+    "vite": "^4.3.0",
     "vite-plugin-eslint": "^1.8.1",
-    "vite-plugin-ruby": "^3.1.2",
+    "vite-plugin-ruby": "^3.2.0",
     "vite-plugin-vue2-svg": "^0.3.0",
     "vitest": "^0.24.4",
     "vue-template-compiler": "^2.7.13"