spina_contact_forms 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 271059450a3277a6d1854e61b063face82479e5f
-  data.tar.gz: c931c3c6b968bb44bc2e65d211f545bd2e979522
+  metadata.gz: e4efda7177e4e030cd9b028cdac12a05f6bda54e
+  data.tar.gz: d3366ee2dbe8c832b37639719266ef67dddc2cb3
 SHA512:
-  metadata.gz: aaddf19354d3b2449f4d35458ddc9504de6fa49e2765a9c24a6accd33c93727060a5eb8e75530eb8661887b83e537d763806c4e449391b646e756f4c481df2cb
-  data.tar.gz: a15a718033f06f5a8add9a45bba5f4cbd0d30b1891741870fa92a2538d5d73b1d11182496810907899d3e328a05e5c5c1fc36731f51a1510cf4eb21704bd033c
+  metadata.gz: 7049bef23f24e8238c1376dff430c46b06eb38881f11b8f3fd8405551e05a7b80044eebe59b862d367cc67c444548b17a2a506e00098f2cf8d63dfa0f5596e65
+  data.tar.gz: 1363a1b9d2f361a485e829367edebd53c39553ea190b73eceffb4b38aac6e90d2a1ea0559cd4e9e5702cee01b810ab11a71b9b906ce2762699ded33e9ce537f8

data/README.md

@@ -1,5 +1,9 @@
 # SpinaContactForms
-This will add a contact form builder for spina. You can create form elements in the backend that will populate the form in the frontend.
+This will add a contact form builder in spina. You can create form elements in the backend that will populate the form in the frontend.
+
+This is a work in progress.
+
+Please update to the latest version, anything under '0.1.2' will NOT work.
 
 ## Installation
 Add this line to your application's Gemfile:
@@ -33,7 +37,7 @@ Add the following to your theme's config file (config/initializers/themes/theme_
 theme.plugins = ['ContactForm']
 ```
 
-Copy and run the migrations
+Copy and run the migrations, make sure to do this when upgrading as well, since new migragtions could be added.
 ```bash
 rake spina_contact_forms_engine:install:migrations
 rake db:migrate
@@ -43,13 +47,20 @@ rake db:migrate
 In your view, call `<%= spina_contact_form%>`
 That's it! Use Mailcatcher for local development, and test it out.
 
+Contact Forms are scoped to the current_theme, so any changes to the theme name or setting a different theme for the account will cause a separate contact form to be loaded.
+
 ## Contributing
 Contributions are welcome! It is still in an early stage, and more features are required. Fork it, and create a pull request.
 
 ## Roadmap
 * Currently only text inputs and text areas are supported, select dropdowns, check boxes and radio buttons still needed
+* Required elements do not yet work
+* Use Form Object design pattern (for Active Model validations)
 * Internationalization needed
 * Create an install generator, which copies the migrations and view files
 
+Further updates will be available in may.
+
+
 ## License
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

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

@@ -2,12 +2,16 @@ module Spina
   module Admin
     class ContactFormElementsController < AdminController
       layout 'spina/admin/admin'
+      before_action :set_element, only: [:edit, :update, :destroy]
 
       def error
       end
 
       def create
         @contact_form_element = ContactFormElement.new(contact_form_element_params)
+        @contact_form_element.theme = current_theme.name
+        @contact_form_element.position = Time.now.to_i
+
         respond_to do |format|
           if @contact_form_element.save
             format.html {redirect_to admin_contact_forms_path, notice: 'Form Element was successfully created.'}
@@ -18,10 +22,24 @@ module Spina
         end
       end
 
+      def sort
+        params[:list].each_pair do |parent_pos, parent_node|
+          ContactFormElement.find(parent_node[:id]).update(position: parent_pos)
+        end
+        head :ok
+      end
+
       def update
+        if @contact_form_element.update_attributes(contact_form_element_params)
+          redirect_to admin_contact_forms_path, notice: 'Form element updated.'
+        else
+          render :error
+        end
       end
 
       def destroy
+        @contact_form_element.destroy
+        redirect_to admin_contact_forms_path, notice: 'Form element deleted.'
       end
 
       private
@@ -30,6 +48,10 @@ module Spina
         params.require(:contact_form_element).permit(:label, :required, :input_type)
       end
 
+      def set_element
+        @contact_form_element = ContactFormElement.find(params[:id])
+      end
+
     end
   end
 end

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

@@ -7,13 +7,13 @@ module Spina
 
       def index
         @contact_form_element = ContactFormElement.new
-        @contact_form_elements = ContactFormElement.all
+        @contact_form_elements = ContactFormElement.by_theme(current_theme)
       end
 
       private
 
       def set_breadcrumb
-        add_breadcrumb t('plugins.ContactForm'), admin_contact_forms_path
+        add_breadcrumb t('contact_form.menu_title'), admin_contact_forms_path
       end
     end
   end

data/app/helpers/spina_contact_forms/contact_forms_helper.rb

@@ -1,7 +1,7 @@
 module SpinaContactForms
   module ContactFormsHelper
     def spina_contact_form
-      render :partial => 'spina/contact_forms/page', locals: {contact_form_elements: Spina::ContactFormElement.all }
+      render :partial => 'spina/contact_forms/page'
     end
 
     def spina_contact_form_input(name, type)

data/app/models/spina/contact_form_element.rb

@@ -7,6 +7,9 @@
 class Spina::ContactFormElement < ApplicationRecord
   enum input_type: [:text_field, :text_area]
 
+  scope :sorted, -> { order('position') }
+  scope :by_theme, ->(theme) { where(theme: theme.name)}
+
   def required?
     self.required
   end

data/app/views/spina/admin/contact_form_elements/_contact_form_element.html.haml

