Merge pull request #7570 from ever-co/develop

* chore(deps): replaced ngx-slider-v2 to @angular-slider/ngx-slider * fix: removed unnecessary filters (not used anywhere) * [Fix] Enabled DB SSL Connection (#7569) * fix: enabled DB ssl connection for knex * fix: improved SSL behavior * fix: updated database configuration --------- Co-authored-by: RAHUL RATHORE <41804588+rahul-rocket@users.noreply.github.com> Co-authored-by: Rahul R <rahulrathore576@gmail.com>
ever-co · Feb 24, 2024 · 2968b15 · 2968b15
2 parents 766fb83 + c71916b
commit 2968b15
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 244 deletions.
diff --git a/apps/gauzy/package.json b/apps/gauzy/package.json
@@ -28,6 +28,7 @@
 	"dependencies": {
 		"@akveo/ng2-completer": "^9.0.1",
 		"@ali-hm/angular-tree-component": "^12.0.5",
+		"@angular-slider/ngx-slider": "^17.0.1",
 		"@angular/animations": "^16.2.12",
 		"@angular/cdk": "^16.2.12",
 		"@angular/common": "^16.2.12",
@@ -145,7 +146,6 @@
 		"ngx-page-scroll-core": "^11.0.0",
 		"ngx-perfect-scrollbar": "^10.1.1",
 		"ngx-permissions": "^13.0.1",
-		"ngx-slider-v2": "16.0.2",
 		"normalize.css": "^8.0.1",
 		"pug": "^3.0.2",
 		"randomcolor": "^0.6.2",

diff --git a/apps/gauzy/src/app/@shared/report/activities-report-grid/activities-report-grid.module.ts b/apps/gauzy/src/app/@shared/report/activities-report-grid/activities-report-grid.module.ts
@@ -10,7 +10,6 @@ import {
 } from '@nebular/theme';
 import { TranslateModule } from '@ngx-translate/core';
 import { SharedModule } from '../../shared.module';
-import { FiltersModule } from '../../timesheet/filters/filters.module';
 import { ProgressStatusModule } from '../../progress-status/progress-status.module';
 import { ProjectColumnViewModule } from "../project-column-view/project-column-view.module";
 import { NoDataMessageModule } from '../../no-data-message/no-data-message.module';
@@ -25,12 +24,11 @@ import { NoDataMessageModule } from '../../no-data-message/no-data-message.modul
 		NbIconModule,
 		NbSpinnerModule,
 		NbCardModule,
-		FiltersModule,
 		NbSelectModule,
 		FormsModule,
 		ProgressStatusModule,
 		ProjectColumnViewModule,
 		NoDataMessageModule
 	],
 })
-export class ActivitiesReportGridModule {}
+export class ActivitiesReportGridModule { }
diff --git a/apps/gauzy/src/app/@shared/report/amounts-owed-grid/amounts-owed-grid.module.ts b/apps/gauzy/src/app/@shared/report/amounts-owed-grid/amounts-owed-grid.module.ts
@@ -10,7 +10,6 @@ import {
 } from '@nebular/theme';
 import { TranslateModule } from '@ngx-translate/core';
 import { SharedModule } from '../../shared.module';
-import { FiltersModule } from '../../timesheet/filters/filters.module';
 import { NoDataMessageModule } from '../../no-data-message/no-data-message.module';
 
 @NgModule({
@@ -23,10 +22,9 @@ import { NoDataMessageModule } from '../../no-data-message/no-data-message.modul
 		NbIconModule,
 		NbSpinnerModule,
 		NbCardModule,
-		FiltersModule,
 		NbSelectModule,
 		FormsModule,
 		NoDataMessageModule
 	]
 })
