Ver Fonte

Changed the general layout

Christopher Giese há 1 ano atrás
pai
commit
ce830797a1

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

@@ -459404,3 +459404,78 @@ To fix this, set a unique name for each project in a project.json inside the pro
 [NX Daemon Server] - 2023-11-16T16:48:07.119Z - [WATCHER]: Processing file changes in outputs
 [NX Daemon Server] - 2023-11-16T16:48:07.120Z - [WATCHER]: .nx/cache/d/daemon.log was modified
 [NX Daemon Server] - 2023-11-16T16:48:07.120Z - Done responding to the client null
+[NX Daemon Server] - 2023-11-16T20:33:28.720Z - Started listening on: \\.\pipe\nx\C:\Users\chris\AppData\Local\Temp\e6a479e02f1047051806\d.sock
+[NX Daemon Server] - 2023-11-16T20:33:28.728Z - [WATCHER]: Subscribed to changes within: c:\Users\chris\Softwareprojekte\Test\DnDTools (native)
+[NX Daemon Server] - 2023-11-16T20:33:28.729Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2023-11-16T20:33:28.729Z - Established a connection. Number of open connections: 2
+[NX Daemon Server] - 2023-11-16T20:33:28.731Z - Closed a connection. Number of open connections: 1
+[NX Daemon Server] - 2023-11-16T20:33:28.732Z - [REQUEST]: Client Request for Project Graph Received
+[NX Daemon Server] - 2023-11-16T20:33:29.244Z - 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-16T20:33:29.244Z - [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-16T20:33:29.246Z - Time taken for 'hash changed files from watcher' 102.00859999656677ms
+[NX Daemon Server] - 2023-11-16T20:33:29.246Z - [WATCHER]: .nx/cache/d/daemon.log was modified
+[NX Daemon Server] - 2023-11-16T20:33:29.247Z - [WATCHER]: Processing file changes in outputs
+[NX Daemon Server] - 2023-11-16T20:33:29.247Z - Done responding to the client null
+[NX Daemon Server] - 2023-11-16T21:06:14.455Z - Started listening on: \\.\pipe\nx\C:\Users\chris\AppData\Local\Temp\e6a479e02f1047051806\d.sock
+[NX Daemon Server] - 2023-11-16T21:06:14.467Z - [WATCHER]: Subscribed to changes within: c:\Users\chris\Softwareprojekte\Test\DnDTools (native)
+[NX Daemon Server] - 2023-11-16T21:06:14.467Z - Established a connection. Number of open connections: 1
+[NX Daemon Server] - 2023-11-16T21:06:14.468Z - Established a connection. Number of open connections: 2
+[NX Daemon Server] - 2023-11-16T21:06:14.469Z - Closed a connection. Number of open connections: 1
+[NX Daemon Server] - 2023-11-16T21:06:14.470Z - [REQUEST]: Client Request for Project Graph Received
+[NX Daemon Server] - 2023-11-16T21:06:14.549Z - 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-16T21:06:14.549Z - [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-16T21:06:14.551Z - Time taken for 'hash changed files from watcher' 23.557300001382828ms
+[NX Daemon Server] - 2023-11-16T21:06:14.551Z - [WATCHER]: Processing file changes in outputs
+[NX Daemon Server] - 2023-11-16T21:06:14.551Z - Done responding to the client null

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

@@ -1 +1 @@
-{"processId":11928}
+{"processId":1312}

+ 9 - 9
package-lock.json

@@ -17,7 +17,7 @@
         "@angular/platform-browser": "^17.0.3",
         "@angular/platform-browser-dynamic": "^17.0.3",
         "@angular/router": "^17.0.3",
-        "@ng-bootstrap/ng-bootstrap": "^15.1.2",
+        "@ng-bootstrap/ng-bootstrap": "^16.0.0-rc.2",
         "@popperjs/core": "^2.11.6",
         "bootstrap": "^5.2.3",
         "localbase": "^0.7.5",
@@ -3765,18 +3765,18 @@
       }
     },
     "node_modules/@ng-bootstrap/ng-bootstrap": {
-      "version": "15.1.2",
-      "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-15.1.2.tgz",
-      "integrity": "sha512-mM2yiGnt9o7KZLIFp8K1vjfmVfu7HR3d8dhH5SszfArbgn9DvvQ4P5D5TDGygzyBSzeyZe18p7I8rX8vgA6DKw==",
+      "version": "16.0.0-rc.2",
+      "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-16.0.0-rc.2.tgz",
+      "integrity": "sha512-XQUOr6OfAYA9FK1e9tsKJiuKYGkNeO3vCkbCryWDWZzWaehvOWLcB214RUVBeoxynd4c/n2PmQRGnKcJLTAeSA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "^16.0.0",
-        "@angular/core": "^16.0.0",
-        "@angular/forms": "^16.0.0",
-        "@angular/localize": "^16.0.0",
-        "@popperjs/core": "^2.11.6",
+        "@angular/common": "^17.0.0",
+        "@angular/core": "^17.0.0",
+        "@angular/forms": "^17.0.0",
+        "@angular/localize": "^17.0.0",
+        "@popperjs/core": "^2.11.8",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },

