spina 2.3.5 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d723b3ba40909c360cc1b6ddcf6f78064278f08911415db9852b38c53efa4064
-  data.tar.gz: 8057a9dab62bb7806f041ec07ecd48c4e91e3f63683c4192df625785a49eecfc
+  metadata.gz: cc21967f4a24ee99e20c76c80c6816cf921f4b0a270686049e8fb736f41c7b3d
+  data.tar.gz: bd94d0854dd6d9e85569075ef965524f3d458820482fecb874fe2ff669ea28df
 SHA512:
-  metadata.gz: 1e41c59c9ce94f638f51ae647ce1d92bde5c930123ada0ca766e02c79725ccb7bbc3b8a667508e813f386770762b16608b94132521faba55a3d2aaaa30133fb8
-  data.tar.gz: 6391ea4c0b0be38de86fa46cee4057302be8be655044d33784bcdd7e5774221004ae1f1d8e9570e8e05f673fbbbff8ed586b8f47923119f9f6405586a691a8e3
+  metadata.gz: 41393817fa4b6e939fa74f3c09d195edfa45b3142c4a30c99a21a6e85c1e0ca6c11516e1902170849ed487d9c47c064416516230685fac412b55af54bff37563
+  data.tar.gz: b94ce566a3ce68541b957831193e7931738ae605b95595901f2dfa915159ae0702189127c67fe2badbd1550e3f491262e18fe4c11775e9712b484502d83088c6

data/README.md

