Skip to content

Commit

Permalink
style: add ui divider in all menus (#1773)
Browse files Browse the repository at this point in the history
Co-authored-by: Antoine Hurard <antoine.reliefapps@gmail.com>
  • Loading branch information
NathanHGit and AntoineRelief committed Aug 30, 2023
1 parent 8b135a1 commit 1e06f84
Show file tree
Hide file tree
Showing 20 changed files with 32 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<ui-icon icon="edit" variant="grey"></ui-icon>
{{ 'common.edit' | translate }}
</button>
<ui-divider class="py-1"></ui-divider>
<button uiMenuItem (click)="onDelete(element)">
<ui-icon icon="delete" variant="danger"></ui-icon>
{{ 'common.delete' | translate }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
ButtonModule,
TableModule,
DialogModule,
DividerModule,
} from '@oort-front/ui';

/**
Expand All @@ -33,6 +34,7 @@ import {
SafeEmptyModule,
ButtonModule,
TableModule,
DividerModule,
],
exports: [PositionComponent],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
<ui-icon icon="edit" variant="grey"></ui-icon>
{{ 'common.edit' | translate }}
</button>
<ui-divider class="py-1"></ui-divider>
<button uiMenuItem (click)="onDeleteAggregation(element)">
<ui-icon icon="delete" variant="danger"></ui-icon>
{{ 'common.delete' | translate }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { AggregationsTabRoutingModule } from './aggregations-tab-routing.module';
import { OverlayModule } from '@angular/cdk/overlay';
import { IconModule } from '@oort-front/ui';
import { DividerModule, IconModule } from '@oort-front/ui';
import { TranslateModule } from '@ngx-translate/core';
import {
SafeAggregationBuilderModule,
Expand Down Expand Up @@ -37,6 +37,7 @@ import {
SafeEmptyModule,
ButtonModule,
TableModule,
DividerModule,
],
})
export class AggregationsTabModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<ui-icon icon="edit" variant="grey"></ui-icon>
{{ 'common.edit' | translate }}
</button>
<ui-divider class="py-1"></ui-divider>
<button uiMenuItem (click)="onDeleteCalculatedField(element)">
<ui-icon icon="delete" variant="danger"></ui-icon>
{{ 'common.delete' | translate }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { CalculatedFieldsTabRoutingModule } from './calculated-fields-tab-routing.module';
import { OverlayModule } from '@angular/cdk/overlay';
import { IconModule } from '@oort-front/ui';
import { DividerModule, IconModule } from '@oort-front/ui';
import { TranslateModule } from '@ngx-translate/core';
import { SafeEmptyModule } from '@oort-front/safe';
import { CalculatedFieldsTabComponent } from './calculated-fields-tab.component';
Expand All @@ -23,6 +23,7 @@ import { MenuModule, ButtonModule, TableModule } from '@oort-front/ui';
SafeEmptyModule,
ButtonModule,
TableModule,
DividerModule,
],
})
export class CalculatedFieldsTabModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
<ui-icon icon="edit" variant="grey"></ui-icon>
{{ 'common.edit' | translate }}
</button>
<ui-divider class="py-1"></ui-divider>
<button
uiMenuItem
(click)="deleteForm(element, $event)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsTabRoutingModule } from './forms-tab-routing.module';
import { FormsTabComponent } from './forms-tab.component';
import { IconModule } from '@oort-front/ui';
import { DividerModule, IconModule } from '@oort-front/ui';
import { TranslateModule } from '@ngx-translate/core';
import { SafeDateModule, SafeSkeletonTableModule } from '@oort-front/safe';
import {
Expand All @@ -28,6 +28,7 @@ import {
ButtonModule,
TableModule,
ChipModule,
DividerModule,
],
})
export class FormsTabModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<ui-icon icon="edit" variant="grey"></ui-icon>
{{ 'common.edit' | translate }}
</button>
<ui-divider class="py-1"></ui-divider>
<button uiMenuItem (click)="onDeleteLayout(element)">
<ui-icon icon="delete" variant="danger"></ui-icon>
{{ 'common.delete' | translate }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { LayoutsTabRoutingModule } from './layouts-tab-routing.module';
import { OverlayModule } from '@angular/cdk/overlay';
import { IconModule } from '@oort-front/ui';
import { DividerModule, IconModule } from '@oort-front/ui';
import { TranslateModule } from '@ngx-translate/core';
import {
SafeDateModule,
Expand Down Expand Up @@ -35,6 +35,7 @@ import {
SafeEmptyModule,
ButtonModule,
TableModule,
DividerModule,
],
})
export class LayoutsTabModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
| translate : { name: 'common.child' | translate }
}}
</button>
<ui-divider class="py-1"></ui-divider>
<button
*ngIf="!showDeletedRecords"
uiMenuItem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
import { RecordsTabRoutingModule } from './records-tab-routing.module';
import { RecordsTabComponent } from './records-tab.component';
import { OverlayModule } from '@angular/cdk/overlay';
import { IconModule } from '@oort-front/ui';
import { DividerModule, IconModule } from '@oort-front/ui';
import { TranslateModule } from '@ngx-translate/core';
import { SafeSkeletonTableModule, SafeEmptyModule } from '@oort-front/safe';
import { UploadMenuModule } from '../../../../components/upload-menu/upload-menu.module';
Expand Down Expand Up @@ -34,6 +34,7 @@ import {
SafeEmptyModule,
ButtonModule,
TableModule,
DividerModule,
],
})
export class RecordsTabModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<ui-icon icon="edit" variant="grey"></ui-icon>
{{ 'common.edit' | translate }}
</button>
<ui-divider class="py-1"></ui-divider>
<button uiMenuItem (click)="onDeleteAggregation(element)">
<ui-icon icon="delete" variant="danger"></ui-icon>
{{ 'common.delete' | translate }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { AggregationTableComponent } from './aggregation-table.component';
import { IconModule } from '@oort-front/ui';
import { DividerModule, IconModule } from '@oort-front/ui';
import { TranslateModule } from '@ngx-translate/core';
import { DragDropModule } from '@angular/cdk/drag-drop';
import { SafeDateModule } from '../../../pipes/date/date.module';
Expand All @@ -19,6 +19,7 @@ import { MenuModule, ButtonModule, TableModule } from '@oort-front/ui';
SafeDateModule,
ButtonModule,
TableModule,
DividerModule,
],
exports: [AggregationTableComponent],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<ui-icon icon="edit" variant="grey"></ui-icon>
{{ 'common.edit' | translate }}
</button>
<ui-divider class="py-1"></ui-divider>
<button uiMenuItem (click)="onDeleteLayout(element)">
<ui-icon icon="delete" variant="danger"></ui-icon>
{{ 'common.delete' | translate }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { LayoutTableComponent } from './layout-table.component';
import { IconModule } from '@oort-front/ui';
import { DividerModule, IconModule } from '@oort-front/ui';
import { TranslateModule } from '@ngx-translate/core';
import { DragDropModule } from '@angular/cdk/drag-drop';
import { SafeDateModule } from '../../../pipes/date/date.module';
Expand All @@ -19,6 +19,7 @@ import { MenuModule, ButtonModule, TableModule } from '@oort-front/ui';
SafeDateModule,
ButtonModule,
TableModule,
DividerModule,
],
exports: [LayoutTableComponent],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<ui-icon icon="edit" variant="grey"></ui-icon>
{{ 'common.edit' | translate }}
</button>
<ui-divider class="py-1"></ui-divider>
<button uiMenuItem (click)="onDelete(index)">
<ui-icon icon="delete" variant="danger"></ui-icon>
{{ 'common.delete' | translate }}
Expand Down
4 changes: 3 additions & 1 deletion libs/safe/src/lib/components/mapping/mapping.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { SafeMappingComponent } from './mapping.component';
import { TranslateModule } from '@ngx-translate/core';
import { IconModule } from '@oort-front/ui';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
MenuModule,
ButtonModule,
TableModule,
DialogModule,
DividerModule,
IconModule,
} from '@oort-front/ui';

/**
Expand All @@ -26,6 +27,7 @@ import {
DialogModule,
ButtonModule,
TableModule,
DividerModule,
],
exports: [SafeMappingComponent],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { SafeTabFilterComponent } from './tab-filter/tab-filter.component';
import { SafeTabStyleComponent } from './tab-style/tab-style.component';
import { SafeTabLayoutPreviewComponent } from './tab-layout-preview/tab-layout-preview.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { IconModule } from '@oort-front/ui';
import { TranslateModule } from '@ngx-translate/core';
import { InputsModule } from '@progress/kendo-angular-inputs';
import { LabelModule } from '@progress/kendo-angular-label';
Expand All @@ -34,6 +33,8 @@ import {
AutocompleteModule,
TabsModule,
DateModule,
DividerModule,
IconModule,
} from '@oort-front/ui';

/**
Expand Down Expand Up @@ -79,6 +80,7 @@ import {
AlertModule,
FormWrapperModule,
SelectMenuModule,
DividerModule,
],
exports: [
SafeQueryBuilderComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
<ui-icon icon="edit" variant="grey"></ui-icon>
{{ 'common.edit' | translate }}
</button>
<ui-divider class="py-1"></ui-divider>
<button uiMenuItem (click)="delete.emit(i)">
<ui-icon icon="delete" variant="danger"></ui-icon>
{{ 'common.delete' | translate }}
Expand Down

0 comments on commit 1e06f84

Please sign in to comment.