Merge pull request #547 from OpenSourcePolitics/develop

Release 2.2.0
OpenSourcePolitics · Jun 27, 2024 · dce2618 · dce2618
2 parents 3ced758 + 9b02210
commit dce2618
Show file tree

Hide file tree

Showing 51 changed files with 1,472 additions and 247 deletions.
diff --git a/.env-example b/.env-example
@@ -83,4 +83,19 @@ DECIDIM_ADMIN_PASSWORD_STRONG="false"
 RAILS_LOG_LEVEL=warn
 
 # Default notifications sending frequency : (daily, weekly, none, real_time)
-# NOTIFICATIONS_SENDING_FREQUENCY=daily
+# NOTIFICATIONS_SENDING_FREQUENCY=daily
+
+## SMS Gateway Service (eg: decidim-half_signup)
+# SMS_GATEWAY_SERVICE="Decidim::SmsGatewayService"
+# SMS_GATEWAY_URL="https://sms.gateway.service/api"
+# SMS_GATEWAY_BULK_URL="https://sms.gateway.service/api/bulk"
+# SMS_GATEWAY_USERNAME=
+# SMS_GATEWAY_PASSWORD=
+## Set to replace the organization name
+# SMS_GATEWAY_PLATFORM="hashimoto.local"
+
+#Timeout for the unsubscribe link of the newsletter
+#NEWSLETTERS_UNSUBSCRIBE_TIMEOUT=
+
+# Redirect to the TOS page after signup (default: true)
+# DECIDIM_HALF_SIGNUP_SHOW_TOS_PAGE_AFTER_SIGNUP=true
diff --git a/.rubocop_rails.yml b/.rubocop_rails.yml
@@ -104,3 +104,6 @@ Rails/BulkChangeTable:
 RSpec/MultipleMemoizedHelpers:
   Exclude:
     - spec/**/**
+
+RSpec/AnyInstance:
+  Enabled: false
diff --git a/Gemfile b/Gemfile
@@ -13,16 +13,20 @@ gem "decidim-conferences", "~> #{DECIDIM_VERSION}.0"
 gem "decidim-initiatives", "~> #{DECIDIM_VERSION}.0"
 gem "decidim-templates", "~> #{DECIDIM_VERSION}.0"
 
+# Load Budgets Booth to avoid errors
+gem "decidim-budgets_booth", github: "OpenSourcePolitics/decidim-module-ptp"
+
 # External Decidim gems
 gem "decidim-budget_category_voting", git: "https://github.com/alecslupu-pfa/decidim-budget_category_voting.git", branch: DECIDIM_BRANCH
 gem "decidim-cache_cleaner"
 gem "decidim-category_enhanced", "~> 0.0.1"
 gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome", branch: "main"
 gem "decidim-extended_socio_demographic_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module-extended_socio_demographic_authorization_handler.git",
                                                                 branch: DECIDIM_BRANCH
-gem "decidim-extra_user_fields", git: "https://github.com/OpenSourcePolitics/decidim-module-extra_user_fields.git", branch: "release/0.27-stable"
+gem "decidim-extra_user_fields", git: "https://github.com/OpenSourcePolitics/decidim-module-extra_user_fields.git", branch: "temp/twilio-compatibility-0.27"
 gem "decidim-friendly_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-friendly_signup.git"
 gem "decidim-gallery", git: "https://github.com/OpenSourcePolitics/decidim-module-gallery.git", branch: "fix/nokogiri_deps"
+gem "decidim-half_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git", branch: "feature/half_signup_and_budgets_booth"
 gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH
 gem "decidim-ludens", git: "https://github.com/OpenSourcePolitics/decidim-ludens.git", branch: DECIDIM_BRANCH
 gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: "release/0.27-stable"
@@ -46,6 +50,7 @@ gem "faker", "~> 2.14"
 gem "fog-aws"
 gem "foundation_rails_helper", git: "https://github.com/sgruhier/foundation_rails_helper.git"
 gem "letter_opener_web", "~> 1.3"
+gem "multipart-post"
 gem "nokogiri", "1.13.4"
 gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "puma", ">= 5.5.1"
@@ -58,7 +63,7 @@ group :development do
   gem "rubocop-faker"
   gem "spring", "~> 2.0"
   gem "spring-watcher-listen", "~> 2.0"