@@ -5,7 +5,7 @@
 [![Ruby](https://github.com/SpinaCMS/Spina/actions/workflows/ruby.yml/badge.svg)](https://github.com/SpinaCMS/Spina/actions/workflows/ruby.yml)
 [![Code Climate](https://codeclimate.com/github/SpinaCMS/Spina/badges/gpa.svg)](https://codeclimate.com/github/SpinaCMS/Spina)
 [![Test Coverage](https://codeclimate.com/github/SpinaCMS/Spina/badges/coverage.svg)](https://codeclimate.com/github/SpinaCMS/Spina/coverage)
-[![Slack](https://slack-spinacms.herokuapp.com/badge.svg)](https://slack-spinacms.herokuapp.com)
+[![Discord](https://img.shields.io/discord/811903407525986304?label=Discord)](https://discord.gg/bv5Mu4XYcN)
 
 ## Getting Started
 [Read the guide](https://www.spinacms.com/docs) to learn more about how to use Spina. If you just want to get started, create a new Ruby on Rails app and follow these instructions:
@@ -24,6 +24,11 @@ The installer will help you create your first user.
 
 Then start `rails s` and access Spina at `/admin`.
 
+## Browser support
+Spina's admin UI requires Chrome/Edge 89+, or any other browser with basic ESM support (Safari/Firefox). This is due to a recent browser feature called `import maps` and will be used in Rails 7 as the default way to deploy javascript assets.
+
+Browser support for websites built with Spina is entirely up to the developer. Spina doesn't force you to build your frontend a certain way.
+
 ## Contributing
 
 Check our [Contributing Guide](CONTRIBUTING.md) for instructions on how to help the project.
@@ -63,6 +68,8 @@ Icons were designed by [@steveschoger](https://twitter.com/steveschoger) - [Hero
 
 HotKeys support via [Hotkeys.js](https://wangchujiang.com/hotkeys/)
 
+Email templates based on Wildbit's [Postmark Templates](https://github.com/wildbit/postmark-templates)
+
 The font used in Spina's admin panel is called Metropolis and was created by Chris Simpson [Metropolis](https://github.com/chrismsimpson/Metropolis)
 
     Copyright (c) 2015, Chris Simpson <chris@victoryonemedia.com>.

data/app/components/spina/media_picker/image_component.html.erb

@@ -2,7 +2,7 @@
   <button type="button" 
     data-action="media-picker-modal#selectImage selectable#select dblclick->media-picker-modal#instantInsert" 
     data-image-id="<%= @image.id %>"
-    data-signed-blob-id="<%= @image.file.blob.signed_id %>"
+    data-signed-blob-id="<%= @image.file.blob&.signed_id %>"
     data-filename="<%= @image.file.filename %>"
     data-thumbnail="<%= helpers.thumbnail_url(@image) %>"
     data-embedded-url="<%= helpers.embedded_image_url(@image) %>"

data/app/components/spina/pages/new_page_button_component.html.erb

@@ -0,0 +1,32 @@
+<% if view_templates.many? %>
+
+  <%= render Spina::UserInterface::DropdownComponent.new do |dropdown| %>
+    <% dropdown.button(classes: "btn btn-primary w-full") do %>
+      <%= helpers.heroicon("plus", style: :solid, class: "w-7 h-7 -ml-2") %>
+      <%=t 'spina.pages.new' %>
+    <% end %>
+    
+    <% dropdown.menu do %>
+      <% view_templates.each do |template| %>
+        <%= link_to helpers.spina.new_admin_page_path(view_template: template.name, resource_id: @resource&.id), class: "block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900", data: {turbo_frame: "modal", action: "reveal#hide"} do %>
+          <div class="font-medium text-gray-700">
+            <%= template.title %>
+            
+            <% if template.recommended %>
+              <span class="text-green-500 text-xs"><%=t 'spina.pages.recommended' %></span>
+            <% end %>
+          </div>
+          <div class="text-gray-400"><%= template.description %></div>
+        <% end %>
+      <% end %>
+    <% end %>
+  <% end %>
+  
+<% else %>
+
+  <%= link_to helpers.spina.new_admin_page_path(view_template: view_template.name, resource_id: resource&.id), class: "btn btn-primary w-full", data: {turbo_frame: "modal"} do %>
+    <%= helpers.heroicon("plus", style: :solid, class: "w-7 h-7 -ml-2") %>
+    <%=t 'spina.pages.new' %>
+  <% end %>
+  
+<% end %>

data/app/components/spina/pages/new_page_button_component.rb

@@ -0,0 +1,19 @@
+module Spina::Pages
+  class NewPageButtonComponent < Spina::ApplicationComponent
+    attr_reader :view_templates, :resource
+    
+    def initialize(view_templates = [], resource: nil)
+      @view_templates = view_templates
+      @resource = resource
+    end
+    
+    def view_template
+      view_templates.first
+    end
+    
+    def render?
+      view_templates.any?
+    end
+    
+  end
+end

data/app/controllers/spina/admin/pages_controller.rb

@@ -8,10 +8,9 @@ module Spina
       def index
         add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
         
-        
         if params[:resource_id]
           @resource = Resource.find(params[:resource_id])
-          @page_templates = Spina::Current.theme.new_page_templates(recommended: @resource.view_template)
+          @page_templates = Spina::Current.theme.new_page_templates(resource: @resource)
           @pages = @resource.pages.active.roots.includes(:translations)
         else
           @pages = Page.active.sorted.roots.main.includes(:translations)

data/app/controllers/spina/admin/password_resets_controller.rb

@@ -11,10 +11,8 @@ module Spina
       def create
         user = User.find_by(email: params[:email])
 
-        if user.present?
-          user.regenerate_password_reset_token
-          user.touch(:password_reset_sent_at)
-          UserMailer.forgot_password(user).deliver_now
+        if user&.reset_passord!
+          UserMailer.forgot_password(user, request.user_agent).deliver_later
           redirect_to admin_login_path, flash: {success: t('spina.forgot_password.instructions_sent')}
         else
           flash.now[:alert] = t('spina.forgot_password.unknown_user')

data/app/helpers/spina/images_helper.rb

@@ -32,7 +32,7 @@ module Spina
     end
     
     def content_type(image)
-      image.file.content_type.split("/").last
+      image.file.content_type&.split("/")&.last || I18n.t("spina.images.missing_image")
     end
 
   end

data/app/mailers/spina/application_mailer.rb

@@ -0,0 +1,7 @@
+module Spina
+  class ApplicationMailer < ActionMailer::Base
+    default Spina.config.mailer_defaults
+    
+    layout 'spina/mail'
+  end
+end

data/app/mailers/spina/user_mailer.rb

@@ -1,21 +1,13 @@
 module Spina
-  class UserMailer < ActionMailer::Base
-    layout 'spina/mail'
+  class UserMailer < ApplicationMailer
 
-    def forgot_password(user)
+    def forgot_password(user, user_agent_string = nil)
       @user = user
-
-      mail(
-        to: @user.email, 
-        from: current_account.email, 
-        subject: t('spina.forgot_password.mail_subject')
-      )
+      @browser = Browser.new(user_agent_string)
+      
+      mail to: @user.email, 
+           subject: t('spina.user_mailer.forgot_password.subject')
     end
 
-    private
-
-      def current_account
-        Spina::Account.first
-      end
   end
 end

data/app/models/spina/user.rb

@@ -15,6 +15,12 @@ module Spina
     def to_s
       name
     end
+    
+    def reset_passord!
+      regenerate_password_reset_token
+      self.password_reset_sent_at = Time.current
+      save!
+    end
 
   end
 end

data/app/views/layouts/spina/mail.html.erb

@@ -1 +1,476 @@
-<%= yield %>
+<!-- The MIT License (MIT)
+
+Copyright (c) 2015 Wildbit
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE. -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="x-apple-disable-message-reformatting" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="color-scheme" content="light dark" />
+    <meta name="supported-color-schemes" content="light dark" />
+    <title></title>
+    <style type="text/css" rel="stylesheet" media="all">
+    /* Base ------------------------------ */
+    
+    @import url("https://fonts.googleapis.com/css?family=Nunito+Sans:400,700&amp;display=swap");
+    body {
+      width: 100% !important;
+      height: 100%;
+      margin: 0;
+      -webkit-text-size-adjust: none;
+    }
+    
+    a {
+      color: #3869D4;
+    }
+    
+    a img {
+      border: none;
+    }
+    
+    td {
+      word-break: break-word;
+    }
+    
+    .preheader {
+      display: none !important;
+      visibility: hidden;
+      mso-hide: all;
+      font-size: 1px;
+      line-height: 1px;
+      max-height: 0;
+      max-width: 0;
+      opacity: 0;
+      overflow: hidden;
+    }
+    /* Type ------------------------------ */
+    
+    body,
+    td,
+    th {
+      font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
+    }
+    
+    h1 {
+      margin-top: 0;
+      color: #333333;
+      font-size: 22px;
+      font-weight: bold;
+      text-align: left;
+    }
+    
+    h2 {
+      margin-top: 0;
+      color: #333333;
+      font-size: 16px;
+      font-weight: bold;
+      text-align: left;
+    }
+    
+    h3 {
+      margin-top: 0;
+      color: #333333;
+      font-size: 14px;
+      font-weight: bold;
+      text-align: left;
+    }
+    
+    td,
+    th {
+      font-size: 16px;
+    }
+    
+    p,
+    ul,
+    ol,
+    blockquote {
+      margin: .4em 0 1.1875em;
+      font-size: 16px;
+      line-height: 1.625;
+    }
+    
+    p.sub {
+      font-size: 13px;
+    }
+    /* Utilities ------------------------------ */
+    
+    .align-right {
+      text-align: right;
+    }
+    
+    .align-left {
+      text-align: left;
+    }
+    
+    .align-center {
+      text-align: center;
+    }
+    /* Buttons ------------------------------ */
+    
+    .button {
+      background-color: #3869D4;
+      border-top: 10px solid #3869D4;
+      border-right: 18px solid #3869D4;
+      border-bottom: 10px solid #3869D4;
+      border-left: 18px solid #3869D4;
+      display: inline-block;
+      color: #FFF;
+      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;
+    }
+    
+    .button--green {
+      background-color: #22BC66;
+      border-top: 10px solid #22BC66;
+      border-right: 18px solid #22BC66;
+      border-bottom: 10px solid #22BC66;
+      border-left: 18px solid #22BC66;
+    }
+    
+    .button--spina {
+      background-color: #6865b4;
+      border-top: 10px solid #6865b4;
+      border-right: 18px solid #6865b4;
+      border-bottom: 10px solid #6865b4;
+      border-left: 18px solid #6865b4;
+    }
+    
+    .button--red {
+      background-color: #FF6136;
+      border-top: 10px solid #FF6136;
+      border-right: 18px solid #FF6136;
+      border-bottom: 10px solid #FF6136;
+      border-left: 18px solid #FF6136;
+    }
+    
+    @media only screen and (max-width: 500px) {
+      .button {
+        width: 100% !important;
+        text-align: center !important;
+      }
+    }
+    /* Attribute list ------------------------------ */
+    
+    .attributes {
+      margin: 0 0 21px;
+    }
+    
+    .attributes_content {
+      background-color: #F4F4F7;
+      padding: 16px;
+    }
+    
+    .attributes_item {
+      padding: 0;
+    }
+    /* Related Items ------------------------------ */
+    
+    .related {
+      width: 100%;
+      margin: 0;
+      padding: 25px 0 0 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+    
+    .related_item {
+      padding: 10px 0;
+      color: #CBCCCF;
+      font-size: 15px;
+      line-height: 18px;
+    }
+    
+    .related_item-title {
+      display: block;
+      margin: .5em 0 0;
+    }
+    
+    .related_item-thumb {
+      display: block;
+      padding-bottom: 10px;
+    }
+    
+    .related_heading {
+      border-top: 1px solid #CBCCCF;
+      text-align: center;
+      padding: 25px 0 10px;
+    }
+    /* Discount Code ------------------------------ */
+    
+    .discount {
+      width: 100%;
+      margin: 0;
+      padding: 24px;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+      background-color: #F4F4F7;
+      border: 2px dashed #CBCCCF;
+    }
+    
+    .discount_heading {
+      text-align: center;
+    }
+    
+    .discount_body {
+      text-align: center;
+      font-size: 15px;
+    }
+    /* Social Icons ------------------------------ */
+    
+    .social {
+      width: auto;
+    }
+    
+    .social td {
+      padding: 0;
+      width: auto;
+    }
+    
+    .social_icon {
+      height: 20px;
+      margin: 0 8px 10px 8px;
+      padding: 0;
+    }
+    /* Data table ------------------------------ */
+    
+    .purchase {
+      width: 100%;
+      margin: 0;
+      padding: 35px 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+    
+    .purchase_content {
+      width: 100%;
+      margin: 0;
+      padding: 25px 0 0 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+    
+    .purchase_item {
+      padding: 10px 0;
+      color: #51545E;
+      font-size: 15px;
+      line-height: 18px;
+    }
+    
+    .purchase_heading {
+      padding-bottom: 8px;
+      border-bottom: 1px solid #EAEAEC;
+    }
+    
+    .purchase_heading p {
+      margin: 0;
+      color: #85878E;
+      font-size: 12px;
+    }
+    
+    .purchase_footer {
+      padding-top: 15px;
+      border-top: 1px solid #EAEAEC;
+    }
+    
+    .purchase_total {
+      margin: 0;
+      text-align: right;
+      font-weight: bold;
+      color: #333333;
+    }
+    
+    .purchase_total--label {
+      padding: 0 15px 0 0;
+    }
+    
+    body {
+      background-color: #FFF;
+      color: #333;
+    }
+    
+    p {
+      color: #333;
+    }
+    
+    .email-wrapper {
+      width: 100%;
+      margin: 0;
+      padding: 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+    
+    .email-content {
+      width: 100%;
+      margin: 0;
+      padding: 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+    /* Masthead ----------------------- */
+    
+    .email-masthead {
+      padding: 25px 0;
+      text-align: center;
+    }
+    
+    .email-masthead_logo {
+      width: 94px;
+    }
+    
+    .email-masthead_name {
+      font-size: 16px;
+      font-weight: bold;
+      color: #A8AAAF;
+      text-decoration: none;
+      text-shadow: 0 1px 0 white;
+    }
+    /* Body ------------------------------ */
+    
+    .email-body {
+      width: 100%;
+      margin: 0;
+      padding: 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+    
+    .email-body_inner {
+      width: 570px;
+      margin: 0 auto;
+      padding: 0;
+      -premailer-width: 570px;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+    
+    .email-footer {
+      width: 570px;
+      margin: 0 auto;
+      padding: 0;
+      -premailer-width: 570px;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+      text-align: center;
+    }
+    
+    .email-footer p {
+      color: #A8AAAF;
+    }
+    
+    .body-action {
+      width: 100%;
+      margin: 30px auto;
+      padding: 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+      text-align: center;
+    }
+    
+    .body-sub {
+      margin-top: 25px;
+      padding-top: 25px;
+      border-top: 1px solid #EAEAEC;
+    }
+    
+    .content-cell {
+      padding: 35px;
+    }
+    /*Media Queries ------------------------------ */
+    
+    @media only screen and (max-width: 600px) {
+      .email-body_inner,
+      .email-footer {
+        width: 100% !important;
+      }
+    }
+    
+    @media (prefers-color-scheme: dark) {
+      body {
+        background-color: #333333 !important;
+        color: #FFF !important;
+      }
+      p,
+      ul,
+      ol,
+      blockquote,
+      h1,
+      h2,
+      h3,
+      span,
+      .purchase_item {
+        color: #FFF !important;
+      }
+      .attributes_content,
+      .discount {
+        background-color: #222 !important;
+      }
+      .email-masthead_name {
+        text-shadow: none !important;
+      }
+    }
+    
+    :root {
+      color-scheme: light dark;
+      supported-color-schemes: light dark;
+    }
+    </style>
+    <!--[if mso]>
+    <style type="text/css">
+      .f-fallback  {
+        font-family: Arial, sans-serif;
+      }
+    </style>
+  <![endif]-->
+    <style type="text/css" rel="stylesheet" media="all">
+    body {
+      width: 100% !important;
+      height: 100%;
+      margin: 0;
+      -webkit-text-size-adjust: none;
+    }
+    
+    body {
+      font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
+    }
+    
+    body {
+      background-color: #FFF;
+      color: #333;
+    }
+    </style>
+  </head>
+  <body style="width: 100% !important; height: 100%; -webkit-text-size-adjust: none; font-family: &quot;Nunito Sans&quot;, Helvetica, Arial, sans-serif; background-color: #FFF; color: #333; margin: 0;" bgcolor="#FFF">
+    <%= yield %>
+  </body>
+</html>

data/app/views/spina/admin/pages/edit_template.html.erb

@@ -15,7 +15,7 @@
               <%= Spina::Page.human_attribute_name :view_template %>
             </label>
 
-            <%= f.select :view_template, options_for_select(current_theme.view_templates.map { |template| [template[:title], template[:name], {'data-page-parts' => template[:page_parts]}] }, @page.view_template), {}, class: "mt-1 form-select w-full" %>
+            <%= f.select :view_template, current_theme.new_page_templates(resource: @page.resource).map{ |template| [template.title, template.name] }, {}, class: "mt-1 form-select w-full" %>
           </div>
         </div>
       </div>

data/app/views/spina/admin/pages/index.html.erb

@@ -8,27 +8,7 @@
     <% end %>
     
     <div class="ml-3">
-      <%= render Spina::UserInterface::DropdownComponent.new do |dropdown| %>
-        <% dropdown.button(classes: "btn btn-primary w-full") do %>
-          <%= heroicon("plus", style: :solid, class: "w-7 h-7 -ml-2") %>
-          <%=t 'spina.pages.new' %>  
-        <% end %>
-        
-        <% dropdown.menu do %>
-          <% @page_templates.each do |template| %>
-            <%= link_to spina.new_admin_page_path(view_template: template.name, resource_id: @resource&.id), class: "block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900", data: {turbo_frame: "modal", action: "reveal#hide"} do %>
-              <div class="font-medium text-gray-700">
-                <%= template.title %>
-                
-                <% if template.recommended %>
-                  <span class="text-green-500 text-xs"><%=t 'spina.pages.recommended' %></span>
-                <% end %>
-              </div>
-              <div class="text-gray-400"><%= template.description %></div>
-            <% end %>
-          <% end %>
-        <% end %>
-      <% end %>
+      <%= render Spina::Pages::NewPageButtonComponent.new(@page_templates, resource: @resource) %>
     </div>
   <% end %>
   

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-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

data/config/locales/en.yml

@@ -140,6 +140,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 +322,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 +352,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/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/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/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

data/lib/spina/engine.rb

@@ -11,6 +11,7 @@ require 'babosa'
 require 'attr_json'
 require 'view_component/engine'
 require 'jsonapi/serializer'
+require 'browser'
 
 module Spina
   class Engine < ::Rails::Engine
@@ -37,22 +38,6 @@ module Spina
         Spina::Parts::Option,
         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
 end

data/lib/spina/theme.rb

@@ -36,15 +36,17 @@ module Spina
       @public_theme = false
     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]

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "2.3.5"
+  VERSION = "2.4.0"
 end

data/lib/spina.rb

@@ -26,6 +26,7 @@ module Spina
                   :disable_decorator_load,
                   :locales, 
                   :embedded_image_size,
+                  :mailer_defaults,
                   :thumbnail_image_size,
                   :party_pooper,
                   :tailwind_purge_content,
@@ -40,6 +41,7 @@ module Spina
   self.disable_frontend_routes = false
   self.disable_decorator_load = false
   self.embedded_image_size = [2000, 2000]
+  self.mailer_defaults = ActiveSupport::OrderedOptions.new
   self.thumbnail_image_size = [400, 400]
   self.frontend_parent_controller = "ApplicationController"
   self.locales = [I18n.default_locale]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.4.0
 platform: ruby
 authors:
 - Bram Jetten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-22 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
@@ -210,16 +210,22 @@ dependencies:
   name: stimulus-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +254,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CMS
 email:
 - bram@denkgroot.com
@@ -874,6 +894,8 @@ files:
 - app/components/spina/pages/list_component.rb
 - app/components/spina/pages/location_component.html.erb
 - app/components/spina/pages/location_component.rb
+- app/components/spina/pages/new_page_button_component.html.erb
+- app/components/spina/pages/new_page_button_component.rb
 - app/components/spina/pages/page_component.html.erb
 - app/components/spina/pages/page_component.rb
 - app/components/spina/pages/page_select_component.html.erb
@@ -932,6 +954,7 @@ files:
 - app/helpers/spina/spina_helper.rb
 - app/jobs/spina/application_job.rb
 - app/jobs/spina/resource_pages_update_job.rb
+- app/mailers/spina/application_mailer.rb
 - app/mailers/spina/user_mailer.rb
 - app/models/concerns/spina/gravatar.rb
 - app/models/concerns/spina/partable.rb
@@ -1036,7 +1059,8 @@ files:
 - app/views/spina/admin/users/new.html.erb
 - app/views/spina/sitemaps/show.xml.builder
 - app/views/spina/user_mailer/forgot_password.html.erb
-- app/views/spina/user_mailer/forgot_password.txt.erb
+- app/views/spina/user_mailer/forgot_password.text.erb
+- config/initializers/importmap.rb
 - config/locales/TH.yml
 - config/locales/bg.yml
 - config/locales/de.yml

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

@@ -1 +0,0 @@
-You forgot your password. Here's a link to setup a new one: <%= spina.edit_admin_password_reset_url(@user.password_reset_token) %>. It expires in 2 hours.