Daniel/sync test deploy 05102023 (#50)

* Chart working with Mock-Data * Removed unused import * Chart working with Mock-Data * Removed unused import * Finalized sync-test-deploy-branch.yaml (#28) Should work now. Was tested in separate repo * Dave/import data format (#32) * edited upload text * display uploaded data * Added HTTP Post Request and give Response to Home Component * Removed unused imports * Chart gets displayed after csv upload * Testupload working * Added Loading Spinner and simple error message * Small fix * Fixed reloading bug (#35) * Update app.yaml * Update cloudbuild.yaml * Inputs working * removed testing console logs * functional fix for sidenav button bug (#40) * Added Cocis inputs and disabled submit button if no file is uploaded * Fixed all Linting errors (#43) * For importing linting to main without merge-conflicts * Autofixed ~12.000 Linting errors * Fixed most linting errors * Created ESLintIgnore for not linting .html-Files with TypeScript-Linter --------- Co-authored-by: cepurwin <[email protected]> * Added basic local kmeans (#44) * Added basic local kmeans * Added empty Chart and fixed daves comments * fixed busy indicator * Start K-Means button changed * Deleted build-beta.yml (#45) Co-authored-by: cepurwin <[email protected]> * Klaas/clustering (#46) * front without logic implemented * läuft mit einem Fehler * Deutsch * Added Kmeans Service File and Test * Sync test-deployment with main (#29) * Installed Playwright for E2E-Testing * Installed ESLint * Added Linting as GitHub Action * Removed Linting as GitHub Action * csv inport (#24) * front without logic implemented * läuft mit einem Fehler * Deutsch * Update sync-test-deploy-branch.yaml (#25) * Update sync-test-deploy-branch.yaml * Update sync-test-deploy-branch.yaml * Finalized sync-test-deploy-branch.yaml (#28) Should work now. Was tested in separate repo --------- Co-authored-by: david-2031 <[email protected]> * Daniel/only https (#30) * Installed Playwright for E2E-Testing * Installed ESLint * Added Linting as GitHub Action * Removed Linting as GitHub Action * csv inport (#24) * front without logic implemented * läuft mit einem Fehler * Deutsch * Update sync-test-deploy-branch.yaml (#25) * Update sync-test-deploy-branch.yaml * Update sync-test-deploy-branch.yaml * Finalized sync-test-deploy-branch.yaml (#28) Should work now. Was tested in separate repo * Ensured only HTTPS is used to access * Fixed Routing Bug (Probably) --------- Co-authored-by: david-2031 <[email protected]> * Inputfeld Manhattan/Euclidean, Input lokale Berechnung * Sync test-deployment with main (#31) * Chart working with Mock-Data * Removed unused import * Installed Playwright for E2E-Testing * Installed ESLint * Added Linting as GitHub Action * Removed Linting as GitHub Action * csv inport (#24) * front without logic implemented * läuft mit einem Fehler * Deutsch * Chart working with Mock-Data * Removed unused import * Update sync-test-deploy-branch.yaml (#25) * Update sync-test-deploy-branch.yaml * Update sync-test-deploy-branch.yaml * Finalized sync-test-deploy-branch.yaml (#28) Should work now. Was tested in separate repo --------- Co-authored-by: cepurwin <[email protected]> Co-authored-by: david-2031 <[email protected]> * Inputfeld Manhattan/Euclidean; Input lokale Berechnung; Hinweis dass K optional ist * Update cloudbuild.yaml * Update app.yaml * Ensured usage of HTTPS * Optionen für die Methode zur Bestiummung von K eingebaut (Ellenbogen, Silhouette); Berechnungsmethode um Methode "Jaccard" ergänzt Alle Optionen wurden in ein Expansion Panel eingebaut * Daniel/fix merge conflicts1 (#36) * Update input.component.css from main for fixing merge conflict * Update input.component.html from main for fixing merge conflict * Update input.component.ts from main for fixing merge conflict * Sync test-deployment with main (#33) * Chart working with Mock-Data * Removed unused import * Installed Playwright for E2E-Testing * Installed ESLint * Added Linting as GitHub Action * Removed Linting as GitHub Action * csv inport (#24) * front without logic implemented * läuft mit einem Fehler * Deutsch * Chart working with Mock-Data * Removed unused import * Update sync-test-deploy-branch.yaml (#25) * Update sync-test-deploy-branch.yaml * Update sync-test-deploy-branch.yaml * Finalized sync-test-deploy-branch.yaml (#28) Should work now. Was tested in separate repo * Dave/import data format (#32) * edited upload text * display uploaded data * Fixed reloading bug (#35) * Update app.yaml * Update cloudbuild.yaml --------- Co-authored-by: cepurwin <[email protected]> Co-authored-by: david-2031 <[email protected]> * Got linting to working and added GitHub action "lint" (#39) * Added Kmeans Service File and Test * Fixed most linting errors * CSV-File Reading implemented * KMeans and JSON-result implementet * Added Elbow Method * Added Elbow Method * Added Elbow Method * changed check for ellbow method * removed useless console.log --------- Co-authored-by: david-2031 <[email protected]> Co-authored-by: REDDERD <[email protected]> Co-authored-by: david-2031 <[email protected]> Co-authored-by: cookie.exe <[email protected]> Co-authored-by: cepurwin <[email protected]> Co-authored-by: Cornelius Daemberg <[email protected]> Co-authored-by: cepurwin <[email protected]> * table view (#47) * Added basic local kmeans * converting the data to table view * flattening table not working yet * implementing table * working * home left container aligned to baseline * linting and cleanup * merge conflicts --------- Co-authored-by: cepurwin <[email protected]> * Increase InitialBudget to 4 MB (#48) --------- Co-authored-by: cepurwin <[email protected]> Co-authored-by: david-2031 <[email protected]> Co-authored-by: cepurwin <[email protected]> Co-authored-by: khuepp <[email protected]> Co-authored-by: david-2031 <[email protected]> Co-authored-by: cookie.exe <[email protected]> Co-authored-by: Cornelius Daemberg <[email protected]>
REDDERD · Oct 5, 2023 · c86b7b6 · c86b7b6
1 parent a129517
commit c86b7b6
Show file tree

Hide file tree

Showing 43 changed files with 897 additions and 12,345 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+*.html
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -6,7 +6,9 @@
   "overrides": [
     {
       "files": [
-        "*.ts"
+        "*.ts",
+        "*.html"
+
       ],
       "extends": [
         "eslint:recommended",

diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -5,4 +5,8 @@ extends: standard-with-typescript
 parserOptions:
   ecmaVersion: latest
   sourceType: module
-rules: {}
+rules: {
+  '@typescript-eslint/consistent-type-imports': 'off',
+  '@typescript-eslint/consistent-type-exports': 'off',
+  '@typescript-eslint/prefer-readonly': 'off',
+}
diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -1,9 +1,10 @@
-name: Linting
+name: Linting # Diese GitHub-Action muss erfoolgreich durchlaufen, sonst darf keine Pull-Req gemergt werden
 
 on:
   push:
     branches:
-      - '**'  # Wird für jeden Push auf einen Branch durchgeführt
+      - '**'  # Wird für jeden Push auf jeden Branch durchgeführt
+
 
 jobs:
   lint:

diff --git a/.github/workflows/sync-test-deploy-branch.yaml b/.github/workflows/sync-test-deploy-branch.yaml
@@ -5,7 +5,8 @@ on:
       - main
 
 
-jobs: 
+jobs:
+
   sync-branches:
     runs-on: ubuntu-latest
     name: Syncing branches

diff --git a/angular.json b/angular.json
@@ -35,8 +35,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "500kb",
-                  "maximumError": "1mb"
+                  "maximumWarning": "3mb",
+                  "maximumError": "4mb"
                 },
                 {
                   "type": "anyComponentStyle",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "@angular/platform-browser-dynamic": "^16.2.0",
     "@angular/router": "^16.2.0",
     "chart.js": "^4.4.0",
+    "ml-kmeans": "^6.0.0",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.13.0"

diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
@@ -1,12 +1,12 @@
-import { TestBed } from '@angular/core/testing';
-import { AppComponent } from './app.component';
-import {HomeComponent} from "./home/home.component";
-import {MatDrawerContainer, MatSidenavModule} from "@angular/material/sidenav";
-import {ChartComponent} from "./home/chart-container/chart/chart.component";
-import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
-import {InputComponent} from "./home/input/input.component";
-import {MatFormFieldModule} from "@angular/material/form-field";
-import {MatIconModule} from "@angular/material/icon";
+import { TestBed } from '@angular/core/testing'
+import { AppComponent } from './app.component'
+import { HomeComponent } from './home/home.component'
+import { MatDrawerContainer, MatSidenavModule } from '@angular/material/sidenav'
+import { ChartComponent } from './home/chart-container/chart/chart.component'
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
+import { InputComponent } from './home/input/input.component'
+import { MatFormFieldModule } from '@angular/material/form-field'
+import { MatIconModule } from '@angular/material/icon'
 
 describe('AppComponent', () => {
   beforeEach(() => TestBed.configureTestingModule({
@@ -21,25 +21,25 @@ describe('AppComponent', () => {
       BrowserAnimationsModule,
       MatFormFieldModule,
       MatIconModule
-    ],
-  }));
+    ]
+  }))
 
   it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.componentInstance;
-    expect(app).toBeTruthy();
-  });
+    const fixture = TestBed.createComponent(AppComponent)
+    const app = fixture.componentInstance
+    expect(app).toBeTruthy()
+  })
 
