diff options
| author | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-10 01:00:55 +0100 |
|---|---|---|
| committer | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-10 01:00:55 +0100 |
| commit | 400f0d32b919da62efd9e26d0fa7f506904f0073 (patch) | |
| tree | c7d7b30ed99c091b0fc5b47d6b50b8017b40aec1 /frontend/package.json | |
| parent | ff97a3c62ab764e35df4928cf87709088e2b4c8b (diff) | |
| parent | a6f994c8bcd6949c186fe4209ad5a5f5f9f58eb5 (diff) | |
Merge branch 'frontendCSV' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
# Conflicts:
# backend/api/api/Controllers/UserController.cs
# backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs
# backend/api/api/Services/IUserService.cs
# backend/api/api/Services/UserService.cs
# backend/api/api/appsettings.json
Diffstat (limited to 'frontend/package.json')
| -rw-r--r-- | frontend/package.json | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/frontend/package.json b/frontend/package.json index 5d3ab5e3..e8180256 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -20,10 +20,12 @@ "@angular/platform-browser-dynamic": "~13.2.0", "@angular/router": "~13.2.0", "@auth0/angular-jwt": "^5.0.2", - "ngx-cookie-service": "^13.1.2", "@ng-bootstrap/ng-bootstrap": "^12.0.0", "@popperjs/core": "^2.10.2", "bootstrap": "^5.1.3", + "csv-parser": "^3.0.0", + "ngx-cookie-service": "^13.1.2", + "ngx-csv-parser": "^0.0.7", "rxjs": "~7.5.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -42,4 +44,4 @@ "karma-jasmine-html-reporter": "~1.7.0", "typescript": "~4.5.2" } -}
\ No newline at end of file +} |