spina 2.3.2 → 2.4.0

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/helpers/spina/spina_helper.rb

@@ -1,13 +1,12 @@
 module Spina::SpinaHelper
 
-  def spina_importmap_tags
+  def spina_importmap_tags(entry_point = "application")
     safe_join [
-      javascript_inline_importmap_tag(Spina.config.importmap),
+      javascript_inline_importmap_tag(Spina.config.importmap.to_json(resolver: self)),
+      javascript_importmap_module_preload_tags(Spina.config.importmap),
       javascript_importmap_shim_tag,
-      javascript_include_tag("spina/libraries/trix"),
-      javascript_import_module_tag("application")
+      javascript_import_module_tag(entry_point)
     ], "\n"
   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>