-  it(`should have as title 'Programmierprojekt'`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.componentInstance;
-    expect(app.title).toEqual('Dave is n Wadenbeißer');
-  });
+  it('should have as title \'Programmierprojekt\'', () => {
+    const fixture = TestBed.createComponent(AppComponent)
+    const app = fixture.componentInstance
+    expect(app.title).toEqual('Dave is n Wadenbeißer')
+  })
 
   it('should render title', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.nativeElement as HTMLElement;
-    expect(compiled.querySelector('.content span')?.textContent).toContain('Programmierprojekt app is running!');
-  });
-});
+    const fixture = TestBed.createComponent(AppComponent)
+    fixture.detectChanges()
+    const compiled = fixture.nativeElement as HTMLElement
+    expect(compiled.querySelector('.content span')?.textContent).toContain('Programmierprojekt app is running!')
+  })
+})
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,10 +1,10 @@
-import { Component } from '@angular/core';
+import { Component } from '@angular/core'
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css']
 })
 export class AppComponent {
-  title = 'Programmierprojekt';
+  title = 'Programmierprojekt'
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,59 +1,64 @@
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core'
+import { BrowserModule } from '@angular/platform-browser'
 
-import { AppComponent } from './app.component';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import {MatButtonModule} from "@angular/material/button";
-import {MatSidenavModule} from "@angular/material/sidenav";
-import {MatIconModule} from "@angular/material/icon";
-import { HomeComponent } from './home/home.component';
-import { InputComponent } from './home/input/input.component';
-import { ChartContainerComponent } from './home/chart-container/chart-container.component';
-import { ChartComponent } from './home/chart-container/chart/chart.component';
-import { LoginComponent } from './login/login.component';
-import { RouterModule, Routes } from '@angular/router'
-import {MatInputModule} from "@angular/material/input";
-import {ReactiveFormsModule} from "@angular/forms";
-import {HttpClient, HttpClientModule} from "@angular/common/http";
-import {MatSnackBarModule} from "@angular/material/snack-bar";
+import { AppComponent } from './app.component'
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
+import { MatButtonModule } from '@angular/material/button'
+import { MatSidenavModule } from '@angular/material/sidenav'
+import { MatIconModule } from '@angular/material/icon'
+import { HomeComponent } from './home/home.component'
+import { InputComponent } from './home/input/input.component'
+import { ChartContainerComponent } from './home/chart-container/chart-container.component'
+import { ChartComponent } from './home/chart-container/chart/chart.component'
+import { LoginComponent } from './login/login.component'
+import { RouterModule, type Routes } from '@angular/router'
+import { MatInputModule } from '@angular/material/input'
+import { ReactiveFormsModule } from '@angular/forms'
+import { HttpClientModule } from '@angular/common/http'
+import { MatSnackBarModule } from '@angular/material/snack-bar'
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'
+import { MatSelectModule } from '@angular/material/select'
+import { MatButtonToggleModule } from '@angular/material/button-toggle'
+import { MatExpansionModule } from '@angular/material/expansion'
+import { MatSlideToggleModule } from '@angular/material/slide-toggle'
+import { TableComponent } from './home/chart-container/table/table.component'
+import { MatTabsModule } from '@angular/material/tabs'
+import { MatTableModule } from '@angular/material/table'
 
-import {MatPseudoCheckboxModule} from "@angular/material/core";
-import {MatButtonToggleModule} from "@angular/material/button-toggle";
-import {MatSlideToggleModule} from "@angular/material/slide-toggle";
-import {MatExpansionModule} from "@angular/material/expansion";
-
-
-
-const routes: Routes = [ { path: 'home', component: HomeComponent },
+const routes: Routes = [{ path: 'home', component: HomeComponent },
   { path: '', redirectTo: '/home', pathMatch: 'full' },
-  { path: 'login', component: LoginComponent },]
+  { path: 'login', component: LoginComponent }]
 @NgModule({
   declarations: [
     AppComponent,
     HomeComponent,
     InputComponent,
     ChartContainerComponent,
     ChartComponent,
-    LoginComponent
+    LoginComponent,
+    TableComponent
   ],
 
-    imports: [
-        BrowserModule,
-        BrowserAnimationsModule,
-        MatButtonModule,
-        MatSidenavModule,
-        MatIconModule,
-        RouterModule.forRoot(routes),
-        MatInputModule,
-        ReactiveFormsModule,
-        HttpClientModule,
-        MatSnackBarModule,
-        MatPseudoCheckboxModule,
-        MatButtonToggleModule,
-        MatSlideToggleModule,
-        MatExpansionModule
-    ],
-
+  imports: [
+    BrowserModule,
+    BrowserAnimationsModule,
+    MatButtonModule,
+    MatSidenavModule,
+    MatIconModule,
+    RouterModule.forRoot(routes),
+    MatInputModule,
+    ReactiveFormsModule,
+    HttpClientModule,
+    MatSnackBarModule,
+    MatProgressSpinnerModule,
+    MatSelectModule,
+    MatButtonToggleModule,
+    MatExpansionModule,
+    MatSlideToggleModule,
+    MatTabsModule,
+    MatTableModule
+  ],
+
   providers: [],
   bootstrap: [AppComponent]
 })

diff --git a/src/app/home/chart-container/chart-container.component.html b/src/app/home/chart-container/chart-container.component.html
@@ -1 +1,13 @@
-<app-chart></app-chart>
+<div style="height: 100%">
+  <mat-tab-group class="container">
+    <mat-tab label="Graph" style="">
+
+        <app-chart [kmeansResult]="kmeansResult"></app-chart>
+
+    </mat-tab>
+    <mat-tab label="Tabelle">
+      <app-table [kmeansResult]="kmeansResult"></app-table>
+    </mat-tab>
+  </mat-tab-group>
+</div>
+