Jelajahi Sumber

moved icon to shared

Warafear 10 bulan lalu
induk
melakukan
e0b3f534e3

+ 0 - 3
src/app/journal/journal.module.ts

@@ -36,7 +36,6 @@ import { InitiativeComponent } from './journal-stats/info-row/initiative/initiat
 import { ConditionsDetailsComponent } from './journal-stats/info-row/conditions/conditions-details/conditions-details.component';
 import { DeathSaveComponent } from './journal-stats/life/death-save/death-save.component';
 import { LifeComponent } from './journal-stats/life/life.component';
-import { IconComponent } from './icon/icon.component';
 import { WeaponTableComponent } from './journal-stats/weapons-container/weapon-table/weapon-table.component';
 import { WeaponModalComponent } from './journal-stats/weapons-container/weapon-table/weapon-modal/weapon-modal.component';
 import { SpellTableComponent } from './journal-stats/weapons-container/spell-table/spell-table.component';
@@ -53,7 +52,6 @@ import { ConditionsComponent } from './journal-stats/info-row/conditions/conditi
 import { AttributeDetailsComponent } from './journal-stats/attribute-panel/attribute-field/attribute-details/attribute-details.component';
 import { SimpleItemDetailsComponent } from './journal-inventory/simple-item-details/simple-item-details.component';
 import { ModalComponent } from './journal-home/modal/modal.component';
-
 import { SharedComponentsModule } from '../shared-components/shared-components.module';
 import { ProficienciesTableComponent } from './journal-stats/ability-panel/proficiencies-table/proficiencies-table.component';
 import { ToolsModalComponent } from './journal-stats/ability-panel/proficiencies-table/tools-modal/tools-modal.component';
@@ -114,7 +112,6 @@ import { CombinedComponent } from './journal-character/combined/combined.compone
     InitiativeComponent,
     DeathSaveComponent,
     LifeComponent,
-    IconComponent,
     WeaponTableComponent,
     SpellTableComponent,
     SpellModalComponent,

+ 10 - 6
src/app/shared-components/full-spellcard/full-spellcard.component.html

@@ -74,11 +74,11 @@
                       {{ "general.dice" | translate }}{{ damage.diceType }}
                     </span>
                     <span>
-                      <!-- <icon
-                [size]="'xs'"
-                [type]="'damage'"
-                [icon]="damage.damageType"
-              ></icon> -->
+                      <icon
+                        [size]="'xs'"
+                        [type]="'damage'"
+                        [icon]="damage.damageType"
+                      ></icon>
                     </span>
                   </div>
                 }
@@ -93,7 +93,11 @@
                     <span>+{{ spell.heal?.additionalHeal }} </span>
                   }
                   <span>
-                    <!-- <icon [size]="'xs'" [type]="'damage'" [icon]="'heal'"></icon> -->
+                    <icon
+                      [size]="'xs'"
+                      [type]="'damage'"
+                      [icon]="'heal'"
+                    ></icon>
                   </span>
                 </div>
               }

+ 0 - 0
src/app/journal/icon/icon.component.html → src/app/shared-components/icon/icon.component.html


+ 0 - 0
src/app/journal/icon/icon.component.scss → src/app/shared-components/icon/icon.component.scss


+ 0 - 0
src/app/journal/icon/icon.component.spec.ts → src/app/shared-components/icon/icon.component.spec.ts


+ 0 - 0
src/app/journal/icon/icon.component.ts → src/app/shared-components/icon/icon.component.ts


+ 3 - 0
src/app/shared-components/shared-components.module.ts

@@ -9,6 +9,7 @@ import { FormsModule } from '@angular/forms';
 import { MatRippleModule } from '@angular/material/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { DurationPipe } from '../../pipes/duration/duration.pipe';
+import { IconComponent } from './icon/icon.component';
 
 @NgModule({
   declarations: [
@@ -17,6 +18,7 @@ import { DurationPipe } from '../../pipes/duration/duration.pipe';
     FullSpellcardComponent,
     IconButtonComponent,
     ValueBoxComponent,
+    IconComponent,
   ],
   exports: [
     SwitchComponent,
@@ -27,6 +29,7 @@ import { DurationPipe } from '../../pipes/duration/duration.pipe';
     FormsModule,
     MatRippleModule,
     TranslateModule,
+    IconComponent,
   ],
   imports: [
     CommonModule,