Skip to content

Commit 6bc8fea

Browse files
authored
Merge pull request #90 from sourcefuse/UI_Changes
feat(arc-saas): UI design changes of SaaS Admin Portal
2 parents 7379ee3 + 5661557 commit 6bc8fea

29 files changed

+513
-146
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ <h3>Plan Configuration</h3>
251251
<button
252252
nbButton
253253
size="medium"
254-
status="danger"
254+
class="btn-danger"
255255
(click)="cancelEdit()"
256256
>
257257
Cancel
@@ -260,7 +260,7 @@ <h3>Plan Configuration</h3>
260260
<button
261261
nbButton
262262
size="medium"
263-
status="danger"
263+
class="btn-danger"
264264
(click)="isEditMode ? editPlan() : addPlan()"
265265
>
266266
{{ isEditMode ? 'Save' : 'Add Plan' }}

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ h3 {
119119
text-align: right;
120120
margin: 10px;
121121
padding: 10px;
122+
.btn-danger{
123+
background-color: #f00a18 !important;
124+
color: white !important;
125+
}
122126
}
123127

124128
input.ng-invalid.ng-touched {
@@ -176,8 +180,11 @@ ul {
176180
.details-wrapeer {
177181
border: 1px solid #cecece;
178182
padding: 20px;
179-
border-radius: 4px;
180-
margin-bottom: 20px;
183+
box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;
184+
border: none;
185+
border-radius: 10px;
186+
margin: 20px 0 35px 0;
187+
181188
}
182189

183190
.input-box-wrapper {
@@ -268,5 +275,6 @@ ul {
268275
color: #007bff;
269276
font-size: 18px;
270277
z-index: 1;
278+
margin-right:10px;
271279
}
272280
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.edit-icon {
2-
color: #ff3d71;
2+
color: #ef0b16;
33
margin-right: 13px;
44
}
55
.delete-icon {
6-
color: #ff3d71;
6+
color: #ef0b16;
77
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,24 @@
11
@use '../../styles/grid-styles.scss' as *;
2+
3+
.header-wrapper{
4+
color: red($color: #000000);
5+
}
6+
7+
.header-bold {
8+
font-weight: bold;
9+
font-family: 'Arial, sans-serif';
10+
font-size: 14px;
11+
color: #333;
12+
}
13+
14+
.ag-theme-quartz .ag-header-group-cell {
15+
font-weight: normal;
16+
font-size: 22px;
17+
18+
.ag-header-cell-sortable .ag-header-cell-label {
19+
cursor: pointer;
20+
font-weight: bold;
21+
font-size: 16px;
22+
}
23+
24+
}

projects/saas-ui/src/app/main/components/lead-list/lead-list.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@ import {HttpClient} from '@angular/common/http';
2323
export class LeadListComponent extends RouteComponentBaseDirective {
2424
// defining column names here
2525
colDefs: ColDef[] = [
26-
{field: 'firstName', width: 250, minWidth: 20},
26+
{
27+
field: 'firstName',
28+
width: 250,
29+
minWidth: 20,
30+
headerClass: 'header-bold',
31+
},
2732
{field: 'lastName', width: 250, minWidth: 20},
2833
{field: 'companyName', width: 250, minWidth: 20},
2934
{field: 'email', width: 300, minWidth: 20},

projects/saas-ui/src/app/main/components/manage-plans/manage-plans.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ <h2 class="heading">Manage Plan</h2>
66
<div class="regbtn">
77
<button
88
nbButton
9+
class="btn-danger"
910
size="medium"
1011
status="basic"
1112
(click)="showManagePlan()"

projects/saas-ui/src/app/main/components/onboarding-tenant-list/onboarding-tenant-list.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ <h2 class="heading">Onboarded Tenant List</h2>
77
<div class="regbtn">
88
<button
99
nbButton
10+
class="btn-danger"
1011
size="medium"
11-
status="danger"
1212
(click)="registerTenantPage()"
1313
>
1414
Add tenant

projects/saas-ui/src/app/main/components/onboarding-tenant-list/onboarding-tenant-list.component.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
@use '../../styles/grid-styles.scss' as *;
23

34
.ag-theme-alpine {
@@ -12,7 +13,12 @@
1213
align-items: center;
1314
}
1415

15-
.a {
16+
a {
17+
text-decoration: none;
18+
color: #19a5ff;
19+
}
20+
21+
.ag-cell-value a{
1622
text-decoration: none;
1723
color: #19a5ff;
1824
}

projects/saas-ui/src/app/main/components/onboarding-tenant-list/onboarding-tenant-list.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,10 @@ export class OnboardingTenantListComponent extends RouteComponentBaseDirective {
242242
'//',
243243
`//${params.data?.key}.`,
244244
);
245-
return `<a href="${url}" target="_blank" class="company-link">
246-
${params.value}
247-
</a>`;
245+
return `<a href="${url}" target="_blank"
246+
style="color: #007bff; text-decoration: none;">
247+
${params.value}
248+
</a>`;
248249
}
249250

250251
registerTenantPage() {

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,26 +306,35 @@ <h3>Subscription Plan</h3>
306306
<div class="plan-card-wrapper">
307307
<nb-card
308308
class="plan-card-box"
309-
accent="danger"
310309
*ngFor="let plan of subscriptionPlans"
311310
>
312311
<nb-card-header class="plan-card-header">
313312
<h5>{{ plan.name }}</h5>
313+
<nb-icon
314+
class="edit-icon"
315+
icon="file-text-outline"
316+
pack="eva"
317+
size="large"
318+
></nb-icon>
314319
</nb-card-header>
315320
<nb-card-body class="plan-card-body">
316321
<p class="plan-description">{{ plan.description }}</p>
317322
<p class="plan-price" *ngIf="plan.tier || plan.size">
318323
{{ plan.tier }}
319324
<ng-container *ngIf="plan.size">
320325
<nb-tag
326+
class="size-tag-wrapper"
321327
*ngIf="plan.size"
322328
status="basic"
323329
appearance="filled"
324330
text="{{ plan.size }}"
325331
></nb-tag>
326332
</ng-container>
327333
</p>
328-
<p class="plan-price">${{ plan.price }}</p>
334+
<p class="numeric-plan-price">
335+
<span class="doller-wrapper">$</span>
336+
{{ plan.price }}
337+
</p>
329338
</nb-card-body>
330339
<nb-card-footer class="plan-card-footer">
331340
<label class="plan-radio">
@@ -347,17 +356,17 @@ <h5>{{ plan.name }}</h5>
347356
<div class="btn regbtn">
348357
<button
349358
nbButton
359+
class="btn-danger"
350360
size="medium"
351-
status="danger"
352361
(click)="backToPriviousPage()"
353362
>
354363
Cancel
355364
</button>
356365

357366
<button
358367
nbButton
368+
class="btn-danger"
359369
size="medium"
360-
status="danger"
361370
[disabled]="!tenantRegForm.valid"
362371
type="submit"
363372
>

0 commit comments

Comments
 (0)