From adde061392c89cbfe3ac0ee29278816463f3607c Mon Sep 17 00:00:00 2001
From: semenovo <oleg.semenov@student.reutlingen-university.de>
Date: Fri, 17 Jul 2020 17:02:34 +0200
Subject: [PATCH] trying backend/frontend connection
---
{groupManagement => frontend}/manifest.yml | 2 +-
.../group-search/group-search.component.html | 2 +-
.../group-search/group-search.component.ts | 45 ++++++++++---------
.../src/app/services/data-provider.service.ts | 6 +--
frontend/src/app/types/modulesDO.ts | 3 +-
groupManagement/pom.xml | 7 +--
.../src/main/resources/application.properties | 2 +-
7 files changed, 33 insertions(+), 34 deletions(-)
rename {groupManagement => frontend}/manifest.yml (72%)
diff --git a/groupManagement/manifest.yml b/frontend/manifest.yml
similarity index 72%
rename from groupManagement/manifest.yml
rename to frontend/manifest.yml
index caf6472..98d3d4c 100644
--- a/groupManagement/manifest.yml
+++ b/frontend/manifest.yml
@@ -3,4 +3,4 @@ applications:
- name: thinkTogether
memory: 256M
host: thinkTogether
- buildpack: java_buildpack
\ No newline at end of file
+ buildpack: nodejs_buildpack
\ No newline at end of file
diff --git a/frontend/src/app/components/group-search/group-search.component.html b/frontend/src/app/components/group-search/group-search.component.html
index dd3de21..20351f6 100644
--- a/frontend/src/app/components/group-search/group-search.component.html
+++ b/frontend/src/app/components/group-search/group-search.component.html
@@ -11,7 +11,7 @@
<li *ngFor="let module of modules"
[class.selected]="module === selectedModule"
(click)="onSelectMod(module)">Module
- <span class="badge">{{module.modul_ID}}</span> {{module.title}}
+ <span class="badge">{{module.id}}</span> {{module.title}}
</li>
</ul>
</div>
diff --git a/frontend/src/app/components/group-search/group-search.component.ts b/frontend/src/app/components/group-search/group-search.component.ts
index d3495af..7e7b38b 100644
--- a/frontend/src/app/components/group-search/group-search.component.ts
+++ b/frontend/src/app/components/group-search/group-search.component.ts
@@ -2,6 +2,7 @@ import {Component, OnInit} from '@angular/core';
import { DataProviderService } from '../../services/data-provider.service';
import { FacultyDO } from '../../types/facultyDO';
import { ModulesDO } from '../../types/modulesDO';
+import { ActivatedRoute } from "@angular/router";
@Component({
selector: 'app-group-search',
@@ -10,36 +11,34 @@ import { ModulesDO } from '../../types/modulesDO';
})
export class GroupSearchComponent implements OnInit {
- faculties: FacultyDO[] = [
- { fakultaet_ID: 1, title: 'Informatik' },
- { fakultaet_ID: 1, title: 'Informatik' },
- { fakultaet_ID: 1, title: 'Informatik' },
- { fakultaet_ID: 1, title: 'Informatik' }
+ faculties: FacultyDO[] = [
+ { fakultaet_ID: 1, title: 'Informatik' },
+ { fakultaet_ID: 1, title: 'Informatik' },
+ { fakultaet_ID: 1, title: 'Informatik' },
+ { fakultaet_ID: 1, title: 'Informatik' }
];
- modules: ModulesDO[] = [
- { member_ID: 1, modul_ID:1, title: 'Betriebssysteme' },
- { member_ID: 1, modul_ID:1, title: 'Betriebssysteme' },
- { member_ID: 1, modul_ID:1, title: 'Betriebssysteme' },
- { member_ID: 1, modul_ID:1, title: 'Betriebssysteme' },
- { member_ID: 1, modul_ID:1, title: 'Betriebssysteme' },
- { member_ID: 1, modul_ID:1, title: 'Betriebssysteme' },
- ];
- selectedModule:ModulesDO;
- selectedFaculty:FacultyDO;
-
- constructor() {}
+ modules: ModulesDO[];
+ selectedModule:ModulesDO;
+ selectedFaculty:FacultyDO;
+
+
+
+ constructor(private route: ActivatedRoute,private dataService: DataProviderService) {}
ngOnInit(): void {
}
+
+
onSelectFac(faculty: FacultyDO): void {
this.selectedFaculty = faculty;
}
onSelectMod(module: ModulesDO): void {
+ this.getAllModules();
this.selectedModule = module;
}
- showFaculties() {
+ getAllFaculties() {
// this.route.params.subscribe((params)=> {
// this.dataService.getFacultyData().then((response) => {
// this.facultyDO = response.payload;
@@ -47,11 +46,15 @@ export class GroupSearchComponent implements OnInit {
//})
}
- showModules() {
-
+ getAllModules() {
+ this.route.params.subscribe((params)=> {
+ this.dataService.getModulesData().then((response) => {
+ this.modules = response.payload;
+ })
+ })
}
- showGroups() {
+ getAllGroups() {
}
diff --git a/frontend/src/app/services/data-provider.service.ts b/frontend/src/app/services/data-provider.service.ts
index f4103c4..5ac8c7b 100644
--- a/frontend/src/app/services/data-provider.service.ts
+++ b/frontend/src/app/services/data-provider.service.ts
@@ -11,7 +11,7 @@ import {ModulesDO} from "../types/modulesDO";
})
export class DataProviderService {
- apiUrl = 'http://localhost:8080/api'
+ apiUrl = 'http://localhost:8080/'
constructor(private httpClient: HttpClient) { }
@@ -36,7 +36,7 @@ export class DataProviderService {
getFacultyData(): Promise<RequestResponse<FacultyDO[]>> {
return new Promise((resolve, reject) => {
- this.httpClient.get<FacultyDO[]>('/group-search').toPromise().then(
+ this.httpClient.get<FacultyDO[]>('localhost:8080/groups').toPromise().then(
(faculty: FacultyDO[]) => {
resolve({type: ResponseType.SUCCESS, payload: faculty});
}, (error: HttpErrorResponse) => {
@@ -55,7 +55,7 @@ export class DataProviderService {
getModulesData(): Promise<RequestResponse<ModulesDO[]>> {
return new Promise((resolve, reject) => {
- this.httpClient.get<ModulesDO[]>('/group-search').toPromise().then(
+ this.httpClient.get<ModulesDO[]>('/module').toPromise().then(
(modules: ModulesDO[]) => {
resolve({type: ResponseType.SUCCESS, payload: modules});
}, (error: HttpErrorResponse) => {
diff --git a/frontend/src/app/types/modulesDO.ts b/frontend/src/app/types/modulesDO.ts
index 1d7697e..8c7a20a 100644
--- a/frontend/src/app/types/modulesDO.ts
+++ b/frontend/src/app/types/modulesDO.ts
@@ -1,5 +1,4 @@
export class ModulesDO {
- modul_ID: number;
- member_ID: number;
+ id: number;
title: string;
}
diff --git a/groupManagement/pom.xml b/groupManagement/pom.xml
index e05dcbe..d817d76 100644
--- a/groupManagement/pom.xml
+++ b/groupManagement/pom.xml
@@ -111,19 +111,16 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <artifactId></artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
- <goal>single</goal>
+
</goals>
</execution>
</executions>
<configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
+
</configuration>
</plugin>
</plugins>
diff --git a/groupManagement/src/main/resources/application.properties b/groupManagement/src/main/resources/application.properties
index e044a74..ee7ebaf 100644
--- a/groupManagement/src/main/resources/application.properties
+++ b/groupManagement/src/main/resources/application.properties
@@ -21,4 +21,4 @@ spring.jpa.show-sql=true
#spring.jpa.open-in-view=false
#spring.datasource.validationQuery=SELECT 1
-server.port=8800
\ No newline at end of file
+server.port=8080
\ No newline at end of file
--
GitLab