Merge branch 'release/0.10.5'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dndtools",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "scripts": {
     "ng": "ng",
     "start": "nx serve",

src/app/journal/journal-home/journal-home.component.ts

@@ -1,5 +1,6 @@
 import { Component, Renderer2, ElementRef } from '@angular/core';
 import { NavigationPanelService } from 'src/services/navigationPanel/navigation-panel.service';
+import { ModalService } from 'src/services/modal/modal.service';
 
 @Component({
   selector: 'app-journal-home',
@@ -13,6 +14,7 @@ export class JournalHomeComponent {
     public navigation: NavigationPanelService,
     private renderer: Renderer2,
     private el: ElementRef,
+    public modalService: ModalService,
   ) {}
 
   ngOnInit() {
@@ -22,7 +24,14 @@ export class JournalHomeComponent {
     });
 
     window.addEventListener('mousemove', (event) => {
-      if (event.clientX < 10 && !this.isNavigationOpen) {
+      if (event.clientX < 10) {
+        console.log(this.isNavigationOpen);
+      }
+      if (
+        event.clientX < 10 &&
+        !this.isNavigationOpen &&
+        !this.modalService.isModalOpen
+      ) {
         this.navigation.openNavigation();
       }
     });

src/app/journal/journal-spellcards/journal-spellcards.component.ts

@@ -96,6 +96,8 @@ export class JournalSpellcardsComponent {
           }, 100);
         } else if (result.state === 'add') {
           this.dataAccessor.addFavoriteSpell(spell);
+        } else if (result.state === 'removeFromFavorites') {
+          this.dataAccessor.removeFavoriteSpell(spell);
         }
       },
     );

src/app/journal/journal-stats/weapons-container/spell-table/spell-table.component.ts

@@ -33,8 +33,9 @@ export class SpellTableComponent {
   }
 
   public showFullSpellcard(spellIndex: number): void {
+    const spell = this.spells[spellIndex];
     this.modalAccessor.openModal(FullSpellcardComponent, {
-      spell: this.spells[spellIndex],
+      spell: spell,
       isFromDashboard: true,
     });
     const resultSubscription = this.modalAccessor.result$.subscribe(
@@ -43,6 +44,8 @@ export class SpellTableComponent {
         if (result.state === 'remove') {
           this.spells.splice(spellIndex, 1);
           this.updateSpellsInDatabase();
+        } else if (result.state === 'removeFromFavorites') {
+          this.dataAccessor.removeFavoriteSpell(spell);
         }
       },
     );

src/app/shared-components/full-spellcard/full-spellcard.component.html

@@ -107,7 +107,9 @@
           } @else if (spell.needsAttackRoll) {
             <div class="name">{{ "fullSpellcards.attack" | translate }}</div>
           } @else {
-            <div class="name">{{ "fullSpellcards.modifier" | translate }}</div>
+            <div class="name">
+              {{ "fullSpellcards.modifier" | translate }}
+            </div>
           }
         </div>
         <div class="value">
@@ -241,4 +243,25 @@
       'var(--' + spell.school.toLowerCase() + '-border-large)'
     "
   ></div>
+  <div class="button-container">
+    @if (spell.isCustom && !isFromDashboard) {
+      <button class="green" (click)="update()">Bearbeiten</button>
+    }
+    <button
+      [class]="alreadyInFavorites ? 'red' : 'green'"
+      (click)="alreadyInFavorites ? removeFromFavorites() : addToFavorites()"
+    >
+      @if (alreadyInFavorites) {
+        Aus Favoriten entfernen
+      } @else {
+        Zu Favoriten hinzufügen
+      }
+    </button>
+    @if (!isFromDashboard) {
+      <button class="red" (click)="remove()">Entfernen</button>
+      @if (spell.isCustom) {
+        <button class="red" (click)="delete()">Endgültig löschen</button>
+      }
+    }
+  </div>
 </div>

src/app/shared-components/full-spellcard/full-spellcard.component.scss

