trying backend/frontend connection

groupManagement/manifest.yml → 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

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>

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() {
 
   }
 

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) => {

frontend/src/app/types/modulesDO.ts

 export class ModulesDO {
-  modul_ID: number;
-  member_ID: number;
+  id: number;
   title: string;
 }

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>

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