diff options
| author | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-03-22 15:04:36 +0000 |
|---|---|---|
| committer | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-03-22 15:04:36 +0000 |
| commit | 012fb19a54f4d55a6e4cc73227f738f64539cf04 (patch) | |
| tree | 57b3de84ad41037e8c7b1403dba4a5bad24a4752 /frontend/package.json | |
| parent | b4f0cd025a86c68a5c35a58e62c22b7cedf3d8b5 (diff) | |
| parent | 31642f68564e67175301235546b74baf56ac5882 (diff) | |
Merge branch 'dev' into 'Privremeno-cuvanje-podataka'
# Conflicts:
# backend/api/api/Controllers/ModelController.cs
Diffstat (limited to 'frontend/package.json')
| -rw-r--r-- | frontend/package.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/frontend/package.json b/frontend/package.json index 01cdf462..c3f0310e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -26,9 +26,11 @@ "@ng-bootstrap/ng-bootstrap": "^12.0.0", "@popperjs/core": "^2.10.2", "bootstrap": "^5.1.3", + "chart.js": "^3.7.1", "csv-parser": "^3.0.0", "mdb-angular-ui-kit": "^2.0.0", "ng-uikit-pro-standard": "^1.0.0", + "ng2-charts": "^3.0.8", "ngx-cookie-service": "^13.1.2", "ngx-csv-parser": "^0.0.7", "rxjs": "~7.5.0", @@ -49,4 +51,4 @@ "karma-jasmine-html-reporter": "~1.7.0", "typescript": "~4.5.2" } -}
\ No newline at end of file +} |