From 1e1750ecbf652e336dbd5d9b0572076d914ffe2f Mon Sep 17 00:00:00 2001 From: Jorge Samuel Mendes de Jesus Date: Thu, 20 Apr 2023 17:01:56 +0200 Subject: [PATCH] add Inrae to About Us modal (#60) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * 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 * Modal Join us (#44) * Add 'Join us' modal * Add action button 'Join us' to top and bottom of Homepage * Add link 'Join us' in footer menu Co-authored-by: Jorge Samuel Mendes de Jesus * add Inrae to About Us modal (#59) * Fix: new cluster name and env for cluster name * Fix: Possible fix for google clould build variable * Update: Rool back to fix k8s name The implementation of google env variable from cloud build is tricky, no time to look into it * Triggering a google build --------- Co-authored-by: María Luena Rodríguez Co-authored-by: Sidney Gijzen --- .cloudbuild.yaml | 2 +- README.md | 4 ++-- components/about-modal/component.js | 23 ++++++++++++++--------- public/images/inrae-logo.png | Bin 0 -> 8635 bytes 4 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 public/images/inrae-logo.png 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/README.md b/README.md index f373a0e..7f4fdeb 100644 --- a/README.md +++ b/README.md @@ -85,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:

-
+ -
+ -
+ -
+ +
+ + INRAE + +

Designed and developed by:

diff --git a/public/images/inrae-logo.png b/public/images/inrae-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0cd93142e9ad2127cf167eac4acf97afed6be74b GIT binary patch literal 8635 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 literal 0 HcmV?d00001