binda 0.0.3 → 0.0.5

data/app/assets/javascripts/binda/index.js

@@ -5,6 +5,8 @@
 import { _FormItem }         from './components/form_item'
 import { _FormItemRepeater } from './components/form_item_repeater'
 import { _FormItemAsset }    from './components/form_item_asset'
+import { _FormItemChoice }   from './components/form_item_choice'
+import { _FormItemEditor }   from './components/form_item_editor'
 import setupSortable         from './components/sortable'
 
 $(document).ready( function()
@@ -12,5 +14,7 @@ $(document).ready( function()
 	if ( _FormItem.isSet() )         { _FormItem.setEvents() }
 	if ( _FormItemRepeater.isSet() ) { _FormItemRepeater.setEvents() }
 	if ( _FormItemAsset.isSet() )    { _FormItemAsset.setEvents() }
+	if ( _FormItemChoice.isSet() )   { _FormItemChoice.setEvents() }
+	if ( _FormItemEditor.isSet() )   { _FormItemEditor.setEvents() }
 	setupSortable()
 })

data/app/assets/stylesheets/binda/components/form_item.scss

@@ -31,6 +31,27 @@
 		}
 	}
 
+	.form-item--half-size {
+		position: relative;
+		width: 46%;
+		margin-right: 4%;
+		float: left;
+
+		h5 {
+			width: 100%;
+		}
+
+		.form-item--select-input {
+			margin-left: 0;
+		}
+	}
+
+	.form-item--full-size { 
+		position: relative;
+		width: 96%;
+		clear: both;
+	}
+
 	.form-item--new {
 		position: absolute;
 		top: 101%;
@@ -81,13 +102,13 @@
 }
 
 .form-item--editor {
-	max-height: 1000px;
+	// max-height: is set via javascript in app/assets/javscripts/components/form_item_editor.js;
 	overflow-y: hidden;
 	transition: max-height 0.6s ease-out;
 }
 
 .form-item--editor-close {
-	max-height: 0;
+	max-height: 0 !important;
 }
 
 .form-item--label-on-top .form-group {
@@ -166,4 +187,45 @@
 	.form-group {
 		margin-bottom: $font-size-base;	
 	}
+}
+
+.form-item--choices {
+	position: relative;
+}
+
+.form-item--editor .form-item--choice {
+	position: relative;
+	clear: left;
+
+	&:last-child {
+		padding-bottom: $font-size-base/2;
+		border-bottom: 1px solid $gray-lighter;
+		margin-bottom: $font-size-base;		
+	}
+}
+
+.form-item--new-choice {
+	display: none;
+}
+
+.form-item--choice-label,
+.form-item--choice-content {
+	@extend .form-item--half-size;
+}
+
+.form-item--delete-choice,
+.form-item--js-delete-choice {
+	position: absolute;
+	top: 32px;
+	right: 0;
+}
+
+.form-item--add-choice {
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+
+.form-item--new-choice .form-item--delete-choice {
+	display: none;
 }

data/app/controllers/binda/application_controller.rb

@@ -5,6 +5,8 @@ module Binda
 
 		before_action :authenticate_user!
 
+		include ComponentControllerHelper
+
 		# _ indicates that we are not using the argument in the method
 	  def after_sign_in_path_for(_)
 	 	  binda.dashboard_path
@@ -15,15 +17,5 @@ module Binda
 	  	root_path
 	  end
 
-	  def get_components( slug, ask_for_published = true, custom_order = '' )
-	  	if ask_for_published && custom_order.blank?
-		  	Binda::Structure.friendly.find( slug ).components.published.order('position')
-		  elsif custom_order.blank?
-		  	Binda::Structure.friendly.find( slug ).components.order('position')
-		  else
-		  	Binda::Structure.friendly.find( slug ).components.order( custom_order )
-		  end
-	  end
-
   end
 end

data/app/controllers/binda/choices_controller.rb

@@ -0,0 +1,19 @@
+require_dependency "binda/application_controller"
+
+module Binda
+  class ChoicesController < ApplicationController
+
+  	before_action :set_choice
+
+  	def destroy
+  		@choice.destroy
+  		head :ok
+  	end
+
+  	private
+
+  		def set_choice
+  			@choice = Choice.find( params[:id] )
+  		end
+  end
+end

data/app/controllers/binda/components_controller.rb

@@ -25,7 +25,7 @@ module Binda
       @component = @structure.components.build(component_params)
       @component.position = @position
       if @component.save
-        redirect_to structure_component_path( @structure.slug, @component.slug ), notice: 'Component was successfully created.'
+        redirect_to structure_component_path( @structure.slug, @component.slug ), notice: "A #{ @component.name } was successfully created."
       else
         redirect_to new_structure_component_path( @structure.slug ), flash: { alert: @component.errors }
       end
@@ -33,7 +33,7 @@ module Binda
 
     def update
       if @component.update(component_params)
-        redirect_to structure_component_path( @structure.slug, @component.slug ), notice: 'Component was successfully updated.'
+        redirect_to structure_component_path( @structure.slug, @component.slug ), notice: "A #{ @component.name } was successfully updated."
       else
         redirect_to edit_structure_component_path( @structure.slug, @component.slug ), flash: { alert: @component.errors }
       end
@@ -41,25 +41,26 @@ module Binda
 
     def destroy
       @component.destroy
-      redirect_to structure_components_url( @structure.slug ), notice: 'Component was successfully destroyed.'
+      redirect_to structure_components_url( @structure.slug ), notice: "A #{ @component.name } was successfully destroyed."
     end
 
     def new_repeater
-      # @repeater_setting = Binda::FieldSetting.find( '3' )
-      @repeater_setting = Binda::FieldSetting.find( params[:repeater_setting_id] )
+      @repeater_setting = FieldSetting.find( params[:repeater_setting_id] )
+      position = @component.repeaters.find_all{|r| r.field_setting_id=@repeater_setting.id }.length + 1
+      @repeater = @component.repeaters.create( field_setting: @repeater_setting, position: position )
       render 'binda/components/_form_item_new_repeater', layout: false
     end
 
     def sort_repeaters
       params[:repeater].each_with_index do |id, i|
-        Binda::Repeater.find( id ).update({ position: i + 1 })
+        Repeater.find( id ).update({ position: i + 1 })
       end
       head :ok
     end
 
     def sort
       params[:component].each_with_index do |id, i|
-        Binda::Component.find( id ).update({ position: i + 1 })
+        Component.find( id ).update({ position: i + 1 })
       end
       head :ok
     end
@@ -81,137 +82,40 @@ module Binda
       # Only allow a trusted parameter "white list" through.
       def component_params
         params.require(:component).permit( 
-          :name, 
-          :slug, 
-          :position, 
-          :publish_state, 
-          :structure_id, 
-          :category_ids,
-          structure_attributes: [ 
-            :id
-            ], 
-          categories_attributes: [ 
-            :id,
-            :category_id
-            ], 
-          texts_attributes: [ 
-            :id, 
-            :field_setting_id, 
-            :fieldable_type,
-            :fieldable_id,
-            :content
-            ], 
-          assets_attributes: [ 
-            :id,
-            :field_setting_id,
-            :fieldable_type,
-            :fieldable_id,
-            :image
-            ], 
-          dates_attributes: [ 
-            :id,
-            :field_setting_id,
-            :fieldable_type,
-            :fieldable_id,
-            :date
-            ], 
-          galleries_attributes: [ 
-            :id,
-            :field_setting_id,
-            :fieldable_type,
-            :fieldable_id
-            ], 
-          repeaters_attributes: [ 
-            :id, 
-            :field_setting_id, 
-            :field_group_id,
-            :fieldable_type,
-            :fieldable_id,
-            texts_attributes: [ 
-              :id, 
-              :repeater_id,
-              :field_setting_id, 
-              :fieldable_type,
-              :fieldable_id,
-              :content
-              ], 
-            assets_attributes: [ 
-              :id,
-              :repeater_id,
-              :field_setting_id,
-              :fieldable_type,
-              :fieldable_id,
-              :image
-              ], 
-            dates_attributes: [ 
-              :id,
-              :repeater_id,
-              :field_setting_id,
-              :fieldable_type,
-              :fieldable_id,
-              :date
-              ], 
-            galleries_attributes: [ 
-              :id,
-              :repeater_id,
-              :field_setting_id,
-              :fieldable_type,
-              :fieldable_id
-              ], 
-            repeaters_attributes: [ 
-              :id, 
-              :repeater_id,
-              :field_setting_id, 
-              :field_group_id,
-              :fieldable_type,
-              :fieldable_id
-              ]
-            ])
+          :name, :slug, :position, :publish_state, :structure_id, :category_ids,
+          structure_attributes:  [ :id ], 
+          categories_attributes: [ :id, :category_id ], 
+          texts_attributes:      [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :content ], 
+          assets_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :image ], 
+          dates_attributes:      [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :date ], 
+          galleries_attributes:  [ :id, :field_setting_id, :fieldable_type, :fieldable_id ],
+          radios_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :choice_ids ],
+          selects_attributes:    [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ],
+          checkboxes_attributes: [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ],
+          repeaters_attributes:  [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :field_group_id,
+            texts_attributes:      [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ], 
+            assets_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ], 
+            dates_attributes:      [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ], 
+            galleries_attributes:  [ :id, :field_setting_id, :fieldable_type, :fieldable_id ], 
+            repeaters_attributes:  [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :field_group_id ],
+            radios_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :choice_ids ],
+            selects_attributes:    [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ],
+            checkboxes_attributes: [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ]
+          ])
       end
 
       def repeater_params
         params.require(:repeater).permit( 
-          new_repeaters_attributes: [ 
-            :id, 
-            :field_setting_id, 
-            :field_group_id,
-            :fieldable_type,
-            :fieldable_id,
-            texts_attributes: [ 
-              :id, 
-              :field_setting_id, 
-              :fieldable_type,
-              :fieldable_id,
-              :content
-              ], 
-            assets_attributes: [ 
-              :id,
-              :field_setting_id,
-              :fieldable_type,
-              :fieldable_id,
-              :image
-              ], 
-            dates_attributes: [ 
-              :id,
-              :field_setting_id,
-              :fieldable_type,
-              :fieldable_id,
-              :date
-              ], 
-            galleries_attributes: [ 
-              :id,
-              :field_setting_id,
-              :fieldable_type,
-              :fieldable_id
-              ], 
-            repeaters_attributes: [ 
-              :id, 
-              :field_setting_id, 
-              :field_group_id,
-              :fieldable_type,
-              :fieldable_id
-              ]
-            ])
+          new_repeaters_attributes: [ :id, :field_setting_id, :field_group_id, :fieldable_type, :fieldable_id,
+            texts_attributes:         [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :content ], 
+            assets_attributes:        [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :image ], 
+            dates_attributes:         [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :date ], 
+            galleries_attributes:     [ :id, :field_setting_id, :fieldable_type, :fieldable_id ], 
+            repeaters_attributes:     [ :id, :field_setting_id, :field_group_id, :fieldable_type, :fieldable_id ],
+            radios_attributes:        [ :id, :field_setting_id, :fieldable_type, :fieldable_id, :choice_ids ],
+            selects_attributes:       [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ],
+            checkboxes_attributes:    [ :id, :field_setting_id, :fieldable_type, :fieldable_id, choice_ids: [] ]
+          ])
       end
 
       def set_position

