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/src/app/app.module.ts | |
| 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/src/app/app.module.ts')
| -rw-r--r-- | frontend/src/app/app.module.ts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 9ccd7ddb..4f26046e 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -9,13 +9,16 @@ import { LoginPageComponent } from './_pages/login-page/login-page.component'; import { RegisterPageComponent } from './_pages/register-page/register-page.component'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { OnlyAuthorizedComponent } from './_pages/only-authorized/only-authorized.component'; +import { DatasetLoadComponent } from './_elements/dataset-load/dataset-load.component'; +import { NgxCsvParser } from 'ngx-csv-parser'; @NgModule({ declarations: [ AppComponent, LoginPageComponent, RegisterPageComponent, - OnlyAuthorizedComponent + OnlyAuthorizedComponent, + DatasetLoadComponent ], imports: [ BrowserModule, |