-  gem "web-console", "4.0.4"
+  gem "web-console", "~> 4.1"
 end
 
 group :development, :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -16,11 +16,11 @@ GIT
 
 GIT
   remote: https://github.com/OpenSourcePolitics/decidim-module-extra_user_fields.git
-  revision: bc26f39233d3216d80fd62d23cbc2e9831173be4
-  branch: release/0.27-stable
+  revision: ce52252129fe2dc13c0cdf91a517e43790fff97f
+  branch: temp/twilio-compatibility-0.27
   specs:
     decidim-extra_user_fields (0.27.2)
-      country_select (~> 4.0)
+      country_select (~> 9.0)
       decidim-core (>= 0.27.0, < 0.28)
       deface (~> 1.5)
 
@@ -40,6 +40,15 @@ GIT
       decidim-admin (>= 0.26.0, < 0.28.0)
       decidim-core (>= 0.26.0, < 0.28.0)
 
+GIT
+  remote: https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git
+  revision: 661bfe02e51d1cd4f16df1eb483d932494d5df1f
+  branch: feature/half_signup_and_budgets_booth
+  specs:
+    decidim-half_signup (0.27.0)
+      countries (~> 5.1, >= 5.1.2)
+      decidim-core (~> 0.27.0)
+
 GIT
   remote: https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git
   revision: dd685166fdf953a11bd6a9e0dac56feca3bd0708
@@ -52,6 +61,14 @@ GIT
       rgeo (~> 2.4)
       rgeo-proj4 (~> 3.1)
 
+GIT
+  remote: https://github.com/OpenSourcePolitics/decidim-module-ptp.git
+  revision: 32b0f9a29499768cf6783a0026badaed33f025ab
+  specs:
+    decidim-budgets_booth (0.27.0)
+      decidim-budgets (~> 0.27.0)
+      decidim-core (~> 0.27.0)
+
 GIT
   remote: https://github.com/OpenSourcePolitics/decidim-module-survey_multiple_answers
   revision: 65ea83227f99d0f3d6237f98334ecc914a2a5597
@@ -303,19 +320,17 @@ GEM
     commonmarker (0.23.10)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    countries (3.1.0)
-      i18n_data (~> 0.11.0)
-      sixarm_ruby_unaccent (~> 1.1)
-      unicode_utils (~> 1.4)
-    country_select (4.0.0)
-      countries (~> 3.0)
-      sort_alphabetical (~> 1.0)
+    countries (5.7.2)
+      unaccent (~> 0.3)
+    country_select (9.0.0)
+      countries (> 5.0, < 7.0)
     crack (1.0.0)
       bigdecimal
       rexml
     crass (1.0.6)
     css_parser (1.17.1)
       addressable
+    csv (3.3.0)
     dalli (3.2.8)
     date (3.3.4)
     date_validator (0.12.0)
@@ -608,7 +623,9 @@ GEM
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     gemoji (3.0.1)
-    geocoder (1.8.2)
+    geocoder (1.8.3)
+      base64 (>= 0.1.0)
+      csv (>= 3.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     graphql (1.12.24)
@@ -632,7 +649,7 @@ GEM
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.37)
       activesupport (>= 4.0.2)
@@ -644,7 +661,6 @@ GEM
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
-    i18n_data (0.11.0)
     icalendar (2.10.1)
       ice_cube (~> 0.16)
     ice_cube (0.16.4)
@@ -716,10 +732,10 @@ GEM
     method_source (1.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0305)
+    mime-types-data (3.2024.0507)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    minitest (5.22.3)
+    minitest (5.23.1)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
@@ -728,10 +744,11 @@ GEM
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
+    multipart-post (2.4.1)
     mustache (1.1.1)
     net-http (0.4.1)
       uri
-    net-imap (0.4.10)
+    net-imap (0.4.11)
       date
       net-protocol
     net-pop (0.1.2)
@@ -740,7 +757,7 @@ GEM
       timeout
     net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.1)
+    nio4r (2.7.3)
     nokogiri (1.13.4-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.4-x86_64-darwin)
@@ -777,7 +794,7 @@ GEM
     omniauth-oauth2 (1.8.0)
       oauth2 (>= 1.4, < 3)
       omniauth (~> 2.0)
-    omniauth-rails_csrf_protection (1.0.1)
+    omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth-twitter (1.4.0)
@@ -827,7 +844,7 @@ GEM
     puma (5.6.8)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.7.3)