+ 2 - 2
package.json

@@ -20,7 +20,7 @@
     "@angular/platform-browser": "^17.0.3",
     "@angular/platform-browser-dynamic": "^17.0.3",
     "@angular/router": "^17.0.3",
-    "@ng-bootstrap/ng-bootstrap": "^15.1.2",
+    "@ng-bootstrap/ng-bootstrap": "^16.0.0-rc.2",
     "@popperjs/core": "^2.11.6",
     "bootstrap": "^5.2.3",
     "localbase": "^0.7.5",
@@ -49,4 +49,4 @@
     "nx": "17.0.2",
     "typescript": "~5.2.2"
   }
-}
+}

+ 4 - 2
src/app/journal/journal-home/journal-home.component.html

@@ -1,8 +1,10 @@
 <div class="journal-container">
+  <!-- Here the different pages are rendered -->
   <router-outlet></router-outlet>
 
-  <app-offcanvas #offcanvas></app-offcanvas>
-  <button class="navigation-button" (click)="openNavigation()">open</button>
   <app-tabbar></app-tabbar>
   <details-panel></details-panel>
+
+  <app-offcanvas #offcanvas></app-offcanvas>
+  <!-- <button class="navigation-button" (click)="openNavigation()">open</button> -->
 </div>

+ 2 - 1
src/app/journal/journal-home/journal-home.component.scss

@@ -12,10 +12,11 @@ app-tabbar{
     bottom: 0;
     display: flex;
     justify-content: center;
-    width: 100vw;
+    margin: auto;
 }
 
 
+// Not used currently
 .navigation-button{
     position: fixed;
     top: 0;

+ 1 - 1
src/app/journal/journal-home/tabbar/tabbar.component.ts

@@ -7,5 +7,5 @@ import { Component } from '@angular/core';
 })
 export class TabbarComponent {
   constructor() {}
-  public active: number = 2;
+  public active: number = 1;
 }

+ 1 - 4
src/app/journal/journal-stats/journal-stats.component.html

@@ -1,9 +1,6 @@
-<div class="stats-page-container">
-  <div class="name-container">Eliane Langwasser</div>
-
+<div class="center">
   <div class="stats-container">
     <!-- Attribute and skill container -->
-
     <attribute-skill-container></attribute-skill-container>
 
     <!-- Life and Weapon Container -->

+ 6 - 80
src/app/journal/journal-stats/journal-stats.component.scss

@@ -1,32 +1,15 @@
-.stats-page-container{
+.center{
+
     display: flex;
-    flex-direction: column;
-    width: 100vw;
+    justify-content: center;
     height: 100vh;
-    gap: 2rem;
-
-    .name-container{
-        display: flex;
-        flex-direction: column;
-        width: 100vw;
-        height: 5vh;
-        // margin: 5rem 0 0 2rem;
-        padding: 10px;
-        border: 1px solid #8d8c8c;
-        border-radius: 5px;
-        text-align: center;
-    }
 }
 
-
 .stats-container{
     display: flex;
-    flex-direction: row;
     justify-content: space-between;
-    width: 96%;
-    margin: 0 2rem 0 2rem;
-
-    border: 1px solid #882121;
+    margin: 2rem 2rem 2rem 2rem;
+    border: 1px solid #ff0000;
 }
 
 attribute-skill-container{
@@ -39,61 +22,4 @@ attribute-skill-container{
 
 ability-panel{
     width: 35%;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//     .attribute-skill-container{
-//         display: flex;
-//         flex-direction: column;
-//         gap: 1rem;
-//         width: 25%;
-//         padding: 10px;
-//         border: 1px solid #8d8c8c;
-//         border-radius: 5px;
-
-//         .aatribute-skill-box{
-//             display: flex;
-//             flex-direction: row;
-//             // gap: 0.5rem;
-//             width: 100%;
-//             border: 1px solid #8d8c8c;
-//             border-radius: 5px;
-//         }
-//     }
-
-//     .save-skill-container{
-//         display: flex;
-//         flex-direction: column;
-//         gap: 0.5rem;
-//         width: 20%;
-//         border: 1px solid #8d8c8c;
-//         border-radius: 5px;
-//     }
-    
-//     .life-weapon-container{
-//         border: 1px solid #8d8c8c;
-//         border-radius: 5px;
-//     }
-
-//     .platzhalter{
-//         width: 30vw;
-//         height: 80vh;
-//         border: 1px solid #8d8c8c;
-//         border-radius: 5px;
-//     }
-// }
-
-
+}

+ 3 - 0
src/styles.scss

@@ -223,3 +223,6 @@ $dialog-position-right: 20%;
 
 // Drag and Drop Table
 
+
+/* Importing Bootstrap SCSS file. */
+@import 'bootstrap/scss/bootstrap';