Prod release 1.13.0

.github/workflows/backend-security.yml

@@ -32,4 +32,4 @@ jobs:
       - name: Run Brakeman
         run: bundle exec brakeman
       - name: Run Bundle Audit
-        run: bundle exec bundle-audit check --update
+        run: bundle exec bundle-audit check --update --ignore CVE-2024-0227

backend/Gemfile.lock

@@ -89,7 +89,7 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
     attr_extras (6.2.5)
-    bcrypt (3.1.18)
+    bcrypt (3.1.20)
     bindex (0.8.1)
     bootsnap (1.11.1)
       msgpack (~> 1.2)
@@ -117,7 +117,7 @@ GEM
       jwt
       redis
       retriable
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.2.5)
     crack (0.4.5)
       rexml
@@ -130,7 +130,7 @@ GEM
       irb (>= 1.3.6)
       reline (>= 0.2.7)
     declarative (0.0.20)
-    devise (4.8.1)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -342,7 +342,7 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.21.2)
     msgpack (1.5.1)
     multi_json (1.15.0)
     multipart-post (2.1.1)
@@ -355,13 +355,13 @@ GEM
       timeout
     net-smtp (0.4.0)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.15.5)
+    nio4r (2.7.0)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-darwin)
+    nokogiri (1.16.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-linux)
+    nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
     optimist (3.0.1)
     orm_adapter (0.5.0)
@@ -378,7 +378,7 @@ GEM
       activerecord (>= 5.2)
       activesupport (>= 5.2)
     public_suffix (5.0.4)
-    puma (6.4.0)
+    puma (6.4.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.7.3)
@@ -430,9 +430,9 @@ GEM
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
+    responders (3.1.1)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
     retriable (3.1.2)
     rexml (3.2.5)
     rgeo (3.0.1)
@@ -441,7 +441,7 @@ GEM
       rgeo (>= 1.0.0)
     rgeo-geojson (2.1.1)
       rgeo (>= 1.0.0)
-    rotp (6.2.0)
+    rotp (6.3.0)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)

frontend/components/privacy-notice/notice-content/component.tsx

