Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync test-deployment with main #52

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
29a8d08
Chart working with Mock-Data
cepurwin Sep 21, 2023
66adc98
Removed unused import
cepurwin Sep 21, 2023
6922b2d
Chart working with Mock-Data
cepurwin Sep 21, 2023
35a8916
Removed unused import
cepurwin Sep 21, 2023
092f96f
Merge remote-tracking branch 'origin/cedric/chartjsDataImplementation…
cepurwin Sep 22, 2023
39abca1
Finalized sync-test-deploy-branch.yaml (#28)
REDDERD Sep 24, 2023
f7b0a09
Merge pull request #26 from REDDERD/cedric/chartjsDataImplementation
david-2031 Sep 24, 2023
7fd8ebb
Dave/import data format (#32)
david-2031 Sep 25, 2023
c1947e4
Added HTTP Post Request and give Response to Home Component
cepurwin Sep 26, 2023
a949722
Removed unused imports
cepurwin Sep 26, 2023
0dc3ea4
Chart gets displayed after csv upload
cepurwin Sep 26, 2023
f905d9f
Testupload working
cepurwin Sep 26, 2023
71e694d
Added Loading Spinner and simple error message
cepurwin Sep 26, 2023
aeb1675
Small fix
cepurwin Sep 26, 2023
f0bcea1
Fixed reloading bug (#35)
REDDERD Sep 27, 2023
2945370
Inputs working
cepurwin Sep 27, 2023
44198b3
removed testing console logs
cepurwin Sep 28, 2023
6032986
functional fix for sidenav button bug (#40)
cepurwin Sep 28, 2023
3eed8e1
Added Cocis inputs and disabled submit button if no file is uploaded
cepurwin Sep 28, 2023
2df639c
Merge pull request #42 from REDDERD/ApiIntegration
david-2031 Sep 28, 2023
24b9454
Fixed all Linting errors (#43)
REDDERD Oct 3, 2023
5caa8f9
Added basic local kmeans (#44)
cepurwin Oct 4, 2023
5bcea27
Deleted build-beta.yml (#45)
REDDERD Oct 4, 2023
ddbf8af
Klaas/clustering (#46)
khuepp Oct 4, 2023
eb8f3fa
table view (#47)
david-2031 Oct 5, 2023
f939b3c
Increase InitialBudget to 4 MB (#48)
REDDERD Oct 5, 2023
858cd6d
Klaas/clustering (#51)
khuepp Oct 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
48 changes: 48 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"root": true,
"ignorePatterns": [
"projects/**/*"
],
"overrides": [
{
"files": [
"*.ts",
"*.html"
],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"prefix": "app",
"style": "camelCase"
}
],
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"prefix": "app",
"style": "kebab-case"
}
]
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended",
"plugin:@angular-eslint/template/accessibility"
],
"rules": {}
}
]
}
6 changes: 5 additions & 1 deletion .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}
18 changes: 0 additions & 18 deletions .github/workflows/build-beta.yml

This file was deleted.

25 changes: 25 additions & 0 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Linting # Diese GitHub-Action muss erfoolgreich durchlaufen, sonst darf keine Pull-Req gemergt werden

on:
push:
branches:
- '**' # Wird für jeden Push auf jeden Branch durchgeführt

jobs:
lint:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v2

- name: Install Node.js
uses: actions/setup-node@v2
with:
node-version: '16'

- name: Install Dependencies
run: npm install

- name: Run ng lint
run: npx ng lint
41 changes: 21 additions & 20 deletions .github/workflows/sync-test-deploy-branch.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
name: Synchronize Branches

name: Sync test-deploy with main
on:
push:
branches:
- main

- name: Sync Branch Action
# You may pin to the exact commit or the version.
# uses: lucasruy/sync-branch-action@2208081dfed383bf8e9c13ce862061a3e7a58239
uses: lucasruy/[email protected]
with:
# User token to be associated with this pull request.
# GITHUB_TOKEN:
# Branch where you implemented your new code.
SOURCE_BRANCH: main
# Branch you want to send your new code.
DESTINATION_BRANCH: test-deployment
# Standard title for your update pull request. Default is: "update: {FROM_BRANCH} to {TO_BRANCH}"
PULL_REQUEST_TITLE: # optional
# Content with description for your automated pull. Default is: "This is an automatic PullRequest to keep {BASE_BRANCH} up to date with {FROM_BRANCH}!"
PULL_REQUEST_BODY: # optional
# Pull Request label. Default is: ""
PULL_REQUEST_LABEL: # optional

jobs:
sync-branches:
runs-on: ubuntu-latest
name: Syncing branches
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: 12
- name: Opening pull request
id: pull
uses: tretuna/[email protected]
with:
GITHUB_TOKEN: ${{secrets.SECRET_SYNC}}
FROM_BRANCH: "main"
TO_BRANCH: "test-deployment"
PULL_REQUEST_TITLE: "Sync test-deployment with main"
PULL_REQUEST_BODY: "For keeping test-deployment up to date with the recent changes made to main."
18 changes: 15 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
"maximumWarning": "3mb",
"maximumError": "4mb"
},
{
"type": "anyComponentStyle",
Expand Down Expand Up @@ -93,11 +93,23 @@
],
"scripts": []
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
}
}
}
},
"cli": {
"analytics": "877cf958-4b8f-4755-bc70-9895434252db"
"analytics": "877cf958-4b8f-4755-bc70-9895434252db",
"schematicCollections": [
"@angular-eslint/schematics"
]
}
}
38 changes: 22 additions & 16 deletions app.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
runtime: python27
api_version: 1
threadsafe: yes
runtime: nodejs18
instance_class: F2

automatic_scaling:
target_cpu_utilization: 0.65
min_instances: 1
max_instances: 5

entrypoint: npm start

env_variables:
PORT: 8080 # der Port, auf dem der App Engine-Proxy auf Anfragen hört

handlers:
- url: /
- url: /(.*\.(js|css|map|json|png|jpg|jpeg|gif|svg|woff|woff2|ttf|eot|ico))
secure: always
static_files: dist/programmierprojekt/\1
upload: dist/programmierprojekt/.*\.(js|css|map|json|png|jpg|jpeg|gif|svg|woff|woff2|ttf|eot|ico)$

# Alle anderen URLs werden an die Angular-App weitergeleitet
- url: /.*
secure: always
static_files: dist/programmierprojekt/index.html
upload: dist/programmierprojekt/index.html
- url: /
static_dir: dist/programmierprojekt

skip_files:
- e2e/
- node_modules/
- src/
- ^(.*/)?\..*$
- ^(.*/)?.*\.json$
- ^(.*/)?.*\.md$
- ^(.*/)?.*\.yaml$
- ^LICENSE
http_headers:
Cache-Control: "no-cache, must-revalidate"
4 changes: 2 additions & 2 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ steps:

# Build productive files
- name: 'gcr.io/cloud-builders/npm'
args: [ 'run', 'build', '--prod' ]
args: [ 'run', 'build', '--output-path=dist/programmierprojekt', '--prod' ]

# Build productive files
- name: 'gcr.io/cloud-builders/npm'
args: [ 'run', 'build', '--prod' ]
args: [ 'run', 'build', '--output-path=dist/programmierprojekt', '--prod' ]

# Deploy to google cloud app engine
- name: 'gcr.io/cloud-builders/gcloud'
Expand Down
Loading
Loading