@@ -1,4 +1,7 @@
-%tr
-  %td= element.label
-  %td= element.input_type
-  %td= element.required?
+%li.dd-item{data: {id: element.id}}
+  %div.dd-item-inner
+    = link_to element.label, edit_admin_contact_form_element_path(element), remote: true, class: 'button button-link button-small sortable-link'
+    %span.pull-right
+      = link_to spina.admin_contact_form_element_path(element), method: :delete, data: {confirm: t('spina.delete_confirmation', subject: element.label)}, class: 'button button-small button-link button-danger dd-nodrag' do
+        = icon('cross')
+        = t('spina.delete')

data/app/views/spina/admin/contact_form_elements/_edit.html.haml

@@ -0,0 +1,24 @@
+.modal
+  = form_for [spina, :admin, @contact_form_element], url: spina.admin_contact_form_element_path do |f|
+    %header
+      = link_to '#', data: {dismiss: 'modal'} do
+        = icon('cross')
+
+      %h3
+        Contact Form Element
+
+    %section
+      .form-label Form Label
+      .form-control= f.text_field :label, placeholder: 'Form Label'
+      .form-label Required?
+      .form-control= f.check_box :required, data: {switch: 'true'}
+      .form-label Form Type
+      .form-control
+        .select-dropdown
+          = f.collection_select :input_type, Spina::ContactFormElement.input_types.map{ |el| [el.first, el.first.humanize] }, :first, :second
+
+    %footer
+      = link_to t('spina.cancel'), '#', data: {dismiss: 'modal'}
+      %button.primary{type: 'submit'}
+        = icon('check')
+        =t 'spina.save'

data/app/views/spina/admin/contact_form_elements/create.js.erb

@@ -1,2 +1,2 @@
-$('#contact_form_elements').append("<%= j render 'spina/admin/contact_form_elements/contact_form_element', element: @contact_form_element %>");
+$('#form_elements_list ol.dd-list').append("<%= j render 'spina/admin/contact_form_elements/contact_form_element', element: @contact_form_element %>");
 $('#contact_form_element_label').val('')

data/app/views/spina/admin/contact_form_elements/edit.js.erb

@@ -0,0 +1,3 @@
+var modal = $("<%= j render 'edit' %>");
+modal.modal();
+$(document).trigger('page:change');

data/app/views/spina/admin/contact_forms/index.html.haml

@@ -1,17 +1,14 @@
 %header#header
   = render partial: 'spina/admin/shared/breadcrumbs'
+  #header_actions
+    = link_to '#form_elements_list', class: 'button sort-switch', data: {change_order: t('spina.pages.change_order'), done_changing_order: t('spina.pages.done_changing_order')} do
+      = icon('random')
+      = t('spina.pages.change_order')
 
 = render 'form'
 
 .well
-  .table-container
-    %table.table
-      %thead
-        %tr
-          %th Element Label
-          %th Element Type
-          %th Required Field?
-          
-      %tbody#contact_form_elements
-        - @contact_form_elements.each do |element|
-          = render 'spina/admin/contact_form_elements/contact_form_element', element: element
+  .dd#form_elements_list{data: {:"sort-url" => spina.sort_admin_contact_form_elements_url }}
+    %ol.dd-list
+      - @contact_form_elements.sorted.each do |element|
+        = render 'spina/admin/contact_form_elements/contact_form_element', element: element

data/app/views/spina/contact_forms/_page.html.haml

@@ -1,5 +1,6 @@
+- @contact_form_elements = Spina::ContactFormElement.by_theme(current_theme)
 = form_tag contact_forms_path, remote: true, id: 'spina_contact_form' do
-  - contact_form_elements.each do |element|
+  - @contact_form_elements.each do |element|
     %label
       - if element.required?
         *

data/config/routes.rb

@@ -2,9 +2,11 @@ Spina::Engine.routes.draw do
 
   namespace :admin, path: Spina.config.backend_path do
     resources :contact_forms, only: [:index]
-    resources :contact_form_elements, except: [:show, :index]
+    resources :contact_form_elements, except: [:show, :index] do
+      post :sort, on: :collection
+    end
   end
 
   resources :contact_forms, only: [:create]
-  
+
 end

data/db/migrate/20170330144159_add_position_and_theme_to_spina_contact_form_elements.rb

@@ -0,0 +1,6 @@
+class AddPositionAndThemeToSpinaContactFormElements < ActiveRecord::Migration[5.0]
+  def change
+    add_column :spina_contact_form_elements, :theme, :string
+    add_column :spina_contact_form_elements, :position, :integer
+  end
+end

data/lib/spina_contact_forms/version.rb

@@ -1,3 +1,3 @@
 module SpinaContactForms
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina_contact_forms
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Adam Cooper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,7 +74,9 @@ files:
 - app/views/layouts/mailers/spina_contact_form.html.erb
 - app/views/layouts/mailers/spina_contact_form.text.erb
 - app/views/spina/admin/contact_form_elements/_contact_form_element.html.haml
+- app/views/spina/admin/contact_form_elements/_edit.html.haml
 - app/views/spina/admin/contact_form_elements/create.js.erb
+- app/views/spina/admin/contact_form_elements/edit.js.erb
 - app/views/spina/admin/contact_form_elements/error.js.erb
 - app/views/spina/admin/contact_forms/_form.html.haml
 - app/views/spina/admin/contact_forms/index.html.haml
@@ -87,6 +89,7 @@ files:
 - config/locales/contact_form_en.yml
 - config/routes.rb
 - db/migrate/20170329144025_create_spina_contact_form_elements.rb
+- db/migrate/20170330144159_add_position_and_theme_to_spina_contact_form_elements.rb
 - lib/spina_contact_forms.rb
 - lib/spina_contact_forms/engine.rb
 - lib/spina_contact_forms/version.rb