Merge (#43)

* Dockerfile/K8s implementation, prod/dev run (#24)

* Modal to recruit user (airtable) (#30)

* Modal to recruit user (airtable)

* airtable: prevent giving a description if 'other' field is not selected

* mobile fixes

* updates in user recruitment  modal

* Updated env variable structure

* cloudbuild configuration - automatic deployment

Co-authored-by: Jorge S. Mendes de Jesus <jorge.mendesdejesus@isric.org>

* Feat/modal check (#35)

* Modal to recruit user (airtable)

* airtable: prevent giving a description if 'other' field is not selected

* updates in user recruitment  modal

* user modal local storage function

* airtable modal removed (#39)

* | missing

* Update docker to bullseye #45

Co-authored-by: Jorge Samuel Mendes de Jesus <jorge.jesus@gmail.com>
Co-authored-by: Jorge S. Mendes de Jesus <jorge.mendesdejesus@isric.org>

.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=

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

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
 

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}
     >
-      <UserModal open={userModalOpen} onClose={handleModalClose} />
       {isDesktop && (
         <>
           {showTour && <Tour />}

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 }) => {