diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 38a1597848e..def03c714d7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -39,6 +39,7 @@ libs/tools @bitwarden/team-tools-dev apps/web/src/app/dirt @bitwarden/team-data-insights-and-reporting-dev bitwarden_license/bit-common/src/dirt @bitwarden/team-data-insights-and-reporting-dev bitwarden_license/bit-web/src/app/dirt @bitwarden/team-data-insights-and-reporting-dev +libs/dirt @bitwarden/team-data-insights-and-reporting-dev ## Localization/Crowdin (Platform and Tools team) apps/browser/src/_locales @bitwarden/team-tools-dev @bitwarden/team-platform-dev diff --git a/.storybook/main.ts b/.storybook/main.ts index d5d116e99be..879e87fe376 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -8,6 +8,8 @@ const config: StorybookConfig = { stories: [ "../libs/auth/src/**/*.mdx", "../libs/auth/src/**/*.stories.@(js|jsx|ts|tsx)", + "../libs/dirt/card/src/**/*.mdx", + "../libs/dirt/card/src/**/*.stories.@(js|jsx|ts|tsx)", "../libs/tools/send/send-ui/src/**/*.mdx", "../libs/tools/send/send-ui/src/**/*.stories.@(js|jsx|ts|tsx)", "../libs/vault/src/**/*.mdx", @@ -20,8 +22,6 @@ const config: StorybookConfig = { "../apps/browser/src/**/*.stories.@(js|jsx|ts|tsx)", "../bitwarden_license/bit-web/src/**/*.mdx", "../bitwarden_license/bit-web/src/**/*.stories.@(js|jsx|ts|tsx)", - "../libs/tools/card/src/**/*.mdx", - "../libs/tools/card/src/**/*.stories.@(js|jsx|ts|tsx)", "../libs/angular/src/**/*.stories.@(js|jsx|ts|tsx)", ], addons: [ diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json index e24985f58af..ff4ac340219 100644 --- a/apps/browser/tsconfig.json +++ b/apps/browser/tsconfig.json @@ -19,6 +19,7 @@ "@bitwarden/billing": ["../../libs/billing/src"], "@bitwarden/common/*": ["../../libs/common/src/*"], "@bitwarden/components": ["../../libs/components/src"], + "@bitwarden/dirt-card": ["../../libs/dirt/card/src"], "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"], "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"], "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"], @@ -31,7 +32,6 @@ "@bitwarden/platform": ["../../libs/platform/src"], "@bitwarden/platform/*": ["../../libs/platform/src/*"], "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"], - "@bitwarden/tools-card": ["../../libs/tools/card/src"], "@bitwarden/ui-common": ["../../libs/ui/common/src"], "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"], "@bitwarden/vault-export-core": [ diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json index 78b3512405e..27e38757e97 100644 --- a/apps/desktop/tsconfig.json +++ b/apps/desktop/tsconfig.json @@ -17,6 +17,7 @@ "@bitwarden/billing": ["../../libs/billing/src"], "@bitwarden/common/*": ["../../libs/common/src/*"], "@bitwarden/components": ["../../libs/components/src"], + "@bitwarden/dirt-card": ["../../libs/dirt/card/src"], "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"], "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"], "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"], @@ -29,7 +30,6 @@ "@bitwarden/node/*": ["../../libs/node/src/*"], "@bitwarden/platform": ["../../libs/platform/src"], "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"], - "@bitwarden/tools-card": ["../../libs/tools/card/src"], "@bitwarden/ui-common": ["../../libs/ui/common/src"], "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"], "@bitwarden/vault-export-core": [ diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index 3d62a30bc01..0cc988ea722 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -13,6 +13,7 @@ "@bitwarden/bit-common/*": ["../../bitwarden_license/bit-common/src/*"], "@bitwarden/common/*": ["../../libs/common/src/*"], "@bitwarden/components": ["../../libs/components/src"], + "@bitwarden/dirt-card": ["../../libs/dirt/card/src"], "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"], "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"], "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"], @@ -24,7 +25,6 @@ "@bitwarden/key-management-ui": ["../../libs/key-management-ui/src"], "@bitwarden/platform": ["../../libs/platform/src"], "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"], - "@bitwarden/tools-card": ["../../libs/tools/card/src"], "@bitwarden/ui-common": ["../../libs/ui/common/src"], "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"], "@bitwarden/vault-export-core": [ diff --git a/bitwarden_license/bit-common/tsconfig.json b/bitwarden_license/bit-common/tsconfig.json index 641b0ac6aa9..c92167bb919 100644 --- a/bitwarden_license/bit-common/tsconfig.json +++ b/bitwarden_license/bit-common/tsconfig.json @@ -12,6 +12,7 @@ "@bitwarden/bit-common/*": ["../bit-common/src/*"], "@bitwarden/common/*": ["../../libs/common/src/*"], "@bitwarden/components": ["../../libs/components/src"], + "@bitwarden/dirt-card": ["../../libs/dirt/card/src"], "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"], "@bitwarden/generator-core": ["../../libs/tools/generator/core/src"], "@bitwarden/generator-history": ["../../libs/tools/generator/extensions/history/src"], @@ -20,7 +21,6 @@ "@bitwarden/key-management": ["../../libs/key-management/src"], "@bitwarden/platform": ["../../libs/platform/src"], "@bitwarden/send-ui": ["../../libs/tools/send/send-ui/src"], - "@bitwarden/tools-card": ["../../libs/tools/card/src"], "@bitwarden/ui-common": ["../../libs/ui/common/src"], "@bitwarden/ui-common/setup-jest": ["../../libs/ui/common/src/setup-jest"], "@bitwarden/vault-export-core": [ diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html index 6f8e738fdc3..0dfe55bed48 100644 --- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html +++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html @@ -26,7 +26,7 @@

