maglevcms 1.1.6 → 1.2.0

data/db/migrate/20210906102712_add_canonical_to_pages.rb

@@ -1,4 +1,4 @@
-class AddCanonicalToPages < ActiveRecord::Migration[6.1]
+class AddCanonicalToPages < ActiveRecord::Migration[6.0]
   def change
     add_column :maglev_page_paths, :canonical, :boolean, null: true, default: true
     add_index :maglev_page_paths, %i[canonical maglev_page_id locale], unique: true, name: 'canonical_uniqueness'

data/db/migrate/20211008064437_add_locales_to_sites.rb

@@ -1,4 +1,4 @@
-class AddLocalesToSites < ActiveRecord::Migration[6.1]
+class AddLocalesToSites < ActiveRecord::Migration[6.0]
   def change
     add_column :maglev_sites, :locales, :jsonb, default: []
   end

data/db/migrate/20211013210954_translate_section_content.rb

@@ -1,4 +1,4 @@
-class TranslateSectionContent < ActiveRecord::Migration[6.1]
+class TranslateSectionContent < ActiveRecord::Migration[6.0]
   def change
     remove_column :maglev_sites, :sections, :jsonb, default: []
     add_column :maglev_sites, :sections_translations, :jsonb, default: {}

data/db/migrate/20211101205001_add_lock_version_to_maglev_pages.rb

@@ -1,4 +1,4 @@
-class AddLockVersionToMaglevPages < ActiveRecord::Migration[6.1]
+class AddLockVersionToMaglevPages < ActiveRecord::Migration[6.0]
   def change
     add_column :maglev_sites, :lock_version, :integer
     add_column :maglev_pages, :lock_version, :integer

data/db/migrate/20211116161121_better_page_path_canonical_indices.rb

@@ -1,4 +1,4 @@
-class BetterPagePathCanonicalIndices < ActiveRecord::Migration[6.1]
+class BetterPagePathCanonicalIndices < ActiveRecord::Migration[6.0]
   def change
     remove_index :maglev_page_paths, [:value, :locale], unique: true
     remove_index :maglev_page_paths, %i[canonical maglev_page_id locale], unique: true, name: 'canonical_uniqueness'

data/db/migrate/20211124101005_fix_page_path_indices.rb

@@ -1,4 +1,4 @@
-class FixPagePathIndices < ActiveRecord::Migration[6.1]
+class FixPagePathIndices < ActiveRecord::Migration[6.0]
   def change
     remove_index :maglev_page_paths, %i[canonical maglev_page_id locale value], unique: true, name: 'canonical_uniqueness'
     add_index :maglev_page_paths, %i[canonical maglev_page_id locale], name: 'scoped_canonical_speed'

data/db/migrate/20211203224112_add_open_graph_tags_to_pages.rb

@@ -1,4 +1,4 @@
-class AddOpenGraphTagsToPages < ActiveRecord::Migration[6.1]
+class AddOpenGraphTagsToPages < ActiveRecord::Migration[6.0]
   def change
     change_table :maglev_pages do |t|
       t.jsonb :og_title_translations, default: {}

data/db/migrate/20220612092235_add_style_to_sites.rb

@@ -1,4 +1,4 @@
-class AddStyleToSites < ActiveRecord::Migration[6.1]
+class AddStyleToSites < ActiveRecord::Migration[6.0]
   def change
     change_table :maglev_sites do |t|
       t.jsonb :style, default: []

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,10 +109,11 @@ 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'
+        when 'collection_item' then 'any'
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity

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,20 +33,22 @@ settings:
   <%- when 'link' -%>
   with_text: true
   <%- when 'select', 'radio' -%>
-  options:
+  select_options:
   - label: Option 1
     value: option_1
   - label: Option 2
     value: option_2
   <%- when 'color' -%>
   presets: ['#E5E7EB', '#FECACA', '#FDE68A', '#A7F3D0', '#BFDBFE']
+  <%- when 'collection_item' -%>
+  collection_id: products # check your config/initializers/maglev.rb to register your collection
   <%- end -%>
   <% if setting.value? -%>default: <%= setting.default %><% end -%>
 
 <%- 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 %>"
@@ -64,11 +66,13 @@ blocks: <%- if blocks.blank? -%>[]
     <%- when 'link' -%>
     with_text: true
     <%- when 'select', 'radio' -%>
-    options:
+    select_options:
     - label: Option 1
       value: option_1
     - label: Option 2
       value: option_2
+    <%- when 'collection_item' -%>
+    collection_id: products # check your config/initializers/maglev.rb to register your collection
     <%- end -%>
     <%- if setting.value? -%>
     default: <%= setting.default %>
@@ -80,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:
@@ -94,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.6'
+  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"