diff --git a/.cloudbuild.yaml b/.cloudbuild.yaml index 7837d15..3635faf 100644 --- a/.cloudbuild.yaml +++ b/.cloudbuild.yaml @@ -24,6 +24,6 @@ steps: args: - '-c' - | - gcloud container clusters get-credentials soils-revealed-cluster --project=$PROJECT_ID --zone=europe-west4-a + gcloud container clusters get-credentials soils-revealed-cluster-v20 --project=$PROJECT_ID --zone=europe-west4-a kubectl set image deployment/$REPO_NAME --namespace=$BRANCH_NAME soils-revealed=eu.gcr.io/$PROJECT_ID/$REPO_NAME/$BRANCH_NAME/$REPO_NAME:$SHORT_SHA kubectl rollout restart deployment $REPO_NAME --namespace=$BRANCH_NAME diff --git a/.env.default b/.env.default index cbda645..eafb378 100644 --- a/.env.default +++ b/.env.default @@ -9,5 +9,3 @@ AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_MAX_Z_TILE_STORAGE= DEPLOYMENT_KEY= -AIRTABLE_API_KEY= -AIRTABLE_USER_ID= diff --git a/Dockerfile b/Dockerfile index ede5796..da064db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian:stable-slim@sha256:a939c03c4d3e3f53e3ef4ef6e75cb681a3ad56537842f95bf89755da86559b13 +FROM docker.io/debian:bullseye-slim@sha256:312218c8dae688bae4e9d12926704fa9af6f7307a6edb4f66e479702a9af5a0c # Source: https://www.kabisa.nl/tech/nvm-in-docker/ # docker build --force-rm --no-cache -t soils-revealed:latest . @@ -7,8 +7,8 @@ FROM docker.io/debian:stable-slim@sha256:a939c03c4d3e3f53e3ef4ef6e75cb681a3ad565 SHELL ["/bin/bash","-l","-c"] ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update \ - && apt-get install -y tini curl \ +RUN apt update \ + && apt install -y tini curl \ && rm -rf /var/lib/apt/lists/* RUN mkdir /soils-revealed diff --git a/README.md b/README.md index 033cd36..7f4fdeb 100644 --- a/README.md +++ b/README.md @@ -45,9 +45,6 @@ Below is a description of each of the keys. | AWS_ACCESS_KEY_ID | Access key ID of the AWS server storing the tiles of the soils layers | | AWS_SECRET_ACCESS_KEY | Secret access key of the AWS server storing the tiles of the soils layers | | AWS_MAX_Z_TILE_STORAGE | Maximum zoom at which tiles generated on-the-fly will be saved in the AWS S3 bucket | -| AIRTABLE_API_KEY | Secret access key for [Airtable](https://airtable.com/) | -| AIRTABLE_USER_ID | Airtable User ID | - ## Deployment @@ -88,8 +85,8 @@ Overall, deploying to either environment takes between 5 to 10 minutes to comple The platform is hosted on an Amazon server and consists of two main applications: -- the web server -- the on-the-fly analysis service +- the web server. +- the on-the-fly analysis service. The web server is a Node.js application made out of two elements: the Next.js server and an API the server relies on for all of its non-cartographic data (e.g. analysis data) and some of its cartographic data (e.g. the soils layers). diff --git a/components/about-modal/component.js b/components/about-modal/component.js index 349b82a..22b646c 100644 --- a/components/about-modal/component.js +++ b/components/about-modal/component.js @@ -25,7 +25,7 @@ const AboutModal = ({ open, onClose }) => (

The project involves collaboration with the following partners:

-
+
( />
-
+
Cornell University
-
+ -
+ +
+ + INRAE + +

Designed and developed by:

diff --git a/components/explore/component.js b/components/explore/component.js index a29f6ab..fe1ba2b 100644 --- a/components/explore/component.js +++ b/components/explore/component.js @@ -6,7 +6,6 @@ import throttle from 'lodash/debounce'; import { Router } from 'lib/routes'; import { logEvent } from 'utils/analytics'; -import { isModalShown } from 'utils/explore'; import { useHasMounted, useDesktop } from 'utils/hooks'; import { toggleBasemap, toggleLabels, toggleRoads } from 'utils/map'; import { @@ -29,7 +28,6 @@ import InfoModal from './info-modal'; import InteractiveFeaturePopup from './interactive-feature-popup'; import DrawBoard from './draw-board'; import MapContainer from './map-container'; -import UserModal from 'components/user-modal'; import './style.scss'; @@ -78,14 +76,6 @@ const Explore = ({ const [interactiveFeatures, setInteractiveFeatures] = useState(null); const [showTour, setShowTour] = useState(false); - // User recruitment modal. This modal should appear just the first time the user - // visits the map section - const [userModalOpen, setUserModalOpen] = useState(isModalShown()); - - const handleModalClose = () => { - setUserModalOpen(false); - }; - // When the user clicks the popup's button that triggers its close, the map also receives the // event and it opens a new popup right after // This is a bug of react-map-gl's library @@ -232,7 +222,6 @@ const Explore = ({ className="c-explore" style={isDesktop ? { backgroundColor: BASEMAPS[basemap].backgroundColor } : undefined} > - {isDesktop && ( <> {showTour && } diff --git a/components/explore/tour/component.js b/components/explore/tour/component.js index a9bfe15..0de566e 100644 --- a/components/explore/tour/component.js +++ b/components/explore/tour/component.js @@ -154,7 +154,7 @@ const ExploreTour = props => { previousShowTour.current = showTour; } } - }, [previousShowTour.current, showTour, props, stepIndex, setOpened, updateShowTour]); + }, [showTour, props, stepIndex, setOpened, updateShowTour]); const onChange = useCallback( ({ action, type }) => { diff --git a/components/footer/component.js b/components/footer/component.js index 4708091..e727815 100644 --- a/components/footer/component.js +++ b/components/footer/component.js @@ -3,15 +3,18 @@ import { Link } from 'lib/routes'; import Icon from 'components/icon'; import AboutModal from 'components/about-modal'; +import JoinUsModal from 'components/join-us-modal'; import './style.scss'; const Footer = () => { const [aboutModalOpen, setAboutModalOpen] = useState(false); + const [joinUsModalOpen, setJoinUsModalOpen] = useState(false); return ( <> setAboutModalOpen(false)} /> + setJoinUsModalOpen(false)} />