alchemy-ajax-form 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55e304619ede188d7073838ccdb5d0db0c757255
-  data.tar.gz: 2dc2ac124c87c24bcb358536b037c861dc9aa3ea
+  metadata.gz: 4802d959a964e57c819c0cf72c81e9c99d298c45
+  data.tar.gz: defa090c069a91d5a3482d19ff606a0d18c91c4d
 SHA512:
-  metadata.gz: a735116c3f091dbe9767fdb668d2143c554465447a8347407932f305890a006734cc5e5eac19f2c59fea7111e31ea0f429df768de1aa069b54530935b626242c
-  data.tar.gz: 52fceb9852fc40ed47698c5617aa2505b7927d9349fff2ee9f675fdffbb426d3bc5b23cea007f6e6271319d8e1e71371ba12448991144aa8c4bd5f1e2637ecf5
+  metadata.gz: 0f9631c383b34fc1461fdbe39ee192635b3fa9919f5e4281e2eb19faa9d87382aa4d415d33be8470ce2e592b3e0f44a8687504b017961b4ae3cdf8eacfdf8a8b
+  data.tar.gz: e0e7063fb6ebca6adb7397d2601c7ed55ab9db9bbc1ea985dccbbfd10189dd14d3c220920580d0ddb95982a4f49797b4158d4ffd998692e80e92f13c1cbdd9e4

data/README.md

