Merge pull request #332 from chaitrali-r/main

UI Changes
Sunbird-RC · Jul 12, 2023 · 0b348cf · 0b348cf
2 parents c848ae8 + 549d6c4
commit 0b348cf
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 71 deletions.
diff --git a/donor-registry/proxy.conf.json b/donor-registry/proxy.conf.json
@@ -1,25 +1,25 @@
 {
-    "/registry/api/v1": {
-      "target": "https://demo-nha-donor-registry.xiv.in",
-      "changeOrigin": true,
-      "logLevel": "debug",
-      "secure": false
+  "/registry/api/v1": {
+    "target": "https://demo-nha-donor-registry.sunbirdrc.dev",
+    "changeOrigin": true,
+    "logLevel": "debug",
+    "secure": false
 
-    },
+  },
 
-    "/registry/api": {
-      "target": "https://demo-nha-donor-registry.xiv.in",
-      "changeOrigin": true,
-      "logLevel": "debug",
-      "secure": false
+  "/registry/api": {
+    "target": "https://demo-nha-donor-registry.sunbirdrc.dev",
+    "changeOrigin": true,
+    "logLevel": "debug",
+    "secure": false
 
-    },
+  },
 
-    "/registry/api/docs": {
-      "target": "https://demo-nha-donor-registry.xiv.in",
-      "changeOrigin": true,
-      "logLevel": "debug",
-      "secure": false
+  "/registry/api/docs": {
+    "target": "https://demo-nha-donor-registry.sunbirdrc.dev",
+    "changeOrigin": true,
+    "logLevel": "debug",
+    "secure": false
 
-    }
   }
+}
diff --git a/donor-registry/src/app/forms/types/verify-identity-no.type.html b/donor-registry/src/app/forms/types/verify-identity-no.type.html
@@ -79,6 +79,9 @@ <h3 class="fw-bold mb-3">Thank you for your enthusiasm. </h3>
 
         <div *ngIf="isGotErr && err409" class="modal-dialog" role="document">
           <div class="p-4 modal-content">
+            <div class="close float-end" data-dismiss="modal" aria-label="Close">
+                <span class=" float-end" aria-hidden="true">&times;</span>
+            </div>
               <div class="modal-body text-center">
                   <div class="d-flex flex-column justify-content-center align-items-center">
 
@@ -94,8 +97,10 @@ <h3 class="fw-bold mb-3">Thank you for your enthusiasm. </h3>
 
                       </div>
                       <div class="container-fluid mt-3">
+                        <a  href="/login" class="mt-3"> 
                       <button type="button" class="btn btn-primary-notto btn-style w-100 submit-button mb-2"
                       data-toggle="modal"  data-dismiss="modal" aria-label="Close">OK</button>
+                      </a>
                   </div>
                   </div>
               </div>

diff --git a/donor-registry/src/app/forms/types/verify-mobileno.type.html b/donor-registry/src/app/forms/types/verify-mobileno.type.html
@@ -133,7 +133,11 @@ <h3 class="fw-bold mb-3">{{'THANK_YOU_MSG' | translate}} </h3>
                         <span class="mr-2 text-grey-color">ABHA number</span>
                         <span class="fw-bold">{{profile.healthIdNumber}}</span>
                       </p>
-                      <p class="text-success" [hidden]="!profile?.pledged">{{'ALREADY_REGISTERED' | translate}}</p>
+                      <a *ngIf="profile?.pledgeStatus == 1" href="/login"><p class="text-success" [hidden]="!profile?.pledged">{{'ALREADY_REGISTERED' | translate}} . {{'CLICK_TO_LOGIN' | translate}} </p>
+                        </a>
+                        <a *ngIf="profile?.pledgeStatus == 0" href="/login"><p class="text-success" [hidden]="!profile?.pledged">{{'YOU_UNPLEDGED' | translate}}. {{'CLICK_TO_PLEDGE_AGAIN' | translate}} </p>
+                        </a>
+
                     </div>
                   </li>
                 </ul>

