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

Add preset save button #118 #147

Merged
merged 35 commits into from
Jan 18, 2023
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
86c0aef
Added openapi 3 documentation for backend api and included WS defintion
jandegen Dec 15, 2022
8890ae5
Added docker volume for upcoming storing of preset files
jandegen Dec 15, 2022
830907d
Added GET & POST /config rest api to backend
jandegen Dec 15, 2022
87882dc
Updated documentation
jandegen Dec 15, 2022
29d891e
Implemented preset feature with load& store
jandegen Dec 20, 2022
fc2390b
Added visibility tests
jandegen Dec 20, 2022
dedd22a
Add a button for dispatching distributeOffset events
jenswaechtler Dec 20, 2022
490bf7c
Include button to page
jenswaechtler Dec 20, 2022
87204cb
Add test for button
jenswaechtler Dec 20, 2022
76565de
Changed order of distributed waves
jenswaechtler Dec 21, 2022
2f42b47
Run precommit
jandegen Dec 21, 2022
161d516
Fixed amplitude slider
jandegen Dec 21, 2022
c831297
Merge remote-tracking branch 'origin/dev' into feature/#117-distribut…
jenswaechtler Dec 21, 2022
5c4998b
Merged changes
jenswaechtler Dec 21, 2022
d842168
Fixed test execution
jandegen Dec 21, 2022
f940291
Slider change value accordingly to distribute value
jenswaechtler Dec 21, 2022
249d2bc
Improved channelConfig store implementation
PhlppKrmr Dec 21, 2022
35fa5a6
Merge remote-tracking branch 'origin/dev' into feature/#118-preset-sa…
jandegen Dec 21, 2022
4271201
by deactivating a channel, the corresponding wave gets invisible, als…
rabbit-zero Jan 9, 2023
25a3877
all channels are deactivated now on start up
rabbit-zero Jan 10, 2023
44b58f1
Fixed Button to only distribute once on click
motschel123 Jan 15, 2023
8496971
Remove no longer used OffsetSlider.svelte
motschel123 Jan 15, 2023
eb9744b
Refactor so Offset uses stores.js as a single source of truth and red…
motschel123 Jan 15, 2023
459de37
Revert "Refactor so Offset uses stores.js as a single source of truth…
motschel123 Jan 15, 2023
2664b1d
Merge remote-tracking branch 'origin/dev' into feature/#118-preset-sa…
jandegen Jan 16, 2023
732ced7
Fixing merge errors
jandegen Jan 16, 2023
57ec4af
Merge remote-tracking branch 'origin/feature/#117-distribute-button' …
jandegen Jan 16, 2023
1791b9e
Completed REST API endpoint and linted frontend & backend
jandegen Jan 17, 2023
d2036c3
Fixed docker deployments for REST API
jandegen Jan 17, 2023
8154ce1
Fixed test execution
jandegen Jan 17, 2023
704580f
Re-added data-cy tag for start stop switches
jandegen Jan 17, 2023
8875303
Disabled save button on empty text field
jandegen Jan 17, 2023
841a7d4
Fixed toggleable start stop
jandegen Jan 17, 2023
38bb1f1
Solve requested changes from PR
jandegen Jan 17, 2023
4eafd0a
Fixed indicators and start stop bug
jandegen Jan 17, 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
2 changes: 1 addition & 1 deletion .github/workflows/build-backend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'Apps/backend/**.*'
- '.github/workflows/build-backend-automation.yml'
pull_request:
branches:
branches:
- "dev"
- "int"
- "main"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-frontend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'Apps/frontend/**.*'
- '.github/workflows/build-frontend-automation.yml'
pull_request:
branches:
branches:
- "dev"
- "int"
- "main"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-generator-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'Apps/generator/**.*'
- '.github/workflows/build-generator-automation.yml'
pull_request:
branches:
branches:
- "dev"
- "int"
- "main"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/push-backend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,27 +61,27 @@ jobs:
- "build-push"

