Bladeren bron

removed old tabbar

Christopher Giese 1 jaar geleden
bovenliggende
commit
b5c87713de

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

@@ -460342,3 +460342,40 @@ To fix this, set a unique name for each project in a project.json inside the pro
 [NX Daemon Server] - 2023-11-29T10:15:13.090Z - [WATCHER]: Processing file changes in outputs
 [NX Daemon Server] - 2023-11-29T10:15:13.091Z - [WATCHER]: .nx/cache/d/daemon.log was modified
 [NX Daemon Server] - 2023-11-29T10:15:13.093Z - Done responding to the client null
+[NX Daemon Server] - 2023-11-29T10:54:10.665Z - Started listening on: \\.\pipe\nx\C:\Users\chris\AppData\Local\Temp\e6a479e02f1047051806\d.sock
+[NX Daemon Server] - 2023-11-29T10:54:10.667Z - [WATCHER]: Subscribed to changes within: c:\Users\chris\Softwareprojekte\Test\DnDTools (native)
+[NX Daemon Server] - 2023-11-29T10:54:10.680Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2023-11-29T10:54:10.682Z - Closed a connection. Number of open connections: 0
+[NX Daemon Server] - 2023-11-29T10:54:10.682Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2023-11-29T10:54:10.685Z - [REQUEST]: Client Request for Project Graph Received
+[NX Daemon Server] - 2023-11-29T10:54:10.770Z - 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] - 2023-11-29T10:54:10.770Z - [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:\Users\chris\Softwareprojekte\Test\DnDTools\node_modules\nx\src\project-graph\utils\project-configuration-utils.js:97:15)
+    at buildProjectsConfigurationsFromProjectPathsAndPlugins (c:\Users\chris\Softwareprojekte\Test\DnDTools\node_modules\nx\src\project-graph\utils\project-configuration-utils.js:70:19)
+    at createProjectConfigurations (c:\Users\chris\Softwareprojekte\Test\DnDTools\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:131:129)
+    at WorkspaceContext.<anonymous> (c:\Users\chris\Softwareprojekte\Test\DnDTools\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:82:39)
+    at getProjectConfigurationsFromContext (c:\Users\chris\Softwareprojekte\Test\DnDTools\node_modules\nx\src\utils\workspace-context.js:26:29)
+    at _retrieveProjectConfigurations (c:\Users\chris\Softwareprojekte\Test\DnDTools\node_modules\nx\src\project-graph\utils\retrieve-workspace-files.js:81:72)
+    at retrieveProjectConfigurations (c:\Users\chris\Softwareprojekte\Test\DnDTools\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:\Users\chris\Softwareprojekte\Test\DnDTools\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:102:34)
+    at async processFilesAndCreateAndSerializeProjectGraph (c:\Users\chris\Softwareprojekte\Test\DnDTools\node_modules\nx\src\daemon\server\project-graph-incremental-recomputation.js:138:17)
+[NX Daemon Server] - 2023-11-29T10:54:10.772Z - Time taken for 'hash changed files from watcher' 24.907600164413452ms
+[NX Daemon Server] - 2023-11-29T10:54:10.772Z - [WATCHER]: Processing file changes in outputs
+[NX Daemon Server] - 2023-11-29T10:54:10.772Z - Done responding to the client null

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

@@ -1 +1 @@
-{"processId":4460}
+{"processId":7496}

+ 0 - 1
src/app/journal/journal-home/journal-home.component.html

@@ -2,7 +2,6 @@
   <!-- Here the different pages are rendered -->
   <router-outlet></router-outlet>
 
-  <!-- <app-tabbar id="tabbar" [class]="hideTabbar() ? 'hidden' : ''"></app-tabbar> -->
   <tab-bar #tabbar id="tabbar" [class]="hideTabbar() ? 'hidden' : ''"></tab-bar>
 
   <details-panel></details-panel>

+ 8 - 8
src/app/journal/journal-home/tab-bar/tab-bar.component.html

@@ -23,14 +23,6 @@
   >
     Inventar
   </button>
-  <button
-    class="tab-button"
-    (click)="active = 4"
-    [class]="active === 4 ? 'active' : ''"
-    [routerLink]="'./notes'"
-  >
-    Notizen
-  </button>
   <button
     class="tab-button"
     (click)="active = 5"
@@ -39,4 +31,12 @@
   >
     Zauber
   </button>
+  <button
+    class="tab-button"
+    (click)="active = 4"
+    [class]="active === 4 ? 'active' : ''"
+    [routerLink]="'./notes'"
+  >
+    Notizen
+  </button>
 </div>

