spina 2.3.5 → 2.6.1

data/app/views/spina/user_mailer/forgot_password.html.erb

@@ -1 +1,57 @@
-You forgot your password. Here's a link to setup a new one: <%= link_to 'Reset password', spina.edit_admin_password_reset_url(@user.password_reset_token) %>. It expires in 2 hours.
+<span class="preheader" style="display: none !important; visibility: hidden; mso-hide: all; font-size: 1px; line-height: 1px; max-height: 0; max-width: 0; opacity: 0; overflow: hidden;"><%=t "spina.user_mailer.forgot_password.preheader" %></span>
+<table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; -premailer-width: 100%; -premailer-cellpadding: 0; -premailer-cellspacing: 0; margin: 0; padding: 0;">
+  <tr>
+    <td align="center" style="word-break: break-word; font-family: &quot;Nunito Sans&quot;, Helvetica, Arial, sans-serif; font-size: 16px;">
+      <table class="email-content" width="100%" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; -premailer-width: 100%; -premailer-cellpadding: 0; -premailer-cellspacing: 0; margin: 0; padding: 0;">
+        <!-- Email Body -->
+        <tr>
+          <td class="email-body" width="570" cellpadding="0" cellspacing="0" style="word-break: break-word; margin: 0; padding: 0; font-family: &quot;Nunito Sans&quot;, Helvetica, Arial, sans-serif; font-size: 16px; width: 100%; -premailer-width: 100%; -premailer-cellpadding: 0; -premailer-cellspacing: 0;">
+            <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation" style="width: 570px; -premailer-width: 570px; -premailer-cellpadding: 0; -premailer-cellspacing: 0; margin: 0 auto; padding: 0;">
+              <!-- Body content -->
+              <tr>
+                <td class="content-cell" style="word-break: break-word; font-family: &quot;Nunito Sans&quot;, Helvetica, Arial, sans-serif; font-size: 16px; padding: 35px;">
+                  <div class="f-fallback">
+                    <h1 style="margin-top: 0; color: #333333; font-size: 22px; font-weight: bold; text-align: left;" align="left">
+                      <%=t "spina.user_mailer.forgot_password.salutation", name: @user.name %>
+                    </h1>
+                    <p style="font-size: 16px; line-height: 1.625; color: #333; margin: .4em 0 1.1875em;">
+                      <%=t "spina.user_mailer.forgot_password.introduction_html" %>
+                    </p>
+                    <!-- Action -->
+                    <table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; -premailer-width: 100%; -premailer-cellpadding: 0; -premailer-cellspacing: 0; text-align: center; margin: 30px auto; padding: 0;">
+                      <tr>
+                        <td align="center" style="word-break: break-word; font-family: &quot;Nunito Sans&quot;, Helvetica, Arial, sans-serif; font-size: 16px;">
+                          <!-- Border based button
+       https://litmus.com/blog/a-guide-to-bulletproof-buttons-in-email-design -->
+                          <table width="100%" border="0" cellspacing="0" cellpadding="0" role="presentation">
+                            <tr>
+                              <td align="center" style="word-break: break-word; font-family: &quot;Nunito Sans&quot;, Helvetica, Arial, sans-serif; font-size: 16px;">
+                                <a href="<%= spina.edit_admin_password_reset_url(@user.password_reset_token) %>" class="f-fallback button button--green" target="_blank" style="color: #FFF; border-color: #6865b4; border-style: solid; border-width: 10px 18px; background-color: #6865b4; display: inline-block; text-decoration: none; border-radius: 7px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.16); -webkit-text-size-adjust: none; box-sizing: border-box;"><%=t "spina.user_mailer.forgot_password.button" %></a>
+                              </td>
+                            </tr>
+                          </table>
+                        </td>
+                      </tr>
+                    </table>
+                    <p style="font-size: 16px; line-height: 1.625; color: #333; margin: .4em 0 1.1875em;">
+                      <%=t "spina.user_mailer.forgot_password.request_origin", platform: @browser.platform.name, browser: @browser.name %>
+                    </p>
+                    <!-- Sub copy -->
+                    <table class="body-sub" role="presentation" style="margin-top: 25px; padding-top: 25px; border-top-width: 1px; border-top-color: #EAEAEC; border-top-style: solid;">
+                      <tr>
+                        <td style="word-break: break-word; font-family: &quot;Nunito Sans&quot;, Helvetica, Arial, sans-serif; font-size: 16px;">
+                          <p class="f-fallback sub" style="font-size: 13px; line-height: 1.625; color: #333; margin: .4em 0 1.1875em;"><%=t "spina.user_mailer.forgot_password.trouble" %></p>
+                          <p class="f-fallback sub" style="font-size: 13px; line-height: 1.625; color: #333; margin: .4em 0 1.1875em;"><%= spina.edit_admin_password_reset_url(@user.password_reset_token) %></p>
+                        </td>
+                      </tr>
+                    </table>
+                  </div>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>

