amazonia360+ rewording

Vizzuality · Jul 24, 2024 · dbbd155 · dbbd155
1 parent 0702788
commit dbbd155
Show file tree

Hide file tree

Showing 18 changed files with 69 additions and 60 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -3,8 +3,8 @@ name: CI / CD
 on:
   push:
     paths:
-      - 'api/**'
-      - '.github/workflows/cicd.yml'
+      - "api/**"
+      - ".github/workflows/cicd.yml"
   workflow_dispatch:
 
 jobs:
@@ -13,36 +13,35 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Check out the repository
-      uses: actions/checkout@v2
+      - name: Check out the repository
+        uses: actions/checkout@v2
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
 
-    - name: Build and run tests
-      run: docker-compose up --build --exit-code-from test test
+      - name: Build and run tests
+        run: docker-compose up --build --exit-code-from test test
 
-    - name: Clean up
-      run: docker-compose down
+      - name: Clean up
+        run: docker-compose down
 
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
     needs: build-and-test
     if: github.ref == 'refs/heads/develop'
     steps:
-
-    - name: Deploy to EC2
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.DEV_HOST }}
-        username: ${{ secrets.USERNAME }}
-        key: ${{ secrets.SSH_KEY }}
-        script: |
-          cd amazonia-360
-          git pull --rebase
-          sudo docker-compose down
-          sudo docker-compose up -d api --build 
+      - name: Deploy to EC2
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.DEV_HOST }}
+          username: ${{ secrets.USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            cd amazonia-360
+            git pull --rebase
+            sudo docker-compose down
+            sudo docker-compose up -d api --build
 
   health-check:
     name: Health Check
@@ -56,5 +55,3 @@ jobs:
           url: ${{ secrets.DEV_HEALTHCHECK }}
           retries: 5
           wait: 10
-
-
diff --git a/README.md b/README.md
@@ -1,2 +1,3 @@
 # amazonia-360
-Amazonia 360
+
+Amazonia 360+
diff --git a/api/README.md b/api/README.md
@@ -1,8 +1,9 @@
-# Amazonia360 API
+# Amazonia360+ API
 
 ## Python setup
 
 ### Production
+
 Use the `requirements.txt` file to install the required packages.
 
 ```bash
@@ -17,7 +18,6 @@ First create a virtual environment with virtualenv or uv.
 
 Then install the dependencies with the following command:
 
-
 ```bash
 pip-sync requirements.txt requirements-dev.txt
 ```
@@ -30,4 +30,4 @@ uv pip sync requirements.txt requirements-dev.txt
 
 To add a new production dependency, add it to the `requirements.in` file and
 run `uv pip compile requirements.in -o requirements.txt` (or `pip-compile requirements.in -o requirements.txt`).
-To add a new development dependency repeat the same process with the `requirements-dev.in`  and `requirement-dev.txt` file.
+To add a new development dependency repeat the same process with the `requirements-dev.in` and `requirement-dev.txt` file.
diff --git a/client/.env.test b/client/.env.test
@@ -0,0 +1,11 @@
+NEXT_PUBLIC_URL=http://localhost:$PORT
+NEXT_PUBLIC_API_URL=https://api.amazonia360.dev-vizzuality.com/
+NEXT_PUBLIC_ARCGIS_API_KEY=""
+NEXT_PUBLIC_API_KEY=""
+
+ARCGIS_CLIENT_ID=""
+ARCGIS_CLIENT_SECRET=""
+
+BASIC_AUTH_USER=amazonia360
+BASIC_AUTH_PASSWORD=amazonia360
+# BASIC_AUTH_PASSWORD=Amazonia360$MVP/2024
diff --git a/client/package.json b/client/package.json
@@ -94,5 +94,5 @@
     "ts-node": "^10.9.2",
     "typescript": "^5"
   },
-  "packageManager": "pnpm@9.1.1+sha256.9551e803dcb7a1839fdf5416153a844060c7bce013218ce823410532504ac10b"
+  "packageManager": "pnpm@9.4.0+sha256.b6fd0bfda555e7e584ad7e56b30c68b01d5a04f9ee93989f4b93ca8473c49c74"
 }
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
@@ -9,7 +9,7 @@ import KeyFeatures from "@/containers/home/key-features";
 import Vision from "@/containers/home/vision";
 
 export const metadata: Metadata = {
-  title: "Amazonia360",
+  title: "Amazonia360+",
   description: "",
 };
 

diff --git a/client/src/constants/datasets.ts b/client/src/constants/datasets.ts
@@ -585,7 +585,7 @@ export const DATASETS = {
       url: null,
       data: `<p><strong>Types of land coverages in the AFP&#39;s area of work.</strong></p>
       <p>Polygon and raster image versions representing land cover in the AFP&#39;s work area.</p>
-      <p>Compiled by Amazonia360 (2023-2024) , from ESA WorldCover project data, consisting of global land cover products at 10 m resolution for 2021, from Sentinel-1 and 2 data. ( <a href="https://worldcover2021.esa.int/">https://worldcover2021.esa.int/</a>)</p>
+      <p>Compiled by Amazonia360+ (2023-2024) , from ESA WorldCover project data, consisting of global land cover products at 10 m resolution for 2021, from Sentinel-1 and 2 data. ( <a href="https://worldcover2021.esa.int/">https://worldcover2021.esa.int/</a>)</p>
       <p>The legend includes 11 generic classes that adequately describe the land surface at 10 m: &quot;Tree cover&quot;, &quot;Shrublands&quot;, &quot;Grasslands&quot;, &quot;Croplands&quot;, &quot;Urbanized&quot;, &quot;Bare/shrubby vegetation&quot;, &quot;Snow and ice&quot;, &quot;Permanent water bodies&quot;, &quot;Herbaceous wetlands&quot;, &quot;Mangroves&quot; and &quot;Mosses and lichens&quot;. The portion of the data for northern South America was extracted, sampled and projected to generate a raster and a vector version for testing the zonal viewer assembly.</p>
       `,
     },
@@ -609,7 +609,7 @@ export const DATASETS = {
       url: null,
       data: `<p><strong>Altitudinal and topographic slope ranges of the terrain.</strong></p>
       <p>Layers of polygons representing the ranges of altitude above sea level in meters (AFP_ALTIT) and the topographic slope of the terrain in degrees (AFP_SLOP), for the entire in the AFP&#39;s work area.</p>
-      <p>Compiled by Amazonia360, 2023, from Copernicus DEM elevation data which is a Digital Surface Model (DSM) representing the topographic surface of the Earth including buildings, infrastructure and vegetation. In particular, the GLO-30 product has been used, offering global coverage with a resolution of 30 meters. A Copernicus DEM altitude raster layer has been constructed in Amazonia360, covering northern South America. The original altitude raster data has been sampled and reclassified into classes relevant to agricultural development and forest management, infrastructure installation feasibility, accessibility and flood risk. The two vector layers of altitude and slope were then assembled from this reclassification.
+      <p>Compiled by Amazonia360+, 2023, from Copernicus DEM elevation data which is a Digital Surface Model (DSM) representing the topographic surface of the Earth including buildings, infrastructure and vegetation. In particular, the GLO-30 product has been used, offering global coverage with a resolution of 30 meters. A Copernicus DEM altitude raster layer has been constructed in Amazonia360+, covering northern South America. The original altitude raster data has been sampled and reclassified into classes relevant to agricultural development and forest management, infrastructure installation feasibility, accessibility and flood risk. The two vector layers of altitude and slope were then assembled from this reclassification.
       Copernicus DEM:
       <a href="https://spacedata.copernicus.eu/es/collections/copernicus-digital-elevation-model">https://spacedata.copernicus.eu/es/collections/copernicus-digital-elevation-model</a></p>`,
     },
@@ -634,7 +634,7 @@ export const DATASETS = {
       url: null,
       data: `<p><strong>Frequency ranges of forest fires in the AFP work area.</strong></p>
       <p>Forest fire frequency classes, based on remotely sensed hot spot and forest fire data.</p>
-      <p>Compiled by Amazonia360 based on basic data of hot spots and forest fires from: Fire Information for Resource Management System (FIRMS) NASA.
+      <p>Compiled by Amazonia360+ based on basic data of hot spots and forest fires from: Fire Information for Resource Management System (FIRMS) NASA.
       <a href="https://firms.modaps.eosdis.nasa.gov/">https://firms.modaps.eosdis.nasa.gov/</a></p>
       <p>The historical data of hot spots between March 2014 and March 2024, from the observation of different types of radiometers in Earth orbit, were requested and downloaded. The resulting event cloud was sampled using a 10 km analysis grid for each rectangular cell, covering the entire AFP working area. The centroids were generated with the accumulated events per cell and transformed into a raster image. This was reclassified to obtain event frequency ranges, cells with industrial or geological hot spots were filtered and polygons were generated to represent regions according to the frequency of fires.</p>
       `,
@@ -712,7 +712,7 @@ export const DATASETS = {
       url: null,
       data: `<p><strong>Estimate of deprivation, deprivation in living conditions in the AFP&#39;s work area.</strong></p>
       <p>Raster model that represents the levels of multidimensional deprivation in living conditions of the population, by means of an index assigned to each pixel of one kilometer resolution.</p>
-      <p>Adapted by Amazonia360, 2023, from the Global Relative Deprivation Index (GRDI), v1 (2010-2020) generated by the Socioeconomic Data and Applications Center (SEDAC; NASA, Columbia University) This is a gridded global relative deprivation index that characterizes multidimensional deprivation levels at each pixel with a resolution of ~1 km. The original GRDI dataset is a one-kilometer pixel model, with a value from 0 to 100, where a value of 100 represents the highest level of relative deprivation and a value of 0 the lowest. GRDIv1. It groups weights of six input components, or dimensions, which are combined to determine the degree of relative deprivation. These dimensions consider economic aspects and living conditions data. The original file is: povmap-grdi-v1-grdiv1-geotiff(1).zip; and comes from:
+      <p>Adapted by Amazonia360+, 2023, from the Global Relative Deprivation Index (GRDI), v1 (2010-2020) generated by the Socioeconomic Data and Applications Center (SEDAC; NASA, Columbia University) This is a gridded global relative deprivation index that characterizes multidimensional deprivation levels at each pixel with a resolution of ~1 km. The original GRDI dataset is a one-kilometer pixel model, with a value from 0 to 100, where a value of 100 represents the highest level of relative deprivation and a value of 0 the lowest. GRDIv1. It groups weights of six input components, or dimensions, which are combined to determine the degree of relative deprivation. These dimensions consider economic aspects and living conditions data. The original file is: povmap-grdi-v1-grdiv1-geotiff(1).zip; and comes from:
       Center for International Earth Science Information Network (CIESIN), Columbia University. 2022. Global Gridded Relative Deprivation Index (GRDI), Version 1. Palisades, New York: NASA Socioeconomic Data and Applications Center (SEDAC). <a href="https://doi.org/10.7927/3xxe-ap97">https://doi.org/10.7927/3xxe-ap97</a></p>
       `,
     },

diff --git a/client/src/containers/disclaimers/data.tsx b/client/src/containers/disclaimers/data.tsx
@@ -6,15 +6,15 @@ export default function DataDisclaimer() {
       <div className="container">
         <div className="space-y-2">
           <p className="font-medium text-sm">
-            The maps, data, and geographic information presented on Amazonia360
+            The maps, data, and geographic information presented on Amazonia360+
             are provided for reference purposes only and are intended solely to
             enhance territorial knowledge of the Amazonia Forever program&apos;s
             work area.
           </p>
 
           <p className="font-medium text-sm">
             International boundary lines and other administrative delimitations
-            used by Amazonia360 are sourced from carefully selected and
+            used by Amazonia360+ are sourced from carefully selected and
             well-referenced external sources. However, the original data may
             have been modified to meet cartographic visualization requirements.
             The cartographic material presented does not reflect any position
@@ -24,10 +24,10 @@ export default function DataDisclaimer() {
 
           <p className="font-medium text-sm">
             This material is not suitable for precision applications,
-            navigation, or emergency situations. Amazonia360 and its affiliates,
-            including the Inter-American Development Bank (IDB), shall not be
-            held liable for any damages, losses, or claims arising from the use
-            of or reliance on the information provided.
+            navigation, or emergency situations. Amazonia360+ and its
+            affiliates, including the Inter-American Development Bank (IDB),
+            shall not be held liable for any damages, losses, or claims arising
+            from the use of or reliance on the information provided.
           </p>
         </div>
       </div>

diff --git a/client/src/containers/disclaimers/demo.tsx b/client/src/containers/disclaimers/demo.tsx
@@ -6,7 +6,7 @@ export default function DemoDisclaimer() {
       <div className="container">
         <div className="flex space-x-2">
           <p className="font-medium text-sm">
-            This website is a prototype of Amazonia360, designed to facilitate
+            This website is a prototype of Amazonia360+, designed to facilitate
             co-creation with select users. The contents and data are for
             demonstration purposes only and have not been fully validated yet.
             Please refrain from sharing this link, as the functionalities

diff --git a/client/src/containers/header/__snapshots__/index.test.tsx.snap b/client/src/containers/header/__snapshots__/index.test.tsx.snap
@@ -30,7 +30,7 @@ exports[`Header renders the Home link selected 1`] = `
             <span
               class="font-medium text-sm"
             >
-              Amazonia360
+              Amazonia360+
             </span>
             <div
               class="inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80"
@@ -97,7 +97,7 @@ exports[`Header renders the Hub link selected 1`] = `
             <span
               class="font-medium text-sm"
             >
-              Amazonia360
+              Amazonia360+
             </span>
             <div
               class="inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80"
@@ -164,7 +164,7 @@ exports[`Header renders the Report Tool link selected 1`] = `
             <span
               class="font-medium text-sm"
             >
-              Amazonia360
+              Amazonia360+
             </span>
             <div
               class="inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80"

diff --git a/client/src/containers/header/index.test.tsx b/client/src/containers/header/index.test.tsx
@@ -21,7 +21,7 @@ describe("Header", () => {
 
   it("renders the title", () => {
     render(<Header />);
-    expect(screen.getByText("Amazonia360")).toBeInTheDocument();
+    expect(screen.getByText("Amazonia360+")).toBeInTheDocument();
   });
 
   it("renders the logo", () => {

diff --git a/client/src/containers/header/index.tsx b/client/src/containers/header/index.tsx
@@ -18,7 +18,7 @@ export default function Header() {
           <h1 className="flex items-center space-x-4">
             <Image src="/IDB-logo.svg" alt="IDB" width={65} height={24} />
             <div className="space-x-2">
-              <span className="font-medium text-sm">Amazonia360</span>
+              <span className="font-medium text-sm">Amazonia360+</span>
               <Badge variant="secondary">Prototype</Badge>
             </div>
           </h1>

diff --git a/client/src/containers/home/help.tsx b/client/src/containers/home/help.tsx
@@ -6,7 +6,7 @@ export default function Help() {
       <div className="container">
         <div className="py-16 flex flex-col md:flex-row justify-between items-center">
           <p className="font-normal md:w-8/12">
-            Amazonia360 goes beyond simply presenting data, it&apos;s making
+            Amazonia360+ goes beyond simply presenting data, it&apos;s making
             sense of it. Our goal is to become a focal point that unifies and
             amplifies the potential of geospatial data and information produced
             by partners and initiatives dedicated to the region. By achieving

diff --git a/client/src/containers/home/hero.tsx b/client/src/containers/home/hero.tsx
@@ -14,7 +14,7 @@ export default function Hero() {
             Understanding Amazonia like never before
           </h2>
           <p className="text-blue-900 text-base lg:text-lg font-normal">
-            <span className="font-bold">Amazonia360</span> is your gateway to
+            <span className="font-bold">Amazonia360+</span> is your gateway to
             understanding and achieving the greatest impact in this region.
           </p>
           <Link href="/report">

diff --git a/client/src/containers/home/vision.tsx b/client/src/containers/home/vision.tsx
@@ -6,13 +6,13 @@ export default function Vision() {
       <div className="container text-white py-10 md:py-28 flex flex-col space-y-10">
         <div className="flex flex-col w-full">
           <h3 className="uppercase text-sm font-extrabold text-cyan-500 tracking-wide-lg">
-            amazonia360 vision{" "}
+            amazonia360+ vision{" "}
           </h3>
           <h2 className="text-blue-400 text-2xl lg:text-4xl pb-6">
             AI-Powered on the horizon{" "}
           </h2>
           <p className="text-blue-900 text-base lg:text-lg font-normal md:max-w-4xl">
-            As Amazonia360 grows beyond this prototype, we are committed to
+            As Amazonia360+ grows beyond this prototype, we are committed to
             enhancing your experience. The next chapter will see a suite of AI
             features that will elevate your search experience and understanding:
           </p>

diff --git a/client/src/containers/report/results/header/share.tsx b/client/src/containers/report/results/header/share.tsx
@@ -64,7 +64,7 @@ export default function ShareReport() {
             <Button className="rounded-full h-10 w-10" variant="outline">
               <FacebookShareButton
                 url={currentUrl}
-                title={"Amazonia360 Report"}
+                title={"Amazonia360+ Report"}
                 aria-label="share facebook"
               >
                 <Facebook className="fill-blue-400 text-blue-400" size={16} />
@@ -74,7 +74,7 @@ export default function ShareReport() {
             <Button className="rounded-full h-10 w-10" variant="outline">
               <TwitterShareButton
                 url={currentUrl}
-                title={"Amazonia360 Report"}
+                title={"Amazonia360+ Report"}
                 aria-label="share twitter"
               >
                 <Twitter className="fill-blue-400 text-blue-400" size={16} />
@@ -84,8 +84,8 @@ export default function ShareReport() {
             <Button className="group rounded-full h-10 w-10" variant="outline">
               <EmailShareButton
                 url={currentUrl}
-                title={"Amazonia360 Report"}
-                subject={"I want to share this Amazonia360 report with you"}
+                title={"Amazonia360+ Report"}
+                subject={"I want to share this Amazonia360+ report with you"}
                 body={""}
                 aria-label="share email"
               >
@@ -99,9 +99,9 @@ export default function ShareReport() {
             <Button className="rounded-full h-10 w-10" variant="outline">
               <LinkedinShareButton
                 url={currentUrl}
-                title={"Amazonia360 Report"}
-                summary={"Amazonia360 Report"}
-                source={"Amazonia360"}
+                title={"Amazonia360+ Report"}
+                summary={"Amazonia360+ Report"}
+                source={"Amazonia360+"}
                 aria-label="share linkedin"
               >
                 <LinkedinIcon className="fill-blue-400 text-blue-400" size={16} />