binda 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a14502da9b61e81895cb12acda199217a9f8e17
-  data.tar.gz: d66be0ef4a7bb1546e2ec9490bf567692e297a66
+  metadata.gz: 5694e1440f4d1444a866b3585c015a505b1916c9
+  data.tar.gz: fbb826b32c32544817670db8c40b2c17b4e0fa0d
 SHA512:
-  metadata.gz: 63b76465c699918032cacfccc5a0dddd95ccfb3052528580747948bf47d84f3ac13ec0eda43a23bdc307936ab776670027e666150b07ab03759d7de0a3c8f50d
-  data.tar.gz: c074e52665ecb324967767c34def618217b978e66199cbcf9a64e71b9151212665d8a1f796c6a414a9ad454d0386c40a8a98417715bae884e65a2e2566b61f1c
+  metadata.gz: 8e6fad4efa8654fd96281eba1cc2d952b06ab2c295e8c5647578dcf9fca72a9c56ac2815531f7a3a63bec2691e771181084b8f0bf5891f5cbfd5e6f470b0038e
+  data.tar.gz: 8e0b3daf423b42e5a0b381678ddd41f62d79dc54c99f359fdf5dbad30958c6f31c38a0d005717b18c77c8279e989f481d532c6e61610334440dc4883814a151f

data/app/assets/javascripts/binda/components/fileupload.js

@@ -78,6 +78,7 @@ function handle_file(event)
 	// formData.append('authenticity_token', token)
 
 	// Display loader
+	$('.popup-warning--message').text( $parent.data('message') )
 	$('.popup-warning').removeClass('popup-warning--hidden')
 
 	// Once form data are gathered make the request
@@ -109,19 +110,17 @@ function makeRequest(event, formData )
 		// Display details and buttons
 		$parent.find('.fileupload--details').removeClass('fileupload--details--hidden')
 		$parent.find('.fileupload--remove-image-btn').removeClass('fileupload--remove-image-btn--hidden')
-	}).fail( function()
+	}).fail( function(dataFail)
 	{
+		console.error("Error:", dataFail.responseJSON)
 		// Hide loaded
 		$('.popup-warning').addClass('popup-warning--hidden')
-		alert('Something went wrong. Upload process failed.')
+		alert($parent.data('error'))
 	})
 }
 
