refactor(pmp-web): clean up after refactor

valueadd-poland · Feb 18, 2020 · 298e6d6 · 298e6d6
1 parent 9cc930c
commit 298e6d6
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 114 deletions.
diff --git a/angular.json b/angular.json
@@ -484,37 +484,6 @@
         }
       }
     },
-    "pmp-web-user-shell": {
-      "projectType": "library",
-      "root": "libs/pmp-web/user/shell",
-      "sourceRoot": "libs/pmp-web/user/shell/src",
-      "prefix": "pmp",
-      "architect": {
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "libs/pmp-web/user/shell/tsconfig.lib.json",
-              "libs/pmp-web/user/shell/tsconfig.spec.json"
-            ],
-            "exclude": ["**/node_modules/**", "!libs/pmp-web/user/shell/**"]
-          }
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "options": {
-            "jestConfig": "libs/pmp-web/user/shell/jest.config.js",
-            "tsConfig": "libs/pmp-web/user/shell/tsconfig.spec.json",
-            "setupFile": "libs/pmp-web/user/shell/src/test-setup.ts"
-          }
-        }
-      },
-      "schematics": {
-        "@nrwl/angular:component": {
-          "styleext": "scss"
-        }
-      }
-    },
     "pmp-web-shared-ui-navbar": {
       "projectType": "library",
       "root": "libs/pmp-web/shared/ui-navbar",
@@ -577,37 +546,6 @@
         }
       }
     },