@@ -12,6 +12,12 @@
   z-index: 1;
 }
 
+// .spellmodal-container {
+//   display: flex;
+//   justify-content: center;
+//   align-items: center;
+// }
+
 .card-container {
   width: 38rem;
   height: 50rem;
@@ -118,7 +124,6 @@
     flex-direction: column;
     justify-content: space-evenly;
     .stats-row {
-      //   margin-top: 0.8rem;
       display: flex;
       align-items: center;
       width: 14.5rem;
@@ -193,3 +198,59 @@
   margin: 0 auto;
   padding: 1rem;
 }
+
+.button-container {
+  position: absolute;
+  left: 38rem;
+  top: 2rem;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  gap: 1.5rem;
+  margin-left: 1.5rem;
+
+  button {
+    display: block;
+    font-size: 1.25rem;
+    font-weight: 600;
+    height: 4rem;
+    width: 10rem;
+    border-radius: 10px;
+    cursor: pointer;
+    box-shadow: var(--shadow);
+    transition: background-color 0.25s ease-in-out;
+  }
+
+  .disabled {
+    cursor: not-allowed;
+    filter: grayscale(50%);
+  }
+
+  .green {
+    background-color: var(--accept);
+    &:hover {
+      background-color: var(--accept-hover);
+    }
+  }
+
+  .red {
+    background-color: var(--delete);
+    &:hover {
+      background-color: var(--delete-hover);
+    }
+  }
+
+  .blue {
+    background-color: var(--edit);
+    &:hover {
+      background-color: var(--edit-hover);
+    }
+  }
+
+  .neutral {
+    background-color: var(--neutral);
+    &:hover {
+      background-color: var(--neutral-hover);
+    }
+  }
+}

src/app/shared-components/full-spellcard/full-spellcard.component.ts

@@ -12,10 +12,7 @@ import { TranslateService } from '@ngx-translate/core';
 export class FullSpellcardComponent {
   @Input() public spell!: Spell;
   @Input() public isFromDashboard!: boolean;
-  @Input() public alreadyInFavorites!: boolean;
-
-  public saveDC: number = 0;
-  public attackBonus: string = '+3';
+  @Input() public alreadyInFavorites: boolean = true;
 
   public constructor(
     private modalAccessor: ModalService,
@@ -23,10 +20,6 @@ export class FullSpellcardComponent {
     public translate: TranslateService,
   ) {}
 
-  // ngOnInit(): void {
-  //   console.log('Der zauber: ', this.spell);
-  // }
-
   public setBackupImage(event: any): void {
     event.target.src = 'assets/images/spells/backup.jpg';
   }
@@ -46,4 +39,10 @@ export class FullSpellcardComponent {
   public addToFavorites(): void {
     this.modalAccessor.handleModalClosing('add', undefined);
   }
+
+  public removeFromFavorites(): void {
+    console.log('removeFromFavorites');
+
+    this.modalAccessor.handleModalClosing('removeFromFavorites', undefined);
+  }
 }

src/app/shared-components/ui-button/ui-button.component.html

@@ -1,4 +1,7 @@
-<button [class]="width + ' ' + color">
+<button
+  [disabled]="disabled"
+  [class]="disabled ? width + ' ' + color + '' + disabled : width + ' ' + color"
+>
   <!-- <ng-content></ng-content> -->
   {{ "buttons." + type | translate }}
 </button>

src/app/shared-components/ui-button/ui-button.component.scss

@@ -12,6 +12,11 @@ button {
   width: 100%;
 }
 
+.disabled {
+  cursor: not-allowed;
+  filter: grayscale(50%);
+}
+
 .green {
   background-color: var(--accept);
   &:hover {

src/app/shared-components/ui-button/ui-button.component.ts

@@ -6,6 +6,9 @@ import { Component, Input } from '@angular/core';
   styleUrls: ['./ui-button.component.scss'],
 })
 export class UiButtonComponent {
+  /** Defines if the ui-button is disabled */
+  @Input() disabled: boolean = false;
+
   /** Available colors: green | red | blue | neutral */
   @Input() type: string = 'default';
 

src/assets/i18n/de.json

@@ -70,7 +70,10 @@
     "close": "Schließen",
     "discard": "Verwerfen",
     "export": "Exportieren",
-    "deleteSelected": "Ausgewählte löschen"
+    "deleteSelected": "Ausgewählte löschen",
+    "addToFavorites": "Zu Favoriten hinzufügen",
+    "alradyInFavorites": "Bereits in Favoriten",
+    "finalDelete": "Endgültig löschen?"
   },
   "time": {
     "action": "Aktion",
@@ -788,7 +791,7 @@
     "hint": "Die App befindet sich immer noch in einem Entwicklungsstadium und es können Fehler auftreten",
     "issues": "<p>Fehler und Anmerkungen bitte auf dem <a href='https://gogs.koljastrohm-games.com/Warafear/DNDTools/issues'>Git-Server in Issues</a> vermerken.<p>",
     "okay": "Verstanden",
-    "version": "0.10.4",
+    "version": "0.10.5",
     "test": "Test"
   }
 }

src/assets/i18n/en.json

@@ -785,7 +785,7 @@
     "hint": "The app is still in a development stage and errors may occur",
     "issues": "<p>Please note errors and comments on the <a href='https://gogs.koljastrohm-games.com/Warafear/DNDTools/issues'>Git server in Issues</a>.<p>",
     "okay": "Understood",
-    "version": "0.10.4",
+    "version": "0.10.5",
     "test": "Test"
   }
 }