data/app/views/spina/user_mailer/forgot_password.text.erb

@@ -0,0 +1,9 @@
+<%=t "spina.user_mailer.forgot_password.preheader" %>
+
+<%=t "spina.user_mailer.forgot_password.salutation", name: @user.name %>
+
+<%=t "spina.user_mailer.forgot_password.introduction" %>
+
+<%= spina.edit_admin_password_reset_url(@user.password_reset_token) %>
+
+<%=t "spina.user_mailer.forgot_password.request_origin", platform: @browser.platform.name, browser: @browser.name %>

data/config/initializers/importmap.rb

@@ -0,0 +1,12 @@
+Spina.config.importmap.draw do
+  # Stimulus & Turbo
+  pin "@hotwired/stimulus", to: "stimulus.js"
+  pin "@hotwired/stimulus-loading", to: "stimulus-loading.js"
+  pin "@hotwired/turbo-rails", to: "turbo.js"
+  
+  # Spina entrypoint
+  pin "application", to: "spina/application.js"
+  
+  pin_all_from Spina::Engine.root.join("app/assets/javascripts/spina/controllers"), under: "controllers", to: "spina/controllers"
+  pin_all_from Spina::Engine.root.join("app/assets/javascripts/spina/libraries"), under: "libraries", to: "spina/libraries"
+end

data/config/locales/en.yml

@@ -1,4 +1,10 @@
 en:
+  activemodel:
+    attributes:
+      spina/embeds/youtube:
+        url: youtube.com/watch?v=...
+      spina/embeds/vimeo:
+        url: vimeo.com/...
   activerecord:
     attributes:
       spina/account:
@@ -94,6 +100,15 @@ en:
       spina/user:
         one: User
         other: Users
+  helpers:
+    label:
+      spina/embeds/button:
+        url: URL
+        label: Button label
+      spina/embeds/youtube:
+        url: Youtube URL
+      spina/embeds/vimeo:
+        url: Vimeo URL
   spina:
     accounts:
       contact_details: Contact details
@@ -117,6 +132,9 @@ en:
     delete_confirmation: Are you sure you want to delete <strong>%{subject}</strong>?
     edit: Edit
     edit_website: Edit your website
+    embeds:
+      embed_a_component: Embed a component
+      embed_component: Embed component
     forgot_password:
       expired: Your password reset token has expired
       mail_subject: Reset your password
@@ -140,6 +158,7 @@ en:
       insert_photo: Insert photo
       insert_photos: Insert photos
       link: Link
+      missing_image: Missing image
       new_folder: New folder
       organize: Organize
       remove_image: Remove image
@@ -321,6 +340,16 @@ en:
       rename: Rename
       save_changes: Save changes
       saving: Saving...
+    user_mailer:
+      forgot_password:
+        button: Reset your password
+        introduction: You recently requested to reset your password for your Spina CMS account. This password reset is only valid for the next 2 hours. Copy and paste the URL below into your web browser.
+        introduction_html: "You recently requested to reset your password for your Spina CMS account. Use the button below to reset it. <strong>This password reset is only valid for the next 2 hours.</strong>"
+        preheader: Use this link to reset your password. The link is only valid for 2 hours.
+        request_origin: For security, this request was received from a %{platform} device using %{browser}. If you did not request a password reset, please ignore this email.
+        salutation: Hi, %{name}
+        subject: Reset your password
+        trouble: If you’re having trouble with the button above, copy and paste the URL below into your web browser.
     users:
       authorization: Authorization
       authorization_description: Administrators can manage users. Regular users cannot.
@@ -341,6 +370,7 @@ en:
       content: Content
       documents: Documents
       images: Images
