Update/actualizacion convocatoria

.gitignore

@@ -12,6 +12,8 @@
 /tmp/*
 !/log/.keep
 !/tmp/.keep
+*~
+._*
 
 /node_modules
 /yarn-error.log
@@ -28,13 +30,28 @@ capybara-*.html
 /vendor/bundle
 
 config/config.yml*
+config/initializers/smtp_settings.rb
 config/database.yml*
 dump.rdb*
 
+config/environment.rb
+config/initializers/devise.rb
+config/initializers/carrierwave-aws.rb
+
 public/fontello-demo.html
 public/javascripts
 public/assets/
+public/media
 
 log
 nohup.out
 .ruby-version
+
+# Ignore encrypted secrets key file.
+config/secrets.yml.key
+config/secrets.yml
+
+.DS_STORE
+public/uploads
+
+

Gemfile

@@ -54,10 +54,13 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gem 'ancestry'
 gem 'bootstrap', '~> 4.5.0'
+gem 'carrierwave'
+gem 'carrierwave-aws'
 gem 'cocoon'
 gem 'devise'
 gem 'font-awesome-rails'
 gem 'fontello_rails_converter', git: 'https://github.com/railslove/fontello_rails_converter.git'
 gem 'jquery-rails'
 gem 'rails', '5.1.6.2'
 gem 'simple_form'
+

Gemfile.lock

@@ -55,6 +55,22 @@ GEM
     arel (8.0.0)
     autoprefixer-rails (10.2.5.1)
       execjs (> 0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.535.0)
+    aws-sdk-core (3.123.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.525.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.51.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.107.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)
+      aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.16)
     bindex (0.8.1)
     bootstrap (4.5.3)
@@ -70,6 +86,17 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
+    carrierwave (2.2.2)
+      activemodel (>= 5.0.0)
+      activesupport (>= 5.0.0)
+      addressable (~> 2.6)
+      image_processing (~> 1.1)
+      marcel (~> 1.0.0)
+      mini_mime (>= 0.1.3)
+      ssrf_filter (~> 1.0)
+    carrierwave-aws (1.5.0)
+      aws-sdk-s3 (~> 1.0)
+      carrierwave (~> 2.0)
     childprocess (3.0.0)
     cocoon (1.2.15)
     coffee-rails (4.2.2)
@@ -101,8 +128,12 @@ GEM
       domain_name (~> 0.5)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
+    image_processing (1.12.1)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     jbuilder (2.11.2)
       activesupport (>= 5.0.0)
+    jmespath (1.4.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -118,10 +149,12 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (1.0.2)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
+    mini_magick (4.11.0)
     mini_mime (1.1.0)
     mini_portile2 (2.5.3)
     minitest (5.14.4)
@@ -174,6 +207,8 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    ruby-vips (2.1.3)
+      ffi (~> 1.12)
     ruby_dep (1.5.0)
     rubyzip (1.3.0)
     sass (3.7.4)
@@ -212,6 +247,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    ssrf_filter (1.0.7)
     thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
@@ -247,6 +283,8 @@ DEPENDENCIES
   bootstrap (~> 4.5.0)
   byebug
   capybara (~> 2.13)
+  carrierwave
+  carrierwave-aws
   cocoon
   coffee-rails (~> 4.2)
   devise
@@ -269,4 +307,4 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 BUNDLED WITH
-   2.0.1
+   2.2.9

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 CONABIO
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,9 +1,8 @@
 # README
 
-This README would normally document whatever steps are necessary to get the
-application up and running.
+Esta aplicación es la base para los concursos de dibujo y de fotografía que realiza anualmente la CONABIO 
 
-Things you may want to cover:
+TODO:
 
 * Ruby version
 

app/assets/javascripts/application.js

@@ -11,8 +11,9 @@
 // about supported directives.
 //
 //= require jquery3
+//= require rails-ujs
+//= require cocoon
 //= require popper
 //= require bootstrap-sprockets
-// require rails-ujs
 //= require turbolinks
 // require_tree .

app/assets/javascripts/entre_azul_y_verde/entre_azul_y_verde.js

@@ -11,8 +11,9 @@
 // about supported directives.
 //
 //= require jquery3
+//= require rails-ujs
+//= require cocoon
 //= require popper
 //= require bootstrap-sprockets
-// require rails-ujs
 //= require turbolinks
 //= require entre_azul_y_verde/entre_azul_y_verde_extra

app/assets/javascripts/entre_azul_y_verde/entre_azul_y_verde_extra.js

@@ -1,18 +1,4 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
-// vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file. JavaScript code in this file should be added after the last require_* statement.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require jquery3
-//= require popper
-//= require bootstrap-sprockets
-// require rails-ujs
-//= require turbolinks
-// require_tree .
+$(document).ready(function(){
+
+});
+

app/assets/javascripts/mosaico_natura/mosaico_natura.js

@@ -0,0 +1,19 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
+// vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery3
+//= require rails-ujs
+//= require cocoon
+//= require popper
+//= require bootstrap-sprockets
+//= require turbolinks
+//= require mosaico_natura/mosaico_natura_extra

app/assets/javascripts/mosaico_natura/mosaico_natura_extra.js

@@ -0,0 +1,70 @@
+$(document).ready(function(){
+		$('[data-toggle="tooltip"]').tooltip();
+		$('.toast').toast('show');
+
+		//Coloca los nested-fields despues de los botones (.links)
+		$("#medias a.add_fields").data("association-insertion-method", 'after');
+
+
+		// limits the number of categories
+		check_to_hide_or_show_add_link();
+
+		$('#medias').on('cocoon:after-insert', function() {
+				check_to_hide_or_show_add_link();
+		});
+
+		$('#medias').on('cocoon:after-remove', function() {
+				check_to_hide_or_show_add_link();
+		});
+
+		function check_to_hide_or_show_add_link() {
+				$("#medias a.add_fields").each(function () {
+						link = $(this);
+						nestedClass = $('.nested-fields-for-'+link.data('categoria')+':visible');
+						link.attr('data-after',link.data('maximos') - nestedClass.length);
+						if (nestedClass.length == link.data('maximos')) {
+								link.removeClass('d-inline-flex').addClass('disabled');
+						} else {
+								link.addClass('d-inline-flex').removeClass('disabled');
+						}
+				});
+		}
+
+		$("#medias").on('change', '.file-to-upload', function(e) {
+
+				if(this.files[0].type.indexOf('video') == 0){
+						return true;
+				}
+
+				var reader = new FileReader();
+				//Read the contents of Image File.
+				reader.readAsDataURL(this.files[0]);
+				reader.onload = function (e) {
+
+						//Initiate the JavaScript Image object.
+						var image = new Image();
+
+						//Set the Base64 string return from FileReader as source.
+						image.src = e.target.result;
+
+						//Validate the File Height and Width.
+						image.onload = function () {
+								var h = this.height;
+								var w = this.width;
+								console.log(h + " - " + w);
+								var largerSide = h > w ? h : w;
+								console.log(largerSide);
+								if (largerSide > 3000 && largerSide < 4500) {
+										console.log("Imagen con medidas adecuadas");
+										return true;
+								}else {
+										alert("Cambia tu foto, no cumple con las medidas mínimas/máximas especificadas en las bases del concurso:\n(Tamaño mínimo: 3,000 pixeles por lado más grande\nTamaño máximo: 4,500 pixeles por lado más grande)\nde subirla sera descalificada.");
+										return false;
+								}
+
+						};
+				};
+		});
+
+});
+

app/assets/stylesheets/entre_azul_y_verde/bootstrap-variable-overrides.scss

@@ -3,15 +3,15 @@
 $enable-gradients:                            true !default;
 
 /* Font para biomex más las default de Bootstrap */
