Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
465 commits
Select commit Hold shift + click to select a range
903ee0e
mini fixes
albertoglezba Nov 15, 2021
912ab9f
correcciones terminos y condicions y ajustes estilos de seccion concurso
Nov 15, 2021
5dccccc
rutas necesarias para mosaiconatura
albertoglezba Nov 15, 2021
e404dcd
algunos pendientes de marcado, faltan varios ¬¬
albertoglezba Nov 15, 2021
c6a73a1
arreglando rutas apra 2 dominios
albertoglezba Nov 15, 2021
0ad2e0e
correcciones previo a publicacion
Nov 15, 2021
33db946
archivos de invitaciones en seccion medios
Nov 15, 2021
278ec48
link de boletin de prensa
Nov 15, 2021
33c4161
footer de terminos y condiciones
Nov 16, 2021
b89154f
reescribiendo bien el html concursos.erb
albertoglezba Nov 16, 2021
395020e
al parecer no me pelaron en los archivos q les puse ¬¬
albertoglezba Nov 16, 2021
08acadb
poniendo leyenda e indentando, al parecer no les gusta indentar códig…
albertoglezba Nov 16, 2021
5a3f28f
acento faltante e imágenes rotas ¬¬
albertoglezba Nov 16, 2021
9d79165
correcciones de texto
Nov 16, 2021
cbb5037
humanize instead of capitalize
albertoglezba Nov 16, 2021
bd0fec5
cambiando texto de paisajes
albertoglezba Nov 16, 2021
829982f
spot de radio en seccion medios
Nov 16, 2021
1ea38de
va spot de nuevo pero ahora en mp3
albertoglezba Nov 16, 2021
4094be1
eliminar archivos duplicados dejar solo descargables
Nov 19, 2021
482db96
actualizacion de terminos y condiciones para video
Nov 23, 2021
5b26250
corrección de texto
alesafi Nov 24, 2021
4b851c6
fixesparra guarde usuarioMN xD
albertoglezba Nov 29, 2021
6f268af
cambios para q jale mejor
albertoglezba Nov 29, 2021
6a7c1d7
cambios para poder subir a AWS
calonsot Nov 29, 2021
4881faa
traducciones del devise al español
albertoglezba Dec 1, 2021
105e13c
fixin code "typos"
albertoglezba Dec 1, 2021
5558de4
con las correcciones de @calonsot :)
albertoglezba Dec 2, 2021
f7428d0
link to add association in media
albertoglezba Dec 3, 2021
860e750
hay un error con el edit, regresando de entregar los recibos lo arreg…
albertoglezba Dec 3, 2021
8940d61
cambiando el notice por un toast
albertoglezba Dec 6, 2021
914fe16
if para diferenciar adultos de niños
albertoglezba Dec 6, 2021
9183492
marcado para subir fotos y metadatos, falta definir metadatos y limit…
albertoglezba Dec 6, 2021
3ee616a
ocultando los botones de añadir relacion una vez clickeados
albertoglezba Dec 6, 2021
c216757
los datos de usuario y direccion se bloquean previo a la actualizacio…
albertoglezba Dec 6, 2021
39ed6f4
ahora se añaden solamente las fotos necesarias no mas, no menos
albertoglezba Dec 6, 2021
1e8f9dd
ya se guardan correctamente con categoria las fotos y se genera en au…
albertoglezba Dec 7, 2021
9cd5441
ahora solo se permite ingresar la cantidad correcta de media, ni una …
albertoglezba Dec 8, 2021
3e1634e
areglando mensaje de bienvenida
albertoglezba Dec 8, 2021
a162800
cambiando mensajes y estilos del devise
albertoglezba Dec 8, 2021
25592a3
quitando puts y añadiendo campos para mn
albertoglezba Dec 8, 2021
2f7696d
para q jale video y campos de mn en la forma
albertoglezba Dec 8, 2021
7a48abd
fix al momento de crear cuenta... sorry
albertoglezba Dec 8, 2021
cd24e08
cuando hay error enla guarda de fotos, ahora forza el reload
albertoglezba Dec 8, 2021
9b69701
se reseteaba la localidad y la marca, faltaba quitar el nil xD
albertoglezba Dec 8, 2021
19c5a70
corrección footer
alesafi Dec 9, 2021
b56f12f
cambios solicitados por diseniadoras
albertoglezba Dec 10, 2021
e954833
la validacion del tamaño se hace enteramente en el browser
albertoglezba Dec 10, 2021
3d661da
descomentando ligas para registro de mn
albertoglezba Dec 10, 2021
398d230
Merge remote-tracking branch 'origin/master' into ggonzalez
alesafi Dec 18, 2021
aaf316e
cambios fechas
alesafi Dec 18, 2021
06b9060
Merge branch 'ggonzalez' into alesafi
alesafi Dec 18, 2021
8f0194b
Merge branch 'alesafi'
alesafi Dec 18, 2021
f74a1d5
Merge remote-tracking branch 'upstream/alesafi' into alesafi
Dec 18, 2021
f93a8a1
Merge remote-tracking branch 'alesafi/master'
albertoglezba Dec 18, 2021
50331d0
siempre no es confirmbale
albertoglezba Jan 11, 2022
b7d4b14
para q deje de salir aguascalientes
albertoglezba Jan 11, 2022
8b0619f
poniendo instucciones claras
albertoglezba Jan 11, 2022
53a711f
poniendo instucciones claras
albertoglezba Jan 11, 2022
fade996
Merge remote-tracking branch 'origin/master'
albertoglezba Jan 11, 2022
98016fc
actualización de fecha
alesafi Jan 16, 2022
8394332
Actualización de fechas en descargables
alesafi Jan 16, 2022
de2fa75
Merge pull request #16 from alesafi/master
albertoglezba Jan 17, 2022
bcda7b6
Merge pull request #15 from alesafi/patch-1
albertoglezba Jan 17, 2022
cd48535
te falto este @alesafi
albertoglezba Jan 17, 2022
e84888e
Actualización de video
alesafi Jan 29, 2022
8f7abc3
cambio de video
alesafi Jan 29, 2022
4420e35
Video spot 2022
alesafi Jan 29, 2022
991902d
Merge branch 'master' of https://github.com/alesafi/concursos
albertoglezba Jan 31, 2022
8eb5fb6
fecha de término de concurso
alesafi Feb 18, 2022
e49dd0d
fecha de límite de entrega
alesafi Feb 18, 2022
378bb4b
Merge pull request #18 from alesafi/alesafi
albertoglezba Feb 18, 2022
99bd1fe
anuncio de video
alesafi Feb 18, 2022
92bedb9
Merge pull request #19 from alesafi/alesafi
albertoglezba Feb 18, 2022
42453e2
había una liga q no pertenecía a este namespace ¬¬
albertoglezba Mar 1, 2022
050b7fc
cierre de concurso de dibujo
albertoglezba Mar 1, 2022
39406e4
Merge remote-tracking branch 'origin/master'
albertoglezba Mar 1, 2022
fe1610e
precalificacion de dibujos
albertoglezba Mar 9, 2022
27c6b64
falto ponerlo en prod
albertoglezba Mar 9, 2022
895448d
falto la vista, duh
albertoglezba Mar 9, 2022
fbd504b
codigo mas limpio
albertoglezba Mar 10, 2022
33f6320
esto es culpa del malevolo vscode, regresandolo a como DEBE de ser xD
albertoglezba Mar 10, 2022
0f1ddb4
añadi hover, y visualizacion en grande a la precalificada
albertoglezba Mar 10, 2022
f1e4559
Poniendo mas cuquis la navegación
albertoglezba Mar 10, 2022
fecde18
añadiendo dummy de switch de votacion
albertoglezba Mar 10, 2022
0297fb4
upgrade a collapse
albertoglezba Mar 15, 2022
ba6eb68
poniendo cuquis
albertoglezba Mar 15, 2022
bdbcad1
faltaba name para el serialize
albertoglezba Mar 15, 2022
016682f
metiendo tabla para calificaciones
albertoglezba Mar 15, 2022
224cde8
fix para q jale la tabla de calificaciones
albertoglezba Mar 15, 2022
3565bdb
funcion ajax para precalificar
albertoglezba Mar 15, 2022
7a726ac
poniendo seguridad al panel de calificacion
albertoglezba Mar 15, 2022
2ad2095
colocando correctamente los límites de las fechas
albertoglezba Mar 16, 2022
d3cf032
haciendo bien la migracion :P
albertoglezba Mar 16, 2022
bbdcadd
joins y limpieza de scopes para meter emtadatos
albertoglezba Mar 16, 2022
e325b3a
añadiendo los campos solicitados
albertoglezba Mar 16, 2022
395d8cc
mas usable los modales y el popover
albertoglezba Mar 17, 2022
bbfdd53
poniendo conteo de seleccionados
albertoglezba Mar 17, 2022
ab9c5f9
parche para que entren a la precalificacion los dibujos de los hijos …
albertoglezba Mar 17, 2022
21bcc9b
parche innecesario x2
albertoglezba Mar 17, 2022
dddb0c4
layout basico del panel de calificacion de jueces
albertoglezba Apr 2, 2022
af726ab
Merge branch 'master' into ggonzalez
albertoglezba Apr 2, 2022
ee5c803
el js del index solo en el index
albertoglezba Apr 7, 2022
e475d70
solo falta implementar las estrellitas (sistema de votacion)
albertoglezba Apr 7, 2022
96b1624
Merge branch 'master' into ggonzalez
albertoglezba Apr 7, 2022
8f8eda0
range listo, falta backend
albertoglezba Apr 8, 2022
19961aa
Merge branch 'master' into ggonzalez
albertoglezba Apr 8, 2022
587c902
solo falta backend x2
albertoglezba Apr 8, 2022
a9dbd75
YA HAS EL BACKEND!!!
albertoglezba Apr 8, 2022
38bf258
dummy de confirmacion
albertoglezba Apr 8, 2022
c613884
update en calificacion, falta diferenciar jueces
albertoglezba Apr 25, 2022
a5d64cf
ya?
albertoglezba Apr 26, 2022
06ff8c2
ejemplo llaves
albertoglezba Apr 26, 2022
88b7c12
cambiando dibujos_popover a dibujos-popover
albertoglezba Apr 27, 2022
03b647c
ahora la calificacion ya es usable, falta meter al extemporaneo ¬¬
albertoglezba Apr 27, 2022
0a75458
metiendo al extemporaneo (gracias chabelo ¬¬!)
albertoglezba Apr 27, 2022
fdeca4f
actualizando calificaciones
albertoglezba Apr 27, 2022
f3300cd
para q pueda entrar dgcc sin calificar
albertoglezba Apr 27, 2022
2a02172
actualizacion de archivos
Apr 27, 2022
9de17ec
Merge remote-tracking branch 'origin/master' into alesafi
Apr 27, 2022
7ad8fc5
actualizacion de fechas de ganadores
Apr 27, 2022
3d907ec
Merge pull request #20 from alesafi/alesafi
albertoglezba Apr 27, 2022
94408d1
files para desempate
albertoglezba Apr 30, 2022
e7cf73b
little hack for the posterity
albertoglezba Apr 30, 2022
ab7a7b9
fixes al layout
albertoglezba Apr 30, 2022
18e1485
de nuevo pa arriba
albertoglezba Apr 30, 2022
2a2ce22
Ya quedo? creo q sí
albertoglezba Apr 30, 2022
30506e4
le cambio al 30 pq sino van a decir "no estan actualizadas ¬¬"
albertoglezba Apr 30, 2022
45b59f4
layout inicial para galerias 2022
albertoglezba May 1, 2022
10906e4
almost ther, query in usuario_ayv not working NPI
albertoglezba May 1, 2022
e7034c4
not ready yet
albertoglezba May 1, 2022
21c1305
no me gusta, usemos cards!!
albertoglezba May 1, 2022
4ddcad5
me gusto más así, falta el estado
albertoglezba May 2, 2022
0ce8392
poniendo estado, fue mucho más sencillo de lo pensado :P
albertoglezba May 2, 2022
3ae2241
creo q ya, a modificar el index y así
albertoglezba May 2, 2022
099e1a5
cerrando mosaico natura, sorry babies, tuvieron un día entero
albertoglezba May 2, 2022
b442da8
liberando ganadores yeeeei
albertoglezba May 2, 2022
8c8e7d3
me falto en produccion xD
albertoglezba May 2, 2022
7747ebd
quitando la liga del registro en mosaico natura, jeje xD
albertoglezba May 2, 2022
958f30a
faltaba el devise, (ya tengo sueño)
albertoglezba May 2, 2022
1b69415
poniendo los subheaders en imagen en las galerias de ganadores
albertoglezba May 2, 2022
bcb83e5
letritas amarillas :)
albertoglezba May 2, 2022
1c35b89
pleca bonita
albertoglezba May 3, 2022
bc2cdda
nadie me dijo q no se veia! :P
albertoglezba May 3, 2022
919682f
para generar los nuevos nombres a futuro
albertoglezba May 6, 2022
387d595
Merge remote-tracking branch 'origin/master'
albertoglezba May 13, 2022
45831ef
cambios al modelo de mn para el renombrado de archivos para conservar…
albertoglezba May 13, 2022
56262ce
ordenando scopes para las menciones
albertoglezba May 13, 2022
258ebc3
añadiendo menciones
albertoglezba May 13, 2022
a14274d
50-50 as suggested by @alesafi
albertoglezba May 16, 2022
609f201
100 as suggested by @alesafi
albertoglezba May 16, 2022
21a9665
¡ay @alesafi! grr
albertoglezba May 16, 2022
c756888
mas detalles de @alesafi
albertoglezba May 16, 2022
98d1809
limpiando codigo
albertoglezba May 16, 2022
3c1dea4
limpiando codigo
albertoglezba May 16, 2022
474ef5d
limpiando codigo
albertoglezba May 17, 2022
d616d2a
initial files for calificacion de jueces de mn
albertoglezba May 17, 2022
4ea6c28
faltan joins
albertoglezba May 17, 2022
2c12867
renombrando variables
albertoglezba May 17, 2022
21acc82
scopes a media para finalistas
albertoglezba May 17, 2022
0565f87
reparando scopes
albertoglezba May 17, 2022
bffd919
haciendo qeu se vea la galeria de calificacion, falta el seteo de cal…
albertoglezba May 17, 2022
ef141e8
fixes para meter mas usuarios para calificar
albertoglezba May 17, 2022
95bb342
cambios que se probaran hasta el proximo año :P
albertoglezba May 17, 2022
996b7b4
cambio de lineas para q ayv no pueda calificar en mn y viceversa
albertoglezba May 17, 2022
8fe0d15
cambios al marcado apra que acomode biena 4 jueces y a mn en vez de ayv
albertoglezba May 17, 2022
c25f6c3
reparando la autenticacion separada de ayv y mn
albertoglezba May 17, 2022
221e0ca
ya diferencia de fotos y videos, solo falta la edad
albertoglezba May 17, 2022
231606b
qeudo la edad lista, TERMINEEEEEEEEEEEEEEEEEEEE!!!!!! YEEEEEI
albertoglezba May 17, 2022
c3a1ad2
Merge pull request #21 from albertoglezba/master
albertoglezba May 17, 2022
bc9c64b
me faltaron las estupidas instrucciones... no se vayana confundir ¬¬
albertoglezba May 17, 2022
25a6ca3
Merge remote-tracking branch 'origin/master'
albertoglezba May 17, 2022
35b54ac
quitando puts y actualizando reglas para ver q juez falta
albertoglezba May 19, 2022
540b7cc
actualizacion texto solicitud CG
May 20, 2022
30e9374
Merge pull request #22 from alesafi/alesafi
albertoglezba May 20, 2022
3480a4b
metiendo los modelos de MN al scope MN duh
albertoglezba May 24, 2022
4600885
frontend para desempatar
albertoglezba May 24, 2022
ba5ffaf
ultimos ajustes para q puedan calificar
albertoglezba May 24, 2022
e7c5be7
Merge remote-tracking branch 'origin/master'
albertoglezba May 24, 2022
8830fcc
cambios para poder generar el json para los listados
albertoglezba May 26, 2022
b9618d0
json para q ivancito lo pueda consumir desde google sheets
albertoglezba May 26, 2022
21ef78d
al parecer ya tengo todo de todos, veamos y probemos
albertoglezba May 26, 2022
ca8add6
fixes para que puedan desempatar adecuadamente
albertoglezba May 26, 2022
d4654c4
fix para pestañear los finalistas con todo de todo
albertoglezba May 26, 2022
544e9c1
namas corrigiendo nombres
albertoglezba May 26, 2022
cf5a699
wtf! bloddy pride ¬¬
albertoglezba Jun 1, 2022
35540c1
incluir fecha de exposicion rejas
Jun 2, 2022
bd4d9a0
Merge pull request #23 from alesafi/alesafi
albertoglezba Jun 3, 2022
37d9cfd
modificacion parrafo
Jun 6, 2022
016c168
Merge pull request #24 from alesafi/alesafi
albertoglezba Jun 6, 2022
d8f66bd
texto invitacion a expo chapultepec
Jun 24, 2022
b75d19e
Merge pull request #25 from alesafi/alesafi
albertoglezba Jun 24, 2022
7cb9c16
img de inicio eliminar lugar de expo
Jun 28, 2022
06c6e3a
Merge pull request #26 from alesafi/alesafi
albertoglezba Jun 28, 2022
f8ee632
va oooooooootra vez
Jun 29, 2022
fe5ba92
Merge pull request #27 from alesafi/alesafi
albertoglezba Jun 29, 2022
d3d64f7
reparando html de expos
albertoglezba Jul 5, 2022
ec125c7
actualizando el nombre del modelo MN con modulo
albertoglezba Jul 13, 2022
9e25d8b
actualizacion de info de expo
Jul 14, 2022
ff2625c
Merge remote-tracking branch 'alesafi/alesafi'
albertoglezba Jul 14, 2022
4881c93
anuncio premiacion
Aug 26, 2022
cf3591d
Merge pull request #28 from alesafi/alesafi
albertoglezba Aug 27, 2022
a1300b4
video de premiacion
Aug 30, 2022
6b4b9c6
Merge pull request #29 from alesafi/alesafi
albertoglezba Aug 30, 2022
761a3f4
fecha expo aragon
Sep 23, 2022
92e323c
img inicio expo aragon
Sep 23, 2022
2b4525c
Merge pull request #30 from alesafi/alesafi
albertoglezba Sep 23, 2022
3603105
galeria de ganadores mn, falta front
calonsot Sep 26, 2022
d1e72b8
info expo aragon enero 2023
Sep 26, 2022
e283e6b
Merge pull request #31 from alesafi/alesafi
albertoglezba Sep 29, 2022
b756574
falta marcado de videos y redimensionar las fotos originales
albertoglezba Oct 4, 2022
c373921
Merge remote-tracking branch 'origin/calonso'
albertoglezba Oct 4, 2022
ab9f82f
poniendo videos, rutas para imagenes en baja y deshabilitando click d…
albertoglezba Oct 4, 2022
c8d3366
Merge remote-tracking branch 'origin/master'
albertoglezba Oct 4, 2022
554aae0
poniendo ruta correcta
albertoglezba Oct 4, 2022
46e9012
habilitando liga en menu de la galeria y cambiando routes
albertoglezba Oct 4, 2022
d0965dd
añadiendo codigo de GA-4 de mosaico natura
albertoglezba Feb 27, 2023
1476795
añadiendo codigo de GA-4 de entre azul y verde
albertoglezba Feb 27, 2023
e4707c5
Create LICENSE
albertoglezba Oct 16, 2023
5eabc49
Update index.erb
alesafi Dec 17, 2025
d8f5e00
Merge branch 'CONABIO:master' into master
alesafi Dec 17, 2025
67cfcf7
Update _concurso.erb
alesafi Dec 18, 2025
07d965e
Merge pull request #32 from alesafi/master
axgonzalezconabio Dec 22, 2025
0046688
Merge pull request #33 from alesafi/patch-2
axgonzalezconabio Dec 22, 2025
e4f5743
fix conflic
Dec 22, 2025
df65659
imágenes nuevas de backgroud de secciones
Dec 23, 2025
1d06d01
cambio de portada con logos y actualización de bases de convocatoria …
Dec 24, 2025
56abce3
Merge branch 'master' into features/ale
alesafi Dec 24, 2025
6d68a64
registro limpio
axgonzalezconabio Apr 15, 2026
788624e
nuevas bases
axgonzalezconabio Apr 15, 2026
4c799cf
neuvas bases
axgonzalezconabio Apr 15, 2026
87de807
actualización de contenido 20 abril 2026
Apr 20, 2026
e4f9c4a
Merge pull request #37 from CONABIO/update/actualizacion-convocatoria
axgonzalezconabio Apr 20, 2026
56ae500
actualización de fechas, aliados y PDF
Apr 23, 2026
83d063e
Delete y
axgonzalezconabio Apr 24, 2026
068aa65
Merge pull request #38 from CONABIO/update/actualizacion-convocatoria
axgonzalezconabio Apr 24, 2026
263b1f8
actualización de documentos PDF y correción de links y código
Apr 24, 2026
bb47276
finalizando unión de versiones de convocatoria
Apr 24, 2026
620fc20
Merge branch 'clean-master' into update/actualizacion-convocatoria
Apr 24, 2026
55f8680
ultimos cambios en las categorias, botones e instrucciones
axgonzalezconabio Apr 24, 2026
b26a516
Merge pull request #39 from CONABIO/update/actualizacion-convocatoria
axgonzalezconabio Apr 24, 2026
d4d4a54
cambios de color y pleca
Apr 24, 2026
9e99350
Merge branch 'clean-master' of github.com:CONABIO/concursos into upda…
Apr 24, 2026
9e708df
Merge pull request #40 from CONABIO/update/actualizacion-convocatoria
axgonzalezconabio Apr 24, 2026
702b48d
video de difusión
Apr 24, 2026
0793342
Merge branch 'clean-master' of github.com:CONABIO/concursos into upda…
Apr 24, 2026
78adada
eliminar video vimeo
Apr 25, 2026
e26c919
corrección de ortografía CoSMoS y agregar link al proyecto
Apr 28, 2026
bbc4c38
cerrar etiqueta y agregar div
Apr 28, 2026
07b2767
corrección de límite de edad jóvenes
Apr 30, 2026
8ac6354
botón en home hacia el registro y botón de registro en header al inicio
May 14, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
/tmp/*
!/log/.keep
!/tmp/.keep
*~
._*

/node_modules
/yarn-error.log
Expand All @@ -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


3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'

40 changes: 39 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -247,6 +283,8 @@ DEPENDENCIES
bootstrap (~> 4.5.0)
byebug
capybara (~> 2.13)
carrierwave
carrierwave-aws
cocoon
coffee-rails (~> 4.2)
devise
Expand All @@ -269,4 +307,4 @@ DEPENDENCIES
web-console (>= 3.3.0)

BUNDLED WITH
2.0.1
2.2.9
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Binary file not shown.
Binary file not shown.
Binary file added app/assets/fonts/chicken-pie/chicken-pie.otf
Binary file not shown.
Binary file added app/assets/fonts/chicken-pie/chicken-pie.ttf
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file added app/assets/images/entre_azul_y_verde/bases-06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/entre_azul_y_verde/bases-07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/entre_azul_y_verde/bases-08.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/entre_azul_y_verde/bases.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/entre_azul_y_verde/faq-01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/entre_azul_y_verde/fondo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/entre_azul_y_verde/inscripcion.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/entre_azul_y_verde/intro.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/entre_azul_y_verde/jurado.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/entre_azul_y_verde/pasos1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/entre_azul_y_verde/pasos2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/entre_azul_y_verde/pasos3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/entre_azul_y_verde/pasos4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/entre_azul_y_verde/pasos5.png
Empty file.
Binary file not shown.
Binary file added app/assets/images/mosaico_natura/Invitacion1.jpg
Binary file added app/assets/images/mosaico_natura/Invitacion2.jpg
Binary file added app/assets/images/mosaico_natura/Invitacion3.jpg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added app/assets/images/mosaico_natura/bases_CoSMoS.png
Binary file added app/assets/images/mosaico_natura/bases_fauna.png
Binary file added app/assets/images/mosaico_natura/bg-concurso.jpg
Binary file added app/assets/images/mosaico_natura/bg-legales.jpg
Binary file added app/assets/images/mosaico_natura/bg-medios.jpg
Binary file added app/assets/images/mosaico_natura/ganadores.jpg
Binary file added app/assets/images/mosaico_natura/menciones.jpg
Binary file added app/assets/images/mosaico_natura/participa-01.png
Binary file added app/assets/images/mosaico_natura/participa-02.png
Binary file added app/assets/images/mosaico_natura/participa-03.png
Binary file added app/assets/images/mosaico_natura/participa-04.png
Binary file added app/assets/images/mosaico_natura/participa-05.png
Binary file added app/assets/images/mosaico_natura/premios-1o.png
Binary file added app/assets/images/mosaico_natura/premios-2o.png
Binary file not shown.
3 changes: 2 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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(){

});

3 changes: 0 additions & 3 deletions app/assets/javascripts/mosaico_natura/inicio.js

This file was deleted.

19 changes: 19 additions & 0 deletions app/assets/javascripts/mosaico_natura/mosaico_natura.js
Original file line number Diff line number Diff line change
@@ -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
70 changes: 70 additions & 0 deletions app/assets/javascripts/mosaico_natura/mosaico_natura_extra.js
Original file line number Diff line number Diff line change
@@ -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;
}

};
};
});

});

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Original file line number Diff line number Diff line change
@@ -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";

Loading