Skip to content

Commit

Permalink
Merge pull request #1597 from DSD-DBS/pre-commit-update
Browse files Browse the repository at this point in the history
build(frontend): Update frontend versions
  • Loading branch information
MoritzWeber0 authored Jun 3, 2024
2 parents c599896 + 6245891 commit b0e2517
Show file tree
Hide file tree
Showing 25 changed files with 1,491 additions and 1,917 deletions.
18 changes: 9 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ repos:
types_or: [ts, css, html, markdown]
exclude: '^frontend/src/app/openapi'
additional_dependencies:
- 'prettier@^3.0.3'
- 'prettier-plugin-tailwindcss@^0.5.13'
- 'prettier@^3.3.0'
- 'prettier-plugin-tailwindcss@^0.6.1'
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.5.5
hooks:
Expand Down Expand Up @@ -147,20 +147,20 @@ repos:
hooks:
- id: reuse
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v9.2.0
rev: v9.4.0
hooks:
- id: eslint
additional_dependencies:
- 'eslint@^8.57.0'
- '@angular-eslint/[email protected].0-alpha.5'
- '@angular-eslint/[email protected].0-alpha.5'
- '@angular-eslint/[email protected].0-alpha.5'
- '@angular-eslint/[email protected].1'
- '@angular-eslint/[email protected].1'
- '@angular-eslint/[email protected].1'
- 'eslint-config-prettier@^9.1.0'
- 'eslint-plugin-import@^2.29.1'
- '@typescript-eslint/eslint-plugin@^7.10.0'
- '@typescript-eslint/parser@^7.10.0'
- '@typescript-eslint/eslint-plugin@^7.11.0'
- '@typescript-eslint/parser@^7.11.0'
- 'eslint-plugin-unused-imports@^3.2.0'
- 'eslint-plugin-deprecation@^2.0.0'
- 'eslint-plugin-deprecation@^3.0.0'
- 'eslint-plugin-tailwindcss@^3.17.0'
- 'eslint-plugin-storybook@^0.8.0'
args: ['--fix']
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,10 @@ Then, choose one of the three options and run the corresponding command:
```

2. Build Capella images locally (without initial TeamForCapella support) \
To reduce the build time, the default configutation only builds images for Capella
6.0.0. If you want to build more images for different versions, set the environment
variable `CAPELLA_VERSIONS` with a space-separated list of semantic Capella versions.
To reduce the build time, the default configutation only builds images for
Capella 6.0.0. If you want to build more images for different versions, set
the environment variable `CAPELLA_VERSIONS` with a space-separated list of
semantic Capella versions.

```
export CAPELLA_VERSIONS="6.0.0 6.1.0"
Expand Down
3,255 changes: 1,414 additions & 1,841 deletions frontend/package-lock.json

Large diffs are not rendered by default.

