Merge pull request #557 from sunbird-cb/parichay-error-tesing

Parichay error tesing
sunbird-cb · Sep 8, 2022 · 833d809 · 833d809
2 parents 2cd9a46 + 5fa2aab
commit 833d809
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/app/routes/public/public-logout/public-logout.component.html b/src/app/routes/public/public-logout/public-logout.component.html
@@ -43,8 +43,8 @@
         <h2 class="mat-h2"> Welcome to iGOT Karmayogi!</h2>
       </div>
       <div *ngIf="message" class="flex flex-1 margin-s w-inherit justify-center flex-column">
-        <span class="mat-subheading-1 mat-error margin-auto flex-wrap">{{message}}</span>
-        <a mat-button class="mat-button ws-mat-accent-text" routerLink="/public/contact"><span>Contact Us</span></a>
+        <span class="mat-subheading-errmsg mat-error margin-auto flex-wrap">{{message}} <span>
+          <a mat-button class="mat-button ws-mat-accent-text" routerLink="/public/contact"><span class="mat-subheading-errmsg parichay-errmsg">Contact Us</span></a></span></span>
       </div>
       <div class="button_box flex flex-col items-center justify-center">
         <a mat-button class="flex button m_b_2" href="/protected/v8/resource">
@@ -57,4 +57,4 @@ <h2 class="mat-h2"> Welcome to iGOT Karmayogi!</h2>
     </div>
 
   </div>
-</div>
+</div>
diff --git a/src/app/routes/public/public-logout/public-logout.component.scss b/src/app/routes/public/public-logout/public-logout.component.scss
@@ -113,3 +113,11 @@
 .w-inherit {
   width: inherit !important;
 }
+
+.mat-subheading-errmsg {
+  font: 500 16px/24px Montserrat!important;
+}
+.parichay-errmsg {
+    text-decoration: underline;
+    cursor: pointer;
+}
diff --git a/src/app/routes/public/public-signup/public-signup.component.ts b/src/app/routes/public/public-signup/public-signup.component.ts
@@ -88,7 +88,8 @@ export function forbiddenNamesValidatorPosition(optionsArray: any): ValidatorFn
 
 export class PublicSignupComponent implements OnInit, OnDestroy {
   registrationForm!: FormGroup
-  namePatern = `^[a-zA-Z']{1,32}$`
+  // namePatern = `^[a-zA-Z']{1,32}$`
+  namePatern = `[a-zA-Z\\s\\']{1,32}$`
   emailWhitelistPattern = `^[a-zA-Z0-9._-]{3,}\\b@\\b[a-zA-Z0-9]*|\\b(.gov|.nic)\b\\.\\b(in)\\b$`
   departments!: any
   masterDepartments!: Observable<any> | undefined