Merge pull request #38 from undp/develop

Develop
undp · Jan 22, 2025 · ca37ba2 · ca37ba2
2 parents 0375e9c + 2ffc2f2
commit ca37ba2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 30 deletions.
diff --git a/.github/workflows/deployment-main.yml b/.github/workflows/deployment-main.yml
@@ -4,19 +4,9 @@ on:
   push:
     branches:
       - main
-
-# on:
-#   workflow_dispatch:
-#     inputs:
-#       cluster_type:
-#         description: 'Enter the cluster type (bd,sl and etc)'
-#         required: true
-#       commit_sha:
-#         description: 'Commit SHA to check for changes'
-#         required: true
+  workflow_dispatch:
 
 env:
-  CONTAINER_NAME_API: api-container
   CONTAINER_NAME_TRIAGE: triage-container
   CONTAINER_NAME_PUBLISHER: publisher-container
 
@@ -118,19 +108,19 @@ jobs:
         run: |
           npm install
 
-      - name: Build, tag, and push the api image to Amazon
-        # if: steps.api-changes.outputs.api-changes == 'true'
-        id: build-image-api
-        env:
-          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-          ECR_REPOSITORY: iverify-api
-          IMAGE_TAG: latest
-        run: |
-          npx nx build api
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f ./apps/api/Dockerfile .
-          echo "Pushing image to ECR..."
-          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+      # - name: Build, tag, and push the api image to Amazon
+      #   # if: steps.api-changes.outputs.api-changes == 'true'
+      #   id: build-image-api
+      #   env:
+      #     ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+      #     ECR_REPOSITORY: iverify-api
+      #     IMAGE_TAG: latest
+      #   run: |
+      #     npx nx build api
+      #     docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f ./apps/api/Dockerfile .
+      #     echo "Pushing image to ECR..."
+      #     docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+      #     echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
 
       - name: Build, tag, and push the publisher image to Amazon
         # if: steps.publisher-changes.outputs.publisher-changes == 'true'

diff --git a/libs/email/src/lib/email.service.ts b/libs/email/src/lib/email.service.ts
@@ -521,7 +521,7 @@ export class EmailService {
                                     style="padding-bottom: 24px"
                                   >
                                     <a
-                                      href="https://rdc.i-verify.org/"
+                                      href="${process.env.WP_URL}"
                                       rel="noopener nofollow"
                                       style="
                                         display: inline-block;
@@ -530,7 +530,7 @@ export class EmailService {
                                         line-height: normal !important;
                                       "
                                       target="_blank"
-                                      data-saferedirecturl="https://www.google.com/url?q=https://rdc.i-verify.org/"
+                                      data-saferedirecturl="https://www.google.com/url?q=${process.env.WP_URL}"
                                       ><img
                                         src="${process.env.IVERIFY_LOGO_URL}"
                                         width="120"
@@ -569,7 +569,7 @@ export class EmailService {
       width="1"
       height="1"
       alt=""
-      src="https://ci3.googleusercontent.com/meips/ADKq_NZvphq6xDO3jYunWUDVEJZ92uZu_LG7JV2vb8sDVdUQSK2XyqgjPzb41FEOeXsZaA_MXm4n58mtw76-xGMKFOHmA4T_24ukVr-51gn5H00SbSB1essLWkSPxfcv0JyIwB8LpUfxbNb6IEp05fGJQKeWk7EaNFYAMn_3hQCRP-t3akOzD9NTe2Kk5tVgzvYDsiVT=s0-d-e1-ft#https://rdc.i-verify.org/"
+      src="https://ci3.googleusercontent.com/meips/ADKq_NZvphq6xDO3jYunWUDVEJZ92uZu_LG7JV2vb8sDVdUQSK2XyqgjPzb41FEOeXsZaA_MXm4n58mtw76-xGMKFOHmA4T_24ukVr-51gn5H00SbSB1essLWkSPxfcv0JyIwB8LpUfxbNb6IEp05fGJQKeWk7EaNFYAMn_3hQCRP-t3akOzD9NTe2Kk5tVgzvYDsiVT=s0-d-e1-ft#${process.env.WP_URL}"
       class="CToWUd"
       data-bit="iit"
     />
@@ -1121,7 +1121,7 @@ export class EmailService {
                                     style="padding-bottom: 24px"
                                   >
                                     <a
-                                      href="https://rdc.i-verify.org/"
+                                      href="${process.env.WP_URL}"
                                       rel="noopener nofollow"
                                       style="
                                         display: inline-block;
@@ -1130,7 +1130,7 @@ export class EmailService {
                                         line-height: normal !important;
                                       "
                                       target="_blank"
-                                      data-saferedirecturl="https://www.google.com/url?q=https://rdc.i-verify.org/"
+                                      data-saferedirecturl="https://www.google.com/url?q=${process.env.WP_URL}"
                                       ><img
                                         src="${process.env.IVERIFY_LOGO_URL}"
                                         width="120"
@@ -1165,7 +1165,7 @@ export class EmailService {
       width="1"
       height="1"
       alt=""
-      src="https://ci3.googleusercontent.com/meips/ADKq_NZvphq6xDO3jYunWUDVEJZ92uZu_LG7JV2vb8sDVdUQSK2XyqgjPzb41FEOeXsZaA_MXm4n58mtw76-xGMKFOHmA4T_24ukVr-51gn5H00SbSB1essLWkSPxfcv0JyIwB8LpUfxbNb6IEp05fGJQKeWk7EaNFYAMn_3hQCRP-t3akOzD9NTe2Kk5tVgzvYDsiVT=s0-d-e1-ft#https://rdc.i-verify.org/"
+      src="https://ci3.googleusercontent.com/meips/ADKq_NZvphq6xDO3jYunWUDVEJZ92uZu_LG7JV2vb8sDVdUQSK2XyqgjPzb41FEOeXsZaA_MXm4n58mtw76-xGMKFOHmA4T_24ukVr-51gn5H00SbSB1essLWkSPxfcv0JyIwB8LpUfxbNb6IEp05fGJQKeWk7EaNFYAMn_3hQCRP-t3akOzD9NTe2Kk5tVgzvYDsiVT=s0-d-e1-ft#${process.env.WP_URL}"
       class="CToWUd"
       data-bit="iit"
     />