-export class AmountsOwedGridModule {}
+export class AmountsOwedGridModule { }
diff --git a/apps/gauzy/src/app/@shared/report/daily-grid/daily-grid.module.ts b/apps/gauzy/src/app/@shared/report/daily-grid/daily-grid.module.ts
@@ -12,7 +12,6 @@ import {
 } from '@nebular/theme';
 import { TranslateModule } from '@ngx-translate/core';
 import { SharedModule } from '../../shared.module';
-import { FiltersModule } from '../../timesheet/filters/filters.module';
 import { ProjectColumnViewModule } from '../project-column-view/project-column-view.module';
 import { TableComponentsModule } from '../../table-components';
 import { NoDataMessageModule } from '../../no-data-message/no-data-message.module';
@@ -29,12 +28,11 @@ import { NoDataMessageModule } from '../../no-data-message/no-data-message.modul
 		NbIconModule,
 		NbSelectModule,
 		NbSpinnerModule,
-		FiltersModule,
 		FormsModule,
 		ProjectColumnViewModule,
 		NbBadgeModule,
 		TableComponentsModule,
 		NoDataMessageModule
 	]
 })
-export class DailyGridModule {}
+export class DailyGridModule { }
diff --git a/apps/gauzy/src/app/@shared/report/daily-statistics/daily-statistics.module.ts b/apps/gauzy/src/app/@shared/report/daily-statistics/daily-statistics.module.ts
@@ -10,7 +10,6 @@ import {
 } from '@nebular/theme';
 import { TranslateModule } from '@ngx-translate/core';
 import { SharedModule } from '../../shared.module';
-import { FiltersModule } from '../../timesheet/filters/filters.module';
 import { CounterPointModule } from '../../counter-point/counter-point.module';
 
 @NgModule({
@@ -23,10 +22,9 @@ import { CounterPointModule } from '../../counter-point/counter-point.module';
 		NbIconModule,
 		NbSpinnerModule,
 		NbCardModule,
-		FiltersModule,
 		NbSelectModule,
 		FormsModule,
-        CounterPointModule,
+		CounterPointModule,
 	]
 })
-export class DailyStatisticsModule {}
+export class DailyStatisticsModule { }
diff --git a/apps/gauzy/src/app/@shared/report/expenses-report-grid/expenses-report-grid.module.ts b/apps/gauzy/src/app/@shared/report/expenses-report-grid/expenses-report-grid.module.ts
@@ -10,7 +10,6 @@ import {
 } from '@nebular/theme';
 import { TranslateModule } from '@ngx-translate/core';
 import { SharedModule } from '../../shared.module';
-import { FiltersModule } from '../../timesheet/filters/filters.module';
 import { ProjectColumnViewModule } from "../project-column-view/project-column-view.module";
 import { NoDataMessageModule } from '../../no-data-message/no-data-message.module';
 
@@ -24,11 +23,10 @@ import { NoDataMessageModule } from '../../no-data-message/no-data-message.modul
 		NbIconModule,
 		NbSpinnerModule,
 		NbCardModule,
-		FiltersModule,
 		NbSelectModule,
 		FormsModule,
 		ProjectColumnViewModule,
 		NoDataMessageModule
 	],
 })
-export class ExpensesReportGridModule {}
+export class ExpensesReportGridModule { }
diff --git a/apps/gauzy/src/app/@shared/report/payment-report-grid/payment-report-grid.module.ts b/apps/gauzy/src/app/@shared/report/payment-report-grid/payment-report-grid.module.ts
@@ -10,7 +10,6 @@ import {
 } from '@nebular/theme';
 import { TranslateModule } from '@ngx-translate/core';
 import { SharedModule } from '../../shared.module';
-import { FiltersModule } from '../../timesheet/filters/filters.module';
 import { ProjectColumnViewModule } from "../project-column-view/project-column-view.module";
 import { NoDataMessageModule } from '../../no-data-message/no-data-message.module';
 
@@ -24,11 +23,10 @@ import { NoDataMessageModule } from '../../no-data-message/no-data-message.modul
 		NbIconModule,
 		NbSpinnerModule,
 		NbCardModule,
