Browse Source

updated details and modals of all dashboard items exept weapon panel

Warafear 1 year ago
parent
commit
5600469c8a

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

@@ -466783,3 +466783,75 @@ 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)
 [NX Daemon Server] - 2024-02-12T17:20:12.643Z - Time taken for 'hash changed files from watcher' 27.236500024795532ms
 [NX Daemon Server] - 2024-02-12T17:20:12.643Z - Done responding to the client null
+[NX Daemon Server] - 2024-02-13T06:38:43.989Z - Started listening on: \\.\pipe\nx\C:\Users\chris\AppData\Local\Temp\83d14e7134fc08a15480\d.sock
+[NX Daemon Server] - 2024-02-13T06:38:43.992Z - [WATCHER]: Subscribed to changes within: c:\Softwareprojekte\DnD (native)
+[NX Daemon Server] - 2024-02-13T06:38:44.001Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-02-13T06:38:44.002Z - Closed a connection. Number of open connections: 0
+[NX Daemon Server] - 2024-02-13T06:38:44.015Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-02-13T06:38:44.017Z - [REQUEST]: Client Request for Project Graph Received
+[NX Daemon Server] - 2024-02-13T06:38:45.073Z - 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-02-13T06:38:45.073Z - [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-02-13T06:38:45.073Z - Time taken for 'hash changed files from watcher' 313.7829999923706ms
+[NX Daemon Server] - 2024-02-13T06:38:45.073Z - Done responding to the client null
+[NX Daemon Server] - 2024-02-13T06:38:54.832Z - Started listening on: \\.\pipe\nx\C:\Users\chris\AppData\Local\Temp\83d14e7134fc08a15480\d.sock
+[NX Daemon Server] - 2024-02-13T06:38:54.835Z - [WATCHER]: Subscribed to changes within: c:\Softwareprojekte\DnD (native)
+[NX Daemon Server] - 2024-02-13T06:38:54.836Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-02-13T06:38:54.837Z - Closed a connection. Number of open connections: 0
+[NX Daemon Server] - 2024-02-13T06:38:54.837Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2024-02-13T06:38:54.841Z - [REQUEST]: Client Request for Project Graph Received
+[NX Daemon Server] - 2024-02-13T06:38:54.929Z - 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-02-13T06:38:54.929Z - [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-02-13T06:38:54.930Z - Time taken for 'hash changed files from watcher' 44.179800033569336ms
+[NX Daemon Server] - 2024-02-13T06:38:54.930Z - Done responding to the client null

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

@@ -1 +1 @@
-{"processId":11504}
+{"processId":25548}

+ 1 - 1
src/app/journal/journal-stats/ability-panel/ability-table/ability-table.component.html

@@ -39,7 +39,7 @@
     }
   </div>
   <div class="footer">
-    <ui-button [color]="'green'" [width]="'w25'" (click)="openModal(false)">
+    <ui-button [color]="'green'" style="width: 80%" (click)="openModal(false)">
       Hinzufügen
     </ui-button>
   </div>

+ 3 - 1
src/app/journal/journal-stats/ability-panel/proficiencies-table/proficiencies-table.component.html

@@ -76,6 +76,8 @@
 
   <!-- MODAL BUTTON -->
   <div class="footer">
-    <button (click)="openModal()">Anpassen</button>
+    <ui-button [color]="'green'" style="width: 80%" (click)="openModal()">
+      Anpassen
+    </ui-button>
   </div>
 </div>

+ 37 - 68
src/app/journal/journal-stats/ability-panel/proficiencies-table/tools-modal/tools-modal.component.html

@@ -1,76 +1,45 @@
-<div class="modal-dimensions">
-  <h1 style="text-align: center">Hinweis</h1>
-  <p style="text-align: center">
-    Diese Seite ist momentan nur eingeschränkt funktionsbereit.
-  </p>
-  <h4>Werkzeuge</h4>
+<div class="dimensions">
+  <div class="title">Sprachen und Werkzeuge hinzufügen</div>
+  <div class="heading left b-05">Sprachen</div>
   <div style="display: flex; flex-direction: column; gap: 0.5rem">
-    <ng-container
-      *ngFor="let tool of proficiencies.tools; let toolIndex = index"
-    >
-      <div>
-        <input type="text" [(ngModel)]="proficiencies.tools[toolIndex]" />
-        <icon
-          [size]="'s'"
-          [type]="'UI'"
-          [icon]="'remove'"
-          [class]="'pointer'"
-          (click)="deleteTool(toolIndex)"
-        ></icon>
-      </div>
-    </ng-container>
-    <icon
-      [size]="'s'"
-      [type]="'UI'"
-      [icon]="'add'"
-      [class]="'pointer'"
-      (click)="addTool()"
-    ></icon>
+    @for(tool of proficiencies.languages; let languageIndex = $index; track
+    tool){
+    <div class="item-row">
+      <mat-form-field appearance="outline">
+        <input matInput [(ngModel)]="proficiencies.languages[languageIndex]" />
+      </mat-form-field>
+      <icon-button
+        [icon]="'delete'"
+        (click)="deleteLanguage(languageIndex)"
+      ></icon-button>
+    </div>
+    }
+    <icon-button [icon]="'add'" (click)="addLanguage()"></icon-button>
   </div>
 
-  <br />
-  <br />
-  <h4>Sprachen</h4>
+  <div class="heading left b-05">Werkzeuge</div>
   <div style="display: flex; flex-direction: column; gap: 0.5rem">
-    <ng-container
-      class="example-box"
-      *ngFor="let tool of proficiencies.languages; let languageIndex = index"
-    >
-      <div>
-        <input
-          type="text"
-          [(ngModel)]="proficiencies.languages[languageIndex]"
-        />
-        <icon
-          [size]="'s'"
-          [type]="'UI'"
-          [icon]="'remove'"
-          [class]="'pointer'"
-          (click)="deleteLanguage(languageIndex)"
-        ></icon>
-      </div>
-    </ng-container>
-    <icon
-      [size]="'s'"
-      [type]="'UI'"
-      [icon]="'add'"
-      [class]="'pointer'"
-      (click)="addLanguage()"
-    ></icon>
+    @for(tool of proficiencies.tools; let toolIndex = $index; track tool){
+    <div class="item-row">
+      <mat-form-field appearance="outline">
+        <input matInput [(ngModel)]="proficiencies.tools[toolIndex]" />
+      </mat-form-field>
+      <icon-button
+        style="margin-left: 0.25rem"
+        [icon]="'delete'"
+        (click)="deleteTool(toolIndex)"
+      ></icon-button>
+    </div>
+    }
+    <icon-button [icon]="'add'" (click)="addTool()"></icon-button>
   </div>
 
-  <div class="button-wrapper-2-block">
-    <ui-button
-      [type]="'update'"
-      [size]="'xlarge'"
-      [color]="'primary'"
-      (click)="update()"
-    ></ui-button>
-    <ui-button
-      [type]="'cancel'"
-      [size]="'xlarge'"
-      [color]="'primary'"
-      (click)="cancel()"
-    ></ui-button>
+  <div class="horizontal-buttons">
+    <ui-button [color]="'green'" style="width: 45%" (click)="update()">
+      Aktualisieren
+    </ui-button>
+    <ui-button [color]="'red'" style="width: 45%" (click)="cancel()">
+      Abbrechen
+    </ui-button>
   </div>
 </div>

+ 5 - 50
src/app/journal/journal-stats/ability-panel/proficiencies-table/tools-modal/tools-modal.component.scss

@@ -1,58 +1,13 @@
-.modal-dimensions {
+.dimensions {
   width: 40vw;
   background-color: var(--modal-background);
   border-radius: 10px;
   border: 1px solid var(--border-color);
-  padding: 1rem;
+  padding: 0 2rem;
 }
 
-//
-.example-list {
-  width: 100%;
-  border: solid 1px #ccc;
-  min-height: 60px;
-  display: block;
-  background: white;
-  border-radius: 4px;
-  overflow: hidden;
-}
-
-.example-box {
-  padding: 20px 10px;
-  border-bottom: solid 1px #ccc;
-  color: rgba(0, 0, 0, 0.87);
+.item-row {
   display: flex;
-  position: relative;
-  flex-direction: column;
-  // align-items: center;
-  justify-content: space-between;
-  box-sizing: border-box;
-  cursor: move;
-  background: white;
-  font-size: 14px;
-}
-
-.cdk-drag-preview {
-  box-sizing: border-box;
-  border-radius: 4px;
-  box-shadow:
-    0 5px 5px -3px rgba(0, 0, 0, 0.2),
-    0 8px 10px 1px rgba(0, 0, 0, 0.14),
-    0 3px 14px 2px rgba(0, 0, 0, 0.12);
-}
-
-.cdk-drag-placeholder {
-  opacity: 0;
-}
-
-.cdk-drag-animating {
-  transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
-}
-
-.example-box:last-child {
-  border: none;
-}
-
-.example-list.cdk-drop-list-dragging .example-box:not(.cdk-drag-placeholder) {
-  transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
+  gap: 0.25rem;
+  align-items: center;
 }

+ 1 - 1
src/app/journal/journal-stats/ability-panel/spellslots/spellslots.component.html

@@ -62,7 +62,7 @@
   <!-- MODAL BUTTON -->
 
   <div class="footer">
-    <ui-button [color]="'green'" [width]="'w25'" (click)="openModal()">
+    <ui-button [color]="'green'" style="width: 80%" (click)="openModal()">
       Anpassen
     </ui-button>
   </div>

+ 0 - 4
src/app/journal/journal-stats/ability-panel/spellslots/spellslots.component.scss

@@ -52,10 +52,6 @@ input[type="checkbox"] {
     position: relative;
 }
 
-// input[type="checkbox"]:checked {
-//     background: #651212;
-// }
-
 input[type="checkbox"]:checked::after {
     content: "";
     position: absolute;

+ 1 - 1
src/app/journal/journal-stats/ability-panel/trait-table/trait-table.component.html

@@ -11,7 +11,7 @@
     }
   </div>
   <div class="footer">
-    <ui-button [color]="'green'" [width]="'w25'" (click)="openModal(false)">
+    <ui-button [color]="'green'" style="width: 80%" (click)="openModal(false)">
       Hinzufügen
     </ui-button>
   </div>

+ 7 - 7
src/app/journal/journal-stats/info-row/conditions/conditions-details/conditions-details.component.html

@@ -68,11 +68,11 @@
 </div>
 
 <!-- NAVIGATION BUTTONS -->
-<div class="button-container">
-  <button class="standard-button confirm" (click)="close('update')">
-    Anwenden
-  </button>
-  <button class="standard-button cancel" (click)="close('cancel')">
-    Abbrechen
-  </button>
+<div class="vertical-buttons bottom">
+  <ui-button [color]="'green'" [width]="'w20'" (click)="close('update')">
+    Anpassen
+  </ui-button>
+  <ui-button [color]="'red'" [width]="'w20'" (click)="close('cancel')">
+    Löschen
+  </ui-button>
 </div>

+ 26 - 3
src/app/journal/journal-stats/life-container/hit-dice/hit-dice.component.scss

@@ -14,8 +14,31 @@
         flex-wrap: wrap;
         width: 20rem;
         row-gap: 0.5rem;
-        input {
-            flex: 0 0 4rem;
-        }
+        column-gap: 3rem;
+        // input {
+        //     flex: 0 0 4rem;
+        // }
     }
 }
+
+input[type="checkbox"] {
+    appearance: none;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    width: 20px;
+    height: 20px;
+    background: white;
+    border: 1px solid #000;
+    position: relative;
+}
+
+input[type="checkbox"]:checked::after {
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 12px;
+    height: 12px;
+    background: #815139;
+    transform: translate(-50%, -50%);
+}

+ 7 - 7
src/app/journal/journal-stats/life-container/life/life-details/life-details.component.html

@@ -21,11 +21,11 @@
 </div>
 <hit-dice style="margin-top: 5rem" (setHitDice)="setHitDice($event)"></hit-dice>
 
-<div class="button-container">
-  <button class="standard-button confirm" (click)="close('update')">
-    Anwenden
-  </button>
-  <button class="standard-button cancel" (click)="close('cancel')">
-    Abbrechen
-  </button>
+<div class="vertical-buttons bottom">
+  <ui-button [color]="'green'" [width]="'w20'" (click)="close('update')">
+    Anpassen
+  </ui-button>
+  <ui-button [color]="'red'" [width]="'w20'" (click)="close('cancel')">
+    Löschen
+  </ui-button>
 </div>

+ 1 - 1
src/button-styles.scss

@@ -5,7 +5,7 @@
 }
 
 .vertical-buttons {
-    width: 100%;
+    width: 27rem;
     display: flex;
     flex-direction: column;
     align-items: center;

+ 21 - 14
src/styles.scss

@@ -98,15 +98,15 @@
     --border: 1px solid var(--border-color);
 
     // Auslagern in UI-Button
-    .standard-button {
-        border: var(--border);
-        border-radius: 10px;
-        font-size: 1.25rem;
-        height: 3rem;
-        font-weight: 600;
-        box-shadow: var(--shadow);
-        transition: background-color 0.25s ease-in-out;
-    }
+    // .standard-button {
+    //     border: var(--border);
+    //     border-radius: 10px;
+    //     font-size: 1.25rem;
+    //     height: 3rem;
+    //     font-weight: 600;
+    //     box-shadow: var(--shadow);
+    //     transition: background-color 0.25s ease-in-out;
+    // }
 
     // Responsiveness
     .responsive-small {
@@ -278,6 +278,15 @@ input[type="checkbox"] {
 
 // DETAILS + MODAL
 
+.dimensions {
+    width: 50vw;
+    background-color: var(--modal-background);
+    border-radius: 10px;
+    border: 1px solid var(--border-color);
+    padding: 0 2rem;
+    box-shadow: var(--shadow);
+}
+
 .title {
     font-size: 2rem;
     font-weight: bold;
@@ -334,6 +343,7 @@ input[type="checkbox"] {
     padding-left: 0.25rem;
 }
 
+// RICH TEXT EDITOR
 .ProseMirror {
     padding-left: 1rem !important;
 }
@@ -342,11 +352,6 @@ input[type="checkbox"] {
 .mat-mdc-form-field-subscript-wrapper {
     display: none;
 }
-// .details-flex-row {
-//     display: flex;
-//     justify-content: space-between;
-//     align-items: center;
-// }
 
 html,
 body {
@@ -366,6 +371,8 @@ body {
     flex-direction: column;
 }
 
+// SOLL WEG
+
 .flex-centered {
     align-items: center;
     justify-content: center;