+      main: Main
       media_library: Media library
       media_library_description: Here's where you'll find all of your images and documents
       pages: Pages

data/config/locales/nl.yml

@@ -337,6 +337,7 @@ nl:
       all_pages: Alle pagina's
       documents: Documenten
       images: Afbeeldingen
+      main: Pagina's
       media_library: Mediabibliotheek
       media_library_description: Hier staan al je afbeeldingen, video's en documenten
       pages: Pagina's

data/config/routes.rb

@@ -80,6 +80,8 @@ Spina::Engine.routes.draw do
     resources :images
     
     resource :media_picker, controller: "media_picker", only: [:show]
+    
+    resources :embeds, only: [:new, :create]
   end
 
   # Sitemap
@@ -92,8 +94,9 @@ Spina::Engine.routes.draw do
     # Pages
     get '/:locale/*id' => 'pages#show', constraints: {locale: /#{Spina.config.locales.join('|')}/ }
     get '/:locale/' => 'pages#homepage', constraints: {locale: /#{Spina.config.locales.join('|')}/ }
-    get '/*id' => 'pages#show', as: "page", controller: 'pages', constraints: lambda { |request|
-      (!(Rails.env.development? && request.env['PATH_INFO'].starts_with?('/rails/') || request.env['PATH_INFO'].starts_with?("/#{Spina.config.backend_path}") || request.env['PATH_INFO'].starts_with?('/attachments/'))) && request.path.exclude?("rails/active_storage")
+    get '/*id' => 'pages#show', as: "page", controller: 'pages', constraints: -> (request) {
+      request.path.exclude?(ActiveStorage.routes_prefix) &&
+      !(Rails.env.development? && request.path.starts_with?('/rails/'))
     }
   end
 

data/lib/generators/spina/embed_generator.rb

@@ -0,0 +1,18 @@
+module Spina
+  class EmbedGenerator < Rails::Generators::NamedBase
+    source_root File.expand_path("../templates", __FILE__)
+    
+    argument :attributes, type: :array, default: [], banner: "field field"
+    
+    def create_embed_object
+      template "app/models/spina/embeds/embed.rb.tt", "app/models/spina/embeds/#{file_name}.rb"
+    end
+    
+    def create_views
+      template "app/views/spina/embeds/_fields.html.erb", "app/views/spina/embeds/#{plural_file_name}/_#{file_name}_fields.html.erb"
+      
+      template "app/views/spina/embeds/_partial.html.erb", "app/views/spina/embeds/#{plural_file_name}/_#{file_name}.html.erb"
+    end
+    
+  end
+end

data/lib/generators/spina/install_generator.rb

@@ -1,52 +1,61 @@
 module Spina
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path("../templates", __FILE__)
+    
+    class_option :first_deploy, type: :boolean, default: false
+    class_option :silent, type: :boolean, default: false
 
     def create_initializer_file
-      return if Rails.env.production?
+      return if first_deploy?
       template 'config/initializers/spina.rb'
     end
 
     def create_mobility_initializer_file
-      return if Rails.env.production?
+      return if first_deploy?
       template 'config/initializers/mobility.rb'
     end
 
     def add_route
-      return if Rails.env.production?
+      return if first_deploy?
       return if Rails.application.routes.routes.detect { |route| route.app.app == Spina::Engine }
       route "mount Spina::Engine => '/'"
     end
 
     def copy_migrations
-      return if Rails.env.production?
+      return if first_deploy?
       rake 'spina:install:migrations'
     end
 
     def run_migrations
+      return if first_deploy?
       rake 'db:migrate'
     end
 
     def create_account
       return if ::Spina::Account.exists? && !no?('An account already exists. Skip? [Yn]')
       name = ::Spina::Account.first.try(:name) || 'MySite'
-      name = ask("What would you like to name your website? [#{name}]").presence || name
-      account = ::Spina::Account.first_or_create.update_attribute(:name, name)
+      if talkative_install?
+        name = ask("What would you like to name your website? [#{name}]").presence || name
+      end
+      account = ::Spina::Account.first_or_create.update(name: name)
     end
 
     def set_theme
       account = ::Spina::Account.first
-      return if account.theme.present? && !no?("Theme '#{account.theme} is set. Skip? [Yn]")
+      return if account.theme.present? && !no?("Theme '#{account.theme}' is set. Skip? [Yn]")
 
-      theme = begin
-                theme = account.theme || themes.first
-                theme = ask("What theme do you want to use? (#{themes.join('/')}) [#{theme}]").presence || theme
-              end until theme.in? themes
+      theme = account.theme || themes.first
+      if talkative_install?
+        theme = begin
+                  theme = ask("What theme do you want to use? (#{themes.join('/')}) [#{theme}]").presence || theme
+                end until theme.in? themes
+      end
 
-      account.update_attribute(:theme, theme)
+      account.update(theme: theme)
     end
 
     def copy_template_files
+      return if options['first_deploy']
       theme = ::Spina::Account.first.theme
       if theme.in? ['default', 'demo']
         template "config/initializers/themes/#{theme}.rb"
@@ -59,10 +68,15 @@ module Spina
 
     def create_user
       return if ::Spina::User.exists? && !no?('A user already exists. Skip? [Yn]')
+
       email = 'admin@domain.com'
-      email = ask("Please enter an email address for your first user: [#{email}]").presence || email
+      if talkative_install?
+        email = ask("Please enter an email address for your first user: [#{email}]").presence || email
+      end
       password = 'password'
-      password = ask("Create a temporary password: [#{password}]").presence || password
+      if talkative_install?
+        password = ask("Create a temporary password: [#{password}]").presence || password
+      end
       @temporary_password = password
       ::Spina::User.create name: 'admin', email: email, password: password, admin: true
     end
@@ -91,6 +105,14 @@ module Spina
         themes = Spina::Theme.all.map(&:name)
         themes | ['default', 'demo']
       end
+      
+      def first_deploy?
+        options['first_deploy']
+      end
+
+      def talkative_install?
+        !options['silent']
+      end
 
   end
 end

data/lib/generators/spina/templates/app/models/spina/embeds/embed.rb.tt

@@ -0,0 +1,18 @@
+class <%= class_name %> < Spina::Embeds::Base
+  attributes <%= attributes.map{|attr| ":#{attr.name}"}.join(", ") %>
+  
+  # You can use Rails validations on your attributes
+  validates <%= attributes.map{|attr| ":#{attr.name}"}.join(", ") %>, presence: true
+  
+  # Pick an icon at https://heroicons.com
+  # and it'll show up in the list of embeddable components
+  heroicon "chip"
+  
+  # If you want to render your embeddable component differently in Trix,
+  # you can choose to render a different partial
+  # Default: _<%= file_name %>.html.erb
+  # 
+  # def to_trix_partial_path
+  #  "spina/embeds/<%= plural_file_name %>/trix_<%= file_name %>"
+  # end
+end

data/lib/generators/spina/templates/app/views/default/pages/homepage.html.erb

@@ -1,2 +1,2 @@
-<h1><%= current_page.title %>
+<h1><%= current_page.title %></h1>
 <%= content.html :text %>

data/lib/generators/spina/templates/app/views/spina/embeds/_fields.html.erb

@@ -0,0 +1,13 @@
+<div class="text-xl font-bold mb-3 text-gray-800">
+  Your embed
+  <div class="text-sm text-gray-500 font-normal">
+    Descriptive text
+  </div>
+</div>
+
+<!-- 
+  Put your fields here using Spina's built-in ViewComponents:
+  
+  render Spina::Forms::LabelComponent.new(f, :url)
+  render Spina::Forms::TextFieldComponent.new(f, :url, autofocus: true)
+-->

data/lib/generators/spina/templates/app/views/spina/embeds/_partial.html.erb

@@ -0,0 +1,2 @@
+<!-- This is what visitors will see -->
+Your embed

data/lib/generators/spina/templates/config/initializers/spina.rb

@@ -39,6 +39,13 @@ Spina.configure do |config|
   # The default is Spina::Authentication::Sessions and includes basic user management
   # config.authentication = "Spina::Authentication::Sessions"
   
+  # Mailers
+  # ===============
+  # In order to send emails, you need to set a default from address.
+  # You can set an optional reply_to address as well.
+  # config.mailer_defaults.from = "no-reply@example.com"
+  # config.mailer_defaults.reply_to = "support@example.com"
+  
   # API
   # ===============
   # Set an API key to activate Spina's API. 

data/lib/generators/spina/templates/config/initializers/themes/default.rb

@@ -59,4 +59,7 @@ Spina::Theme.register do |theme|
   
   # Plugins (optional)
   theme.plugins = []
+  
+  # Embeds (optional)
+  theme.embeds = []
 end

data/lib/generators/spina/templates/config/initializers/themes/demo.rb

@@ -37,7 +37,7 @@ Spina::Theme.register do |theme|
   theme.view_templates = [
     {name: 'homepage', title: 'Homepage', parts: %w(headline body image_collection)}, 
     {name: 'show', title: 'Default', parts: %w(body image repeater)}, 
-    {name: 'demo', title: 'Demo', parts: %w(body image_collection image repeater)}
+    {name: 'demo', title: 'Demo', parts: %w(body image_collection image repeater), exclude_from: %w(articles)}
   ]
 
   # Custom pages
@@ -69,4 +69,7 @@ Spina::Theme.register do |theme|
 
   # Plugins (optional)
   theme.plugins = ['reviews']
+  
+  # Embeds (optional)
+  theme.embeds = []
 end

data/lib/spina/embeddable.rb

@@ -0,0 +1,48 @@
+module Spina
+  module Embeddable
+    extend ActiveSupport::Concern
+    
+    included do
+      class_attribute :embed_attributes, default: []
+      class_attribute :icon, default: nil
+    end
+    
+    class_methods do
+      def from_json(json)
+        begin
+          attributes = JSON.parse(json)
+          attributes.transform_keys!(&:to_sym)
+          new(attributes)
+        rescue
+          Rails.logger.error "[#{self.class.name}] Couldn't parse JSON"
+          nil
+        end
+      end
+      
+      def attributes(*names)
+        attr_accessor(*names.map(&:to_sym))
+        self.embed_attributes += names.map(&:to_sym)
+      end
+      
+      # Give it an icon
+      def heroicon(name)
+        self.icon = name
+      end
+    end
+    
+    def initialize(attributes = {})
+      attributes.slice(*self.class.embed_attributes).each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+    end
+    
+    def to_fields_path
+      "#{to_partial_path}_fields"
+    end
+    
+    def to_trix_partial_path
+      to_partial_path
+    end
+    
+  end
+end

data/lib/spina/embeds/trix_conversion.rb

@@ -0,0 +1,41 @@
+module Spina
+  module Embeds
+    module TrixConversion
+      extend ActiveSupport::Concern
+      
+      # Wrap rendered partial in an <embed> tag for Trix
+      def to_trix_attachment(content = trix_attachment_content)        
+        wrap_with_embed_tag(content)
+      end
+      
+      def wrap_with_embed_tag(html)
+        element = html_document.create_element("spina-embed", embed_tag_attributes)
+        element.inner_html = html
+        element.to_html
+      end
+      
+      private
+      
+        def embed_tag_attributes
+          spina_attributes.merge({"data-embed-attributes": embed_attributes_to_json})
+        end
+      
+        def embed_attributes_to_json
+          JSON.generate Hash[self.class.embed_attributes.map{|a| [a.to_s, send(a)]}]
+        end
+        
+        def spina_attributes
+          {"data-embed-type": self.class.name, "data-controller": "embed-tag"}
+        end
+      
+        def trix_attachment_content
+          ApplicationController.render(partial: to_trix_partial_path, formats: :html, object: self, as: model_name.element)
+        end
+        
+        def html_document
+          Nokogiri::HTML::Document.new.tap{|doc| doc.encoding = "UTF-8"}
+        end
+      
+    end
+  end
+end

data/lib/spina/embeds.rb

@@ -0,0 +1,11 @@
+module Spina
+  module Embeds
+  
+    def self.constantize(embeddable_type)
+      return nil if embeddable_type.blank?
+      name = embeddable_type.camelize.demodulize.to_s
+      "Spina::Embeds::#{name}".safe_constantize
+    end
+
+  end
+end

data/lib/spina/engine.rb

@@ -1,4 +1,3 @@
-require 'sass-rails'
 require 'importmap-rails'
 require 'turbo-rails'
 require 'stimulus-rails'
@@ -9,13 +8,14 @@ require 'mobility'
 require 'rack-rewrite'
 require 'babosa'
 require 'attr_json'
-require 'view_component/engine'
+require 'view_component'
 require 'jsonapi/serializer'
+require 'browser'
 
 module Spina
   class Engine < ::Rails::Engine
     isolate_namespace Spina
-
+    
     config.autoload_paths += %W( #{config.root}/lib )
 
     config.to_prepare do
@@ -25,8 +25,9 @@ module Spina
           require_dependency(decorator)
         end
       end
-
-      # Register JSON part types for editing content
+    end
+    
+    config.to_prepare do
       Spina::Part.register(
         Spina::Parts::Line,
         Spina::Parts::MultiLine,
@@ -38,21 +39,6 @@ module Spina
         Spina::Parts::Attachment
       )
     end
-    
-    initializer "spina.importmap" do
-      Spina.config.importmap.draw do
-        # Stimulus & Turbo
-        pin "@hotwired/stimulus", to: "stimulus.js"
-        pin "@hotwired/stimulus-autoloader", to: "stimulus-autoloader.js"
-        pin "@hotwired/turbo-rails", to: "turbo.js"
-        
-        # Spina entrypoint
-        pin "application", to: "spina/application.js"
-        
-        pin_all_from Spina::Engine.root.join("app/assets/javascripts/spina/controllers"), under: "controllers", to: "spina/controllers"
-        pin_all_from Spina::Engine.root.join("app/assets/javascripts/spina/libraries"), under: "libraries", to: "spina/libraries"
-      end
-    end
-    
+
   end
 end

data/lib/spina/part.rb

@@ -8,12 +8,20 @@ module Spina
       end
 
       def register(*parts)
-        parts.each{|part| all << part}
+        parts.each do |part|
+          unregister(part)
+          all << part
+        end
+      end
+      
+      def unregister(part)
+        all.delete_if do |registered_part|
+          registered_part.name == part.name
+        end
       end
 
     end
 
-
   end
 end
 

data/lib/spina/railtie.rb

@@ -5,6 +5,16 @@ module Spina
       app.config.assets.precompile += %w(spina/manifest)
     end
     
+    initializer "spina.theme_reloader" do |app|
+      reloader = ThemeReloader.new
+      reloader.execute
+      
+      app.reloaders << reloader
+      app.reloader.to_run do
+        reloader.execute
+      end
+    end
+    
     ActiveSupport.on_load(:action_controller) do
       ::ActionController::Base.send(:include, Spina::AdminSectionable)
     end

data/lib/spina/theme.rb

@@ -1,13 +1,18 @@
 module Spina
   class Theme
 
-    attr_accessor :name, :title, :parts, :page_parts, :structures, :view_templates, :layout_parts, :custom_pages, :plugins, :public_theme, :config, :navigations, :resources
+    attr_accessor :name, :title, :parts, :page_parts, :structures, :view_templates, :layout_parts, :custom_pages, :plugins, :public_theme, :config, :navigations, :resources, :embeds
 
     class << self
 
       def all
         ::Spina::THEMES
       end
+      
+      def unregister(name)
+        theme = find_by_name(name)
+        all.delete(theme) if theme
+      end
 
       def find_by_name(name)
         all.find { |theme| theme.name == name }
@@ -17,6 +22,7 @@ module Spina
         theme = ::Spina::Theme.new
         yield theme
         raise 'Missing theme name' if theme.name.nil?
+        unregister(theme.name)
         if theme.plugins.nil?
           theme.plugins = ::Spina::Plugin.all.map { |plugin| plugin.name }
         end
@@ -33,18 +39,25 @@ module Spina
       @custom_pages     = []
       @navigations      = []
       @resources        = []
+      @embeds           = []
       @public_theme = false
     end
+    
+    def embeddables
+      embeds.map{|embed| Embeds.constantize(embed)}
+    end
 
-    def new_page_templates(recommended: "")
+    def new_page_templates(resource: nil)
+      page_collection = resource&.name || "main"
       @view_templates.map do |view_template|
         next if is_custom_undeletable_page?(view_template[:name])
+        next if view_template[:exclude_from]&.include?(page_collection)
         
         OpenStruct.new({
           name: view_template[:name],
           title: view_template[:title],
           description: view_template[:description],
-          recommended: view_template[:name] == recommended
+          recommended: view_template[:name] == resource&.view_template
         })
       end.compact.sort_by do |page_template|
         [page_template.recommended ? 0 : 1]