data/app/controllers/binda/field_groups_controller.rb

@@ -42,6 +42,18 @@ module Binda
         end
       end
 
+      # Create new fields if any
+      unless new_params[:new_choices].nil? 
+        new_params[:new_choices].each do |choice|
+          unless choice[:label].blank? || choice[:value].blank?
+            new_choice = Choice.create( choice )
+            unless new_choice
+              return redirect_to edit_structure_field_group_path( @structure.slug, @field_group.slug ), flash: { error: new_choice.errors }
+            end
+          end
+        end
+      end 
+
       # Update the other ones
       if @field_group.update(field_group_params)
         reset_field_settings_cache
@@ -70,44 +82,20 @@ module Binda
       # Only allow a trusted parameter "white list" through.
       def field_group_params
         params.require(:field_group).permit(
-          :name, 
-          :slug, 
-          :description, 
-          :position, 
-          :layout,
-          :structure_id,
-          field_settings_attributes: [
-            :id, 
-            :field_group_id,
-            :field_setting_id,
-            :name, 
-            :slug,
-            :description,
-            :field_type,
-            :position,
-            :required,
-            :default_text,
-            :ancestry
+          :name, :slug, :description, :position, :layout, :structure_id,
+          field_settings_attributes: [ :id, :field_group_id, :field_setting_id, :name, :slug, :description, :field_type, :position, :required, :default_text, :ancestry, choices: [], :default_choice_id_id, :allow_null,
+            choices_attributes: [ :field_setting_id, :label, :value ]
           ])
       end
 
       def new_params
         params.require(:field_group).permit( 
-          new_field_settings:[ 
-            :field_group_id, 
-            :field_setting_id,
-            :name, 
-            :slug,
-            :description, 
-            :field_type, 
-            :position,
-            :required,
-            :ancestry
-            ])
+          new_field_settings:[ :field_group_id, :field_setting_id, :name, :slug, :description, :field_type, :position, :required, :ancestry, choices: [], :default_choice_id, :allow_null ],
+          new_choices: [ :field_setting_id, :label, :value ])
       end
 
       def reset_field_settings_cache