diff --git a/donor-registry/src/assets/config/config.json b/donor-registry/src/assets/config/config.json
@@ -1,51 +1,51 @@
 {
-    "environment": "development",
-    "keycloak": {
-    "url": "/auth",
-    "clientId": "registry-frontend",
-    "realm": "sunbird-rc"
-    },
-    "configFolder": "/assets/config/ui-config",
-    "languageFolder": "/assets/i18n",
-    "title": "Organ donation registry",
-    "baseUrl": "/registry/api/v1",
-      "domainName" : "https://demo-nha-donor-registry.xiv.in",
-    "schemaUrl": "/registry/api/docs/swagger.json",
-    "footerText": "Organ donation registry",
-    "languages": [
-    "en"    
-    ],
-    "appType": "attestation",
-    "default_theme": {
-          "logoPath": "../../assets/images/NOTTO_WITH_TXT_LOGO.svg",
-    "primaryColor": "#1987B6",
-    "secondaryColor": "#1987B6",
-    "bodyBackground": "#F6F8FC",
-    "cardBackground": "#FFFFFF",
-    "tagsBackground": "#F4ECFF",
-    "navLabelColor": "#0098AB",
-    "headerColor": "#FFFFFF",
-    "primaryTextColor": "#000000",
-    "secondaryTextColor": "#000000",
-    "headerLinkColor": "#000000",
-    "linkColor": "#443DF6",
-    "secondaryBtnBgColor": "#e0edf5",
-    "cardBorder": "#00000020"
-    },
-    "dark_theme": {
-          "logoPath": "../../assets/images/NOTTO_WITH_TXT_LOGO.svg",
-    "primaryColor": "#1987B6",
-    "secondaryColor": "#1987B6",
-    "bodyBackground": "#080808",
-    "cardBackground": "#323232",
-    "tagsBackground": "#505050",
-    "navLabelColor": "#0098AB",
-    "headerColor": "#313131",
-    "primaryTextColor": "#FFFFFF",
-    "secondaryTextColor": "#c3c3c3",
-    "headerLinkColor": "#0098AB",
-    "linkColor": "#443DF6",
-    "secondaryBtnBgColor": "#e0edf5",
-    "cardBorder": "#ffffff20"
-    }
-    }
+      "environment": "development",
+      "keycloak": {
+      "url": "/auth",
+      "clientId": "registry-frontend",
+      "realm": "sunbird-rc"
+      },
+      "configFolder": "/assets/config/ui-config",
+      "languageFolder": "/assets/i18n",
+      "title": "Organ donation registry",
+      "baseUrl": "/registry/api/v1",
+        "domainName" : "https://demo-nha-donor-registry.sunbirdrc.dev",
+      "schemaUrl": "/registry/api/docs/swagger.json",
+      "footerText": "Organ donation registry",
+      "languages": [
+      "en"    
+      ],
+      "appType": "attestation",
+      "default_theme": {
+            "logoPath": "../../assets/images/NOTTO_WITH_TXT_LOGO.svg",
+      "primaryColor": "#1987B6",
+      "secondaryColor": "#1987B6",
+      "bodyBackground": "#F6F8FC",
+      "cardBackground": "#FFFFFF",
+      "tagsBackground": "#F4ECFF",
+      "navLabelColor": "#0098AB",
+      "headerColor": "#FFFFFF",
+      "primaryTextColor": "#000000",
+      "secondaryTextColor": "#000000",
+      "headerLinkColor": "#000000",
+      "linkColor": "#443DF6",
+      "secondaryBtnBgColor": "#e0edf5",
+      "cardBorder": "#00000020"
+      },
+      "dark_theme": {
+            "logoPath": "../../assets/images/NOTTO_WITH_TXT_LOGO.svg",
+      "primaryColor": "#1987B6",
+      "secondaryColor": "#1987B6",
+      "bodyBackground": "#080808",
+      "cardBackground": "#323232",
+      "tagsBackground": "#505050",
+      "navLabelColor": "#0098AB",
+      "headerColor": "#313131",
+      "primaryTextColor": "#FFFFFF",
+      "secondaryTextColor": "#c3c3c3",
+      "headerLinkColor": "#0098AB",
+      "linkColor": "#443DF6",
+      "secondaryBtnBgColor": "#e0edf5",
+      "cardBorder": "#ffffff20"
+      }
+      }
diff --git a/donor-registry/src/assets/i18n/global/en-global.json b/donor-registry/src/assets/i18n/global/en-global.json
@@ -263,7 +263,10 @@
     "CONFIRM_PLEDGE_REGISTRATION":"Confirm Pledge Registration",
     "PLEASE_CONFIRM":"Please confirm to submit details",
     "LINK_COPIED":"Link Copied",
-    "LOGIN_TOSHARE_PLEDGE_STATUS": "Login to share your pledge status"
+    "LOGIN_TOSHARE_PLEDGE_STATUS": "Login to share your pledge status",
+    "CLICK_TO_LOGIN":"Click here to login",
+    "YOU_UNPLEDGED":"You have already unpledged",
+    "CLICK_TO_PLEDGE_AGAIN":"Click here to pledge again"
 
 
 }
diff --git a/donor-registry/src/assets/i18n/global/hi-global.json b/donor-registry/src/assets/i18n/global/hi-global.json
@@ -259,7 +259,10 @@
   "CONFIRM_PLEDGE_REGISTRATION": "प्रतिज्ञा पंजीकरण की पुष्टि करें",
   "PLEASE_CONFIRM": "कृपया विवरण सबमिट करने की पुष्टि करें",
   "LINK_COPIED":"लिंक कॉपी केली",
-  "LOGIN_TOSHARE_PLEDGE_STATUS": "तुमची तारण स्थिती शेअर करण्यासाठी लॉग इन करा"
+  "LOGIN_TOSHARE_PLEDGE_STATUS": "तुमची तारण स्थिती शेअर करण्यासाठी लॉग इन करा",
+  "CLICK_TO_LOGIN":"लॉगिन करने के लिए यहां क्लिक करें",
+  "YOU_UNPLEDGED":"आप पहले ही गिरवी रख चुके हैं",
+  "CLICK_TO_PLEDGE_AGAIN":"फिर से प्रतिज्ञा करने के लिए यहां क्लिक करें"
 
 
 }