Skip to content

Commit

Permalink
Merge pull request #8057 from ever-co/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
evereq authored Aug 10, 2024
2 parents 4312a98 + 3d97c05 commit d1332fe
Show file tree
Hide file tree
Showing 66 changed files with 42 additions and 301 deletions.
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { NbCardModule, NbIconModule, NbListModule } from '@nebular/theme';
import { TranslateModule } from '@ngx-translate/core';
import { SharedModule } from '@gauzy/ui-core/shared';
import { ThemeModule } from '@gauzy/ui-core/theme';
import { WorkspaceSelectionComponent } from './workspace-selection.component';

@NgModule({
imports: [
CommonModule,
ThemeModule,
NbCardModule,
NbIconModule,
NbListModule,
TranslateModule.forChild(),
SharedModule
],
imports: [ThemeModule, NbCardModule, NbIconModule, NbListModule, TranslateModule.forChild(), SharedModule],
declarations: [WorkspaceSelectionComponent],
exports: [WorkspaceSelectionComponent],
providers: []
Expand Down
5 changes: 0 additions & 5 deletions apps/gauzy/src/app/auth/auth.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NbAuthModule } from '@nebular/auth';
import {
NbAccordionModule,
Expand Down Expand Up @@ -53,9 +51,6 @@ const NB_MODULES = [

@NgModule({
imports: [
CommonModule,
FormsModule,
ReactiveFormsModule,
...NB_MODULES,
NgxAuthRoutingModule,
TranslateModule.forChild(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NbLayoutModule, NbCardModule, NbSelectModule, NbButtonModule } from '@nebular/theme';
import { AceEditorModule } from 'ngx-ace-editor-wrapper';
import { TranslateModule } from '@ngx-translate/core';
Expand All @@ -10,20 +8,17 @@ import { AccountingTemplatesComponent } from './accounting-templates.component';

@NgModule({
imports: [
NbLayoutModule,
CommonModule,
NbButtonModule,
NbCardModule,
FormsModule,
ReactiveFormsModule,
NbLayoutModule,
NbSelectModule,
TranslateModule.forChild(),
NbButtonModule,
AceEditorModule,
TranslateModule.forChild(),
SharedModule,
LanguageSelectorModule,
AccountingTemplatesRoutingModule
],
providers: [],
declarations: [AccountingTemplatesComponent]
declarations: [AccountingTemplatesComponent],
providers: []
})
export class AccountingTemplatesModule {}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
NbBadgeModule,
NbButtonModule,
Expand Down Expand Up @@ -28,8 +27,6 @@ import { ApprovalPolicyRoutingModule } from './approval-policy-routing.module';

@NgModule({
imports: [
SharedModule,
CommonModule,
NbBadgeModule,
NbButtonModule,
NbCardModule,
Expand All @@ -42,6 +39,7 @@ import { ApprovalPolicyRoutingModule } from './approval-policy-routing.module';
NbSpinnerModule,
NbTooltipModule,
NbRadioModule,
SharedModule,
CardGridModule,
ApprovalPolicyMutationModule,
ApprovalPolicyRoutingModule,
Expand Down
4 changes: 1 addition & 3 deletions apps/gauzy/src/app/pages/approvals/approvals.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
NbBadgeModule,
NbButtonModule,
Expand Down Expand Up @@ -29,8 +28,6 @@ import { RequestApprovalActionComponent } from './table-components/request-appro

@NgModule({
imports: [
CommonModule,
SharedModule,
NbBadgeModule,
NbButtonModule,
NbCardModule,
Expand All @@ -45,6 +42,7 @@ import { RequestApprovalActionComponent } from './table-components/request-appro
NbTooltipModule,
NbRadioModule,
ApprovalsRoutingModule,
SharedModule,
RequestApprovalMutationModule,
TranslateModule.forChild(),
NgxPermissionsModule.forChild(),
Expand Down
5 changes: 0 additions & 5 deletions apps/gauzy/src/app/pages/candidates/candidates.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
NbAccordionModule,
NbActionsModule,
Expand Down Expand Up @@ -143,9 +141,6 @@ const COMPONENTS = [

@NgModule({
imports: [
CommonModule,
FormsModule,
ReactiveFormsModule,
FullCalendarModule,
NbAccordionModule,
NbActionsModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
NbAccordionModule,
NbCardModule,
Expand All @@ -24,7 +23,6 @@ import { ContactViewRoutingModule } from './contact-view-routing.module';
@NgModule({
imports: [
ContactViewRoutingModule,
CommonModule,
NbCardModule,
NbRouteTabsetModule,
TranslateModule.forChild(),
Expand Down
5 changes: 0 additions & 5 deletions apps/gauzy/src/app/pages/contacts/contacts.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
NbButtonModule,
NbCardModule,
Expand Down Expand Up @@ -38,9 +36,6 @@ const COMPONENTS = [ContactsComponent, InviteContactComponent, ContactMutationCo

@NgModule({
imports: [
CommonModule,
FormsModule,
ReactiveFormsModule,
NbButtonModule,
NbCardModule,
NbDialogModule.forChild(),
Expand Down
4 changes: 0 additions & 4 deletions apps/gauzy/src/app/pages/dashboard/dashboard.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {
NbAlertModule,
NbButtonModule,
Expand Down Expand Up @@ -42,11 +40,9 @@ import { TeamModule } from './team/team.module';

@NgModule({
imports: [
CommonModule,
DashboardRoutingModule,
NbCardModule,
NgSelectModule,
FormsModule,
NbButtonModule,
NbInputModule,
RecordsHistoryModule,
Expand Down
2 changes: 0 additions & 2 deletions apps/gauzy/src/app/pages/dashboard/team/team.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
NbBadgeModule,
NbButtonModule,
Expand All @@ -20,7 +19,6 @@ import { AllTeamComponent } from './all-team/all-team.component';
@NgModule({
declarations: [TeamComponent, TeamCardComponent, TeamMemberComponent, ChartComponent, AllTeamComponent],
imports: [
CommonModule,
NbBadgeModule,
NbButtonModule,
NbCardModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
NbCardModule,
NbSpinnerModule,
Expand All @@ -11,7 +10,6 @@ import {
NbButtonModule,
NbPopoverModule
} from '@nebular/theme';
import { FormsModule } from '@angular/forms';
import { NgChartsModule } from 'ng2-charts';
import { NgxPermissionsModule } from 'ngx-permissions';
import { TranslateModule } from '@ngx-translate/core';
Expand All @@ -30,8 +28,6 @@ import {

@NgModule({
imports: [
CommonModule,
FormsModule,
SharedModule,
NbCardModule,
NbButtonModule,
Expand Down
5 changes: 0 additions & 5 deletions apps/gauzy/src/app/pages/departments/departments.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
NbButtonModule,
NbCardModule,
Expand Down Expand Up @@ -33,13 +31,10 @@ const COMPONENTS = [DepartmentsComponent, DepartmentsMutationComponent];

@NgModule({
imports: [
CommonModule,
SharedModule,
DepartmentsRoutingModule,
NbCardModule,
FormsModule,
NbDialogModule,
ReactiveFormsModule,
NbButtonModule,
NbInputModule,
NbSelectModule,
Expand Down
5 changes: 0 additions & 5 deletions apps/gauzy/src/app/pages/documents/documents.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
NbButtonModule,
NbCardModule,
Expand Down Expand Up @@ -29,11 +27,8 @@ const COMPONENTS = [DocumentsComponent, UploadDocumentComponent];

@NgModule({
imports: [
CommonModule,
DocumentsRoutingModule,
NbCardModule,
FormsModule,
ReactiveFormsModule,
NbButtonModule,
NbInputModule,
NbSelectModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {
NbCardModule,
NbButtonModule,
Expand All @@ -25,10 +23,8 @@ import { EmployeeLevelRoutingModule } from './employee-level-routing.module';

@NgModule({
imports: [
CommonModule,
SharedModule,
NbCardModule,
FormsModule,
NbButtonModule,
EmployeeLevelRoutingModule,
NbInputModule,
Expand Down
10 changes: 1 addition & 9 deletions apps/gauzy/src/app/pages/employees/activity/activity.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { NbCardModule, NbRouteTabsetModule } from '@nebular/theme';
import { TranslateModule } from '@ngx-translate/core';
import { SharedModule } from '@gauzy/ui-core/shared';
Expand All @@ -8,13 +7,6 @@ import { ActivityLayoutComponent } from './layout/layout.component';

@NgModule({
declarations: [ActivityLayoutComponent],
imports: [
CommonModule,
NbCardModule,
NbRouteTabsetModule,
TranslateModule.forChild(),
ActivityRoutingModule,
SharedModule
]
imports: [NbCardModule, NbRouteTabsetModule, TranslateModule.forChild(), ActivityRoutingModule, SharedModule]
})
export class ActivityModule {}
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { ReactiveFormsModule, FormsModule } from '@angular/forms';
import { NbSpinnerModule, NbButtonModule, NbDialogModule, NbIconModule, NbCheckboxModule } from '@nebular/theme';
import { TranslateModule } from '@ngx-translate/core';
import { MomentModule } from 'ngx-moment';
Expand All @@ -19,7 +17,6 @@ import { ScreenshotComponent } from './screenshot/screenshot.component';
@NgModule({
declarations: [ScreenshotComponent],
imports: [
CommonModule,
ScreenshotRoutingModule,
SharedModule,
NbSpinnerModule,
Expand All @@ -30,8 +27,6 @@ import { ScreenshotComponent } from './screenshot/screenshot.component';
ViewTimeLogModalModule,
NbIconModule,
NbCheckboxModule,
FormsModule,
ReactiveFormsModule,
ScreenshotsItemModule,
GalleryModule,
GauzyFiltersModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
NbButtonModule,
NbCardModule,
Expand All @@ -20,11 +19,9 @@ import { ManageAppointmentRoutingModule } from './manage-appointment-routing.mod
imports: [
ManageAppointmentRoutingModule,
NbCardModule,
FormsModule,
NbButtonModule,
NbInputModule,
EmployeeSchedulesModule,
ReactiveFormsModule,
NbIconModule,
NbSpinnerModule,
TimerPickerModule,
Expand Down
5 changes: 0 additions & 5 deletions apps/gauzy/src/app/pages/employees/employees.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
NbAccordionModule,
NbActionsModule,
Expand Down Expand Up @@ -101,9 +99,6 @@ const COMPONENTS = [

@NgModule({
imports: [
CommonModule,
FormsModule,
ReactiveFormsModule,
CKEditorModule,
NbAccordionModule,
NbActionsModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import {
NbButtonModule,
NbCardModule,
Expand Down Expand Up @@ -32,7 +31,6 @@ import { EventTypeMutationModule } from './event-type-mutation/event-type-mutati
SharedModule,
NbToastrModule,
NbCardModule,
FormsModule,
NbButtonModule,
NbInputModule,
NbIconModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// tslint:disable: nx-enforce-module-boundaries
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { NbButtonModule, NbCardModule, NbDialogModule, NbIconModule, NbTooltipModule } from '@nebular/theme';
import { FullCalendarModule } from '@fullcalendar/angular';
import { TranslateModule } from '@ngx-translate/core';
Expand All @@ -13,8 +11,6 @@ import { AvailabilitySlotsComponent } from './availability-slots.component';
@NgModule({
declarations: [AvailabilitySlotsComponent],
imports: [
CommonModule,
FormsModule,
NbButtonModule,
NbCardModule,
NbDialogModule,
Expand Down
Loading

0 comments on commit d1332fe

Please sign in to comment.