From b3479aa63d26e7ce7acedd0d56352c04440eb41b Mon Sep 17 00:00:00 2001 From: Ivan Ljubisavljevic Date: Fri, 25 Mar 2022 12:10:59 +0100 Subject: Moji modeli stranica. Nije zavrseno #55 --- .../_elements/item-model/item-model.component.css | 0 .../_elements/item-model/item-model.component.html | 26 ++++++++++++++++++++++ .../item-model/item-model.component.spec.ts | 25 +++++++++++++++++++++ .../_elements/item-model/item-model.component.ts | 18 +++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 frontend/src/app/_elements/item-model/item-model.component.css create mode 100644 frontend/src/app/_elements/item-model/item-model.component.html create mode 100644 frontend/src/app/_elements/item-model/item-model.component.spec.ts create mode 100644 frontend/src/app/_elements/item-model/item-model.component.ts (limited to 'frontend/src/app/_elements/item-model') diff --git a/frontend/src/app/_elements/item-model/item-model.component.css b/frontend/src/app/_elements/item-model/item-model.component.css new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/_elements/item-model/item-model.component.html b/frontend/src/app/_elements/item-model/item-model.component.html new file mode 100644 index 00000000..ca170b3d --- /dev/null +++ b/frontend/src/app/_elements/item-model/item-model.component.html @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/frontend/src/app/_elements/item-model/item-model.component.spec.ts b/frontend/src/app/_elements/item-model/item-model.component.spec.ts new file mode 100644 index 00000000..f696a160 --- /dev/null +++ b/frontend/src/app/_elements/item-model/item-model.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ItemModelComponent } from './item-model.component'; + +describe('ItemModelComponent', () => { + let component: ItemModelComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ItemModelComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ItemModelComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/_elements/item-model/item-model.component.ts b/frontend/src/app/_elements/item-model/item-model.component.ts new file mode 100644 index 00000000..7f85f43f --- /dev/null +++ b/frontend/src/app/_elements/item-model/item-model.component.ts @@ -0,0 +1,18 @@ +import { Component, Input, OnInit } from '@angular/core'; +import Model from 'src/app/_data/Model'; + +@Component({ + selector: 'app-item-model', + templateUrl: './item-model.component.html', + styleUrls: ['./item-model.component.css'] +}) +export class ItemModelComponent implements OnInit { + + @Input() model: Model = new Model(); + + constructor() { } + + ngOnInit(): void { + } + +} -- cgit v1.2.3 From a315d3c0bc44c091d7c85697c9c8135b314ebc06 Mon Sep 17 00:00:00 2001 From: Ivan Ljubisavljevic Date: Sat, 26 Mar 2022 20:09:28 +0100 Subject: Odradjen my-models stranica #55 --- .../_elements/item-model/item-model.component.html | 26 +++-------- .../app/_pages/my-models/my-models.component.html | 32 +++++++++++--- .../app/_pages/my-models/my-models.component.ts | 51 ++++++++++++++++++---- frontend/src/app/_services/models.service.ts | 10 +++++ 4 files changed, 86 insertions(+), 33 deletions(-) (limited to 'frontend/src/app/_elements/item-model') diff --git a/frontend/src/app/_elements/item-model/item-model.component.html b/frontend/src/app/_elements/item-model/item-model.component.html index ca170b3d..9466da01 100644 --- a/frontend/src/app/_elements/item-model/item-model.component.html +++ b/frontend/src/app/_elements/item-model/item-model.component.html @@ -1,26 +1,14 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/src/app/_pages/my-models/my-models.component.html b/frontend/src/app/_pages/my-models/my-models.component.html index e94f67f5..870e0ddb 100644 --- a/frontend/src/app/_pages/my-models/my-models.component.html +++ b/frontend/src/app/_pages/my-models/my-models.component.html @@ -1,5 +1,27 @@ -
    -
  • - -
    • -
\ No newline at end of file +
+
+
+ +
+
+ +
+
+ +
+ +
+
+
+
+

Nema rezultata

+
+
+ +
+ + + + + +
diff --git a/frontend/src/app/_pages/my-models/my-models.component.ts b/frontend/src/app/_pages/my-models/my-models.component.ts index 3ab57e59..bd6b0a2b 100644 --- a/frontend/src/app/_pages/my-models/my-models.component.ts +++ b/frontend/src/app/_pages/my-models/my-models.component.ts @@ -1,22 +1,55 @@ import { Component, OnInit } from '@angular/core'; import Model from 'src/app/_data/Model'; +import { ModelsService } from 'src/app/_services/models.service'; @Component({ selector: 'app-my-models', templateUrl: './my-models.component.html', styleUrls: ['./my-models.component.css'] }) -export class MyModelsComponent /*implements OnInit*/ { - myModels: Model[]; +export class MyModelsComponent implements OnInit { + myModels: Model[] = []; + //myModel: Model; - constructor() { - this.myModels = [ - new Model('Titanik', 'Opis titanik'), - new Model('Neki drugi set', 'opis'), - new Model('Treci set', 'opis') - ]; } + constructor(private modelsS : ModelsService) { + + + + } + + ngOnInit(): void { + this.getAllMyModels(); - /*ngOnInit(): void { + } +/* + editModel(): void{ + this.modelsS.editModel().subscribe(m => { + this.myModel = m; + + }) } */ + +deleteThisModel(model: Model): void{ + console.log("OK"); + this.modelsS.deleteModel(model).subscribe((response) => { + console.log("OBRISANOOO JEE", response); + //na kraju uspesnog + this.getAllMyModels(); + }, (error) =>{ + if (error.error == "Model with name = {name} deleted") { + alert("Greška pri brisanju modela!"); + } + }); + +} + + getAllMyModels(): void{ + this.modelsS.getMyModels().subscribe(m => { + + this.myModels = m; + console.log(this.myModels); + }); + } + } diff --git a/frontend/src/app/_services/models.service.ts b/frontend/src/app/_services/models.service.ts index d0346c03..58ddb2e6 100644 --- a/frontend/src/app/_services/models.service.ts +++ b/frontend/src/app/_services/models.service.ts @@ -46,4 +46,14 @@ export class ModelsService { getMyModels(): Observable { return this.http.get(`${API_SETTINGS.apiURL}/model/mymodels`, { headers: this.authService.authHeader() }); } + + editModel(model:Model) : Observable + { + return this.http.put(`${API_SETTINGS.apiURL}/model/`, model, { headers: this.authService.authHeader() }); + } + + deleteModel(model:Model) : Observable + { + return this.http.delete(`${API_SETTINGS.apiURL}/model/`+model.name, { headers: this.authService.authHeader() }); + } } -- cgit v1.2.3