-        Binda::FieldSetting.reset_field_settings_array
+        FieldSetting.reset_field_settings_array
       end
 
   end

data/app/controllers/binda/structures_controller.rb

@@ -2,7 +2,7 @@ require_dependency "binda/application_controller"
 
 module Binda
   class StructuresController < ApplicationController
-    before_action :set_structure, only: [:show, :edit, :update, :destroy]
+    before_action :set_structure, only: [:show, :edit, :update, :destroy, :fields_update ]
 
     def index
       @structures = Structure.order('position').all
@@ -30,7 +30,7 @@ module Binda
           return redirect_to structure_path( @structure.slug ), flash: { error: 'General Details group hasn\'t been created' }
         end
         # ... redirect to the new structure path
-        redirect_to structure_path( @structure.slug ), notice: 'Structure was successfully created.'
+        redirect_to structure_path( @structure.slug ), notice: "#{ @structure.name } structure was successfully created."
       else
         render :new
       end
@@ -49,7 +49,7 @@ module Binda
 
       # Update the other ones
       if @structure.update(structure_params)
-        redirect_to structure_path( @structure.slug ), notice: 'Structure was successfully updated.'
+        redirect_to structure_path( @structure.slug ), notice: "#{ @structure.name } structure was successfully updated."
       else
         render :edit
       end
@@ -57,16 +57,16 @@ module Binda
 
     def destroy
       @structure.destroy
-      redirect_to structures_url, notice: 'Structure was successfully destroyed.'
+      redirect_to structures_url, notice: "#{ @structure.name } structure was successfully destroyed."
     end
 
     def fields_update
-      redirect_to :back, notice: 'Components was successfully updated.'
+      redirect_to :back, notice: "#{ @structure.name } structure was successfully updated."
     end
 
     def sort
       params[:structure].each_with_index do |id, i|
-        Binda::Structure.find( id ).update({ position: i + 1 })
+        Structure.find( id ).update({ position: i + 1 })
       end
       head :ok
     end