Browse Source

Removed global navbar to enlarge the available screen size

Warafear 1 year ago
parent
commit
b5d8d64d4f

+ 36 - 0
.nx/cache/d/daemon.log

@@ -463112,3 +463112,39 @@ To fix this, set a unique name for each project in a project.json inside the pro
     at async processFilesAndCreateAndSerializeProjectGraph (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:138:17)
     at async processFilesAndCreateAndSerializeProjectGraph (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:138:17)
 [NX Daemon Server] - 2024-01-21T13:57:09.776Z - Time taken for 'hash changed files from watcher' 263.76770001649857ms
 [NX Daemon Server] - 2024-01-21T13:57:09.776Z - Time taken for 'hash changed files from watcher' 263.76770001649857ms
 [NX Daemon Server] - 2024-01-21T13:57:09.776Z - Done responding to the client null
 [NX Daemon Server] - 2024-01-21T13:57:09.776Z - Done responding to the client null
+[NX Daemon Server] - 2024-01-22T16:16:36.444Z - Started listening on: \\.\pipe\nx\C:\Users\chris\AppData\Local\Temp\83d14e7134fc08a15480\d.sock
+[NX Daemon Server] - 2024-01-22T16:16:36.451Z - [WATCHER]: Subscribed to changes within: c:\Softwareprojekte\DnD (native)
+[NX Daemon Server] - 2024-01-22T16:16:36.453Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-01-22T16:16:36.454Z - Established a connection. Number of open connections: 2
+[NX Daemon Server] - 2024-01-22T16:16:36.457Z - Closed a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-01-22T16:16:36.459Z - [REQUEST]: Client Request for Project Graph Received
+[NX Daemon Server] - 2024-01-22T16:16:37.543Z - Error detected when recomputing project file map: The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+[NX Daemon Server] - 2024-01-22T16:16:37.544Z - [REQUEST]: Responding to the client with an error. Error when preparing serialized project graph. The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+Error: The following projects are defined in multiple locations:
+- DnDTools: 
+  - 
+  - .
+
+To fix this, set a unique name for each project in a project.json inside the project's root. If the project does not currently have a project.json, you can create one that contains only a name.
+    at readProjectConfigurationsFromRootMap (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\project-configuration-utils.js:97:15)
+    at buildProjectsConfigurationsFromProjectPathsAndPlugins (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\project-configuration-utils.js:70:19)
+    at createProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:131:129)
+    at WorkspaceContext.<anonymous> (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:82:39)
+    at getProjectConfigurationsFromContext (c:\Softwareprojekte\DnD\node_modules\nx\src\utils\workspace-context.js:26:29)
+    at _retrieveProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:81:72)
+    at retrieveProjectConfigurations (c:\Softwareprojekte\DnD\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:58:12)
+    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
+    at async processCollectedUpdatedAndDeletedFiles (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:102:34)
+    at async processFilesAndCreateAndSerializeProjectGraph (c:\Softwareprojekte\DnD\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:138:17)
+[NX Daemon Server] - 2024-01-22T16:16:37.545Z - Time taken for 'hash changed files from watcher' 378.6278000175953ms
+[NX Daemon Server] - 2024-01-22T16:16:37.546Z - Done responding to the client null

+ 1 - 1
.nx/cache/d/server-process.json

@@ -1 +1 @@
-{"processId":19204}
+{"processId":19228}

+ 1 - 1
src/app/character/character-picker/character-card/character-card.component.html

@@ -14,7 +14,7 @@
   <img [src]="image" alt="portrait" />
   <img [src]="image" alt="portrait" />
   } @else {
   } @else {
   <img
   <img
-    [src]="'assets/images/' + characterData.gender + '.jpg'"
+    [src]="'assets/images/' + characterData.gender.toLowerCase() + '.jpg'"
     alt="character"
     alt="character"
   />
   />
   }
   }

+ 3 - 5
src/app/journal/journal-home/journal-home.component.html

@@ -2,14 +2,12 @@
   <!-- Here the different pages are rendered -->
   <!-- Here the different pages are rendered -->
   <router-outlet></router-outlet>
   <router-outlet></router-outlet>
 
 
-  <tab-bar #tabbar id="tabbar" [class]="hideTabbar() ? 'hidden' : ''"></tab-bar>
+  <!-- <tab-bar #tabbar id="tabbar" [class]="hideTabbar() ? 'hidden' : ''"></tab-bar> -->
 
 
   <details-panel></details-panel>
   <details-panel></details-panel>
 
 
