diff options
| author | Nevena Bojovic <nenabojov@gmail.com> | 2022-04-04 21:52:26 +0200 |
|---|---|---|
| committer | Nevena Bojovic <nenabojov@gmail.com> | 2022-04-04 21:52:26 +0200 |
| commit | cfaf42a42223bc60621ae583e8ac536d980a794a (patch) | |
| tree | f43987731445ff7c0af42a2a1e014db905f37087 /frontend/src/app/_elements | |
| parent | 6ffac0e8f7803e895e411328917f6c49b2520b28 (diff) | |
| parent | 8077f508fa552b789b669c433776357da1f809eb (diff) | |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
Diffstat (limited to 'frontend/src/app/_elements')
| -rw-r--r-- | frontend/src/app/_elements/item-predictor/item-predictor.component.ts | 3 | ||||
| -rw-r--r-- | frontend/src/app/_elements/navbar/navbar.component.ts | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/frontend/src/app/_elements/item-predictor/item-predictor.component.ts b/frontend/src/app/_elements/item-predictor/item-predictor.component.ts index 41d2ab9c..246032e0 100644 --- a/frontend/src/app/_elements/item-predictor/item-predictor.component.ts +++ b/frontend/src/app/_elements/item-predictor/item-predictor.component.ts @@ -17,8 +17,7 @@ export class ItemPredictorComponent implements OnInit { } openPredictor() { - this.router.navigate(['predict/'+ '6245a5958a9c76c1bf7ff9b6']); - //this.router.navigate(['predict'+this.predictor._id]); + this.router.navigate(['predict/'+ this.predictor._id]); } } diff --git a/frontend/src/app/_elements/navbar/navbar.component.ts b/frontend/src/app/_elements/navbar/navbar.component.ts index 2e4bde91..368508ed 100644 --- a/frontend/src/app/_elements/navbar/navbar.component.ts +++ b/frontend/src/app/_elements/navbar/navbar.component.ts @@ -3,6 +3,7 @@ import { Location } from '@angular/common'; import { AuthService } from '../../_services/auth.service'; import shared from 'src/app/Shared'; import { UserInfoService } from 'src/app/_services/user-info.service'; +import { MatDialog } from '@angular/material/dialog'; @Component({ selector: 'app-navbar', @@ -14,7 +15,8 @@ export class NavbarComponent implements OnInit { currentUrl: string; shared = shared; - constructor(public location: Location, private auth: AuthService, private userInfoService: UserInfoService) { + constructor(public location: Location, private auth: AuthService, private userInfoService: UserInfoService, private matDialog: MatDialog) { + shared.dialog = matDialog; this.currentUrl = this.location.path(); this.location.onUrlChange(() => { this.currentUrl = this.location.path(); |