{{ "allApplications" | i18n }}

- - - + - +
- - - + - +
({ props: args, template: /*html*/ ` - `, + `, }), }; diff --git a/libs/tools/card/src/index.ts b/libs/dirt/card/src/index.ts similarity index 100% rename from libs/tools/card/src/index.ts rename to libs/dirt/card/src/index.ts diff --git a/libs/tools/card/test.setup.ts b/libs/dirt/card/test.setup.ts similarity index 100% rename from libs/tools/card/test.setup.ts rename to libs/dirt/card/test.setup.ts diff --git a/libs/tools/card/tsconfig.json b/libs/dirt/card/tsconfig.json similarity index 100% rename from libs/tools/card/tsconfig.json rename to libs/dirt/card/tsconfig.json diff --git a/libs/tools/card/tsconfig.spec.json b/libs/dirt/card/tsconfig.spec.json similarity index 100% rename from libs/tools/card/tsconfig.spec.json rename to libs/dirt/card/tsconfig.spec.json diff --git a/libs/shared/tsconfig.spec.json b/libs/shared/tsconfig.spec.json index 6d2c7498129..5402594e5ab 100644 --- a/libs/shared/tsconfig.spec.json +++ b/libs/shared/tsconfig.spec.json @@ -10,6 +10,7 @@ "@bitwarden/billing": ["../billing/src"], "@bitwarden/common/*": ["../common/src/*"], "@bitwarden/components": ["../components/src"], + "@bitwarden/dirt-card": ["../dirt/card/src"], "@bitwarden/generator-components": ["../tools/generator/components/src"], "@bitwarden/generator-core": ["../tools/generator/core/src"], "@bitwarden/generator-history": ["../tools/generator/extensions/history/src"], @@ -22,7 +23,6 @@ "@bitwarden/node/*": ["../node/src/*"], "@bitwarden/platform": ["../platform/src"], "@bitwarden/send-ui": ["../tools/send/send-ui/src"], - "@bitwarden/tools-card": ["../tools/card/src"], "@bitwarden/ui-common": ["../ui/common/src"], "@bitwarden/ui-common/setup-jest": ["../ui/common/src/setup-jest"], "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"], diff --git a/libs/tools/card/README.md b/libs/tools/card/README.md deleted file mode 100644 index 5e28e62d154..00000000000 --- a/libs/tools/card/README.md +++ /dev/null @@ -1,5 +0,0 @@ -## Tools Card - -Package name: `@bitwarden/tools-card` - -Generic Tools Card Component diff --git a/package-lock.json b/package-lock.json index 071f42c94c9..d4009fff06d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -277,6 +277,11 @@ "name": "@bitwarden/components", "version": "0.0.0" }, + "libs/dirt/card": { + "name": "@bitwarden/dirt-card", + "version": "0.0.0", + "license": "GPL-3.0" + }, "libs/importer": { "name": "@bitwarden/importer", "version": "0.0.0", @@ -302,11 +307,6 @@ "version": "0.0.0", "license": "GPL-3.0" }, - "libs/tools/card": { - "name": "@bitwarden/tools-card", - "version": "0.0.0", - "license": "GPL-3.0" - }, "libs/tools/export/vault-export/vault-export-core": { "name": "@bitwarden/vault-export-core", "version": "0.0.0", @@ -5169,6 +5169,10 @@ "resolved": "apps/desktop/desktop_native/napi", "link": true }, + "node_modules/@bitwarden/dirt-card": { + "resolved": "libs/dirt/card", + "link": true + }, "node_modules/@bitwarden/generator-components": { "resolved": "libs/tools/generator/components", "link": true @@ -5219,10 +5223,6 @@ "resolved": "libs/tools/send/send-ui", "link": true }, - "node_modules/@bitwarden/tools-card": { - "resolved": "libs/tools/card", - "link": true - }, "node_modules/@bitwarden/ui-common": { "resolved": "libs/ui/common", "link": true diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json index e8c3f669c0c..90b95ff54bf 100644 --- a/tsconfig.eslint.json +++ b/tsconfig.eslint.json @@ -23,6 +23,7 @@ "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"], "@bitwarden/common/*": ["./libs/common/src/*"], "@bitwarden/components": ["./libs/components/src"], + "@bitwarden/dirt-card": [".libs/dirt/card/src"], "@bitwarden/generator-components": ["./libs/tools/generator/components/src"], "@bitwarden/generator-core": ["./libs/tools/generator/core/src"], "@bitwarden/generator-history": ["./libs/tools/generator/extensions/history/src"], @@ -35,7 +36,6 @@ "@bitwarden/node/*": ["./libs/node/src/*"], "@bitwarden/platform": ["./libs/platform/src"], "@bitwarden/send-ui": [".libs/tools/send/send-ui/src"], - "@bitwarden/tools-card": [".libs/tools/card/src"], "@bitwarden/ui-common": ["./libs/ui/common/src"], "@bitwarden/vault-export-core": [".libs/tools/export/vault-export/vault-export-core/src"], "@bitwarden/vault-export-ui": [".libs/tools/export/vault-export/vault-export-ui/src"], diff --git a/tsconfig.json b/tsconfig.json index c82851d50c8..525af0ac3b7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,6 +24,7 @@ "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"], "@bitwarden/common/*": ["./libs/common/src/*"], "@bitwarden/components": ["./libs/components/src"], + "@bitwarden/dirt-card": ["./libs/dirt/card/src"], "@bitwarden/generator-components": ["./libs/tools/generator/components/src"], "@bitwarden/generator-core": ["./libs/tools/generator/core/src"], "@bitwarden/generator-history": ["./libs/tools/generator/extensions/history/src"], @@ -37,7 +38,6 @@ "@bitwarden/platform": ["./libs/platform/src"], "@bitwarden/platform/*": ["./libs/platform/src/*"], "@bitwarden/send-ui": ["./libs/tools/send/send-ui/src"], - "@bitwarden/tools-card": ["./libs/tools/card/src"], "@bitwarden/ui-common": ["./libs/ui/common/src"], "@bitwarden/ui-common/setup-jest": ["./libs/ui/common/src/setup-jest"], "@bitwarden/vault-export-core": ["./libs/tools/export/vault-export/vault-export-core/src"], @@ -57,7 +57,7 @@ "apps/browser/src/**/*", "libs/*/src/**/*", "libs/tools/send/**/src/**/*", - "libs/tools/card/src/**/*", + "libs/dirt/card/src/**/*", "bitwarden_license/bit-web/src/**/*", "bitwarden_license/bit-common/src/**/*" ],