-  <navigation-panel
-    [showAdditionalNavigation]="hideTabbar()"
-    (activeTabChanged)="onNavigationUpdated($event)"
-  ></navigation-panel>
+  <!-- [showAdditionalNavigation]="hideTabbar()" -->
+  <navigation-panel></navigation-panel>
 
 
   <modal></modal>
   <modal></modal>
 </div>
 </div>

+ 18 - 8
src/app/journal/journal-home/navigation-panel/navigation-panel.component.html

@@ -1,11 +1,12 @@
 <div #navigationBackdrop class="backdrop" (click)="closePanel()"></div>
 <div #navigationBackdrop class="backdrop" (click)="closePanel()"></div>
 <div #navigationPanel class="panel">
 <div #navigationPanel class="panel">
   <h2 style="margin-bottom: 1.5rem">Menu</h2>
   <h2 style="margin-bottom: 1.5rem">Menu</h2>
+  {{ active }}
   <ul>
   <ul>
-    @if(showAdditionalNavigation){
     <li>
     <li>
       <div
       <div
         class="navigation-entry"
         class="navigation-entry"
+        [ngClass]="active === 1 ? 'active' : ''"
         (click)="setActiveProperty(1)"
         (click)="setActiveProperty(1)"
         [routerLink]="'./stats'"
         [routerLink]="'./stats'"
       >
       >
@@ -15,6 +16,7 @@
     <li>
     <li>
       <div
       <div
         class="navigation-entry"
         class="navigation-entry"
+        [ngClass]="active === 2 ? 'active' : ''"
         (click)="setActiveProperty(2)"
         (click)="setActiveProperty(2)"
         [routerLink]="'./character'"
         [routerLink]="'./character'"
       >
       >
@@ -24,6 +26,7 @@
     <li>
     <li>
       <div
       <div
         class="navigation-entry"
         class="navigation-entry"
+        [class]="active === 3 ? 'active' : ''"
         (click)="setActiveProperty(3)"
         (click)="setActiveProperty(3)"
         [routerLink]="'./inventory'"
         [routerLink]="'./inventory'"
       >
       >
@@ -33,6 +36,7 @@
     <li>
     <li>
       <div
       <div
         class="navigation-entry"
         class="navigation-entry"
+        [class]="active === 4 ? 'active' : ''"
         (click)="setActiveProperty(4)"
         (click)="setActiveProperty(4)"
         [routerLink]="'./spellcards'"
         [routerLink]="'./spellcards'"
       >
       >
@@ -42,17 +46,18 @@
     <li>
     <li>
       <div
       <div
         class="navigation-entry"
         class="navigation-entry"
+        [class]="active === 5 ? 'active' : ''"
         (click)="setActiveProperty(5)"
         (click)="setActiveProperty(5)"
         [routerLink]="'./notes'"
         [routerLink]="'./notes'"
       >
       >
         Notizen
         Notizen
       </div>
       </div>
     </li>
     </li>
-    }
     <li>
     <li>
       <div
       <div
         class="navigation-entry"
         class="navigation-entry"
-        (click)="setActiveProperty(0)"
+        [class]="active === 3 ? 'active' : ''"
+        (click)="setActiveProperty(6)"
         [routerLink]="'./spellbook'"
         [routerLink]="'./spellbook'"
       >
       >
         Zauberbuch
         Zauberbuch
@@ -61,7 +66,8 @@
     <li>
     <li>
       <div
       <div
         class="navigation-entry"
         class="navigation-entry"
-        (click)="setActiveProperty(0)"
+        [class]="active === 7 ? 'active' : ''"
+        (click)="setActiveProperty(7)"
         [routerLink]="'./quests'"
         [routerLink]="'./quests'"
       >
       >
         Aufträge
         Aufträge
@@ -70,7 +76,8 @@
     <li>
     <li>
       <div
       <div
         class="navigation-entry"
         class="navigation-entry"
-        (click)="setActiveProperty(0)"
+        [class]="active === 8 ? 'active' : ''"
+        (click)="setActiveProperty(8)"
         [routerLink]="'./npcs'"
         [routerLink]="'./npcs'"
       >
       >
         NPCs
         NPCs
@@ -79,7 +86,8 @@
     <li>
     <li>
       <div
       <div
         class="navigation-entry"
         class="navigation-entry"