steps:
-
-
if: github.event.pull_request.base.ref == 'dev'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_DEV }}?VERSION_TAG=nightly
webhook_url: ${{ secrets.WEBHOOK_URL_DEV }}?VERSION_TAG=nightly&API_KEY=${{ secrets.FRONTEND_API_KEY }}
webhook_secret: "none"
verbose: true
-
-
if: github.event.pull_request.base.ref == 'int'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_INT }}?VERSION_TAG=${{ github.event.pull_request.title }}
webhook_url: ${{ secrets.WEBHOOK_URL_INT }}?VERSION_TAG=${{ github.event.pull_request.title }}&API_KEY=${{ secrets.FRONTEND_API_KEY }}
webhook_secret: "none"
verbose: true
-
-
if: github.event.pull_request.base.ref == 'main'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_PROD }}?VERSION_TAG=${{ github.event.pull_request.title }}
webhook_url: ${{ secrets.WEBHOOK_URL_PROD }}?VERSION_TAG=${{ github.event.pull_request.title }}&API_KEY=${{ secrets.FRONTEND_API_KEY }}
webhook_secret: "none"
verbose: true
12 changes: 6 additions & 6 deletions .github/workflows/push-frontend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,27 +67,27 @@ jobs:
- "build-push"

steps:
-
-
if: github.event.pull_request.base.ref == 'dev'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_DEV }}?VERSION_TAG=nightly
webhook_url: ${{ secrets.WEBHOOK_URL_DEV }}?VERSION_TAG=nightly&API_KEY=${{ secrets.FRONTEND_API_KEY }}
webhook_secret: "none"
verbose: true
-
-
if: github.event.pull_request.base.ref == 'int'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_INT }}?VERSION_TAG=${{ github.event.pull_request.title }}
webhook_url: ${{ secrets.WEBHOOK_URL_INT }}?VERSION_TAG=${{ github.event.pull_request.title }}&API_KEY=${{ secrets.FRONTEND_API_KEY }}
webhook_secret: "none"
verbose: true
-
-
if: github.event.pull_request.base.ref == 'main'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_PROD }}?VERSION_TAG=${{ github.event.pull_request.title }}
webhook_url: ${{ secrets.WEBHOOK_URL_PROD }}?VERSION_TAG=${{ github.event.pull_request.title }}&API_KEY=${{ secrets.FRONTEND_API_KEY }}
webhook_secret: "none"
verbose: true
6 changes: 3 additions & 3 deletions .github/workflows/push-generator-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,23 @@ jobs:
- "build-push"

steps:
-
-
if: github.event.pull_request.base.ref == 'dev'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_DEV }}?VERSION_TAG=nightly
webhook_secret: "none"
verbose: true
-
-
if: github.event.pull_request.base.ref == 'int'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_INT }}?VERSION_TAG=${{ github.event.pull_request.title }}
webhook_secret: "none"
verbose: true
-
-
if: github.event.pull_request.base.ref == 'main'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
id: create_release
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.event.pull_request.title }}
release_name: ${{ github.event.pull_request.title }}
Expand All @@ -39,7 +39,7 @@ jobs:
id: create_release
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.event.pull_request.title }}
release_name: ${{ github.event.pull_request.title }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-frontend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'Apps/frontend/**.*'
- '.github/workflows/test-frontend-automation.yml'
pull_request:
branches:
branches:
- "dev"
- "int"
- "main"
Expand All @@ -26,10 +26,10 @@ jobs:
# Disable running of tests within install job
runTests: false
build: npm run build

- name: Cypress Test Execution
uses: cypress-io/github-action@v4
with:
with:
working-directory: ./Apps/frontend
start: npm run dev
wait-on: 'http://127.0.0.1:5173'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-generator-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'Apps/generator/**.*'
- '.github/workflows/test-generator-automation.yml'
pull_request:
branches:
branches:
- "dev"
- "int"
- "main"
Expand Down
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v1.2.3
hooks:
- id: trailing-whitespace
- id: check-yaml
- id: end-of-file-fixer
1 change: 1 addition & 0 deletions Apps/backend/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/**
16 changes: 16 additions & 0 deletions Apps/backend/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"env": {
"browser": true,
"es2021": true
},
"extends": ["eslint:recommended", "plugin:cypress/recommended", "prettier"],
"plugins": ["prettier"],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"rules": {
"prettier/prettier": "error"
},
"ignorePatterns": ["src/assets/**/*"]
}
6 changes: 6 additions & 0 deletions Apps/backend/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"singleQuote": false
}
2 changes: 1 addition & 1 deletion Apps/backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ RUN npm install
# Copy source code into docker container
COPY . ./

CMD [ "npm", "start" ]
CMD [ "npm", "start" ]
Loading