-    "pmp-web-user-domain": {
-      "projectType": "library",
-      "root": "libs/pmp-web/user/domain",
-      "sourceRoot": "libs/pmp-web/user/domain/src",
-      "prefix": "pmp",
-      "architect": {
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "libs/pmp-web/user/domain/tsconfig.lib.json",
-              "libs/pmp-web/user/domain/tsconfig.spec.json"
-            ],
-            "exclude": ["**/node_modules/**", "!libs/pmp-web/user/domain/**"]
-          }
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "options": {
-            "jestConfig": "libs/pmp-web/user/domain/jest.config.js",
-            "tsConfig": "libs/pmp-web/user/domain/tsconfig.spec.json",
-            "setupFile": "libs/pmp-web/user/domain/src/test-setup.ts"
-          }
-        }
-      },
-      "schematics": {
-        "@nrwl/angular:component": {
-          "styleext": "scss"
-        }
-      }
-    },
     "pmp-web-shared-ui-picture-label": {
       "root": "libs/pmp-web/shared/ui-picture-label",
       "sourceRoot": "libs/pmp-web/shared/ui-picture-label/src",

diff --git a/libs/pmp-web/report/domain/README.md b/libs/pmp-web/report/domain/README.md
@@ -1,7 +1,7 @@
-# pmp-web-repository-domain
+# pmp-web-report-domain
 
 This library was generated with [Nx](https://nx.dev).
 
 ## Running unit tests
 
-Run `nx test pmp-web-repository-domain` to execute the unit tests.
+Run `nx test pmp-web-report-domain` to execute the unit tests.
diff --git a/libs/pmp-web/report/repositories-statistics/data-access/README.md b/libs/pmp-web/report/repositories-statistics/data-access/README.md
@@ -1,7 +1,7 @@
-# pmp-web-repository-repositories-statistics-data-access
+# pmp-web-report-repositories-statistics-data-access
 
 This library was generated with [Nx](https://nx.dev).
 
 ## Running unit tests
 
-Run `nx test pmp-web-repository-repositories-statistics-data-access` to execute the unit tests.
+Run `nx test pmp-web-report-repositories-statistics-data-access` to execute the unit tests.
diff --git a/libs/pmp-web/report/repositories-statistics/feature/README.md b/libs/pmp-web/report/repositories-statistics/feature/README.md
@@ -1,7 +1,7 @@
-# pmp-web-repository-repositories-statistics-feature
+# pmp-web-report-repositories-statistics-feature
 
 This library was generated with [Nx](https://nx.dev).
 
 ## Running unit tests
 
-Run `nx test pmp-web-repository-repositories-statistics-feature` to execute the unit tests.
+Run `nx test pmp-web-report-repositories-statistics-feature` to execute the unit tests.
diff --git a/libs/pmp-web/report/repository-statistics/data-access/README.md b/libs/pmp-web/report/repository-statistics/data-access/README.md
@@ -1,7 +1,7 @@
-# pmp-web-repository-repository-statistics-data-access
+# pmp-web-report-repository-statistics-data-access
 
 This library was generated with [Nx](https://nx.dev).
 
 ## Running unit tests
 
-Run `nx test pmp-web-repository-repository-statistics-data-access` to execute the unit tests.
+Run `nx test pmp-web-report-repository-statistics-data-access` to execute the unit tests.
diff --git a/libs/pmp-web/report/repository-statistics/feature/README.md b/libs/pmp-web/report/repository-statistics/feature/README.md
@@ -1,7 +1,7 @@
-# pmp-web-repository-repository-statistics-feature
+# pmp-web-report-repository-statistics-feature
 
 This library was generated with [Nx](https://nx.dev).
 
 ## Running unit tests
 
-Run `nx test pmp-web-repository-repository-statistics-feature` to execute the unit tests.
+Run `nx test pmp-web-report-repository-statistics-feature` to execute the unit tests.
diff --git a/libs/pmp-web/report/single-user-statistics/data-access/README.md b/libs/pmp-web/report/single-user-statistics/data-access/README.md
@@ -1,7 +1,7 @@
-# pmp-web-user-single-user-statistics-data-access
+# pmp-web-report-single-user-statistics-data-access
 
 This library was generated with [Nx](https://nx.dev).
 
 ## Running unit tests
 
-Run `nx test pmp-web-user-single-user-statistics-data-access` to execute the unit tests.
+Run `nx test pmp-web-report-single-user-statistics-data-access` to execute the unit tests.
diff --git a/libs/pmp-web/report/single-user-statistics/feature/README.md b/libs/pmp-web/report/single-user-statistics/feature/README.md
@@ -1,7 +1,7 @@
-# pmp-web-user-single-user-statistics-feature
+# pmp-web-report-single-user-statistics-feature
 
 This library was generated with [Nx](https://nx.dev).
 
 ## Running unit tests
 
-Run `ng test pmp-web-user-single-user-statistics-feature` to execute the unit tests via [Jest](https://jestjs.io).
+Run `ng test pmp-web-report-single-user-statistics-feature` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/...e-user-statistics/feature/src/lib/pmp-web-report-single-user-statistics-feature.module.ts b/...e-user-statistics/feature/src/lib/pmp-web-report-single-user-statistics-feature.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { PmpWebUserSingleUserStatisticsRoutingModule } from './pmp-web-user-single-user-statistics-routing.module';
+import { PmpWebReportSingleUserStatisticsRoutingModule } from './pmp-web-report-single-user-statistics-routing.module';
 import { SingleUserStatisticsComponent } from './containers/single-user-statistics/single-user-statistics.component';
 import { PmpWebSharedUiPictureLabelModule } from '@pimp-my-pr/pmp-web/shared/ui-picture-label';
 import { MatIconModule, MatTableModule } from '@angular/material';
@@ -13,7 +13,7 @@ import { ContentLoaderModule } from '@ngneat/content-loader';
 @NgModule({
   imports: [
     CommonModule,
-    PmpWebUserSingleUserStatisticsRoutingModule,
+    PmpWebReportSingleUserStatisticsRoutingModule,
     PmpWebSharedUiPictureLabelModule,
     PmpWebReportSingleUserStatisticsDataAccessModule,
     PmpWebSharedUiTablePrStatisticModule,

diff --git a/...-single-user-statistics-routing.module.ts → ...-single-user-statistics-routing.module.ts b/...-single-user-statistics-routing.module.ts → ...-single-user-statistics-routing.module.ts
@@ -14,4 +14,4 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class PmpWebUserSingleUserStatisticsRoutingModule {}
+export class PmpWebReportSingleUserStatisticsRoutingModule {}
diff --git a/libs/pmp-web/report/users-statistics/data-access/README.md b/libs/pmp-web/report/users-statistics/data-access/README.md
@@ -1,7 +1,7 @@
-# pmp-web-user-data-access
+# pmp-web-report-data-access
 
 This library was generated with [Nx](https://nx.dev).
 
 ## Running unit tests
 
-Run `nx test pmp-web-user-data-access` to execute the unit tests.
+Run `nx test pmp-web-report-data-access` to execute the unit tests.
diff --git a/libs/pmp-web/report/users-statistics/feature/README.md b/libs/pmp-web/report/users-statistics/feature/README.md
@@ -1,7 +1,7 @@
-# pmp-web-user-users-statistics-feature
+# pmp-web-report-users-statistics-feature
 
 This library was generated with [Nx](https://nx.dev).
 
 ## Running unit tests
 
-Run `nx test pmp-web-user-users-statistics-feature` to execute the unit tests.
+Run `nx test pmp-web-report-users-statistics-feature` to execute the unit tests.
diff --git a/...report/users-statistics/feature/src/lib/pmp-web-report-users-statistics-feature.module.ts b/...report/users-statistics/feature/src/lib/pmp-web-report-users-statistics-feature.module.ts
@@ -1,14 +1,14 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { UsersStatisticsComponent } from './containers/users-statistics/users-statistics.component';
-import { PmpWebUserUsersStatisticsRoutingModule } from './pmp-web-user-users-statistics-routing.module';
+import { PmpWebReportUsersStatisticsRoutingModule } from './pmp-web-report-users-statistics-routing.module';
 import { PmpWebReportUsersStatisticsDataAccessModule } from '@pimp-my-pr/pmp-web/report/users-statistics/data-access';
 import { PmpWebSharedUiStatisticsOverviewTableModule } from '@pimp-my-pr/pmp-web/shared/ui-statistics-overview-table';
 
 @NgModule({
   imports: [
     CommonModule,
-    PmpWebUserUsersStatisticsRoutingModule,
+    PmpWebReportUsersStatisticsRoutingModule,
     PmpWebReportUsersStatisticsDataAccessModule,
     PmpWebSharedUiStatisticsOverviewTableModule
   ],

diff --git a/...b-user-users-statistics-routing.module.ts → ...report-users-statistics-routing.module.ts b/...b-user-users-statistics-routing.module.ts → ...report-users-statistics-routing.module.ts
@@ -13,4 +13,4 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class PmpWebUserUsersStatisticsRoutingModule {}
+export class PmpWebReportUsersStatisticsRoutingModule {}
diff --git a/nx.json b/nx.json
@@ -53,9 +53,6 @@
     "pmp-web-shared-util": {
       "tags": ["scope:pmp-web-shared", "type:util"]
     },
-    "pmp-web-user-shell": {
-      "tags": ["scope:pmp-web-user", "type:shell"]
-    },
     "pmp-web-shared-ui-navbar": {
       "tags": ["scope:pmp-web-shared", "type:ui"]
     },
@@ -65,9 +62,6 @@
     "pmp-web-shared-ui-picture-label": {
       "tags": ["scope:pmp-web-shared", "type:ui"]
     },
-    "pmp-web-user-domain": {
-      "tags": ["scope:pmp-web-user", "type:domain"]
-    },
     "pmp-web-shared-ui-table-pr-statistic": {
       "tags": ["scope:shared", "type:ui"]
     },
@@ -93,31 +87,31 @@
       "tags": ["scope:pmp-report", "type:feature"]
     },
     "pmp-web-report-domain": {
-      "tags": ["scope:pmp-web-repository", "type:domain"]
+      "tags": ["scope:pmp-web-report", "type:domain"]
     },
     "pmp-web-report-repository-statistics-feature": {
-      "tags": ["scope:pmp-web-repository", "type:feature"]
+      "tags": ["scope:pmp-web-report", "type:feature"]
     },
     "pmp-web-report-repository-statistics-data-access": {
-      "tags": ["scope:pmp-web-repository", "type:data-access"]
+      "tags": ["scope:pmp-web-report", "type:data-access"]
     },
     "pmp-web-report-repositories-statistics-feature": {
-      "tags": ["scope:pmp-web-repository", "type:feature"]
+      "tags": ["scope:pmp-web-report", "type:feature"]
     },
     "pmp-web-report-repositories-statistics-data-access": {
-      "tags": ["scope:pmp-web-repository", "type:data-access"]
+      "tags": ["scope:pmp-web-report", "type:data-access"]
     },
     "pmp-web-report-single-user-statistics-feature": {
-      "tags": ["scope:pmp-web-user", "type:feature"]
+      "tags": ["scope:pmp-web-report", "type:feature"]
     },
     "pmp-web-report-single-user-statistics-data-access": {
-      "tags": ["scope:pmp-web-user", "type:data-access"]
+      "tags": ["scope:pmp-web-report", "type:data-access"]
     },
     "pmp-web-report-users-statistics-data-access": {
-      "tags": ["scope:pmp-web-user", "type:data-access"]
+      "tags": ["scope:pmp-web-report", "type:data-access"]
     },
     "pmp-web-report-users-statistics-feature": {
-      "tags": ["scope:pmp-web-user", "type:feature"]
+      "tags": ["scope:pmp-web-report", "type:feature"]
     }
   }
 }
diff --git a/tslint.json b/tslint.json
@@ -104,8 +104,7 @@
             "onlyDependOnLibsWithTags": [
               "scope:shared",
               "scope:pmp-web",
-              "scope:pmp-web-repository",
-              "scope:pmp-web-user",
+              "scope:pmp-web-report",
               "scope:pmp-web-auth"
             ]
           },
@@ -114,9 +113,9 @@
             "onlyDependOnLibsWithTags": ["scope:shared", "scope:pmp-api"]
           },
           {
-            "sourceTag": "scope:pmp-web-repository",
+            "sourceTag": "scope:pmp-web-report",
             "onlyDependOnLibsWithTags": [
-              "scope:pmp-web-repository",
+              "scope:pmp-web-report",
               "scope:pmp-web-shared",
               "scope:shared"
             ]
@@ -125,14 +124,6 @@
             "sourceTag": "scope:pmp-web-shared",
             "onlyDependOnLibsWithTags": ["scope:pmp-web-shared", "scope:shared"]
           },
-          {
-            "sourceTag": "scope:pmp-web-user",
-            "onlyDependOnLibsWithTags": [
-              "scope:pmp-web-user",
-              "scope:pmp-web-shared",
-              "scope:shared"
-            ]
-          },
           {
             "sourceTag": "scope:pmp-web-auth",
             "onlyDependOnLibsWithTags": ["scope:pmp-web-shared", "scope:shared"]

diff --git a/valueadd-dev.json5 b/valueadd-dev.json5
@@ -99,7 +99,7 @@
         'pmp',
         'pmp-api',
         'pmp-web',
-        'pmp-web-user'
+        'pmp-web-report'
       ]
     ]
   },