src/fonts.scss

@@ -0,0 +1,212 @@
+@font-face {
+  font-family: "Bookinsanity";
+  src:
+    local("Bookinsanity Remake"),
+    local("Bookinsanity"),
+    url("assets/fonts/Bookinsanity/Bookinsanity.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Bookinsanity/Bookinsanity.otf")
+      format("opentype");
+}
+@font-face {
+  font-family: "Bookinsanity";
+  src:
+    local("Bookinsanity Remake"),
+    local("Bookinsanity"),
+    url("assets/fonts/Bookinsanity/Bookinsanity Bold Italic.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Bookinsanity/Bookinsanity%20Bold%20Italic.otf")
+      format("opentype");
+  font-weight: bold;
+  font-style: italic;
+}
+@font-face {
+  font-family: "Bookinsanity";
+  src:
+    local("Bookinsanity Remake"),
+    local("Bookinsanity"),
+    url("assets/fonts/Bookinsanity/Bookinsanity Bold.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Bookinsanity/Bookinsanity%20Bold.otf")
+      format("opentype");
+  font-weight: bold;
+}
+@font-face {
+  font-family: "Bookinsanity";
+  src:
+    local("Bookinsanity Remake"),
+    local("Bookinsanity"),
+    url("assets/fonts/Bookinsanity/Bookinsanity Italic.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Bookinsanity/Bookinsanity%20Italic.otf")
+      format("opentype");
+  font-style: italic;
+}
+@font-face {
+  font-family: "Zatanna Misdirection";
+  src:
+    local("Zatanna Misdirection Remake"),
+    local("Zatanna Misdirection"),
+    url("assets/fonts/Zatanna Misdirection/Zatanna Misdirection.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Zatanna%20Misdirection/Zatanna%20Misdirection.otf")
+      format("opentype");
+}
+@font-face {
+  font-family: "Zatanna Misdirection";
+  src:
+    local("Zatanna Misdirection Remake"),
+    local("Zatanna Misdirection"),
+    url("assets/fonts/Zatanna Misdirection/Zatanna Misdirection Bold Italic.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Zatanna%20Misdirection/Zatanna%20Misdirection%20Bold%20Italic.otf")
+      format("opentype");
+  font-weight: bold;
+  font-style: italic;
+}
+@font-face {
+  font-family: "Zatanna Misdirection";
+  src:
+    local("Zatanna Misdirection Remake"),
+    local("Zatanna Misdirection"),
+    url("assets/fonts/Zatanna Misdirection/Zatanna Misdirection Bold.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Zatanna%20Misdirection/Zatanna%20Misdirection%20Bold.otf")
+      format("opentype");
+  font-weight: bold;
+}
+@font-face {
+  font-family: "Zatanna Misdirection";
+  src:
+    local("Zatanna Misdirection Remake"),
+    local("Zatanna Misdirection"),
+    url("assets/fonts/Zatanna Misdirection/Zatanna Misdirection Italic.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Zatanna%20Misdirection/Zatanna%20Misdirection%20Italic.otf")
+      format("opentype");
+  font-style: italic;
+}
+@font-face {
+  font-family: "NodestoCapsCondensed";
+  src:
+    local("NodestoCapsCondensed"),
+    url("assets/fonts/NodestoCapsCondensed/NodestoCapsCondensed.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Nodesto%20Caps%20Condensed/Nodesto%20Caps%20Condensed.otf")
+      format("opentype");
+}
+@font-face {
+  font-family: "NodestoCapsCondensed";
+  src:
+    local("NodestoCapsCondensed"),
+    url("assets/fonts/NodestoCapsCondensed/NodestoCapsCondensed-Bold-Italic.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Nodesto%20Caps%20Condensed/Nodesto%20Caps%20Condensed%20Bold%20Italic.otf")
+      format("opentype");
+  font-weight: bold;
+  font-style: italic;
+}
+@font-face {
+  font-family: "NodestoCapsCondensed";
+  src:
+    local("NodestoCapsCondensed"),
+    url("assets/fonts/NodestoCapsCondensed/NodestoCapsCondensed-Bold.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Nodesto%20Caps%20Condensed/Nodesto%20Caps%20Condensed%20Bold.otf")
+      format("opentype");
+  font-weight: bold;
+}
+@font-face {
+  font-family: "NodestoCapsCondensed";
+  src:
+    local("NodestoCapsCondensed"),
+    url("assets/fonts/NodestoCapsCondensed/NodestoCapsCondensed-Italic.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Nodesto%20Caps%20Condensed/Nodesto%20Caps%20Condensed%20Italic.otf")
+      format("opentype");
+  font-style: italic;
+}
+@font-face {
+  font-family: "Mr Eaves Small Caps";
+  src:
+    local("Mr Eaves Small Caps"),
+    url("assets/fonts/Mr Eaves/Mr Eaves Small Caps.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Mr%20Eaves/Mr%20Eaves%20Small%20Caps.otf")
+      format("opentype");
+}
+@font-face {
+  font-family: "Scaly Sans";
+  src:
+    local("Scaly Sans"),
+    url("assets/fonts/Scaly Sans/Scaly Sans.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Scaly%20Sans/Scaly%20Sans.otf")
+      format("opentype");
+}
+@font-face {
+  font-family: "Scaly Sans";
+  src:
+    local("Scaly Sans"),
+    url("assets/fonts/Scaly Sans/Scaly Sans Bold Italic.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Scaly%20Sans/Scaly%20Sans%20Bold%20Italic.otf")
+      format("opentype");
+  font-weight: bold;
+  font-style: italic;
+}
+@font-face {
+  font-family: "Scaly Sans";
+  src:
+    local("Scaly Sans"),
+    url("assets/fonts/Scaly Sans/Scaly Sans Bold.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Scaly%20Sans/Scaly%20Sans%20Bold.otf")
+      format("opentype");
+  font-weight: bold;
+}
+@font-face {
+  font-family: "Scaly Sans";
+  src:
+    local("Scaly Sans"),
+    url("assets/fonts/Scaly Sans/Scaly Sans Italic.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Scaly%20Sans/Scaly%20Sans%20Italic.otf")
+      format("opentype");
+  font-style: italic;
+}
+@font-face {
+  font-family: "Scaly Sans Caps";
+  src:
+    local("Scaly Sans Caps"),
+    url("assets/fonts/Scaly Sans Caps/Scaly Sans Caps.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Scaly%20Sans%20Caps/Scaly%20Sans%20Caps.otf")
+      format("opentype");
+}
+@font-face {
+  font-family: "Scaly Sans Caps";
+  src:
+    local("Scaly Sans Caps"),
+    url("assets/fonts/Scaly Sans Caps/Scaly Sans Caps Bold Italic.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Scaly%20Sans%20Caps/Scaly%20Sans%20Caps%20Bold%20Italic.otf")
+      format("opentype");
+  font-weight: bold;
+  font-style: italic;
+}
+@font-face {
+  font-family: "Scaly Sans Caps";
+  src:
+    local("Scaly Sans Caps"),
+    url("assets/fonts/Scaly Sans Caps/Scaly Sans Caps Bold.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Scaly%20Sans%20Caps/Scaly%20Sans%20Caps%20Bold.otf")
+      format("opentype");
+  font-weight: bold;
+}
+@font-face {
+  font-family: "Scaly Sans Caps";
+  src:
+    local("Scaly Sans Caps"),
+    url("assets/fonts/Scaly Sans Caps/Scaly Sans Caps Italic.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Scaly%20Sans%20Caps/Scaly%20Sans%20Caps%20Italic.otf")
+      format("opentype");
+  font-style: italic;
+}
+@font-face {
+  font-family: "Solbera Imitation";
+  src:
+    local("Solbera Imitation"),
+    url("assets/fonts/Solbera Imitation/Solbera Imitation.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Solbera%20Imitation/Solbera%20Imitation.otf")
+      format("opentype");
+}
+@font-face {
+  font-family: "Dungeon Drop Case";
+  src:
+    local("Dungeon Drop Case"),
+    url("assets/fonts/Dungeon Drop Case/Dungeon Drop Case.otf"),
+    url("https://raw.githubusercontent.com/jonathonf/solbera-dnd-fonts/master/Dungeon%20Drop%20Case/Dungeon%20Drop%20Case.otf")
+      format("opentype");
+}

