Merge pull request #77 from OCA-UFCG/feat/contact-us

Contact Us

Author: cilasmarques

.env.sample

@@ -12,4 +12,10 @@ export NEXT_PUBLIC_GEE_PRIVATE_KEY=""
 
 # Contentful credencials
 NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN=""
-NEXT_PUBLIC_CONTENTFUL_SPACE=""
+NEXT_PUBLIC_CONTENTFUL_SPACE=""
+
+# Email credentials for sending emails
+
+NEXT_PUBLIC_MAIL_APP_PASS=""
+NEXT_PUBLIC_MAIL_APP_USER=""
+NEXT_PUBLIC_MAIL_APP_TO=""

.github/workflows/deploy-beta.yml

@@ -23,7 +23,7 @@ jobs:
         uses: docker/login-action@v2
         with:
           username: ${{ vars.DOCKER_USERNAME }}
-          password: ${{ vars.DOCKER_PASSWORD }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
@@ -40,7 +40,10 @@ jobs:
             NEXT_PUBLIC_GEE_PRIVATE_KEY=${{ secrets.NEXT_PUBLIC_GEE_PRIVATE_KEY }}
             NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN=${{ secrets.NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN }}
             NEXT_PUBLIC_CONTENTFUL_SPACE=${{ secrets.NEXT_PUBLIC_CONTENTFUL_SPACE  }}
-    
+            NEXT_PUBLIC_MAIL_APP_TO=${{ vars.NEXT_PUBLIC_MAIL_APP_TO }}
+            NEXT_PUBLIC_MAIL_APP_USER=${{ vars.NEXT_PUBLIC_MAIL_APP_USER }}
+            NEXT_PUBLIC_MAIL_APP_PASS=${{ secrets.NEXT_PUBLIC_MAIL_APP_PASS }}
+
       - name: Pull the latest image
         run: sudo docker pull ${{ vars.DOCKER_IMAGE_BETA }}:latest
 

.github/workflows/deploy-oca.yml

@@ -23,7 +23,7 @@ jobs:
         uses: docker/login-action@v2
         with:
           username: ${{ vars.DOCKER_USERNAME }}
-          password: ${{ vars.DOCKER_PASSWORD }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
@@ -41,6 +41,9 @@ jobs:
             NEXT_PUBLIC_GA_ID=${{ secrets.NEXT_PUBLIC_GA_ID }}
             NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN=${{ secrets.NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN }}
             NEXT_PUBLIC_CONTENTFUL_SPACE=${{ secrets.NEXT_PUBLIC_CONTENTFUL_SPACE  }}
+            NEXT_PUBLIC_MAIL_APP_TO=${{ vars.NEXT_PUBLIC_MAIL_APP_TO }}
+            NEXT_PUBLIC_MAIL_APP_USER=${{ vars.NEXT_PUBLIC_MAIL_APP_USER }}
+            NEXT_PUBLIC_MAIL_APP_PASS=${{ secrets.NEXT_PUBLIC_MAIL_APP_PASS }}
 
       - name: Pull the latest image
         run: sudo docker pull ${{ vars.DOCKER_IMAGE_PROD }}:latest    

Dockerfile.production

@@ -6,13 +6,19 @@ ARG NEXT_PUBLIC_HOST_URL
 ARG NEXT_PUBLIC_GEE_PRIVATE_KEY
 ARG NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN
 ARG NEXT_PUBLIC_CONTENTFUL_SPACE
+ARG NEXT_PUBLIC_MAIL_APP_TO
+ARG NEXT_PUBLIC_MAIL_APP_USER
+ARG NEXT_PUBLIC_MAIL_APP_PASS
 
 # Set the environment variables
 ENV NEXT_PUBLIC_GA_ID=$NEXT_PUBLIC_GA_ID
 ENV NEXT_PUBLIC_HOST_URL=$NEXT_PUBLIC_HOST_URL
 ENV NEXT_PUBLIC_GEE_PRIVATE_KEY=$NEXT_PUBLIC_GEE_PRIVATE_KEY
 ENV NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN=$NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN
 ENV NEXT_PUBLIC_CONTENTFUL_SPACE=$NEXT_PUBLIC_CONTENTFUL_SPACE
+ENV NEXT_PUBLIC_MAIL_APP_TO=$NEXT_PUBLIC_MAIL_APP_TO
+ENV NEXT_PUBLIC_MAIL_APP_USER=$NEXT_PUBLIC_MAIL_APP_USER
+ENV NEXT_PUBLIC_MAIL_APP_PASS=$NEXT_PUBLIC_MAIL_APP_PASS
 
 # Set the working directory inside the container
 WORKDIR /app

Makefile

@@ -35,6 +35,9 @@ docker-build-prod:
 		--build-arg NEXT_PUBLIC_GEE_PRIVATE_KEY='${NEXT_PUBLIC_GEE_PRIVATE_KEY}' \
 		--build-arg NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN=${NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN} \
 		--build-arg NEXT_PUBLIC_CONTENTFUL_SPACE=${NEXT_PUBLIC_CONTENTFUL_SPACE} \
+		--build-arg NEXT_PUBLIC_MAIL_APP_TO=${NEXT_PUBLIC_MAIL_APP_TO} \
+        --build-arg NEXT_PUBLIC_MAIL_APP_USER=${NEXT_PUBLIC_MAIL_APP_USER} \
+        --build-arg NEXT_PUBLIC_MAIL_APP_PASS=${NEXT_PUBLIC_MAIL_APP_PASS} \
 		-t $(IMAGE_NAME) \
 		-f Dockerfile.production .
 

package-lock.json

@@ -21,11 +21,12 @@
     "@google/earthengine": "^0.1.402",
     "@next/third-parties": "^14.2.3",
     "@types/google-earth": "^0.0.8",
+    "braces": ">=3.0.3",
     "contentful": "^10.11.10",
     "express": "^4.19.2",
     "maplibre-gl": "^4.2.0",
     "next": "14.2.2",
-    "braces": ">=3.0.3",
+    "nodemailer": "^6.9.14",
     "react": "^18",
     "react-dom": "^18",
     "styled-components": "^6.1.8"
@@ -34,6 +35,7 @@
     "@eslint/js": "^9.1.1",
     "@types/express": "^4.17.21",
     "@types/node": "^20.12.12",
+    "@types/nodemailer": "^6.4.15",
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "eslint": "^8.57.0",