-
-function reset_file(event) 
-{
-	let input = event.target
-	
+function reset_file(input) 
+{	
 	input.value = ''
 
 	if(!/safari/i.test(navigator.userAgent)){
@@ -137,7 +136,10 @@ function remove_preview(event)
 
 	// Reset previews (either image or video)
 	$parent.find('.fileupload--preview').css('background-image','').removeClass('fileupload--preview--uploaded')
-	$parent.find('video source').attr('src', '')
+	$parent.find('video source').removeAttr('src')
+	
+	// Clear input field 
+	reset_file( $parent.find('input[type=file]').get(0) )
 
 	// Reset buttons to initial state
 	$parent.find('.fileupload--remove-image-btn').addClass('fileupload--remove-image-btn--hidden')
@@ -176,7 +178,7 @@ function setup_video_preview(data, id)
 	  .attr('type', 'video/' + data.ext)
 
   // If video source isn't blank load it (consider that a video tag is always present)
-	if ( $preview.find('video source').attr('src').length > 0 )
+	if ( typeof $preview.find('video source').attr('src') != undefined )
 	{
 		$preview.find('video').get(0).load()
 	}
@@ -188,4 +190,5 @@ function setup_video_preview(data, id)
 	// Update details
 	$parent.find('.fileupload--filesize').text(data.size)
 	$parent.find('.fileupload--filename').text(data.name)
+	$parent.find('.fileupload--videolink a').attr('href', data.url)
 }

data/app/assets/javascripts/binda/components/sortable.js

@@ -4,25 +4,9 @@
 
 
 var sortableOptions = {
-		stop: function(event, ui)
-		{
-			ui.item.css('z-index', 0)
-		},
+		stop: function(event, ui){ ui.item.css('z-index', 0) },
   	placeholder: "ui-state-highlight",
-  	update: function () 
-  	{
-  		if ( $('.popup-warning').length > 0 ) 
-  		{
-  			$('.sortable').addClass('sortable--disabled')
-  			$('.popup-warning').removeClass('popup-warning--hidden')
-  			$(this).sortable('option','disabled', true)
-  		}
-			let url = $(this).data('update-url')
-			let data = $(this).sortable('serialize')
-			// If there is a pagination update accordingly
-			data = data.concat(`&id=${$(this).attr('id')}`)
-			$.post( url, data )
-  	}
+  	update: updateSortable
   }
 
 export default function() 
@@ -92,4 +76,28 @@ function toggleSortable(event)
  	$( id ).toggleClass('sortable--disabled')
  	$( id ).toggleClass('sortable--enabled')
  	$( this ).children('.sortable--toggle-text').toggle()
+}
+
+function updateSortable() 
+{
+	if ( $('.popup-warning').length > 0 ) 
+	{
+		$(this).addClass('sortable--disabled')
+		$('.popup-warning--message').text( $(this).data('message') )
+		$('.popup-warning').removeClass('popup-warning--hidden')
+		$(this).sortable('option','disabled', true)
+	}
+	let url = $(this).data('update-url')
+	let data = $(this).sortable('serialize')
+	// If there is a pagination update accordingly
+	data = data.concat(`&id=${$(this).attr('id')}`)
+	$.post( url, data ).done( function(doneData)
+	{
+		$(doneData.id).sortable('option', 'disabled', false)
+		$('.popup-warning').addClass('popup-warning--hidden')
+		$(doneData.id).removeClass('sortable--disabled')
+	}).fail(function(failData){
+		$('.popup-warning').addClass('popup-warning--hidden')
+		alert('Error: ' + failData.message)
+	})
 }

data/app/assets/javascripts/binda/dist/binda.bundle.js

@@ -286,6 +286,8 @@ function deleteChoice(event) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _FileUpload; });
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -374,6 +376,7 @@ function handle_file(event) {
 	// formData.append('authenticity_token', token)
 
 	// Display loader
+	$('.popup-warning--message').text($parent.data('message'));
 	$('.popup-warning').removeClass('popup-warning--hidden');
 
 	// Once form data are gathered make the request
@@ -405,16 +408,15 @@ function makeRequest(event, formData) {
 		// Display details and buttons
 		$parent.find('.fileupload--details').removeClass('fileupload--details--hidden');
 		$parent.find('.fileupload--remove-image-btn').removeClass('fileupload--remove-image-btn--hidden');
-	}).fail(function () {
+	}).fail(function (dataFail) {
+		console.error("Error:", dataFail.responseJSON);
 		// Hide loaded
 		$('.popup-warning').addClass('popup-warning--hidden');
-		alert('Something went wrong. Upload process failed.');
+		alert($parent.data('error'));
 	});
 }
 