@@ -54,7 +54,7 @@ const NoticeContent: FC<NoticeContentProps> = ({}: NoticeContentProps) => {
                   id="RrcFtD"
                   values={{
                     a: (chunks) => (
-                      <Link href={Paths.TermsConditions}>
+                      <Link href={`${Paths.TermsConditions}#hyperlinks_and_cookies`}>
                         <a
                           className="underline focus-visible:outline focus-visible:outline-green-dark focus-visible:outline-2 focus-visible:outline-offset-2"
                           target="_blank"

frontend/containers/about/our-allies/component.tsx

@@ -0,0 +1,65 @@
+import { FormattedMessage } from 'react-intl';
+
+import cx from 'classnames';
+
+import Image from 'next/image';
+
+import { useAlliesLogos, useSupportedByLogos } from './data';
+
+export const OurAllies = () => {
+  const alliesLogos = useAlliesLogos();
+  const supportedByLogos = useSupportedByLogos();
+
+  return (
+    <div className="text-center">
+      <div>
+        <h2 className="font-serif text-3xl font-bold md:text-4xl">
+          <FormattedMessage defaultMessage="Our allies" id="SmmWBo" />
+        </h2>
+        <div className="flex flex-col mt-8">
+          {alliesLogos.map((row, idx) => {
+            return (
+              <div
+                key={idx}
+                className={cx({
+                  'flex flex-wrap items-center justify-center gap-6': true,
+                  'mb-8': idx === 0,
+                })}
+              >
+                {row.map((logo) => {
+                  return (
+                    <span key={logo.src}>
+                      <Image
+                        src={logo.src}
+                        width={logo.width}
+                        height={logo.height}
+                        alt={logo.alt}
+                      />
+                    </span>
+                  );
+                })}
+              </div>
+            );
+          })}
+        </div>
+      </div>
+      <div className="mt-16">
+        <h3 className="font-serif text-2xl font-bold md:text-3xl">
+          <FormattedMessage defaultMessage="Supported by" id="oA5Cj7" />
+        </h3>
+        <div className="flex flex-col mt-8">
+          <div className="flex flex-wrap items-center justify-center gap-6">
+            {supportedByLogos.map((logo) => {
+              return (
+                <span key={logo.src}>
+                  <Image src={logo.src} width={logo.width} height={logo.height} alt={logo.alt} />
+                </span>
+              );
+            })}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+export default OurAllies;

frontend/containers/about/our-allies/data.ts

@@ -0,0 +1,233 @@
+import { useMemo } from 'react';
+
+import { useIntl } from 'react-intl';
+
+export const useAlliesLogos = () => {
+  const { formatMessage } = useIntl();
+
+  return useMemo(
+    () => [
+      // ROW 1
+      [
+        {
+          src: '/images/logos/allies-heco.png',
+          alt: formatMessage({ defaultMessage: 'Herencia Colombia', id: 'nZhcAT' }),
+          width: 214,
+          height: 150,
+        },
+      ],
+      // ROW 2
+      [
+        {
+          src: '/images/logos/allies-presidencia-colombia.png',
+          alt: formatMessage({ defaultMessage: 'Presidencia de Colombia', id: 'xxILzE' }),
+          width: 162,
+          height: 80,
+        },
+        {
+          src: '/images/logos/allies-ministerior-ambiente.png',
+          alt: formatMessage({
+            defaultMessage: 'Ministerio de ambiente y desarrollo sostenible',
+            id: 'ko1LXm',
+          }),
+          width: 183,
+          height: 80,
+        },
+        {
+          src: '/images/logos/allies-departamento-nacional-planeacion.png',
+          alt: formatMessage({
+            defaultMessage: 'Departamiento Nacional de Planeacion',
+            id: 'hSzbKu',
+          }),
+          width: 256,
+          height: 80,
+        },
+      ],
+      // ROW 3
+      [
+        {
+          src: '/images/logos/allies-parques-nacionales-naturales.png',
+          alt: formatMessage({
+            defaultMessage: 'Unidad Administrativa de Parques Nacionales Naturales de Colombia',
+            id: '3rQrSS',
+          }),
+          width: 150,
+          height: 80,
+        },
+        {
+          src: '/images/logos/allies-patrimonio-natural.png',
+          alt: formatMessage({
+            defaultMessage: 'Patrimonio Natural',
+            id: 'orvj8F',
+          }),
+          width: 114,
+          height: 80,
+        },
+        {
+          src: '/images/logos/allies-gordon-betty-moore.png',
+          alt: formatMessage({
+            defaultMessage: 'Gordon and Betty Moore Foundation',
+            id: 'P8c19Y',
+          }),
+          width: 114,
+          height: 80,
+        },
+        {
+          src: '/images/logos/allies-ci-colombia.png',
+          alt: formatMessage({
+            defaultMessage: 'Conservation International',
+            id: '/HOZmK',
+          }),
+          width: 80,
+          height: 80,
+        },
+        {
+          src: '/images/logos/allies-wcs.png',
+          alt: formatMessage({
+            defaultMessage: 'Wildlife Conservation Society',
+            id: 'UgHwIR',
+          }),
+          width: 84,
+          height: 80,
+        },
+        {
+          src: '/images/logos/allies-wwf.png',
+          alt: formatMessage({
+            defaultMessage: 'World Wildlife Fund',
+            id: 'V7dSXH',
+          }),
+          width: 64,
+          height: 80,
+        },
+        {
+          src: '/images/logos/allies-andes-amazon-fund.png',
+          alt: formatMessage({
+            defaultMessage: 'Andes Amazon Fund',
+            id: 'sFd7gz',
+          }),
+          width: 53,
+          height: 80,
+        },
+        {
+          src: '/images/logos/allies-the-nature-conservancy.png',
+          alt: formatMessage({
+            defaultMessage: 'The Nature Conservancy',
+            id: 'MStfWd',
+          }),
+          width: 160,
+          height: 80,
+        },
+        {
+          src: '/images/logos/allies-bezos-earth-fund.png',
+          alt: formatMessage({
+            defaultMessage: 'Bezos Earth Fund',
+            id: 'FDU8fT',
+          }),
+          width: 122,
+          height: 80,
+        },
+      ],
+    ],
+    [formatMessage]
+  );
+};
+
+export const useSupportedByLogos = () => {
+  const { formatMessage } = useIntl();
+
+  return useMemo(
+    () => [
+      {
+        src: '/images/logos/supported-by-volo-foundation.png',
+        alt: formatMessage({
+          defaultMessage: 'Volo Fundation',
+          id: 'bovYQa',
+        }),
+        width: 59,
+        height: 56,
+      },
+      {
+        src: '/images/logos/supported-by-bobolink-fundacion.png',
+        alt: formatMessage({
+          defaultMessage: 'Bobolink Fundacion',
+          id: 'fgdxhB',
+        }),
+        width: 59,
+        height: 56,
+      },
+      {
+        src: '/images/logos/supported-by-global-environment-facility.png',
+        alt: formatMessage({
+          defaultMessage: 'Global environment facility',
+          id: 'idE0oW',
+        }),
+        width: 122,
+        height: 54,
+      },
+      {
+        src: '/images/logos/supported-by-un-development-programme.png',
+        alt: formatMessage({
+          defaultMessage: 'United Nations Development Programme',
+          id: 'Pmm0Xv',
+        }),
+        width: 51,
+        height: 56,
+      },
+      {
+        src: '/images/logos/supported-by-the-world-bank.png',
+        alt: formatMessage({
+          defaultMessage: 'The World Bank',
+          id: 'QkxMUG',
+        }),
+        width: 98,
+        height: 56,
+      },
+      {
+        src: '/images/logos/supported-by-eu.png',
+        alt: formatMessage({
+          defaultMessage: 'European Union',
+          id: 'eRRmEa',
+        }),
+        width: 58,
+        height: 56,
+      },
+      {
+        src: '/images/logos/supported-by-fao-un.png',
+        alt: formatMessage({
+          defaultMessage: 'Food and Agriculture Organization of the United Nations - FAO',
+          id: 'shhSYM',
+        }),
+        width: 242,
+        height: 56,
+      },
+      {
+        src: '/images/logos/supported-by-trillion-trees.png',
+        alt: formatMessage({
+          defaultMessage: 'Trillion Trees',
+          id: '3PNhOL',
+        }),
+        width: 123,
+        height: 56,
+      },
+      {
+        src: '/images/logos/supported-by-bid.png',
+        alt: formatMessage({
+          defaultMessage: 'Inter American Development Bank',
+          id: 'I8phsw',
+        }),
+        width: 94,
+        height: 56,
+      },
+      {
+        src: '/images/logos/supported-by-green-climate-fund.png',
+        alt: formatMessage({
+          defaultMessage: 'Green Climate Fund',
+          id: 'IKpwpU',
+        }),
+        width: 92,
+        height: 56,
+      },
+    ],
+    [formatMessage]
+  );
+};