nuntius 1.3.4 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcf2eb3ee110dd40c68860c8b1b1351b77558b269ce1921f7f530230c63762ee
-  data.tar.gz: fe52688abaf148ad6481c66abfec1c22d45335224687f82087f36b5bd995daaf
+  metadata.gz: 11b30e0625c1b47a70a22803a0bdec45d92faf881b1e83ae72e00582d95b36f4
+  data.tar.gz: ec9251af770d4b3cd4ae58b75968bddc4e4917dc1ba01d8073eb73df56c9fe4e
 SHA512:
-  metadata.gz: 56d4e617138d2868119fbb18302c884e30282d309ad77bcd7cbeccf28b430aff49d5af773fcda03c388fd14dc5c3132584fb715cc62fa750148e9aea55b0ed9b
-  data.tar.gz: 1e91a60fad70aeaade08ae345923340ce0b6d06e2898c4a6abe933c08694d8e32ba6733d72cec63fbc814a36cbc43a831490c1c3ebe20a73fedb081e24e69fd2
+  metadata.gz: a8dd4831dcbb7c4e8440e4a1ebf281a712959de7a47323e2590a24d71bf039c5a7c7b5899e3427832949a061f1bed2ac72b3f70acdc86b534aafe16f7d364689
+  data.tar.gz: 1c5e6ad9964622533dad4c91df0ff7bcdf05299bbaddcdf81efcfee6eeea02f9b50bc7ad662b174e8433e422d040dda57b8e9f627fd2c8360cc27575653735c8

data/app/controllers/nuntius/admin/layouts_controller.rb

@@ -43,7 +43,9 @@ module Nuntius
       private
 
       def layout_params
-        params.require(:layout).permit(:name, :data, :metadata_yaml)
+        permitted = %i[name data metadata_yaml]
+        permitted += [attachments: []] if params[:layout][:attachments].compact_blank.present?
+        params.require(:layout).permit(permitted)
       end
     end
   end

data/app/views/nuntius/admin/campaigns/edit.html.slim

@@ -1,6 +1,8 @@
 - if @campaign.draft?
   = sts.form_for [:admin, @campaign] do |f|
     = sts.card :nuntius_admin_campaigns, icon: 'fal fa-megaphone' do |card|
+      - card.with_action
+        = f.continue
       - card.with_action
         = f.submit
 

data/app/views/nuntius/admin/layouts/edit.html.slim

@@ -1,5 +1,7 @@
 = sts.form_for([:admin, @layout]) do |f|
   = sts.card :nuntius_admin_layouts, icon: 'fal fa-table-layout' do |card|
+    - card.with_action
+      = f.continue
     - card.with_action
       = f.submit
 
@@ -17,7 +19,23 @@
 
     - if @layout.persisted?
       - card.with_tab:media, padding: true
-        = render partial: 'nuntius/admin/layouts/attachments/index', locals: { attachments: @layout.attachments, upload_url: nuntius.admin_layout_attachments_path(@layout) }
+        .grid.grid-cols-4.gap-4
+          .col-span-4 
+            = f.input :attachments, as: :file, multiple: true
+          ul.col-span-4 
+            - @layout.attachments.each do |attachment|
+              li.col-span-1
+                - if attachment.previewable?
+                  = image_tag attachment.preview(resize_to_limit: [500, 500]).url, class: 'object-cover pointer-events-none'
+                - elsif attachment.image?
+                  = image_tag main_app.url_for(attachment.variant(resize_to_limit: [500, 500])), class: 'object-cover pointer-events-none'
+                = (attachment.blob.byte_size / 1048576.0).round(2)
+                ' MB
+                = link_to admin_layout_attachment_path(@layout, attachment.id), data: { controller: 'attachment-delete', 'action': 'attachment-delete#delete' } do
+                    i.fal.fa-xmark
+                =< link_to(main_app.rails_blob_path(attachment, disposition: 'attachment'),
+                      title: attachment.filename)
+                    i.fal.fa-download
 
     - if @layout.templates.exists?
       - card.with_tab :templates, padding: false

data/app/views/nuntius/admin/templates/edit.html.slim

@@ -55,16 +55,16 @@
             .col-span-12
               = f.association :layout, collection: @layouts, include_blank: true
             .col-span-12
-              = f.input :html, as: :editor, mode: 'text/markdown'
+              = f.input :html, as: :editor, mode: 'text/markdown', height: '400px'
 
           template data-toggle-target='toggleable' data-toggle-value='voice'
             .col-span-12
-              = f.input :text, as: :editor, mode: 'text/plain'
+              = f.input :text, as: :editor, mode: 'text/plain', height: '400px'
           template data-toggle-target='toggleable' data-toggle-value='slack'
             .col-span-12
-              = f.input :text, as: :editor, mode: 'text/plain'
+              = f.input :text, as: :editor, mode: 'text/plain', height: '400px'
             .col-span-12
-              = f.input :payload, as: :editor, mode: 'application/yaml', hint: 'See here for more information: https://app.slack.com/block-kit-builder/'
+              = f.input :payload, as: :editor, mode: 'application/yaml', hint: 'See here for more information: https://app.slack.com/block-kit-builder/', height: '400px'
 
           template data-toggle-target='toggleable' data-toggle-value='sms'
             .col-span-12
