fix css

Author: Surbhi-sharma1

projects/saas-ui/src/app/on-boarding/commands/get-all-tenant-command.ts

@@ -15,7 +15,7 @@ export class GetAllTenantKeysCommand<T> extends GetAPICommand<T> {
     super(
       apiService,
       adapter,
-      `${appConfig.baseApiUrl}${appConfig.tenantmgmtServiceUrl}/tenant-keys`,
+      `${appConfig.baseApiUrl}${appConfig.tenantmgmtServiceUrl}/tenant/keys`,
     );
   }
 }

projects/saas-ui/src/app/on-boarding/components/add-subscriber/add-subscriber.component.html

@@ -1,4 +1,4 @@
-<nb-card class="h-100 card-row glassmorphism">
+<nb-card class="h-100 card-row">
   <nb-card-body class="m-0">
     <div class="main-wrapper add-lead-wrapper">
       <div>
@@ -178,26 +178,20 @@ <h2 class="title">Marketplace Registration</h2>
                       status="info"
                       formControlName="zip"
                       nbInput
+                      maxlength="6"
                     />
                     <nb-icon
                       icon="info-outline"
                       class="info-icon"
                       nbTooltip="Please enter zip code."
                     ></nb-icon>
                   </div>
+
                   <div
                     class="error-msg"
-                    *ngIf="
-                      marketSubsForm.get('zip').invalid &&
-                      marketSubsForm.get('zip').touched
-                    "
+                    *ngIf="marketSubsForm.get('zip').hasError('pattern')"
                   >
-                    <div
-                      class="error-msg"
-                      *ngIf="marketSubsForm.get('zip').hasError('pattern')"
-                    >
-                      Zip Code must be numeric only.
-                    </div>
+                    Zip Code must be numeric only.
                   </div>
                 </div>
               </div>
@@ -206,21 +200,20 @@ <h2 class="title">Marketplace Registration</h2>
                 <div class="input-title">
                   <span>Country <span class="required">*</span></span>
                 </div>
-                <div class="input">
-                  <div class="input-container">
-                    <input
-                      type="text"
-                      placeholder="Enter your Country"
-                      status="info"
-                      formControlName="country"
-                      nbInput
-                    />
-                    <nb-icon
-                      icon="globe-outline"
-                      class="info-icon"
-                      nbTooltip="Please enter your country."
-                    ></nb-icon>
-                  </div>
+                <div class="select">
+                  <nb-select
+                    class="dropdown-wrapper"
+                    placeholder="Select Your Country"
+                    size="large"
+                    formControlName="country"
+                  >
+                    <nb-option
+                      *ngFor="let option of countryOptions"
+                      [value]="option.value"
+                    >
+                      {{ option.label }}
+                    </nb-option>
+                  </nb-select>
                 </div>
               </div>
 
@@ -246,9 +239,26 @@ <h2 class="title">Marketplace Registration</h2>
                     ></nb-icon>
                   </div>
                   <div>
-                    <div *ngIf="keyVerificationMessage" class="message">
+                    <div
+                      *ngIf="
+                        marketSubsForm.get('subdomain').valid &&
+                        keyVerificationMessage &&
+                        marketSubsForm.get('subdomain').touched
+                      "
+                      class="message"
+                    >
                       {{ keyVerificationMessage }}
                     </div>
+                    <div
+                      *ngIf="
+                        marketSubsForm.get('subdomain').hasError('pattern') &&
+                        marketSubsForm.get('subdomain').touched
+                      "
+                      class="error-msg"
+                    >
+                      Subdomain must start with a letter and can include numbers
+                      and hyphens and has maximum length 20.
+                    </div>
                   </div>
                 </div>
               </div>

projects/saas-ui/src/app/on-boarding/components/add-subscriber/add-subscriber.component.scss

@@ -52,7 +52,7 @@
       .dropdown-wrapper {
         min-width: 100%;
         margin-top: 5px;
-        border: 1px solid #dcdcdc;
+        background-color: #ffffff;
         border-radius: 3px;
       }
     }
@@ -344,7 +344,7 @@ input[nbInput] {
   }
 }
 .message {
-  color: rgb(22, 19, 19);
+  color: rgb(170, 24, 24);
   font-size: 12px;
   margin-top: 5px;
   display: flex;

projects/saas-ui/src/app/on-boarding/components/add-subscriber/add-subscriber.component.ts

@@ -7,6 +7,7 @@ import {Location} from '@angular/common';
 import {keyValidator} from '@project-lib/core/validators';
 import {Subscriber} from '../../../shared/models';
 import {debounceTime, distinctUntilChanged} from 'rxjs';
+import {COUNTRIES} from '../../../shared/constants/countries.constant';
 @Component({
   selector: 'app-add-subscriber',
   templateUrl: './add-subscriber.component.html',
@@ -17,7 +18,7 @@ export class AddSubscriberComponent {
   [x: string]: any;
 
   leadId = '';
-
+  countryOptions = COUNTRIES;
   constructor(
     private route: ActivatedRoute,
     private readonly onBoardingService: OnBoardingService,
@@ -66,7 +67,8 @@ export class AddSubscriberComponent {
       .get('subdomain')
       ?.valueChanges.pipe(debounceTime(1500), distinctUntilChanged())
       .subscribe(subdomain => {
-        if (subdomain) {
+        const subdomainControl = this.marketSubsForm.get('subdomain');
+        if (subdomainControl && subdomainControl.valid) {
           this.verifyKey(subdomain);
         } else {
           this.keyVerificationMessage = '';
@@ -114,8 +116,8 @@ export class AddSubscriberComponent {
         subdomain: userData.subdomain,
         regToken: this.regToken,
       };
-
       console.log(user);
+      this.keyVerificationMessage = '';
       this.onBoardingService.addSubscriber(user).subscribe(
         () => {
           this.toastrService.show('Subscriber Added successfully');

projects/saas-ui/src/app/shared/services/on-boarding-service.ts

@@ -121,7 +121,8 @@ export class OnBoardingService {
     const headers = new HttpHeaders({
       'Content-Type': 'application/json',
       'x-api-key': this.appConfig.apiKey,
-    });
+    }).set(AuthTokenSkipHeader, '-');
+
     const command: AddSubscriberCommand<Subscriber> = new AddSubscriberCommand(
       this.apiService,
       this.anyAdapter,