-        (click)="setActiveProperty(0)"
+        [class]="active === 9 ? 'active' : ''"
+        (click)="setActiveProperty(9)"
         [routerLink]="'./places'"
         [routerLink]="'./places'"
       >
       >
         Orte
         Orte
@@ -88,7 +96,8 @@
     <li>
     <li>
       <div
       <div
         class="navigation-entry"
         class="navigation-entry"
-        (click)="setActiveProperty(0)"
+        [class]="active === 10 ? 'active' : ''"
+        (click)="setActiveProperty(10)"
         [routerLink]="'./maps'"
         [routerLink]="'./maps'"
       >
       >
         Karten
         Karten
@@ -98,7 +107,8 @@
     <li>
     <li>
       <div
       <div
         class="navigation-entry"
         class="navigation-entry"
-        (click)="setActiveProperty(0)"
+        [class]="active === 11 ? 'active' : ''"
+        (click)="setActiveProperty(11)"
         [routerLink]="'./ruleset'"
         [routerLink]="'./ruleset'"
       >
       >
         Regelwerk
         Regelwerk

+ 7 - 5
src/app/journal/journal-home/navigation-panel/navigation-panel.component.scss

@@ -49,11 +49,13 @@ ul {
     box-shadow: var(--shadow-small);
     box-shadow: var(--shadow-small);
     border-radius: 10px;
     border-radius: 10px;
     transition: transform 0.2s ease-in-out;
     transition: transform 0.2s ease-in-out;
-}
-.navigation-entry:hover {
-    background-color: var(--primary-color);
-    transform: scale(1.05);
-    cursor: pointer;
+
+    &:hover,
+    &.active {
+        background-color: var(--primary-color);
+        transform: scale(1.05);
+        cursor: pointer;
+    }
 }
 }
 
 
 .settings-container {
 .settings-container {

+ 6 - 15
src/app/journal/journal-home/navigation-panel/navigation-panel.component.ts

@@ -1,10 +1,4 @@
-import {
-  Component,
-  ViewChild,
-  Input,
-  Output,
-  EventEmitter,
-} from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
 import { NavigationPanelService } from 'src/services/navigationPanel/navigation-panel.service';
 import { NavigationPanelService } from 'src/services/navigationPanel/navigation-panel.service';
 
 
 @Component({
 @Component({
@@ -13,14 +7,11 @@ import { NavigationPanelService } from 'src/services/navigationPanel/navigation-
   styleUrl: './navigation-panel.component.scss',
   styleUrl: './navigation-panel.component.scss',
 })
 })
 export class NavigationPanelComponent {
 export class NavigationPanelComponent {
-  constructor(private navigation: NavigationPanelService) {}
-
-  @Output() public activeTabChanged = new EventEmitter<any>();
-
-  @Input() showAdditionalNavigation: boolean = true;
-
   @ViewChild('navigationBackdrop') backdrop: any;
   @ViewChild('navigationBackdrop') backdrop: any;
   @ViewChild('navigationPanel') panel: any;
   @ViewChild('navigationPanel') panel: any;
+  public active: number = 1;
+
+  constructor(private navigation: NavigationPanelService) {}
 
 
   public ngOnInit(): void {
   public ngOnInit(): void {
     this.navigation.showNavigationPanel$.subscribe((state) => {
     this.navigation.showNavigationPanel$.subscribe((state) => {
@@ -42,7 +33,7 @@ export class NavigationPanelComponent {
     this.panel?.nativeElement.classList.remove('panel--open');
     this.panel?.nativeElement.classList.remove('panel--open');
   }
   }
 
 
-  public setActiveProperty(tab: number) {
-    this.activeTabChanged.emit(tab);
+  public setActiveProperty(number: number) {
+    this.active = number;
   }
   }
 }
 }

+ 1 - 1
src/app/journal/journal-stats/info-row/armor-class/armor-class.component.html

@@ -6,6 +6,6 @@
     (change)="updateValue()"
     (change)="updateValue()"
     (click)="$event.stopPropagation()"
     (click)="$event.stopPropagation()"
   />
   />
-  <div class="info-label responsive-small">Rüstungs</div>
+  <div class="info-label responsive-small">Rüstung</div>
   <div class="info-label responsive-large">Rüstungsklasse</div>
   <div class="info-label responsive-large">Rüstungsklasse</div>
 </div>
 </div>