src/services/data/data.service.ts

@@ -237,7 +237,9 @@ export class DataService {
   }
 
   public removeFavoriteSpell(spell: Spell): void {
-    const index = this._favoriteSpells.indexOf(spell);
+    const index = this._favoriteSpells.findIndex(
+      (favorite) => favorite.id === spell.id,
+    );
     if (index > -1) {
       this._favoriteSpells.splice(index, 1);
       this.setData('favoriteSpells', { spells: this._favoriteSpells });

src/services/modal/modal.service.ts

@@ -14,13 +14,18 @@ export class ModalService {
   private _resultSubject = new Subject<any>();
   result$ = this._resultSubject.asObservable();
 
+  private _isModalOpen = false;
+  public get isModalOpen(): boolean {
+    return this._isModalOpen;
+  }
+
   /**
    * Opens the modal with the specified component and provides the data as input for the component.
    * @param component The component to open in the modal.
    * @param data The data for the input of the component.
    */
   public openModal(component: any, data: any) {
-    console.log('ModalService: openModal');
+    this._isModalOpen = true;
     this._modalSubject.next({ component, data });
   }
 
@@ -30,8 +35,9 @@ export class ModalService {
    * @param data The oprional data object that eg contains a new or modifed weapon object.
    */
   public handleModalClosing(result: any, data?: any) {
-    //The host components subscribe to the result$ Observable to get the result of the modal
+    //The host components subscribes to the result$ Observable to get the result of the modal
     this._resultSubject.next({ state: result, data: data });
     this._closeModalSubject.next('close');
+    this._isModalOpen = false;
   }
 }

src/styles.scss

@@ -6,12 +6,10 @@
 @import url("./helpers.scss");
 @import url("./button-styles.scss");
 @import url("./colors.scss");
-// @import url("./responsive.scss");
-
 @import "responsive";
+@import "fonts";
 
 // LISTS
-
 .item-list {
   width: 100%;
   overflow: auto;