Merge pull request #493 from Vizzuality/develop

Homepage refactoring

Gemfile

@@ -18,7 +18,7 @@ gem 'bootsnap', '>= 1.4.2', require: false
 
 gem 'activerecord-import'
 gem 'acts_as_list'
-gem 'activeadmin'
+gem 'activeadmin', '~> 3.2.0'
 gem 'activeadmin_addons'
 gem 'devise', '>= 4.7.1'
 gem 'cancancan'

Gemfile.lock

@@ -1,40 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actioncable (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionmailbox (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      actionview (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionmailer (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      actionview (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.6)
-      actionview (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionpack (6.1.7.8)
+      actionview (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actiontext (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionview (6.1.7.8)
+      activesupport (= 6.1.7.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -43,8 +43,9 @@ GEM
       actionpack
       addressable
     active_material (1.5.2)
-    activeadmin (3.2.0)
+    activeadmin (3.2.4)
       arbre (~> 1.2, >= 1.2.1)
+      csv
       formtastic (>= 3.1)
       formtastic_i18n (>= 0.4)
       inherited_resources (~> 1.7)
@@ -59,28 +60,28 @@ GEM
       sassc
       sassc-rails
       xdan-datetimepicker-rails (~> 2.5.1)
-    activejob (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activejob (6.1.7.8)
+      activesupport (= 6.1.7.8)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activemodel (6.1.7.8)
+      activesupport (= 6.1.7.8)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.1.7.6)
-      activemodel (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activerecord (6.1.7.8)
+      activemodel (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
     activerecord-import (1.4.0)
       activerecord (>= 4.2)
-    activestorage (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activestorage (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.6)
+    activesupport (6.1.7.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -111,7 +112,7 @@ GEM
     bootsnap (1.12.0)
       msgpack (~> 1.2)
     brakeman (5.2.3)
-    builder (3.2.4)
+    builder (3.3.0)
     bullet (7.0.2)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
@@ -154,11 +155,12 @@ GEM
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.2.5)
     countries (5.1.1)
       sixarm_ruby_unaccent (~> 1.1)
     crass (1.0.6)
+    csv (3.3.0)
     database_cleaner-active_record (2.0.1)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
@@ -189,7 +191,7 @@ GEM
       request_store (>= 1.0)
       ruby2_keywords
     draper-cancancan (1.1.1)
-    erubi (1.12.0)
+    erubi (1.13.0)
     execjs (2.8.1)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
@@ -292,14 +294,14 @@ GEM
     marcel (1.0.4)
     matrix (0.4.2)
     memoist (0.16.2)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mini_magick (4.11.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.6)
-    minitest (5.23.1)
+    mini_portile2 (2.8.7)
+    minitest (5.25.1)
     msgpack (1.5.3)
     multi_json (1.15.0)
-    net-imap (0.4.9.1)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
@@ -308,11 +310,11 @@ GEM
       timeout
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
     net-ssh (7.0.1)
-    nio4r (2.7.0)
-    nokogiri (1.16.5)
+    nio4r (2.7.3)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     optimist (3.0.1)
@@ -338,28 +340,28 @@ GEM
     public_suffix (4.0.7)
     puma (5.6.8)
       nio4r (~> 2.0)
-    racc (1.8.0)
+    racc (1.8.1)
     rack (2.2.9)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-proxy (0.7.2)
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.6)
-      actioncable (= 6.1.7.6)
-      actionmailbox (= 6.1.7.6)
-      actionmailer (= 6.1.7.6)
-      actionpack (= 6.1.7.6)
-      actiontext (= 6.1.7.6)
-      actionview (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activemodel (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    rails (6.1.7.8)
+      actioncable (= 6.1.7.8)
+      actionmailbox (= 6.1.7.8)
+      actionmailer (= 6.1.7.8)
+      actionpack (= 6.1.7.8)
+      actiontext (= 6.1.7.8)
+      actionview (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activemodel (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.6)
+      railties (= 6.1.7.8)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -372,15 +374,15 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    railties (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
-    rake (13.1.0)
-    ransack (4.1.1)
+    rake (13.2.1)
+    ransack (4.2.1)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
@@ -405,8 +407,8 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.6)
+      strscan
     roo (2.10.0)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
@@ -491,9 +493,9 @@ GEM
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     sshkit (1.21.2)
       net-scp (>= 1.1.2)
@@ -504,7 +506,7 @@ GEM
       diff-lcs
       patience_diff
     test-prof (1.0.9)
-    thor (1.3.0)
+    thor (1.3.1)
     tilt (2.0.10)
     timecop (0.9.5)
     timeout (0.4.1)
@@ -545,14 +547,14 @@ GEM
       rails (>= 3.2.16)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   active_link_to
-  activeadmin
+  activeadmin (~> 3.2.0)
   activeadmin_addons
   activerecord-import
   acts_as_list

app/admin/tpi_sector_clusters.rb

@@ -6,7 +6,7 @@
 
   menu priority: 8, parent: 'TPI'
 
-  permit_params :name
+  permit_params :name, sector_ids: []
 
   filter :name_contains
 
@@ -25,4 +25,12 @@
     column :name, &:name_link
     actions
   end
+
+  form do |f|
+    f.inputs do
+      f.input :name
+      f.input :sectors, as: :check_boxes, collection: TPISector.all.order(:name)
+    end
+    f.actions
+  end
 end

app/assets/stylesheets/tpi.scss

@@ -55,7 +55,7 @@ html {
 
 body {
   overflow-x: hidden;
-  font-family: $family-sans-serif;
+  font-family: $font-family-regular;
 
   @include desktop {
     overflow-x: visible;

app/assets/stylesheets/tpi/_banner.scss

@@ -15,25 +15,17 @@
     .partners__title {
       display: flex;
       justify-content: flex-end;
-      font-size: $size-7;
+      font-size: $size-8;
       color: $grey-dark;
       line-height: 0.938rem;
-      margin-bottom: 20px;
+      margin-bottom: 5px;
     }
 
     .partners {
       display: flex;
       align-items: center;
       justify-content: end;
       gap: 30px;
-
-      &__grantham {
-        max-height: 38px;
-      }
-
-      &__lse {
-        max-height: 42px;
-      }
     }
   }
 }

app/assets/stylesheets/tpi/_filters.scss

@@ -109,7 +109,7 @@
   padding: 6px 12px;
   cursor: pointer;
   font-size: 14px;
-  font-family: $family-sans-serif;
+  font-family: $font-family-regular;
   margin-right: 16px;
   margin-bottom: 10px;
 }

app/assets/stylesheets/tpi/_footer.scss

@@ -45,6 +45,7 @@
     justify-content: space-around;
 
     @include mobile {
+      flex-direction: column;
       font-size: 14px;
     }