-$font-size-base:              .85rem !default;
-$font-family-sans-serif:      opensans, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;;
+$font-size-base:              1.25rem !default;
+$font-family-sans-serif:      'McLaren', cursive, opensans, -apple-system, BlinkMacSystemFont !default;;
 
-$h1-font-size:                $font-size-base * 2 !default;
-$h2-font-size:                $font-size-base * 1.75 !default;
-$h3-font-size:                $font-size-base * 1.5 !default;
-$h4-font-size:                $font-size-base * 1.25 !default;
-$h5-font-size:                $font-size-base * 1 !default;
-$h6-font-size:                $font-size-base * 0.9 !default;
+/*$h1-font-size:                $font-size-base * 2 !default;*/
+/*$h2-font-size:                $font-size-base * 1.75 !default;*/
+/*$h3-font-size:                $font-size-base * 1.5 !default;*/
+/*$h4-font-size:                $font-size-base * 1.25 !default;*/
+/*$h5-font-size:                $font-size-base * 1 !default;*/
+/*$h6-font-size:                $font-size-base * 0.9 !default;*/
 
 /* Breadcrumbs overrides! */
 $breadcrumb-padding-y:              .5rem !default;
@@ -25,10 +25,12 @@ $breadcrumb-border-radius:          0 !default;
 $enable-responsive-font-sizes:      true !default;
 
 //$primary: #bd0016;
-$primary: #800000;
-$success: #A0C11F;
-$info: #104C5B;
-$warning: #ea9028;
-$danger: #C77878;
+$primary: #fc6042;
+//$success: #A0C11F;
+$info: #ffaa00;
+//$warning: #ea9028;
+//$danger: #C77878;
 
-$embed-responsive-aspect-ratios: ((21 9), (23 9), (16 9), (11 4), (4 3), (1 1)) !default;
+$link-color: #eabd0d !default;
+
+$embed-responsive-aspect-ratios: ((21 9), (23 9), (16 9), (11 4), (4 3), (1 1)) !default;

app/assets/stylesheets/entre_azul_y_verde/entre_azul_y_verde.scss

@@ -1,4 +1,6 @@
+@import url('https://fonts.googleapis.com/css2?family=McLaren&display=swap');
+@import "font-awesome";
 @import 'entre_azul_y_verde/bootstrap-variable-overrides';
 @import 'bootstrap';
 @import "entre_azul_y_verde/entre_azul_y_verde_extra";
-//@import "font-awesome";
+