Skip to content

Commit

Permalink
add Inrae to About Us modal (#60)
Browse files Browse the repository at this point in the history
* 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

* 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 <jorge.mendesdejesus@isric.org>

* 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 <maluenarod@gmail.com>
Co-authored-by: Sidney Gijzen <sidneygijzen@users.noreply.github.com>
  • Loading branch information
3 people committed Apr 20, 2023
1 parent 6957984 commit 1e1750e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
23 changes: 14 additions & 9 deletions components/about-modal/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const AboutModal = ({ open, onClose }) => (
<p>The project involves collaboration with the following partners:</p>
<div className="container mt-3">
<div className="row align-items-center text-center">
<div className="col-6 col-md-3 pl-md-0 mb-4 mb-md-0">
<div className="col-6 col-md-4 pl-md-0 mb-4">
<a href="https://www.nature.org" target="_blank" rel="noopener noreferrer">
<Image
src="/images/tnc-logo.svg"
Expand All @@ -35,31 +35,36 @@ const AboutModal = ({ open, onClose }) => (
/>
</a>
</div>
<div className="col-6 col-md-3 mb-4 mb-md-0">
<div className="col-6 col-md-4 mb-4">
<a href="https://www.cornell.edu" target="_blank" rel="noopener noreferrer">
<Image
src="/images/cornell-university-logo.svg"
alt="Cornell University"
width={100}
height={100}
width={90}
height={90}
/>
</a>
</div>
<div className="col-6 col-md-3">
<div className="col-6 col-md-4 pr-md-0 mb-4">
<a href="https://www.isric.org" target="_blank" rel="noopener noreferrer">
<Image src="/images/isric-logo.svg" alt="ISRIC" width={62} height={100} />
<Image src="/images/isric-logo.svg" alt="ISRIC" width={59} height={95} />
</a>
</div>
<div className="col-6 col-md-3 pr-md-0">
<div className="col-6 col-md-4 pl-md-0 mb-4 mb-md-0">
<a href="https://www.woodwellclimate.org/" target="_blank" rel="noopener noreferrer">
<Image
src="/images/wcrc-logo.png"
alt="Woodwell Climate Research Center"
width={185}
height={78}
width={153}
height={65}
/>
</a>
</div>
<div className="col-6 col-md-4 pr-md-0">
<a href="https://www.inrae.fr/en" target="_blank" rel="noopener noreferrer">
<Image src="/images/inrae-logo.png" alt="INRAE" width={100} height={26} />
</a>
</div>
</div>
</div>
<p className="mt-4">Designed and developed by:</p>
Expand Down
Binary file added public/images/inrae-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1e1750e

Please sign in to comment.