@@ -72,7 +72,11 @@
           template data-toggle-target='toggleable' data-toggle-value='push'
             .col-span-12
               = f.input :text, as: :editor, mode: 'text/plain'
-          template data-toggle-target='toggleable' data-toggle-value='slack'
+          template data-toggle-target='toggleable' data-toggle-value='teams'
+            .col-span-12
+              = f.input :text, as: :editor, mode: 'text/plain', height: '400px'
+            .col-span-12
+              = f.input :payload, as: :editor, mode: 'application/yaml', hint: 'See here for more information: https://www.adaptivecards.io/designer/', height: '400px'
 
 
       - if @template.messages.exists?

data/config/locales/en.yml

@@ -1,4 +1,5 @@
 en:
+  choose_files: Choose files
   activerecord:
     attributes:
       nuntius/campaign:

data/config/locales/nl.yml

@@ -1,4 +1,5 @@
 nl:
+  choose_files: Kies bestanden
   activerecord:
     attributes:
       nuntius/campaign:
@@ -72,6 +73,7 @@ nl:
                 edit: Edit
                 media: Media
                 metadata: Metadata
+                templates: Templates
         index:
           card:
             nuntius_admin_layouts:

data/lib/nuntius/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nuntius
-  VERSION = "1.3.4"
+  VERSION = "1.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.6
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-19 00:00:00.000000000 Z
+date: 2024-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apnotic
@@ -514,9 +514,6 @@ files:
 - app/validators/liquid_validator.rb
 - app/views/nuntius/admin/campaigns/edit.html.slim
 - app/views/nuntius/admin/campaigns/index.html.slim
-- app/views/nuntius/admin/layouts/attachments/_attachments.html.slim
-- app/views/nuntius/admin/layouts/attachments/_index.html.slim
-- app/views/nuntius/admin/layouts/attachments/create.json.jbuilder
 - app/views/nuntius/admin/layouts/edit.html.slim
 - app/views/nuntius/admin/layouts/index.html.slim
 - app/views/nuntius/admin/lists/edit.html.slim

data/app/views/nuntius/admin/layouts/attachments/_attachments.html.slim

@@ -1,28 +0,0 @@
-- attachments.each do |attachment|
-  li.relative
-    /! Current: "ring-2 ring-offset-2 ring-indigo-500", Default: "focus-within:ring-2 focus-within:ring-offset-2 focus-within:ring-offset-gray-100 focus-within:ring-indigo-500"
-    .group.block.w-full.aspect-w-10.aspect-h-7.rounded-lg.bg-gray-100.overflow-hidden
-      /! Current: "", Default: "group-hover:opacity-75"
-      - if attachment.previewable?
-        = image_tag attachment.preview(resize_to_limit: [500, 500]).url, class: 'object-cover pointer-events-none'
-      - elsif attachment.image?
-        = image_tag main_app.url_for(attachment.variant(resize_to_limit: [500, 500])), class: 'object-cover pointer-events-none'
-    p.mt-2.block.text-sm.font-medium.text-gray-900.truncate.pointer-events-none = attachment.filename
-    p.block.text-sm.font-medium.text-gray-500
-      = (attachment.blob.byte_size / 1048576.0).round(2)
-      ' MB
-      = link_to admin_layout_attachment_path(@layout, attachment.id), data: { controller: 'attachment-delete', 'action': 'attachment-delete#delete' } do
-          i.fal.fa-xmark
-      =< link_to(main_app.rails_blob_path(attachment, disposition: 'attachment'),
-            title: attachment.filename)
-          i.fal.fa-download
-
-/ This controller comes from papyrus
-li.relative.attachment-upload data-controller="attachment-upload" data-attachment-upload-url="#{upload_url}" data-attachment-upload-param-name="attachments[]" data-attachment-upload-extra-data='{}'
-  .group.block.w-full.aspect-w-10.aspect-h-7.rounded-lg.bg-gray-100.overflow-hidden.text-center.align-middle style="height: 200px;"
-    span.icon.upload
-      i.fal.fa-4x.fa-upload.pt-16
-    span.icon.uploading
-      i.fal.fa-4x.fa-circle-notch.fa-spin.pt-16
-
-  p.mt-2.block.text-sm.font-medium.text-gray-500.truncate.pointer-events-none Drag or click to attach files

data/app/views/nuntius/admin/layouts/attachments/_index.html.slim

@@ -1,2 +0,0 @@
-ul.attachments.grid.grid-cols-2.gap-x-4.gap-y-8.sm:grid-cols-3.sm:gap-x-6.md:grid-cols-4.lg:grid-cols-3.xl:grid-cols-4.xl:gap-x-8 role="list"
-  = render partial: 'nuntius/admin/layouts/attachments/attachments', locals: { attachments: @layout.attachments, upload_url: admin_layout_attachments_path(@layout) }

data/app/views/nuntius/admin/layouts/attachments/create.json.jbuilder

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-json.selector "ul.attachments"
-json.html render partial: "nuntius/admin/layouts/attachments/attachments", layout: false, formats: [:html],
-  locals: {attachments: @layout.attachments, upload_url: admin_layout_attachments_path(@layout)}