+    racc (1.8.0)
     rack (2.2.9)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
@@ -887,7 +904,7 @@ GEM
       activesupport (>= 5.2.4)
       i18n
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     redcarpet (3.6.0)
     redis (4.8.1)
@@ -1006,15 +1023,12 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sixarm_ruby_unaccent (1.2.2)
     smart_properties (1.17.0)
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
     social-share-button (1.2.4)
       coffee-rails
-    sort_alphabetical (1.1.0)
-      unicode_utils (>= 1.2.2)
     spring (2.1.1)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
@@ -1044,8 +1058,8 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
+    unaccent (0.4.0)
     unicode-display_width (2.5.0)
-    unicode_utils (1.4.0)
     uri (0.13.0)
     valid_email2 (2.3.1)
       activemodel (>= 3.2)
@@ -1071,7 +1085,7 @@ GEM
       rexml (~> 3.2)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.0.4)
+    web-console (4.2.1)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
@@ -1103,7 +1117,7 @@ GEM
     wkhtmltopdf-binary (0.12.6.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   arm64-darwin-21
@@ -1112,6 +1126,7 @@ PLATFORMS
   x86_64-darwin-20
   x86_64-darwin-21
   x86_64-darwin-22
+  x86_64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -1125,6 +1140,7 @@ DEPENDENCIES
   dalli
   decidim (~> 0.27.0)
   decidim-budget_category_voting!
+  decidim-budgets_booth!
   decidim-cache_cleaner
   decidim-category_enhanced (~> 0.0.1)
   decidim-conferences (~> 0.27.0)
@@ -1134,6 +1150,7 @@ DEPENDENCIES
   decidim-extra_user_fields!
   decidim-friendly_signup!
   decidim-gallery!
+  decidim-half_signup!
   decidim-homepage_interactive_map!
   decidim-initiatives (~> 0.27.0)
   decidim-ludens!
@@ -1152,6 +1169,7 @@ DEPENDENCIES
   letter_opener_web (~> 1.3)
   listen (~> 3.1)
   lograge
+  multipart-post
   nokogiri (= 1.13.4)
   omniauth-france_connect!
   omniauth-publik!
@@ -1169,7 +1187,7 @@ DEPENDENCIES
   spring (~> 2.0)
   spring-watcher-listen (~> 2.0)
   sys-filesystem
-  web-console (= 4.0.4)
+  web-console (~> 4.1)
   wicked_pdf (= 2.6.3)
 
 RUBY VERSION

diff --git a/Makefile b/Makefile
@@ -2,7 +2,9 @@ run: up
 	@make create-seeds
 
 up:
-	docker-compose -f docker-compose.local.yml up --build -d
+	docker build . -f Dockerfile.local -t decidim-app-app:latest
+	docker build . -f Dockerfile.local -t decidim-app-sidekiq:latest
+	docker-compose -f docker-compose.local.yml up -d
 	@make setup-database
 
 # Stops containers and remove volumes

diff --git a/app/cells/decidim/initiatives_votes/vote/show.erb b/app/cells/decidim/initiatives_votes/vote/show.erb
@@ -0,0 +1,39 @@
+<% collect_user_extra_fields = model.initiative.type.collect_user_extra_fields %>
+<% cell_small_width = collect_user_extra_fields ? "9.4%" : "15.6%" %>
+<% style_initiatives_votes_table_row = "width: 100%; display: inline-block; min-height: 33pt; border-bottom: 1pt solid black;" %>
+<% style_initiatives_votes_table_cell = "width: #{cell_small_width}; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;" %>
+<br>
+<div class="initiatives-votes-table-row" style="<%= style_initiatives_votes_table_row %>">
+  <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+    <%= initiative_id %>
+  </div>
+  <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+    <%= initiative_title %>
+  </div>
+  <% if collect_user_extra_fields %>
+    <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+      <%= name_and_surname %>
+    </div>
+    <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+      <%= document_number %>
+    </div>
+    <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+      <%= date_of_birth %>
+    </div>
+    <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+      <%= postal_code %>
+    </div>
+  <% end %>
+  <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+    <%= time_and_date %>
+  </div>
+  <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+    <%= timestamp %>
+  </div>
+  <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+    <%= hash_id %>
+  </div>
+  <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+    <%= scope %>
+  </div>
+</div>