74 changes: 37 additions & 37 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~18.0.0",
"@angular/cdk": "^18.0.0",
"@angular/common": "~18.0.0",
"@angular/compiler": "~18.0.0",
"@angular/core": "~18.0.0",
"@angular/forms": "~18.0.0",
"@angular/material": "^18.0.0",
"@angular/platform-browser": "~18.0.0",
"@angular/platform-browser-dynamic": "~18.0.0",
"@angular/router": "~18.0.0",
"@angular/animations": "~18.0.1",
"@angular/cdk": "^18.0.1",
"@angular/common": "~18.0.1",
"@angular/compiler": "~18.0.1",
"@angular/core": "~18.0.1",
"@angular/forms": "~18.0.1",
"@angular/material": "^18.0.1",
"@angular/platform-browser": "~18.0.1",
"@angular/platform-browser-dynamic": "~18.0.1",
"@angular/router": "~18.0.1",
"@ngneat/until-destroy": "^10.0.0",
"@panzoom/panzoom": "^4.5.1",
"@types/semver": "^7.5.8",
Expand All @@ -35,47 +35,47 @@
"monaco-editor": "^0.49.0",
"ngx-cookie": "^6.0.1",
"ngx-skeleton-loader": "^9.0.0",
"ngx-toastr": "^18.0.0",
"npm": "^10.8.0",
"ngx-toastr": "^19.0.0",
"npm": "^10.8.1",
"npm-check-updates": "^16.14.20",
"path-is-absolute": "^2.0.0",
"rxjs": "~7.8.1",
"semver": "^7.6.2",
"slugify": "^1.6.6",
"tslib": "^2.6.2",
"uuid": "^9.0.1",
"yaml": "^2.4.2",
"yaml": "^2.4.3",
"zone.js": "~0.14.6"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.0.1",
"@angular-eslint/builder": "18.0.0-alpha.5",
"@angular-eslint/eslint-plugin": "18.0.0-alpha.5",
"@angular-eslint/eslint-plugin-template": "18.0.0-alpha.5",
"@angular-eslint/schematics": "18.0.0-alpha.5",
"@angular-eslint/template-parser": "18.0.0-alpha.5",
"@angular/cli": "~18.0.1",
"@angular/compiler-cli": "~18.0.0",
"@compodoc/compodoc": "^1.1.24",
"@angular-devkit/build-angular": "^18.0.2",
"@angular-eslint/builder": "18.0.1",
"@angular-eslint/eslint-plugin": "18.0.1",
"@angular-eslint/eslint-plugin-template": "18.0.1",
"@angular-eslint/schematics": "18.0.1",
"@angular-eslint/template-parser": "18.0.1",
"@angular/cli": "~18.0.2",
"@angular/compiler-cli": "~18.0.1",
"@compodoc/compodoc": "^1.1.25",
"@playwright/test": "^1.44.1",
"@storybook/addon-docs": "^8.1.3",
"@storybook/addon-essentials": "^8.1.3",
"@storybook/addon-interactions": "^8.1.3",
"@storybook/addon-links": "^8.1.3",
"@storybook/angular": "^8.1.3",
"@storybook/blocks": "^8.1.3",
"@storybook/test": "^8.1.3",
"@storybook/addon-docs": "^8.1.5",
"@storybook/addon-essentials": "^8.1.5",
"@storybook/addon-interactions": "^8.1.5",
"@storybook/addon-links": "^8.1.5",
"@storybook/angular": "^8.1.5",
"@storybook/blocks": "^8.1.5",
"@storybook/test": "^8.1.5",
"@types/file-saver": "^2.0.7",
"@types/jasmine": "~5.1.4",
"@types/node": "^20.12.12",
"@types/node": "^20.14.0",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "^7.10.0",
"@typescript-eslint/parser": "^7.10.0",
"@typescript-eslint/eslint-plugin": "^7.11.0",
"@typescript-eslint/parser": "^7.11.0",
"autoprefixer": "^10.4.19",
"chromatic": "^11.4.1",
"chromatic": "^11.5.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-deprecation": "^2.0.0",
"eslint-plugin-deprecation": "^3.0.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-storybook": "^0.8.0",
"eslint-plugin-tailwindcss": "^3.17.0",
Expand All @@ -88,9 +88,9 @@
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "^2.1.0",
"postcss": "^8.4.38",
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.14",
"storybook": "^8.1.3",
"prettier": "^3.3.0",
"prettier-plugin-tailwindcss": "^0.6.1",
"storybook": "^8.1.5",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.5"
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div
[ngClass]="{
'wrapper mx-3 my-2 md:mx-5':
(fullscreenService.isFullscreen$ | async) === false
(fullscreenService.isFullscreen$ | async) === false,
}"
>
@if (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'border-radius': '5px',
height: '36px',
width: '110px',
border: '1px solid white'
border: '1px solid white',
}"
></ngx-skeleton-loader>
</ng-container>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'border-radius': '5px',
height: '52px',
width: '100%',
border: '1px solid white'
border: '1px solid white',
}"
></ngx-skeleton-loader>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
'border-radius': '5px',
height: '260px',
width: '410px',
border: '1px solid white'
border: '1px solid white',
}"
></ngx-skeleton-loader>
</ng-container>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'border-radius': '5px',
width: 'calc(100% - 10px)',
height: '51px',
border: '1px solid white'
border: '1px solid white',
}"
></ngx-skeleton-loader>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
'border-radius': '5px',
height: '1em',
width: width,
margin: 0
margin: 0,
}"
></ngx-skeleton-loader>
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ <h3 class="flex justify-center pb-[5px] sm:hidden sm:pb-0">
mat-button
[routerLink]="[
'/project',
(projectService.project$ | async)?.slug
(projectService.project$ | async)?.slug,
]"
[color]="getColorByModelCreationStep()"
data-testId="a-skipModelAndFinishProjectCreation"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
width: '600px',
'max-width': '100%',
border: '1px solid white',
margin: '0'
margin: '0',
}"
></ngx-skeleton-loader>
} @else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h2 class="mb-5 text-xl font-medium">View diagrams</h2>
'border-radius': '5px',
height: '332px',
'min-width': '208px',
border: '1px solid white'
border: '1px solid white',
}"
></ngx-skeleton-loader>
}
Expand All @@ -66,7 +66,7 @@ <h2 class="mb-5 text-xl font-medium">View diagrams</h2>
padding: 0,
height: '200px',
width: '100%',
border: '1px solid white'
border: '1px solid white',
}"
></ngx-skeleton-loader>
} @else if (diagrams[diagram.uuid].content) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
height: '100%',
'border-radius': '5px',
border: '1px solid white',
margin: 0
margin: 0,
}"
></ngx-skeleton-loader>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2 class="text-xl font-medium">Models</h2>
'/project',
(projectService.project$ | async)?.slug,
'models',
'create'
'create',
]
"
[matTooltip]="
Expand Down Expand Up @@ -54,7 +54,7 @@ <h2 class="text-xl font-medium">Models</h2>
height: '280px',
width: '500px',
margin: '10px',
border: '1px solid white'
border: '1px solid white',
}"
></ngx-skeleton-loader>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ <h2 class="break-all text-xl font-medium">
'border-radius': '5px',
height: '24px',
width: '50%',
border: '1px solid white'
border: '1px solid white',
}"
></ngx-skeleton-loader>
<ngx-skeleton-loader
[theme]="{
'border-radius': '5px',
height: '100px',
width: '80%',
border: '1px solid white'
border: '1px solid white',
}"
></ngx-skeleton-loader>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ <h3 class="pl-1">Current members</h3>
'border-radius': '5px',
height: '125px',
width: 'calc(100% - 12px)',
border: '1px solid white'
border: '1px solid white',
}"
></ngx-skeleton-loader>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class="flex w-full flex-col active:z-30"
[ngClass]="{
'z-20': session.focused,
'z-10': !session.focused
'z-10': !session.focused,
}"
(click)="sessionViewerService.focusSession(session)"
*ngFor="let session of viewerSessions; trackBy: trackBySessionId"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
class="size-full"
allow="clipboard-read; clipboard-write"
[ngClass]="{
'pointer-events-none': session.disabled
'pointer-events-none': session.disabled,
}"
>
</iframe>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/sessions/session/session.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
height: '24px',
width: '80%',
border: '1px solid white',
margin: '0'
margin: '0',
}"
></ngx-skeleton-loader>
</div>
Expand Down Expand Up @@ -83,7 +83,7 @@
*ngIf="viewerSessions.length"
[ngClass]="{
height: (fullscreenService.isFullscreen$ | async) === false,
'h-screen': fullscreenService.isFullscreen$ | async
'h-screen': fullscreenService.isFullscreen$ | async,
}"
>
<app-floating-window-manager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h1 class="text-2xl">Active Sessions</h1>
'border-radius': '5px',
height: '240px',
width: '432px',
border: '1px solid white'
border: '1px solid white',
}"
></ngx-skeleton-loader>
} @else if ((userSessionService.sessions$ | async)?.length === 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2 id="title" class="text-xl font-medium">Read-only Sessions</h2>
padding: '0',
margin: '0 0 18px 0',
width: '100%',
border: '1px solid white'
border: '1px solid white',
}"
></ngx-skeleton-loader>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class="mt-3 max-h-0 overflow-hidden transition-all duration-700"
[ngClass]="{
'max-h-[600px]':
sessionsLoaded === sessionsToBeLoaded && sessionsToBeLoaded > 0
sessionsLoaded === sessionsToBeLoaded && sessionsToBeLoaded > 0,
}"
>
<div class="flex flex-col gap-2">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h2 class="!mb-[10px] text-xl font-medium">General monitoring</h2>
height: '120px',
width: '260px',
border: '1px solid white',
margin: '10px'
margin: '10px',
}"
></ngx-skeleton-loader>
<div class="collab-card !mb-[15px] !ml-[10px]" *ngIf="generalHealth">
Expand Down Expand Up @@ -56,7 +56,7 @@ <h2 class="!mb-[10px] text-xl font-medium">Projects Monitoring</h2>
height: '120px',
width: '260px',
border: '1px solid white',
margin: '10px'
margin: '10px',
}"
></ngx-skeleton-loader>
<div *ngFor="let projectStatus of projectStatuses">
Expand Down Expand Up @@ -97,7 +97,7 @@ <h2 class="!mb-[10px] text-xl font-medium">Models monitoring</h2>
height: '200px',
width: '350px',
border: '1px solid white',
margin: '10px'
margin: '10px',
}"
></ngx-skeleton-loader>
</div>
Expand Down
Loading

0 comments on commit b0e2517

Please sign in to comment.