+ 0 - 19
src/app/journal/journal-home/tabbar/tabbar.component.html

@@ -1,19 +0,0 @@
-<div>
-  <ul ngbNav #nav="ngbNav" [(activeId)]="active" class="nav-tabs">
-    <li [ngbNavItem]="1">
-      <button ngbNavLink [routerLink]="'./stats'">Kampf</button>
-    </li>
-    <li [ngbNavItem]="2">
-      <button ngbNavLink [routerLink]="'./character'">Charakter</button>
-    </li>
-    <li [ngbNavItem]="3">
-      <button ngbNavLink [routerLink]="'./inventory'">Inventar</button>
-    </li>
-    <li [ngbNavItem]="4">
-      <button ngbNavLink [routerLink]="'./notes'">Notizen</button>
-    </li>
-    <li [ngbNavItem]="5">
-      <button ngbNavLink [routerLink]="'./spellcards'">Zauber</button>
-    </li>
-  </ul>
-</div>

+ 0 - 34
src/app/journal/journal-home/tabbar/tabbar.component.scss

@@ -1,34 +0,0 @@
-.li{
-    width: 10%;
-}
-
-button{
-    width: 8rem;
-    height: 4rem;
-    font-size: 1.5rem;
-    font-weight: 600;
-    color: black;
-    border: 1px solid black !important;
-    transition: all 0.25s ease-in-out;
-    background-color: var(--primary-color-light);
-}
-
-button:hover{
-    height: 4.125rem;
-    color: black;
-    background-color: var(--primary-color);
-}
-
-button.active{
-    height: 4.5rem;
-    width: 9rem;
-    font-size: 1.625rem;
-    background-color: var(--primary-color) !important;
-}
-
-
-li{
-    display: flex;
-    align-items: flex-end;
-}
-

+ 0 - 21
src/app/journal/journal-home/tabbar/tabbar.component.spec.ts

@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TabbarComponent } from './tabbar.component';
-
-describe('TabbarComponent', () => {
-  let component: TabbarComponent;
-  let fixture: ComponentFixture<TabbarComponent>;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [TabbarComponent]
-    });
-    fixture = TestBed.createComponent(TabbarComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

+ 0 - 11
src/app/journal/journal-home/tabbar/tabbar.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-tabbar',
-  templateUrl: './tabbar.component.html',
-  styleUrls: ['./tabbar.component.scss'],
-})
-export class TabbarComponent {
-  constructor() {}
-  public active: number = 1;
-}

+ 2 - 1
src/app/journal/journal-stats/life-container/life/life.component.html

@@ -1,6 +1,7 @@
 <div class="life-box">
   <div class="life-box-name" (click)="openDetailsPanel()">Trefferpunkte</div>
-  <div class="life-box-bar">
+  <div class="life-box-bar" (click)="openDetailsPanel()">
+    <!-- FIXME: The percentages are not shown correctly when using the details panel -->
     <div
       class="life-box-bar-current"
       [style.width.%]="currentHitPointsPercentage"

+ 4 - 0
src/app/journal/journal-stats/life-container/life/life.component.scss

@@ -11,6 +11,7 @@
     font-size: 1.4rem;
     font-weight: bold;
     text-align: center;
+    cursor: pointer;
 }
 
 .life-box-bar{
@@ -21,6 +22,7 @@
     margin: 0 0.5rem;
     border-radius: 10px;
     overflow: hidden;
+    cursor: pointer;
 }
 
 .life-box-bar-current{
@@ -36,6 +38,8 @@
 }
 
 .life-box-bar-label{
+    font-size: 1.5rem;
+    font-weight: bold;
     position: absolute;
     top: 50%;
     left: 50%;

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

@@ -6,7 +6,6 @@ import { CdkTableModule } from '@angular/cdk/table';
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { NgxSmartModalModule } from 'ngx-smart-modal';
 
-import { TabbarComponent } from './journal-home/tabbar/tabbar.component';
 import { JournalRoutingModule } from './journal-routing.module';
 import { JournalHomeComponent } from './journal-home/journal-home.component';
 import { JournalStatsComponent } from './journal-stats/journal-stats.component';
@@ -86,7 +85,6 @@ import { TabBarComponent } from './journal-home/tab-bar/tab-bar.component';
     JournalSpellbookComponent,
     JournalSpellcardsComponent,
     JournalCharacterComponent,
-    TabbarComponent,
     AttributeFieldComponent,
     SkillFieldComponent,
     AttributeSkillContainerComponent,