Skip to content

Commit 89373c3

Browse files
Deepika516Deepika516
committed
fix(arc-saas): review changes
review changes in design GH-64
1 parent c887d28 commit 89373c3

File tree

6 files changed

+226
-219
lines changed

6 files changed

+226
-219
lines changed

‎projects/saas-ui/src/app/main/components/add-plan/add-plan.component.html‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h3>General Details</h3>
4444
<!-- Billing Plan in select-->
4545
<div class="input-box">
4646
<div class="input-title">
47-
<span>Billing Plan <span class="required">*</span></span>
47+
<span>Billing Cycle <span class="required">*</span></span>
4848
</div>
4949
<div class="select">
5050
<nb-select
@@ -114,7 +114,7 @@ <h3>General Details</h3>
114114
<!-- desc -->
115115
<div class="input-box address-input-box">
116116
<div class="input-title">
117-
<span>Description<span class="required">*</span></span>
117+
<span>Description</span>
118118
</div>
119119

120120
<div class="input address-input">
@@ -182,7 +182,7 @@ <h3>Plan Configuration</h3>
182182
>
183183
<nb-option
184184
*ngFor="let storage of storageSizes"
185-
[value]="storage.name"
185+
[value]="storage.value"
186186
>
187187
{{ storage.name }}
188188
</nb-option>
@@ -238,15 +238,26 @@ <h3>Plan Configuration</h3>
238238
</div>
239239

240240
<!-- AddPlan button -->
241-
<div class="regbtn">
241+
<!-- *ngIf="isEditMode" -->
242+
<div class="regbtn button-wrapper ">
243+
<button
244+
nbButton
245+
size="medium"
246+
status="danger"
247+
(click)="cancelEdit()"
248+
>
249+
Cancel
250+
</button>
251+
242252
<button
243253
nbButton
244254
size="medium"
245255
status="danger"
246256
(click)="isEditMode ? editPlan() : addPlan()"
247257
>
248-
{{ isEditMode ? 'Edit Plan' : 'Add Plan' }}
258+
{{ isEditMode ? 'Save' : 'Add Plan' }}
249259
</button>
260+
250261
</div>
251262
</form>
252263
</div>

‎projects/saas-ui/src/app/main/components/add-plan/add-plan.component.ts‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export class AddPlanComponent implements OnInit {
8282
billingCycleId: [null, Validators.required],
8383
price: [''],
8484
currencyId: ['', Validators.required],
85-
description: ['', Validators.required],
85+
description: [''],
8686
tier: ['', Validators.required],
8787
size: [''],
8888
// features
@@ -205,25 +205,6 @@ export class AddPlanComponent implements OnInit {
205205
}
206206
}
207207

208-
// getPlanbyId() {
209-
// this.billingplanService
210-
// .getPlanById(this.activateRoute.snapshot.params.id)
211-
// .subscribe(response => {
212-
// // const body = JSON.parse(JSON.stringify(response)).body;
213-
// const tierName: string = response.tier;
214-
// body.tier = JSON.stringify(body.tier);
215-
216-
// this.addPlanForm = this.fb.group({
217-
// name: [body.name, Validators.required],
218-
// description: [body.description, Validators.required],
219-
// price: [body.price, Validators.required],
220-
// currencyId: [body.currencyId, Validators.required],
221-
// billingCycleId: [body.billingCycleId, Validators.required],
222-
// tier: [tierName, Validators.required],
223-
// size: [body.size],
224-
// features: this.fb.group({}),
225-
// });
226-
// });
227208
getPlanbyId() {
228209
this.billingplanService
229210
.getPlanById(this.activateRoute.snapshot.params.id)
@@ -330,6 +311,11 @@ export class AddPlanComponent implements OnInit {
330311
// }
331312
// }
332313

314+
cancelEdit(){
315+
this.router.navigate(['/main/plans']);
316+
}
317+
318+
333319
editPlan() {
334320
if (this.addPlanForm.valid) {
335321
const domainData = this.addPlanForm.value;

‎projects/saas-ui/src/app/main/components/tenant-registration/tenant-registration.component.html‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ <h2>Tenant Registration</h2>
7878
<div class="input-title">
7979
<span>Email <span class="required">*</span></span>
8080
</div>
81-
<div class="input">
81+
<div class="input inputTags">
8282
<div class="input-container">
8383
<input
8484
type="Email"
@@ -119,44 +119,50 @@ <h2>Tenant Registration</h2>
119119
<div class="input-title">
120120
<span>Address</span>
121121
</div>
122-
<div class="input address-input">
122+
<div class="input address-input inputTags ">
123+
<div class="input-container">
123124
<input
124125
type="text"
125126
placeholder="Enter Your Address"
126127
status="“info”"
127128
formControlName="address"
128129
nbInput
129130
/>
131+
</div>
130132
</div>
131133
</div>
132134

133135
<div class="input-box">
134136
<div class="input-title">
135137
<span>Zip Code</span>
136138
</div>
137-
<div class="input">
139+
<div class="input inputTags">
140+
<div class="input-container">
138141
<input
139142
type="text"
140143
placeholder="Enter your Zip Code"
141144
status="“info”"
142145
formControlName="zip"
143146
nbInput
144147
/>
148+
</div>
145149
</div>
146150
</div>
147151

148152
<div class="input-box">
149153
<div class="input-title">
150154
<span>Country <span class="required">*</span></span>
151155
</div>
152-
<div class="input">
156+
<div class="input inputTags">
157+
<div class="input-container">
153158
<input
154159
type="text"
155160
placeholder="Enter your Country"
156161
status="“info”"
157162
formControlName="country"
158163
nbInput
159164
/>
165+
</div>
160166
</div>
161167
</div>
162168
<!-- key -->
@@ -166,7 +172,7 @@ <h2>Tenant Registration</h2>
166172
Application Sub-Domain <span class="required">*</span></span
167173
>
168174
</div>
169-
<div class="input">
175+
<div class="input inputTags">
170176
<div class="input-container">
171177
<input
172178
placeholder="Enter the subdomain of your application"
@@ -209,7 +215,7 @@ <h2>Tenant Registration</h2>
209215
<div class="input-title">
210216
<span>Email domain<span class="required">*</span></span>
211217
</div>
212-
<div class="input">
218+
<div class="input inputTags">
213219
<div class="input-container">
214220
<input
215221
placeholder="Enter the Email domain "
@@ -248,6 +254,12 @@ <h5>{{ plan.name }}</h5>
248254
</nb-card-header>
249255
<nb-card-body class="plan-card-body">
250256
<p class="plan-description">{{ plan.description }}</p>
257+
<p class="plan-price" *ngIf="plan.tier || plan.size">
258+
{{ plan.tier }}
259+
<ng-container *ngIf="plan.size">
260+
<nb-tag *ngIf="plan.size" status="basic" appearance="filled" text="{{ plan.size }}" ></nb-tag>
261+
</ng-container>
262+
</p>
251263
<p class="plan-price">${{ plan.price }}</p>
252264
</nb-card-body>
253265
<nb-card-footer class="plan-card-footer">

0 commit comments

Comments
 (0)