-function reset_file(event) {
-	var input = event.target;
-
+function reset_file(input) {
 	input.value = '';
 
 	if (!/safari/i.test(navigator.userAgent)) {
@@ -429,7 +431,10 @@ function remove_preview(event) {
 
 	// Reset previews (either image or video)
 	$parent.find('.fileupload--preview').css('background-image', '').removeClass('fileupload--preview--uploaded');
-	$parent.find('video source').attr('src', '');
+	$parent.find('video source').removeAttr('src');
+
+	// Clear input field 
+	reset_file($parent.find('input[type=file]').get(0));
 
 	// Reset buttons to initial state
 	$parent.find('.fileupload--remove-image-btn').addClass('fileupload--remove-image-btn--hidden');
@@ -461,7 +466,7 @@ function setup_video_preview(data, id) {
 	$preview.removeClass('fileupload--preview--uploaded').find('video').attr('id', 'video-' + id).find('source').attr('src', data.url).attr('type', 'video/' + data.ext);
 
 	// If video source isn't blank load it (consider that a video tag is always present)
-	if ($preview.find('video source').attr('src').length > 0) {
+	if (_typeof($preview.find('video source').attr('src')) != undefined) {
 		$preview.find('video').get(0).load();
 	}
 
@@ -472,6 +477,7 @@ function setup_video_preview(data, id) {
 	// Update details
 	$parent.find('.fileupload--filesize').text(data.size);
 	$parent.find('.fileupload--filename').text(data.name);
+	$parent.find('.fileupload--videolink a').attr('href', data.url);
 }
 
 /***/ }),
@@ -1164,18 +1170,7 @@ var sortableOptions = {
 		ui.item.css('z-index', 0);
 	},
 	placeholder: "ui-state-highlight",
-	update: function update() {
-		if ($('.popup-warning').length > 0) {
-			$('.sortable').addClass('sortable--disabled');
-			$('.popup-warning').removeClass('popup-warning--hidden');
-			$(this).sortable('option', 'disabled', true);
-		}
-		var url = $(this).data('update-url');
-		var data = $(this).sortable('serialize');
-		// If there is a pagination update accordingly
-		data = data.concat('&id=' + $(this).attr('id'));
-		$.post(url, data);
-	}
+	update: updateSortable
 };
 
 /* harmony default export */ __webpack_exports__["a"] = (function () {
@@ -1238,6 +1233,27 @@ function toggleSortable(event) {
 	$(this).children('.sortable--toggle-text').toggle();
 }
 
+function updateSortable() {
+	if ($('.popup-warning').length > 0) {
+		$(this).addClass('sortable--disabled');
+		$('.popup-warning--message').text($(this).data('message'));
+		$('.popup-warning').removeClass('popup-warning--hidden');
+		$(this).sortable('option', 'disabled', true);
+	}
+	var url = $(this).data('update-url');
+	var data = $(this).sortable('serialize');
+	// If there is a pagination update accordingly
+	data = data.concat('&id=' + $(this).attr('id'));
+	$.post(url, data).done(function (doneData) {
+		$(doneData.id).sortable('option', 'disabled', false);
+		$('.popup-warning').addClass('popup-warning--hidden');
+		$(doneData.id).removeClass('sortable--disabled');
+	}).fail(function (failData) {
+		$('.popup-warning').addClass('popup-warning--hidden');
+		alert('Error: ' + failData.message);
+	});
+}
+
 /***/ }),
 /* 13 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {

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

@@ -131,4 +131,8 @@
 
 .standard-form--video .fileupload--dimension {
   display: none;
+}
+
+.standard-form--image .fileupload--videolink {
+  display: none;
 }

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

@@ -12,6 +12,10 @@
       padding: 6px 12px;
     }
 
+    th:last-child {
+      text-align: right;
+    }
+
     td
     {
       padding: 12px;

data/app/controllers/binda/components_controller.rb

@@ -64,15 +64,14 @@ module Binda
       params[:repeater].each_with_index do |id, i|
         Repeater.find( id ).update({ position: i + 1 })
       end
-      render js: "$('.popup-warning').addClass('popup-warning--hidden');"
-      head :ok
+      render json: { id: "##{params[:id]}" }, status: 200
     end
     
     def sort
       params[:component].each_with_index do |id, i|
         Component.find( id ).update_column('position', i + 1) # use update_column to skip callbacks (which leads to huge useless memory consumption)
       end
-      render js: "$('##{params[:id]}').sortable('option', 'disabled', false); $('.popup-warning').addClass('popup-warning--hidden'); $('.sortable').removeClass('sortable--disabled')"
+      render json: { id: "##{params[:id]}" }, status: 200
     end
 
     def sort_index
@@ -82,12 +81,9 @@ module Binda
 
     def upload
       if @component.update( upload_params(:component) )
-        respond_to do |format|
-          format.json { render json: upload_details }
-        end
+        render json: upload_details, status: 200
       else
-        logger.debug("The upload process has failed. #{ @component.errors.full_messages }")
-        head :bad_request
+        render json: @component.errors.full_messages, status: 400
       end
     end
 

data/app/controllers/binda/images_controller.rb

@@ -50,8 +50,11 @@ module Binda
 
     def remove_image
       @image.remove_image!
-      @image.save!
-      head :ok
+      if @image.save
+        head :ok
+      else
+        render json: @image.errors.full_messages, status: 400
+      end
     end
 
     private

data/app/controllers/binda/videos_controller.rb

@@ -50,8 +50,11 @@ module Binda
 
     def remove_video
       @video.remove_video!
-      @video.save!
-      render js: "$('#video-#{@video.id}').remove();"
+      if @video.save
+        head :ok
+      else
+        render json: @video.errors.full_messages, status: 400
+      end
     end
 
     private

data/app/views/binda/components/sort_index.html.erb

@@ -8,15 +8,8 @@
 <% end %>
 
 <% content_for :content do %>
-  <div class="popup-warning popup-warning--hidden">
-      <div class="popup-warning--loader">
-        <span></span>
-        <span></span>
-        <span></span>
-        <span></span>
-      </div>
-      <p><%= t 'binda.sort_items_loader', { arg1: t('binda.components').downcase } %></p>
-  </div>
+
+  <%= render 'layouts/binda/popup_warning' %>
 
   <div class="main-sortable-table">
 
@@ -25,7 +18,7 @@
       <div class="main-sortable-table--header-title"><p>Publish State</p></div>
     </div>
 
-    <div id="<%= @structure.slug %>-components--sort-index" class="sortable" data-update-url="<%= structure_components_sort_path( @structure.slug ) %>">
+    <div id="<%= @structure.slug %>-components--sort-index" class="sortable" data-update-url="<%= structure_components_sort_path( @structure.slug ) %>" data-message="<%= t 'binda.sort_items_loader', { arg1: t('binda.components').downcase } %>">
       <% @components.order( :position, :name ).each do |component| %>
         <div class="main-sortable-table--row ui-sortable-handle" id="component_<%= component.id %>">
           <div class="main-sortable-table--row-cell"><%= link_to component.name, structure_component_path( @structure.slug, component ) %></div>

data/app/views/binda/field_groups/_form_body.html.erb

@@ -1,3 +1,5 @@
+<%= render 'layouts/binda/popup_warning' %>
+
 <div class="standard-form">
 
 <%= simple_form_for @field_group, url: get_form_field_group_url, html: { class: 'form-body' } do |f| %>

data/app/views/binda/fieldable/_form_body.html.erb

@@ -1,12 +1,4 @@
-<div class="popup-warning popup-warning--hidden">
-    <div class="popup-warning--loader">
-      <span></span>
-      <span></span>
-      <span></span>
-      <span></span>
-    </div>
-    <p><%= t 'binda.upload_loading_message' %></p>
-</div>
+<%= render 'layouts/binda/popup_warning' %>
 
 <%= simple_form_for [ @instance.structure, @instance ], html: { class: 'form-body', multipart: true } do |f| %>
 

data/app/views/binda/fieldable/_form_item_image.html.erb

@@ -1,6 +1,8 @@
 <div id="standard-form--image-<%= field_setting.id %>" class="standard-form--image form-item">
   <div id="fileupload-<%= ff.object.id %>" 
-    class="fileupload form-group">
+    class="fileupload form-group"
+    data-message="<%= t('binda.upload_loading_message') %>"
+    data-error="<%= t('binda.upload_error_message')%>">
 
     <p class="control-label"><%= field_setting.name.capitalize %></p>
 
@@ -19,7 +21,7 @@
             @instance, 
             action: :upload, 
             repeater: { id: "#{field_setting.parent_id}" }]),
-          'data-id': ff.object.id 
+          'data-id': ff.object.id
         } %>
 
     </div>

data/app/views/binda/fieldable/_form_item_repeater.html.erb

@@ -23,7 +23,7 @@
 		
 		</div>
 
-		<ul id="form-item--repeater-setting-<%= repeater_setting.id %>" class="sortable sortable--disabled" data-update-url="<%= url_for([@structure, @instance, :sort_repeaters]) %>">
+		<ul id="form-item--repeater-setting-<%= repeater_setting.id %>" class="sortable sortable--disabled" data-update-url="<%= url_for([@structure, @instance, :sort_repeaters]) %>" data-message="<%= t 'binda.sort_items_loader', { arg1: t('binda.components').downcase } %>">
 
 			<% if repeaters.size == 0 %>
 

data/app/views/binda/fieldable/_form_item_video.html.erb

@@ -1,6 +1,8 @@
 <div id="standard-form--video-<%= field_setting.id %>" class="standard-form--video form-item">
   <div id="fileupload-<%= ff.object.id %>" 
-    class="fileupload form-group">
+    class="fileupload form-group"
+    data-message="<%= t('binda.upload_loading_message') %>"
+    data-error="<%= t('binda.upload_error_message')%>">
 
     <p class="control-label"><%= field_setting.name.capitalize %></p>
 
@@ -15,7 +17,7 @@
 				input_html: { 
 					class: 'form-item--video--uploader',
           'data-url': url_for([@instance.structure, @instance, action: :upload]),
-          'data-id': ff.object.id 
+          'data-id': ff.object.id,
 				} %>
 
       

data/app/views/binda/structures/sort_index.html.erb

@@ -6,15 +6,8 @@
 <% end %>
 
 <% content_for :content do %>
-  <div class="popup-warning popup-warning--hidden">
-      <div class="popup-warning--loader">
-        <span></span>
-        <span></span>
-        <span></span>
-        <span></span>
-      </div>
-      <p><%= t 'binda.sort_items_loader', { arg1: t('binda.structures').downcase } %></p>
-  </div>
+
+  <%= render 'layouts/binda/popup_warning' %>
 
   <div class="main-table--container">
     <h5 class="text-muted"><%= t('binda.sort_index_hint', { arg1: t('binda.structures').downcase }).html_safe %></h5>
@@ -25,7 +18,7 @@
           <p>Structures</p>
         </div>
       </div>
-      <div id="structures--sort-index" class="sortable" data-update-url="<%= structures_sort_path() %>">
+      <div id="structures--sort-index" class="sortable" data-update-url="<%= structures_sort_path() %>" data-message="<%= t 'binda.sort_items_loader', { arg1: t('binda.components').downcase } %>">
       <% @structures.order( :name ).each do |structure| %>
         <div id="structure_<%= structure.id %>" class="main-sortable-table--row ui-sortable-handle">
           <div class="main-sortable-table--row-cell">

data/app/views/layouts/binda/_popup_warning.html.erb

@@ -0,0 +1,9 @@
+<div class="popup-warning popup-warning--hidden">
+    <div class="popup-warning--loader">
+      <span></span>
+      <span></span>
+      <span></span>
+      <span></span>
+    </div>
+    <p class="popup-warning--message"></p>
+</div>

data/config/initializers/simple_form__fileupload.rb

@@ -54,7 +54,8 @@ module SimpleForm
             html << '" data-id="'
             html << obj.id.to_s
             html << '">'
-              html << '<i class="fa fa-trash-alt" aria-hidden="true"></i> Delete image'
+              html << '<i class="fa fa-trash-alt" aria-hidden="true"></i>'
+              html << t('binda.delete')
           html << '</a>'
           html << '<div class="clearfix"></div>'
         end
@@ -100,6 +101,12 @@ module SimpleForm
           html << '</span> x <span class="fileupload--height">'
           html << image[:height].to_s unless image.nil?
           html << '</span> px</p>'
+          html << '<p class="fileupload--videolink"><a href="'
+          html << obj.video.url if obj.video.present?
+          html << '" target="_blank"><i class="fas fa-external-link-alt"></i> <strong>'
+          html << t('binda.filevideolink')
+          html << '</strong></a></p>'
+
           html << '</div>'
         end
       end

data/config/locales/en.yml

@@ -50,12 +50,14 @@ en:
     confirm_delete: Do you really want to remove it?
     upload_button: Upload
     upload_loading_message: Uploading file...
+    upload_error_message: Ops! Something went wrong. Make sure the file you are uploading is correct.
     choose_file_button: Choose a file
     preview: Preview
     no_preview: No file selected
     filename: Name
     filesize: Size
     filedimension: Dimension
+    filevideolink: Preview video
     select_placeholder: Select a option
     new_item_in_repeater: New %{arg1} item
     null_is_not_allowed: You need to select at least one choice
@@ -103,6 +105,6 @@ en:
     login_credit: Built with Binda %{arg1}
     choice_label: label
     choice_value: value
-    allow_null: Choice method
-    allow_null_true: Allow to not choose any of the choices
-    allow_null_false: Force to make a choice among the available choices
+    allow_null: Require a choice
+    allow_null_true: Choosing is not required 
+    allow_null_false: Require to choose among the available choices

data/lib/binda/version.rb

@@ -1,3 +1,3 @@
 module Binda
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: binda
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Alessandro Barbieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -764,6 +764,7 @@ files:
 - app/views/kaminari/_prev_page.html.erb
 - app/views/layouts/binda/_flash.html.erb
 - app/views/layouts/binda/_header.html.erb
+- app/views/layouts/binda/_popup_warning.html.erb
 - app/views/layouts/binda/_sidebar.html.erb
 - app/views/layouts/binda/application.html.erb
 - config/autoprefixer.yml