Skip to content

Commit 7f0336e

Browse files
authored
Merge branch 'master' into SAAS-73-A
2 parents 5f96632 + efde01f commit 7f0336e

34 files changed

+1632
-1635
lines changed

.cz-config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ module.exports = {
2525
],
2626

2727
scopes: [
28+
{name: 'ci-cd'},
29+
{name: 'chore'},
30+
{name: 'docs'},
2831
{name: 'arc'},
2932
{name: 'arc-lib'},
3033
{name: 'arc-docs'},

angular.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,12 @@
315315
"glob": "**/*",
316316
"input": "projects/arc-lib/src/lib/assets/",
317317
"output": "/assets/"
318-
}
318+
},
319+
{
320+
"glob": "**/*",
321+
"input": "projects/saas-ui/src/assets/",
322+
"output": "/assets/"
323+
}
319324

320325
],
321326
"styles": [

package-lock.json

Lines changed: 1087 additions & 1466 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@nebular/theme": "^11.0.0",
3434
"@ngx-translate/core": "^14.0.0",
3535
"@ngx-translate/http-loader": "^7.0.0",
36-
"@types/lodash": "^4.17.9",
36+
"@types/lodash": "^4.17.10",
3737
"ag-grid-angular": "^31.3.1",
3838
"ag-grid-community": "^31.3.4",
3939
"date-fns": "^2.29.3",

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
}

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

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ export class AddPlanComponent implements OnInit {
103103
const domainData = this.addPlanForm.value;
104104
domainData.price = parseFloat(domainData.price);
105105
domainData.tier = String(domainData.tier);
106+
if (domainData.tier === 'BASIC') {
107+
domainData.size = '';
108+
}
106109
const featuresGroup = this.addPlanForm.get('features') as FormGroup;
107110
const selectedFeatures = Object.keys(featuresGroup.controls)
108111
.filter(
@@ -178,7 +181,7 @@ export class AddPlanComponent implements OnInit {
178181
break;
179182
case 'number':
180183
control = new FormControl(
181-
feature.defaultValue,
184+
feature.defaultValue || 0,
182185
Validators.pattern(/[0-9]/),
183186
);
184187
break;
@@ -251,27 +254,22 @@ export class AddPlanComponent implements OnInit {
251254

252255
const featuresGroup = this.addPlanForm.get('features') as FormGroup;
253256
const selectedFeatures = featuresGroup
254-
? Object.keys(featuresGroup.controls)
255-
.filter(
256-
key =>
257-
featuresGroup.get(key)?.value !== null &&
258-
featuresGroup.get(key)?.value !== '',
259-
)
260-
.reduce(
261-
(acc, key) => {
262-
const feature = this.featureValue.features.find(
263-
f => (f as any).key === key,
264-
);
265-
if (feature) {
266-
acc[feature.id] = {
267-
id: (feature.value as any).id,
268-
value: featuresGroup.get(key)?.value,
269-
};
270-
}
271-
return acc;
272-
},
273-
{} as {[key: string]: any},
274-
)
257+
? Object.keys(featuresGroup.controls).reduce(
258+
(acc, key) => {
259+
const feature = this.featureValue.features.find(
260+
f => (f as any).key === key,
261+
);
262+
if (feature) {
263+
const featureVal = featuresGroup.get(key)?.value;
264+
acc[feature.id] = {
265+
id: (feature.value as any)?.id,
266+
value: featureVal || feature.defaultValue || '',
267+
};
268+
}
269+
return acc;
270+
},
271+
{} as {[key: string]: any},
272+
)
275273
: {};
276274
const generalDetailsData = {
277275
name: domainData.name,
@@ -317,6 +315,7 @@ export class AddPlanComponent implements OnInit {
317315
console.error('Form is invalid');
318316
}
319317
}
318+
320319
onTierChange(selectedTier: string): void {
321320
this.showStorageSize =
322321
selectedTier === 'STANDARD' || selectedTier === 'PREMIUM';
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},

0 commit comments

Comments
 (0)