-		FiltersModule,
 		NbSelectModule,
 		FormsModule,
 		ProjectColumnViewModule,
 		NoDataMessageModule
 	],
 })
-export class PaymentReportGridModule {}
+export class PaymentReportGridModule { }
diff --git a/apps/gauzy/src/app/@shared/timesheet/filters/filters.component.html b/apps/gauzy/src/app/@shared/timesheet/filters/filters.component.html
diff --git a/apps/gauzy/src/app/@shared/timesheet/filters/filters.component.spec.ts b/apps/gauzy/src/app/@shared/timesheet/filters/filters.component.spec.ts
diff --git a/apps/gauzy/src/app/@shared/timesheet/filters/filters.component.ts b/apps/gauzy/src/app/@shared/timesheet/filters/filters.component.ts
@@ -23,7 +23,7 @@ import * as moment from 'moment';
 import { Subject } from 'rxjs';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { Store } from '../../../@core/services/store.service';
-import { Options, ChangeContext } from 'ngx-slider-v2';
+import { Options, ChangeContext } from '@angular-slider/ngx-slider';
 import { NgxPermissionsService } from 'ngx-permissions';
 import {
 	ActivityLevel,

diff --git a/apps/gauzy/src/app/@shared/timesheet/filters/filters.module.ts b/apps/gauzy/src/app/@shared/timesheet/filters/filters.module.ts
@@ -11,7 +11,7 @@ import {
 	NbInputModule
 } from '@nebular/theme';
 import { TranslateModule } from '@ngx-translate/core';
-import { NgxSliderModule } from 'ngx-slider-v2';
+import { NgxSliderModule } from '@angular-slider/ngx-slider';
 import { FiltersComponent } from './filters.component';
 import { EmployeeMultiSelectModule } from '../../employee/employee-multi-select/employee-multi-select.module';
 import { SharedModule } from '../../shared.module';

diff --git a/.../timesheet/filters/filters.component.scss → ...heet/gauzy-filters/filters.component.scss b/.../timesheet/filters/filters.component.scss → ...heet/gauzy-filters/filters.component.scss
diff --git a/apps/gauzy/src/app/@shared/timesheet/gauzy-filters/gauzy-filters.component.scss b/apps/gauzy/src/app/@shared/timesheet/gauzy-filters/gauzy-filters.component.scss
@@ -1,6 +1,6 @@
 @import 'var';
-@import '../filters/filters.component.scss';
 @import 'gauzy/_gauzy-overrides';
+@import 'filters.component.scss';
 
 $button-radius : nb-theme(button-rectangle-border-radius);
 

diff --git a/apps/gauzy/src/app/@shared/timesheet/gauzy-filters/gauzy-filters.component.ts b/apps/gauzy/src/app/@shared/timesheet/gauzy-filters/gauzy-filters.component.ts
@@ -9,7 +9,7 @@ import {
 	Output
 } from '@angular/core';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { Options, ChangeContext } from 'ngx-slider-v2';
+import { Options, ChangeContext } from '@angular-slider/ngx-slider';
 import {
 	ITimeLogFilters,
 	PermissionsEnum,

diff --git a/apps/gauzy/src/app/@shared/timesheet/gauzy-filters/gauzy-filters.module.ts b/apps/gauzy/src/app/@shared/timesheet/gauzy-filters/gauzy-filters.module.ts
@@ -13,7 +13,7 @@ import {
 	NbSelectModule
 } from '@nebular/theme';
 import { TranslateModule } from '@ngx-translate/core';
-import { NgxSliderModule } from 'ngx-slider-v2';
+import { NgxSliderModule } from '@angular-slider/ngx-slider';
 import { EmployeeMultiSelectModule } from '../../employee/employee-multi-select/employee-multi-select.module';
 import { ProjectSelectModule } from '../../project-select/project-select.module';