fix: Remove bootstrap styles from @rucken/core move it to @rucken/web

rucken · Dec 9, 2018 · 215f892 · 215f892
1 parent 049f1bf
commit 215f892
Show file tree

Hide file tree

Showing 17 changed files with 301 additions and 336 deletions.
diff --git a/libs/rucken/core/src/lib/base/base-entity-list-modal.component.ts b/libs/rucken/core/src/lib/base/base-entity-list-modal.component.ts
@@ -44,8 +44,12 @@ export class BaseEntityListModalComponent<TModel extends IModel> implements IBas
   no = new EventEmitter<any>();
   @Output()
   yes = new EventEmitter<any>();
+
+  @Input()
+  yesClass: string;
   @Input()
-  yesClass = 'btn btn-primary';
+  noClass: string;
+
   @Input()
   hideNo = false;
   @Input()

diff --git a/libs/rucken/core/src/lib/base/base-entity-list.component.ts b/libs/rucken/core/src/lib/base/base-entity-list.component.ts
@@ -170,7 +170,7 @@ export class BaseEntityListComponent<TModel extends IModel> implements IBaseEnti
     const modalRef = await this.modalsService.createAsync<BasePromptFormModalComponent<TModel>>(
       this.modalView.component || this.modalItem.component,
       {
-        class: this.modalView.class || this.modalItem.class || 'modal-md',
+        class: this.modalView.class || this.modalItem.class,
         initialState: {
           title: title,
           noTitle: translate('Close'),
@@ -208,7 +208,7 @@ export class BaseEntityListComponent<TModel extends IModel> implements IBaseEnti
     const modalRef = await this.modalsService.createAsync<BasePromptFormModalComponent<TModel>>(
       this.modalCreate.component || this.modalItem.component,
       {
-        class: this.modalCreate.class || this.modalItem.class || 'modal-md',
+        class: this.modalCreate.class || this.modalItem.class,
         initialState: {
           title: title,
           yesTitle: translate('Create'),
@@ -274,7 +274,7 @@ export class BaseEntityListComponent<TModel extends IModel> implements IBaseEnti
     const modalRef = await this.modalsService.createAsync<BasePromptFormModalComponent<TModel>>(
       this.modalUpdate.component || this.modalItem.component,
       {
-        class: this.modalUpdate.class || this.modalItem.class || 'modal-md',
+        class: this.modalUpdate.class || this.modalItem.class,
         initialState: {
           title: title,
           yesTitle: translate('Save'),
@@ -343,7 +343,7 @@ export class BaseEntityListComponent<TModel extends IModel> implements IBaseEnti
     const modalRef = await this.modalsService.createAsync<BasePromptFormModalComponent<TModel>>(
       this.modalDelete.component || this.modalItem.component,
       {
-        class: this.modalDelete.class || this.modalItem.class || 'modal-md',
+        class: this.modalDelete.class || this.modalItem.class,
         initialState: {
           title: title,
           message: message,
@@ -408,7 +408,7 @@ export class BaseEntityListComponent<TModel extends IModel> implements IBaseEnti
     const modalRef = await this.modalsService.createAsync<BaseEntityListModalComponent<TModel>>(
       this.modalAppendFromGrid.component,
       {
-        class: this.modalAppendFromGrid.class || this.modalItem.class || 'modal-md',
+        class: this.modalAppendFromGrid.class || this.modalItem.class,
         initialState: {
           title: title,
           yesTitle: translate('Append'),

diff --git a/libs/rucken/core/src/lib/base/base-form.interface.ts b/libs/rucken/core/src/lib/base/base-form.interface.ts
@@ -15,6 +15,7 @@ export class IBaseForm {
   yes: EventEmitter<any>;
   disabled: boolean;
   yesClass: string;
+  noClass: string;
   hideNo: boolean;
   hideYes: boolean;
   readonly: boolean;

diff --git a/libs/rucken/core/src/lib/base/base-prompt-form-modal.component.ts b/libs/rucken/core/src/lib/base/base-prompt-form-modal.component.ts
@@ -34,8 +34,12 @@ export class BasePromptFormModalComponent<TModel extends IModel> implements IBas
   no = new EventEmitter<any>();
   @Output()
   yes = new EventEmitter<any>();
+
+  @Input()
+  yesClass: string;
   @Input()
-  yesClass = 'btn btn-primary';
+  noClass: string;
+
   @Input()
   hideNo = false;
   @Input()

diff --git a/libs/rucken/core/src/lib/base/base-prompt-modal.component.ts b/libs/rucken/core/src/lib/base/base-prompt-modal.component.ts
@@ -37,8 +37,12 @@ export class BasePromptModalComponent implements IBaseForm {
   yes = new EventEmitter<any>();
   @Input()
   disabled: boolean;
+
+  @Input()
+  yesClass: string;
   @Input()
-  yesClass = 'btn btn-primary';
+  noClass: string;
+
   @Input()
   hideNo = false;
   @Input()

diff --git a/libs/rucken/core/src/lib/base/base-prompt-panel.component.ts b/libs/rucken/core/src/lib/base/base-prompt-panel.component.ts
@@ -34,8 +34,12 @@ export class BasePromptPanelComponent<TModel extends IModel> implements ControlV
   no = new EventEmitter<any>();
   @Output()
   yes = new EventEmitter<any>();
+
+  @Input()
+  yesClass: string;
   @Input()
-  yesClass = 'btn btn-primary';
+  noClass: string;
+
   @Input()
   hideNo = false;
   @Input()

diff --git a/libs/rucken/core/src/lib/base/base-prompt.component.ts b/libs/rucken/core/src/lib/base/base-prompt.component.ts
@@ -32,8 +32,12 @@ export class BasePromptComponent implements IBaseForm {
   yes = new EventEmitter<any>();
   @Input()
   disabled: boolean;
+
+  @Input()
+  yesClass: string;
   @Input()
-  yesClass = 'btn btn-primary';
+  noClass: string;
+
   @Input()
   hideNo = false;
   @Input()

diff --git a/libs/rucken/core/src/lib/modules/auth-modal/auth-modal.service.ts b/libs/rucken/core/src/lib/modules/auth-modal/auth-modal.service.ts
@@ -14,6 +14,8 @@ export class AuthModalService {
   componentModal: string | TemplateRef<any> | any;
   signInInfoMessage: string;
   #InfoMessage: string;
+  signInModalClass: string;
+  signOutModalClass: string;
 
   constructor(
     public authService: AuthService,
@@ -29,7 +31,6 @@ export class AuthModalService {
         this.modalsService
           .errorAsync({
             error: translate('Your session has expired, please re-login'),
-            class: 'modal-md',
             onTop: true
           })
           .then(result => this.authService.signOut().subscribe(data => this.onSignOutSuccess(undefined)));
@@ -53,7 +54,7 @@ export class AuthModalService {
   }
   async onSignOutAsync() {
     const modalRef = await this.modalsService.createAsync<AuthModalComponent>(this.componentModal, {
-      class: 'modal-md',
+      class: this.signOutModalClass,
       initialState: {
         type: AuthModalTypeEnum.SignOut,
         noTitle: translate('No')
@@ -69,7 +70,7 @@ export class AuthModalService {
   }
   async onSignInAsync() {
     const modalRef = await this.modalsService.createAsync<AuthModalComponent>(this.componentModal, {
-      class: 'modal-xs',
+      class: this.signInModalClass,
       initialState: {
         type: AuthModalTypeEnum.SignIn,
         data: {},

diff --git a/libs/rucken/core/src/lib/modules/modals/modals.service.ts b/libs/rucken/core/src/lib/modules/modals/modals.service.ts
@@ -5,6 +5,9 @@ import { IModalRef } from './modal-ref.interface';
 export class ModalsService {
   componentInfoModal: string | TemplateRef<any> | any;
   componentErrorModal: string | TemplateRef<any> | any;
+  modalClass: string;
+  yesClass: string;
+  noClass: string;
 
   createAsync<TComponent>(
     component: string | TemplateRef<TComponent> | any,

diff --git a/libs/rucken/web/src/lib/components/entity-modal/entity-modal.component.html b/libs/rucken/web/src/lib/components/entity-modal/entity-modal.component.html
@@ -1,30 +1,23 @@
-<form
-    [formGroup]="form"
-    *ngIf="form"
-    novalidate>
-    <prompt-form-modal
-        [title]="title"
-        [message]="message"
-        [infoMessage]="infoMessage"
-        [errorMessage]="errorMessage"
-        [noTitle]="noTitle"
-        [yesTitle]="yesTitle"
-        [readonly]="readonly"
-        (no)="onNoClick()"
-        (yes)="onYesClick()"
-        [data]="data"
-        [processing]="processing$ | async">
-        <span *ngFor="let key of keys; let i = index">
-            <form-group
-                [checkIsDirty]="checkIsDirty"
-                [form]="form"
-                [name]="key"
-                [title]="strings[key]">
-                <input
-                    [formControlName]="key"
-                    [readonly]="readonly"
-                    [autofocus]="i===0">
-            </form-group>
-        </span>
-    </prompt-form-modal>
+<form [formGroup]="form" *ngIf="form" novalidate>
+  <prompt-form-modal
+    [title]="title"
+    [message]="message"
+    [infoMessage]="infoMessage"
+    [errorMessage]="errorMessage"
+    [noTitle]="noTitle"
+    [yesTitle]="yesTitle"
+    [readonly]="readonly"
+    (no)="onNoClick()"
+    (yes)="onYesClick()"
+    [data]="data"
+    [processing]="processing$ | async"
+    [yesClass]="yesClass"
+    [noClass]="noClass"
+  >
+    <span *ngFor="let key of keys; let i = index">
+      <form-group [checkIsDirty]="checkIsDirty" [form]="form" [name]="key" [title]="strings[key]">
+        <input [formControlName]="key" [readonly]="readonly" [autofocus]="i === 0" />
+      </form-group>
+    </span>
+  </prompt-form-modal>
 </form>
diff --git a/...n/web/src/lib/entities/content-types/content-type-modal/content-type-modal.component.html b/...n/web/src/lib/entities/content-types/content-type-modal/content-type-modal.component.html
@@ -1,36 +1,24 @@
-<form
-    [formGroup]="form"
-    novalidate>
-    <prompt-form-modal
-        [title]="title"
-        [message]="message"
-        [infoMessage]="infoMessage"
-        [errorMessage]="errorMessage"
-        [noTitle]="noTitle"
-        [yesTitle]="yesTitle"
-        [readonly]="readonly"
-        (no)="onNoClick()"
-        (yes)="onYesClick()"
-        [data]="data"
-        [processing]="processing$ | async">
-        <form-group
-            [checkIsDirty]="checkIsDirty"
-            [form]="form"
-            name="name"
-            [title]="strings.name">
-            <input
-                formControlName="name"
-                [readonly]="readonly"
-                focused>
-        </form-group>
-        <form-group
-            [checkIsDirty]="checkIsDirty"
-            [form]="form"
-            name="title"
-            [title]="strings.title">
-            <input
-                formControlName="title"
-                [readonly]="readonly">
-        </form-group>
-    </prompt-form-modal>
+<form [formGroup]="form" novalidate>
+  <prompt-form-modal
+    [title]="title"
+    [message]="message"
+    [infoMessage]="infoMessage"
+    [errorMessage]="errorMessage"
+    [noTitle]="noTitle"
+    [yesTitle]="yesTitle"
+    [readonly]="readonly"
+    (no)="onNoClick()"
+    (yes)="onYesClick()"
+    [data]="data"
+    [processing]="processing$ | async"
+    [yesClass]="yesClass"
+    [noClass]="noClass"
+  >
+    <form-group [checkIsDirty]="checkIsDirty" [form]="form" name="name" [title]="strings.name">
+      <input formControlName="name" [readonly]="readonly" focused />
+    </form-group>
+    <form-group [checkIsDirty]="checkIsDirty" [form]="form" name="title" [title]="strings.title">
+      <input formControlName="title" [readonly]="readonly" />
+    </form-group>
+  </prompt-form-modal>
 </form>
diff --git a/libs/rucken/web/src/lib/entities/groups/group-modal/group-modal.component.html b/libs/rucken/web/src/lib/entities/groups/group-modal/group-modal.component.html
@@ -1,42 +1,31 @@
-<form
-    [formGroup]="form"
-    novalidate>
-    <prompt-form-modal
-        [title]="title"
-        [message]="message"
-        [infoMessage]="infoMessage"
-        [errorMessage]="errorMessage"
-        [noTitle]="noTitle"
-        [yesTitle]="yesTitle"
-        [readonly]="readonly"
-        (no)="onNoClick()"
-        (yes)="onYesClick()"
-        [data]="data"
-        [processing]="processing$ | async">
-        <form-group
-            [checkIsDirty]="checkIsDirty"
-            [form]="form"
-            name="name"
-            [title]="strings.name">
-            <input
-                formControlName="name"
-                [readonly]="readonly"
-                focused>
-        </form-group>
-        <form-group
-            [checkIsDirty]="checkIsDirty"
-            [form]="form"
-            name="title"
-            [title]="strings.title">
-            <input
-                formControlName="title"
-                [readonly]="readonly">
-        </form-group>
-        <group-permissions-grid
-            [mockedItems]="data.permissions"
-            (mockedItemsChange)="onPermissionsChange($event)"
-            [readonly]="readonly"
-            [title]="strings.permissions"
-            [apiUrl]="apiUrl"></group-permissions-grid>
-    </prompt-form-modal>
+<form [formGroup]="form" novalidate>
+  <prompt-form-modal
+    [title]="title"
+    [message]="message"
+    [infoMessage]="infoMessage"
+    [errorMessage]="errorMessage"
+    [noTitle]="noTitle"
+    [yesTitle]="yesTitle"
+    [readonly]="readonly"
+    (no)="onNoClick()"
+    (yes)="onYesClick()"
+    [data]="data"
+    [processing]="processing$ | async"
+    [yesClass]="yesClass"
+    [noClass]="noClass"
+  >
+    <form-group [checkIsDirty]="checkIsDirty" [form]="form" name="name" [title]="strings.name">
+      <input formControlName="name" [readonly]="readonly" focused />
+    </form-group>
+    <form-group [checkIsDirty]="checkIsDirty" [form]="form" name="title" [title]="strings.title">
+      <input formControlName="title" [readonly]="readonly" />
+    </form-group>
+    <group-permissions-grid
+      [mockedItems]="data.permissions"
+      (mockedItemsChange)="onPermissionsChange($event)"
+      [readonly]="readonly"
+      [title]="strings.permissions"
+      [apiUrl]="apiUrl"
+    ></group-permissions-grid>
+  </prompt-form-modal>
 </form>