Release

apps/desktop/package.json

@@ -43,7 +43,6 @@
 		"@gauzy/contracts": "^0.1.0",
 		"@gauzy/desktop-ui-lib": "^0.1.0",
 		"@gauzy/ui-config": "^0.1.0",
-		"@gauzy/ui-core": "^0.1.0",
 		"@grpc/grpc-js": "^1.6.7",
 		"@nebular/auth": "^12.0.0",
 		"@nebular/bootstrap": "^9.1.0-rc.6",

apps/desktop/src/index.ts

@@ -5,10 +5,10 @@ import log from 'electron-log';
 console.log = log.log;
 Object.assign(console, log.functions);
 
-import * as path from 'path';
-import { app, BrowserWindow, ipcMain, Menu, shell, MenuItemConstructorOptions, dialog, nativeTheme } from 'electron';
 import * as remoteMain from '@electron/remote/main';
 import { setupTitlebar } from 'custom-electron-titlebar/main';
+import { BrowserWindow, Menu, MenuItemConstructorOptions, app, dialog, ipcMain, nativeTheme, shell } from 'electron';
+import * as path from 'path';
 
 import { environment } from './environments/environment';
 
@@ -29,6 +29,7 @@ import {
 	AppError,
 	AppMenu,
 	DesktopServer,
+	DesktopThemeListener,
 	DesktopUpdater,
 	DialogErrorHandler,
 	ErrorEventManager,
@@ -43,8 +44,7 @@ import {
 	ipcMainHandler,
 	ipcTimer,
 	removeMainListener,
-	removeTimerListener,
-	DesktopThemeListener
+	removeTimerListener
 } from '@gauzy/desktop-libs';
 import {
 	AlwaysOn,
@@ -57,10 +57,10 @@ import {
 	createTimeTrackerWindow,
 	createUpdaterWindow
 } from '@gauzy/desktop-window';
-import { initSentry } from './sentry';
+import * as Sentry from '@sentry/electron';
 import { fork } from 'child_process';
 import { autoUpdater } from 'electron-updater';
-import * as Sentry from '@sentry/electron';
+import { initSentry } from './sentry';
 
 // the folder where all app data will be stored (e.g. sqlite DB, settings, cache, etc)
 // C:\Users\USERNAME\AppData\Roaming\gauzy-desktop
@@ -535,7 +535,7 @@ app.on('ready', async () => {
 		timeTrackerWindow,
 		settingsWindow,
 		updaterWindow,
-		imageViewWindow: imageView,
+		imageViewerWindow: imageView,
 		gauzyWindow,
 		splashScreenWindow: splashScreen.browserWindow,
 		alwaysOnWindow: alwaysOn.browserWindow

apps/desktop/src/package.json

@@ -29,6 +29,7 @@
 			"../../../packages/config",
 			"../../../packages/contracts",
 			"../../../packages/ui-config",
+			"../../../packages/ui-core",
 			"../../../packages/plugin",
 			"../../../packages/plugins/integration-ai",
 			"../../../packages/plugins/integration-hubstaff",

apps/gauzy/package.json

@@ -68,7 +68,6 @@
 		"@gauzy/plugin-onboarding-ui": "^0.1.0",
 		"@gauzy/plugin-public-layout-ui": "^0.1.0",
 		"@gauzy/ui-config": "^0.1.0",
-		"@gauzy/ui-core": "^0.1.0",
 		"@jitsu/js": "^1.8.2",
 		"@kurkle/color": "^0.2.0",
 		"@nebular/auth": "^12.0.0",

apps/gauzy/src/app/pages/dashboard/dashboard.module.ts

@@ -1,31 +1,45 @@
 import { NgModule } from '@angular/core';
 import {
 	NbAlertModule,
+	NbBadgeModule,
 	NbButtonModule,
 	NbCardModule,
 	NbDialogModule,
 	NbIconModule,
 	NbInputModule,
+	NbListModule,
+	NbPopoverModule,
+	NbProgressBarModule,
 	NbRouteTabsetModule,
 	NbSelectModule,
 	NbSpinnerModule,
+	NbToggleModule,
 	NbTooltipModule,
 	NbTreeGridModule
 } from '@nebular/theme';
 import { NgSelectModule } from '@ng-select/ng-select';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgChartsModule } from 'ng2-charts';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { NgxPermissionsModule } from 'ngx-permissions';
-import { TranslateModule } from '@ngx-translate/core';
+import { SwiperModule } from 'swiper/angular';
 import {
+	ActivityItemModule,
+	CounterPointModule,
 	DynamicTabsModule,
+	GalleryModule,
 	InfoBlockModule,
 	LineChartModule,
 	NoDataMessageModule,
 	ProfitHistoryModule,
 	RecordsHistoryModule,
+	ScreenshotsItemModule,
 	SharedModule,
 	SingleStatisticModule,
 	TableComponentsModule,
+	TimezoneFilterModule,
+	WidgetLayoutModule,
+	WindowLayoutModule,
 	WorkInProgressModule
 } from '@gauzy/ui-core/shared';
 import { DashboardRoutingModule } from './dashboard-routing.module';
@@ -34,22 +48,32 @@ import { DataEntryShortcutsComponent } from './data-entry-shortcuts/data-entry-s
 import { HumanResourcesComponent } from './human-resources/human-resources.component';
 import { AccountingComponent } from './accounting/accounting.component';
 import { ProjectManagementComponent } from './project-management/project-management.component';
-import { EmployeeChartsModule } from './human-resources/employee-charts/employee-charts.module';
-import { TimeTrackingModule } from './time-tracking/time-tracking.module';
 import { ProjectManagementDetailsComponent } from './project-management/project-management-details/project-management-details.component';
-import { TeamModule } from './team/team.module';
+import { TimeTrackingComponent } from './time-tracking/time-tracking.component';
+import {
+	EmployeeChartsComponent,
+	EmployeeDoughnutChartComponent,
+	EmployeeHorizontalBarChartComponent,
+	EmployeeStackedBarChartComponent
+} from './employee-charts';
+import { AllTeamComponent, ChartComponent, TeamCardComponent, TeamComponent, TeamMemberComponent } from './team';
 
 // NB Modules
 const NB_MODULES = [
 	NbAlertModule,
+	NbBadgeModule,
 	NbButtonModule,
 	NbCardModule,
 	NbDialogModule.forChild(),
 	NbIconModule,
 	NbInputModule,
+	NbListModule,
+	NbPopoverModule,
+	NbProgressBarModule,
 	NbRouteTabsetModule,
 	NbSelectModule,
 	NbSpinnerModule,
+	NbToggleModule,
 	NbTooltipModule,
 	NbTreeGridModule
 ];
@@ -60,9 +84,31 @@ const THIRD_PARTY_MODULES = [
 	LineChartModule,
 	NgSelectModule,
 	NgxPermissionsModule.forChild(),
+	NgChartsModule,
+	SwiperModule,
 	TranslateModule.forChild()
 ];
 
+// Components
+const COMPONENTS = [
+	DashboardComponent,
+	DataEntryShortcutsComponent,
+	AccountingComponent,
+	HumanResourcesComponent,
+	ProjectManagementComponent,
+	ProjectManagementDetailsComponent,
+	TimeTrackingComponent,
+	EmployeeChartsComponent,
+	EmployeeHorizontalBarChartComponent,
+	EmployeeStackedBarChartComponent,
+	EmployeeDoughnutChartComponent,
+	TeamComponent,
+	TeamCardComponent,
+	TeamMemberComponent,
+	ChartComponent,
+	AllTeamComponent
+];
+
 @NgModule({
 	imports: [
 		DashboardRoutingModule,
@@ -71,26 +117,21 @@ const THIRD_PARTY_MODULES = [
 		// Feature Modules
 		RecordsHistoryModule,
 		ProfitHistoryModule,
-		EmployeeChartsModule,
 		SingleStatisticModule,
 		InfoBlockModule,
-		TimeTrackingModule,
-		TeamModule,
-		// Shared Modules
 		SharedModule,
 		TableComponentsModule,
 		NoDataMessageModule,
 		WorkInProgressModule,
-		// Custom Modules
-		DynamicTabsModule
+		ActivityItemModule,
+		CounterPointModule,
+		DynamicTabsModule,
+		GalleryModule,
+		ScreenshotsItemModule,
+		TimezoneFilterModule,
+		WidgetLayoutModule,
+		WindowLayoutModule
 	],
-	declarations: [
-		DashboardComponent,
-		AccountingComponent,
-		HumanResourcesComponent,
-		DataEntryShortcutsComponent,
-		ProjectManagementComponent,
-		ProjectManagementDetailsComponent
-	]
+	declarations: [...COMPONENTS]
 })
 export class DashboardModule {}

apps/gauzy/src/app/pages/dashboard/human-resources/employee-charts/employee-charts.component.ts → apps/gauzy/src/app/pages/dashboard/employee-charts/employee-charts.component.ts

@@ -16,9 +16,7 @@ export class EmployeeChartsComponent implements OnInit {
 	selectedChart = EmployeeChartEnum.BAR;
 	EmployeeChartEnum: typeof EmployeeChartEnum = EmployeeChartEnum;
 
-	@Input() employeeStatistics: IMonthAggregatedEmployeeStatistics[];
-
-	constructor() {}
+	@Input() employeeStatistics: IMonthAggregatedEmployeeStatistics[] = [];
 
 	ngOnInit() {}
 }

apps/gauzy/src/app/pages/dashboard/human-resources/employee-charts/employee-horizontal-bar-chart/employee-horizontal-bar-chart.component.ts → apps/gauzy/src/app/pages/dashboard/employee-charts/employee-horizontal-bar-chart/employee-horizontal-bar-chart.component.ts

@@ -7,11 +7,11 @@ import { debounceTime, filter, tap } from 'rxjs/operators';
 import { BaseChartDirective } from 'ng2-charts';
 import { ChartConfiguration, ChartType } from 'chart.js';
 import { environment } from '@gauzy/ui-config';
-import { TranslationBaseComponent } from '@gauzy/ui-core/i18n';
 import { CurrencyPosition, IMonthAggregatedEmployeeStatistics, IOrganization } from '@gauzy/contracts';
 import { distinctUntilChange } from '@gauzy/ui-core/common';
-import { CurrencyPositionPipe } from '@gauzy/ui-core/shared';
 import { Store, months } from '@gauzy/ui-core/core';
+import { TranslationBaseComponent } from '@gauzy/ui-core/i18n';
+import { CurrencyPositionPipe } from '@gauzy/ui-core/shared';
 
 @UntilDestroy({ checkProperties: true })
 @Component({

apps/gauzy/src/app/pages/dashboard/human-resources/employee-charts/employee-stacked-bar-chart/employee-stacked-bar-chart.component.ts → apps/gauzy/src/app/pages/dashboard/employee-charts/employee-stacked-bar-chart/employee-stacked-bar-chart.component.ts

@@ -2,8 +2,8 @@ import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
 import { NbThemeService } from '@nebular/theme';
 import { TranslateService } from '@ngx-translate/core';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { monthNames } from '@gauzy/ui-core/core';
 import { IMonthAggregatedEmployeeStatistics } from '@gauzy/contracts';
+import { monthNames } from '@gauzy/ui-core/core';
 import { TranslationBaseComponent } from '@gauzy/ui-core/i18n';
 
 @UntilDestroy()

apps/gauzy/src/app/pages/dashboard/employee-charts/index.ts

@@ -0,0 +1,4 @@
+export * from './employee-charts.component';
+export * from './employee-stacked-bar-chart/employee-stacked-bar-chart.component';
+export * from './employee-doughnut-chart/employee-doughnut-chart.component';
+export * from './employee-horizontal-bar-chart/employee-horizontal-bar-chart.component';

apps/gauzy/src/app/pages/dashboard/project-management/project-management-details/project-management-details.component.html

@@ -39,9 +39,7 @@
 					</div>
 				</ng-container>
 				<ng-template [ngIf]="!tasks?.length">
-					<ngx-no-data-message
-						[message]="'REPORT_PAGE.NO_TASK' | translate"
-					></ngx-no-data-message>
+					<ngx-no-data-message [message]="'REPORT_PAGE.NO_TASK' | translate"></ngx-no-data-message>
 				</ng-template>
 			</div>
 			<div *ngxPermissionsOnly="[permissions.ORG_TASK_ADD]" (click)="addTodo()" class="more">
@@ -51,10 +49,7 @@
 		</nb-card-body>
 	</nb-card>
 	<div class="last-column">
-		<nb-card
-			[ngStyle]="{ 'height': !selectedEmployeeId ? '100%' : '' }"
- 			class="projects"
-		>
+		<nb-card [ngStyle]="{ height: !selectedEmployeeId ? '100%' : '' }" class="projects">
 			<nb-card-header>
 				{{ 'DASHBOARD_PAGE.MOST_VIEW_PROJECTS' | translate }}
 			</nb-card-header>
@@ -72,15 +67,11 @@
 				<div class="card-body-content">
 					<ng-container *ngFor="let project of projects">
 						<div class="card project">
-							<ngx-project
-								[rowData]="{ project: project }"
-							></ngx-project>
+							<ngx-project [rowData]="{ project: project }"></ngx-project>
 						</div>
 					</ng-container>
 					<ng-template [ngIf]="!projects?.length">
-						<ngx-no-data-message
-							[message]="'TIMESHEET.NO_PROJECT' | translate"
-						></ngx-no-data-message>
+						<ngx-no-data-message [message]="'TIMESHEET.NO_PROJECT' | translate"></ngx-no-data-message>
 					</ng-template>
 				</div>
 			</nb-card-body>
@@ -101,10 +92,7 @@
 					>
 						{{ 'BUTTONS.VIEW_ALL' | translate }}
 					</button>
-					<div
-						[ngStyle]="{'max-height': !isMyTask ? 'calc(100% - 28px)' : ''}"
-						class="card-body-content"
-					>
+					<div [ngStyle]="{ 'max-height': !isMyTask ? 'calc(100% - 28px)' : '' }" class="card-body-content">
 						<ng-container *ngFor="let task of assigned">
 							<div class="card assigned">
 								<div class="">