@@ -288,6 +288,18 @@ Add to app/assets/javascripts/application.js
 //= require ajax_forms
 ```
 
+Add to vendor/assets/stylesheets/alchemy/admin/all.css
+
+```ruby
+ *= require alchemy/ajax/form/backend/custom_resource_show
+```
+
+Add to app/assets/stylesheets/application.css
+
+```ruby
+ *= require alchemy/ajax/form/style
+```
+
 ### Run Migration
 Run migration with rake task
 
@@ -302,9 +314,12 @@ Restart Server
 ## Translations
 Remember to check translations
 
-
-## Contributing
-Contribution directions go here.
+## Disable MJML
+If you don't want mjml, insert in an initializer 
+```ruby
+Alchemy::Ajax::Form.enable_mjml= false
+```
+n.b. Disable mjml before launching the generator, otherwise email templates will be generated with mjml
 
 ## License
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/app/assets/javascripts/ajax_forms.js.erb

@@ -1,185 +1,186 @@
 (function ($) {
 
-  var recaptha_disabled = <%= Recaptcha.configuration.skip_verify_env.include?(Rails.env.to_s ) %>
+    var recaptha_disabled =
+    <%= Recaptcha.configuration.skip_verify_env.include?(Rails.env.to_s ) %>
 
 
-  var print_results = function (element, result) {
-    if (result instanceof Array) {
-      var resp = "";
+    var print_results = function (element, result) {
+        if (result instanceof Array) {
+            var resp = "";
 
-      $.each(result, function (index, value) {
+            $.each(result, function (index, value) {
 
-        resp += "<span>" + value + "</span>";
+                resp += "<span>" + value + "</span>";
 
-      });
+            });
 
-    } else {
-      resp = result
-    }
+        } else {
+            resp = result
+        }
 
-    resp = '<div class="default_message">' + resp + '</div>';
-    $(element).append(resp);
+        resp = '<div class="default_message">' + resp + '</div>';
+        $(element).append(resp);
 
-  };
+    };
 
-  var add_errors = function (form, errors) {
+    var add_errors = function (form, errors) {
 
-    $.each(errors, function (name, value) {
+        $.each(errors, function (name, value) {
 
-      var input = $(form).find("[name*='" + name + "']");
+            var input = $(form).find("[name*='" + name + "']");
 
 
-      $(input).addClass("invalid");
+            $(input).addClass("invalid");
 
-      if ($(input).parent().children('.error-message').length == 0) {
-        $(input).parent().append("<span class='error-message'>" + value + "</span>");
-      } else {
-        $('.error-message').show();
-      }
+            if ($(input).parent().children('.error-message').length == 0) {
+                $(input).parent().append("<span class='error-message'>" + value + "</span>");
+            } else {
+                $('.error-message').show();
+            }
 
-    });
-  };
+        });
+    };
 
 
-  var clear_deafult_message = function (form) {
-    var message_box = $(form).parent().find(".messages")[0];
-    var default_message = $(message_box).find(".default_message");
-    var custom_message = $(message_box).find(".custom_message");
-    if ($(default_message).length > 0) {
-      $(default_message).remove();
-    }
+    var clear_deafult_message = function (form) {
+        var message_box = $(form).parent().find(".messages")[0];
+        var default_message = $(message_box).find(".default_message");
+        var custom_message = $(message_box).find(".custom_message");
+        if ($(default_message).length > 0) {
+            $(default_message).remove();
+        }
 
-    if ($(custom_message).length == 0) {
-      $(message_box).html("");
+        if ($(custom_message).length == 0) {
+            $(message_box).html("");
+        }
     }
-  }
 
 
-  var add_loader = function (form) {
-    if ($(form).children('.ajax_forms_loader').length == 0) {
-      $(form).append('<div class="ajax_forms_loader"> <i class="fa fa-circle-o-notch fa-spin"></i> </div>');
-    } else {
-      $(form).children('.ajax_forms_loader').fadeIn();
+    var add_loader = function (form) {
+        if ($(form).children('.ajax_forms_loader').length == 0) {
+            $(form).append('<div class="ajax_forms_loader"> <i class="fa fa-circle-o-notch fa-spin"></i> </div>');
+        } else {
+            $(form).children('.ajax_forms_loader').fadeIn();
+        }
     }
-  }
 
-  var hide_loader = function (form) {
-    $(form).children('.ajax_forms_loader').fadeOut();
-  }
-
-  var submit_function = function (form, method, action) {
-    $(form).trigger("submitted");
-    add_loader(form);
-
-    if ($(form).find("[name='_dontcare']").length < 1) {
-      $(form).append("<input type=\"hidden\" name=\"_dontcare\">")
+    var hide_loader = function (form) {
+        $(form).children('.ajax_forms_loader').fadeOut();
     }
 
-    var formdata = new FormData($(form)[0])
-    $.ajax({
-      method: method,
-      url: action,
-      dataType: "json",
-      data: formdata,
-      contentType: false,
-      processData: false,
-      success: function (response, status, xhr) {
-
-        clear_deafult_message(form);
-        var message_box = $(form).parent().find(".messages")[0];
-        if (!$(message_box).find(".custom_message").length > 0) {
-          print_results(message_box, response.messages);
-        }
-
-        $(form).trigger("successed");
-        $(message_box).addClass('ok');
-        $(form).trigger("reset");
+    var submit_function = function (form, method, action) {
+        $(form).trigger("submitted");
+        add_loader(form);
 
-      },
-      error: function (xhr, status, errorThrown) {
-        var response = JSON.parse(xhr.responseText);
-        var message_box = $(form).parent().find(".messages")[0];
-        clear_deafult_message(form);
-        print_results(message_box, response.messages);
-        $(form).trigger("failed", [xhr, status, errorThrown]);
-        $(message_box).addClass('ko');
-        add_errors(form, response.errors);
-
-      },
-      complete: function () {
-        if (!recaptha_disabled) {
-          grecaptcha.reset();
+        if ($(form).find("[name='_dontcare']").length < 1) {
+            $(form).append("<input type=\"hidden\" name=\"_dontcare\">")
         }
-        $(form).find("input[type='submit']").attr("disabled", false);
-        hide_loader(form);
-      }
-    });
-  }
 
-  load_invisible_recaptcha = function () {
+        var formdata = new FormData($(form)[0])
+        $.ajax({
+            method: method,
+            url: action,
+            dataType: "json",
+            data: formdata,
+            contentType: false,
+            processData: false,
+            success: function (response, status, xhr) {
+
+                clear_deafult_message(form);
+                var message_box = $(form).parent().find(".messages")[0];
+                if (!$(message_box).find(".custom_message").length > 0) {
+                    print_results(message_box, response.messages);
+                }
+
+                $(form).trigger("successed");
+                $(message_box).addClass('ok');
+                $(form).trigger("reset");
+
+            },
+            error: function (xhr, status, errorThrown) {
+                var response = JSON.parse(xhr.responseText);
+                var message_box = $(form).parent().find(".messages")[0];
+                clear_deafult_message(form);
+                print_results(message_box, response.messages);
+                $(form).trigger("failed", [xhr, status, errorThrown]);
+                $(message_box).addClass('ko');
+                add_errors(form, response.errors);
+
+            },
+            complete: function () {
+                if (!recaptha_disabled) {
+                    grecaptcha.reset();
+                }
+                $(form).find("input[type='submit']").attr("disabled", false);
+                hide_loader(form);
+            }
+        });
+    }
+
+    load_invisible_recaptcha = function () {
 
 
-    $(document).ready(function () {
+        $(document).ready(function () {
 
 
+            $(".ajax_forms").each(function (element, index) {
 
-      $(".ajax_forms").each(function (element, index) {
+                var form = this;
+                var action = $(this).attr("action");
+                var method = $(this).attr("method");
+                var submit_button = $(form).find(".submit").last();
 
-        var form = this;
-        var action = $(this).attr("action");
-        var method = $(this).attr("method");
-        var submit_button = $(form).find(".submit").last();
 
+                if (!recaptha_disabled) {
+                    var container_div = $('<div class="invisible_recaptcha_container"></div>');
+                    $(submit_button).before(container_div);
 
-        if (!recaptha_disabled) {
-          var container_div = $('<div class="invisible_recaptcha_container"></div>');
-          $(submit_button).before(container_div);
+                    var widget_id = grecaptcha.render(container_div[0], {
+                        'sitekey': '<%= Recaptcha.configuration.site_key! %>',
+                        'badge': 'inline',
+                        'size': 'invisible',
+                        'callback': function () {
+                            submit_function(form, method, action);
+                        }
+                    });
 
-          var widget_id = grecaptcha.render(container_div[0], {
-            'sitekey': '<%= Recaptcha.configuration.site_key! %>',
-            'badge': 'inline',
-            'size': 'invisible',
-            'callback': function () {
-              submit_function(form, method, action);
-            }
-          });
+                    $(form).data("widget-id", widget_id)
 
-          $(form).data("widget-id",widget_id)
+                }
 
-        }
+                $(form).children('.ajax_forms_loader').fadeOut();
+            });
 
-        $(form).children('.ajax_forms_loader').fadeOut();
-      });
+            $(document).on("submit", ".ajax_forms", function (event) {
 
-      $(document).on("submit", ".ajax_forms", function (event) {
+                event.preventDefault ? event.preventDefault() : (event.returnValue = false);
 
-        event.preventDefault ? event.preventDefault() : (event.returnValue = false);
+                var form = $(event.target);//.closest("form");
+                var action = $(form).attr("action");
+                var method = $(form).attr("method");
+                var widget_id = $(form).data("widget-id");
+                // disable all submit buttons
+                $(form).find("input[type='submit']").attr("disabled", true)
 
-        var form = $(event.target);//.closest("form");
-        var action = $(form).attr("action");
-        var method = $(form).attr("method");
-        var widget_id = $(form).data("widget-id");
-        // disable all submit buttons
-        $(form).find("input[type='submit']").attr("disabled", true)
 
+                if (!recaptha_disabled) {
+                    grecaptcha.execute(widget_id)
+                } else {
+                    submit_function(form, method, action);
+                }
 
-        if (!recaptha_disabled) {
-          grecaptcha.execute(widget_id)
-        } else {
-          submit_function(form, method, action);
-        }
 
+            });
 
-      });
+            $('.ajax_forms').on('change', '.invalid', function () {
+                $(this).removeClass("invalid");
+                $(this).parent().children('.error-message').hide();
+            });
 
-      $('.ajax_forms').on('change', '.invalid', function () {
-        $(this).removeClass("invalid");
-        $(this).parent().children('.error-message').hide();
-      });
+        });
+    };
+    $.getScript("//www.google.com/recaptcha/api.js?onload=load_invisible_recaptcha&render=explicit")
 
-    });
-  };
-  $.getScript("//www.google.com/recaptcha/api.js?onload=load_invisible_recaptcha&render=explicit")
 
+})(jQuery);
 
-})(jQuery);

data/app/assets/stylesheets/alchemy/ajax/form/backend/custom_resource_show.scss

@@ -0,0 +1,21 @@
+.ajax_forms {
+  .alchemy-dialog {
+    max-width: 1080px !important;
+    width: 100% !important;
+
+    .attribute_row {
+      margin: 10px 0px;
+
+      .labelfield {
+        font-size: 20px;
+        font-weight: bold;
+        text-transform: uppercase;
+      }
+
+      .valuefield {
+        font-size: 15px;
+      }
+
+    }
+  }
+}

data/app/assets/stylesheets/alchemy/ajax/form/style.scss

@@ -0,0 +1,17 @@
+.ajax_forms {
+    position: relative;
+
+.ajax_forms_loader {
+    position: absolute;
+    left: 0;
+    display: flex;
+    top: 0;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    width: 100%;
+    font-size: 2rem;
+    background: rgba(255, 255, 255, 0.5);
+}
+
+}

data/app/controllers/alchemy/admin/ajax_forms_controller.rb

@@ -34,6 +34,9 @@ module Alchemy
         end
       end
 
+      def show
+      end
+
       protected
 
       def common_search_filter_includes
@@ -47,6 +50,11 @@ module Alchemy
         ].freeze
       end
 
+      def load_resource
+        @resource = resource_handler.model.find(params[:id])
+        instance_variable_set("@#{resource_handler.resource_name}", @resource)
+      end
+
 
     end
   end

data/app/helpers/alchemy/admin/ajax_forms_helper.rb

@@ -0,0 +1,17 @@
+module Alchemy
+  module Admin
+    module AjaxFormsHelper
+
+      def alchemy_body_class
+        [
+          "ajax_forms",
+          controller_name,
+          action_name,
+          content_for(:main_menu_style),
+          content_for(:alchemy_body_class)
+        ].compact
+      end
+
+    end
+  end
+end

data/app/views/alchemy/admin/ajax_forms/_resource.html.erb

@@ -0,0 +1,36 @@
+<tr class="<%= cycle('even', 'odd') %>">
+<% resource_handler.attributes.each do |attribute| %>
+  <td class="<%= attribute[:type] %> <%= attribute[:name] %>">
+  <% if attribute[:type] == :boolean %>
+    <%= resource.public_send(attribute[:name]) ? render_icon(:check) : nil %>
+  <% else %>
+    <%= render_attribute(resource, attribute) %>
+  <% end %>
+  </td>
+<% end %>
+  <td class="tools">
+  <% if can?(:destroy, resource) %>
+    <%= delete_button resource_path(resource, search_filter_params) %>
+  <% end %>
+  <% if can?(:edit, resource) %>
+    <%= link_to_dialog render_icon(:edit),
+      edit_resource_path(resource, search_filter_params),
+      {
+        title: Alchemy.t('Edit'),
+        size: resource_window_size
+      },
+      title: Alchemy.t('Edit') %>
+  <% end %>
+    <% if can?(:show, resource) %>
+      <%= link_to_dialog render_icon(:eye),
+                         resource_path(resource, search_filter_params),
+                         {
+                             title: Alchemy.t('Show'),
+                             size: resource_window_size,
+                             class: "pippo"
+                         },
+                         title: Alchemy.t('Show')
+                          %>
+    <% end %>
+  </td>
+</tr>

data/app/views/alchemy/admin/ajax_forms/show.html.erb

@@ -0,0 +1,12 @@
+
+<% resource_handler.attributes.each do |attribute| %>
+<div class="attribute_row">
+  <div class="labelfield">
+    <%= @resource.class.human_attribute_name(attribute[:name].to_sym) %>
+  </div>
+  <div class="valuefield">
+    <%= render_attribute(@resource, attribute) %>
+  </div>
+</div>
+
+<% end %>

data/config/locales/it.yml

@@ -50,6 +50,7 @@ it:
                 30/06/2003 n.196"
   submit: "Invia"
   form_sended_succesfully: "Inviato con successo"
+  show: Visualizza
 
 
 

data/lib/alchemy/ajax/form/version.rb

@@ -1,7 +1,7 @@
 module Alchemy
   module Ajax
     module Form
-      VERSION = '1.0.1'
+      VERSION = '1.1.0'
     end
   end
 end

data/lib/generators/custom_form/custom_form_generator.rb

@@ -154,12 +154,26 @@ resources :#{name.underscore.pluralize} , only: [:create]\n
     inject_into_file  "app/assets/javascripts/application.js" , before: '//= require_tree .' do
       "\n//= require jquery3\n//= require ajax_forms\n"
     end
+    inject_into_file  "vendor/assets/stylesheets/alchemy/admin/all.css" , before: '*= require_tree .' do
+      "\n*= require alchemy/ajax/form/backend/custom_resource_show\n"
+    end
+    # inject_into_file  "app/assets/stylesheets/application.css", {} do
+    #   "\n*= require alchemy/ajax/form/style\n"
+    # end
+    # inject_into_file  "app/assets/stylesheets/application.*" , before: '*= require alchemy/ajax/form/style' do
+    #   "\n*= require @fortawesome/fontawesome-free/css/all\n"
+    # end
+
+    # inject_into_file  "app/assets/javascripts/application.js", {} do
+    #   "\n//= @fortawesome/fontawesome-free/js/all\n"
+    # end
   end
 
   desc "Run migration and install mjml and create alchemy elements"
   def run_scripts
     rake("db:migrate")
     #run "npm install mjml"
+    run "yarn add @fortawesome/fontawesome-free"
     generate("alchemy:elements","--skip")
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-ajax-form
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Alessandro Baccanelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,12 +122,17 @@ files:
 - app/assets/images/ajax_form.png
 - app/assets/images/alchemy/ajax_form.png
 - app/assets/javascripts/ajax_forms.js.erb
+- app/assets/stylesheets/alchemy/ajax/form/backend/custom_resource_show.scss
+- app/assets/stylesheets/alchemy/ajax/form/style.scss
 - app/controllers/alchemy/admin/ajax_forms_controller.rb
 - app/controllers/alchemy/ajax_forms_controller.rb
+- app/helpers/alchemy/admin/ajax_forms_helper.rb
 - app/mailers/alchemy/ajax_forms_mailer.rb
 - app/models/alchemy/ajax_form.rb
 - app/models/alchemy/ajax_form_ability.rb
+- app/views/alchemy/admin/ajax_forms/_resource.html.erb
 - app/views/alchemy/admin/ajax_forms/_table.html.erb
+- app/views/alchemy/admin/ajax_forms/show.html.erb
 - app/views/alchemy/ajax_forms/create.json.jbuilder
 - app/views/alchemy/ajax_forms_mailer/mjml_notify_message.mjml.erb
 - app/views/alchemy/ajax_forms_mailer/mjml_notify_user_message.mjml.erb