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

sprint-11-release #178

Merged
merged 109 commits into from
Jan 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
23813e3
Extract slider logic into seperate file
motschel123 Dec 12, 2022
6f5be08
Merge remote-tracking branch 'origin/feature/#106-refactoring-front-e…
jenswaechtler Dec 13, 2022
f2b5205
Moved controls in separate component
jenswaechtler Dec 13, 2022
cb4bbbe
Resolved merge conflicts
jenswaechtler Dec 14, 2022
a40d0c2
Merge remote-tracking branch 'origin/feature/#77-toggle-buttons' into…
jenswaechtler Dec 14, 2022
8d48d7c
Add indicatorElement to WaveControls
jenswaechtler Dec 14, 2022
76b50f8
fix time-sweep #144
nicolaskolbenschlag Dec 14, 2022
b475114
add default step size constant for vertical base speed #144
nicolaskolbenschlag Dec 14, 2022
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
8b4e804
Some linting and restructuring
PhlppKrmr Dec 18, 2022
61fb9b6
add link to documentation for #144
nicolaskolbenschlag Dec 18, 2022
ced4ecf
Correct slider naming, add tests for testing generic slider implement…
motschel123 Dec 19, 2022
d33cdbc
Merge branch 'dev' into feature/#106-refactoring-front-end-sliders
motschel123 Dec 19, 2022
30148f2
Fix for testing
motschel123 Dec 19, 2022
29d891e
Implemented preset feature with load& store
jandegen Dec 20, 2022
fc2390b
Added visibility tests
jandegen Dec 20, 2022
fd02eb3
Merge pull request #146 from amosproj/bug/#144-fix-time-sweep
nicolaskolbenschlag 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
ea77601
Merge branch 'dev' into feature/#106-refactoring-front-end-sliders
motschel123 Dec 20, 2022
ff6123e
Merge pull request #139 from amosproj/feature/#106-refactoring-front-…
motschel123 Dec 20, 2022
ac36733
Create feature-board.PNG
dev3225 Dec 21, 2022
5223c6a
Create feature-board.PNG
dev3225 Dec 21, 2022
fc11de3
Add files via upload
dev3225 Dec 21, 2022
76565de
Changed order of distributed waves
jenswaechtler Dec 21, 2022
daa2a90
Add files via upload
dev3225 Dec 21, 2022
37f9f00
Delete feature-board.PNG
dev3225 Dec 21, 2022
2eccbc0
Merge branch 'dev' into PO-sprint-09
dev3225 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
f3fe3a3
First raw draft of site scaling
PhlppKrmr Dec 21, 2022
bbb2e86
Laptop Layout top draft
PhlppKrmr Dec 25, 2022
4108094
Ugly version of finalised Layout without Log
PhlppKrmr Jan 5, 2023
b6e4eea
Finalised layout, ready for suggestions to improve; tests will be adj…
PhlppKrmr Jan 6, 2023
d470317
Adjusted tests and improved browser compatability
PhlppKrmr Jan 7, 2023
2e70fb5
Merge branch 'dev' of origin into feature/#122-rescale-window
PhlppKrmr Jan 8, 2023
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
55f1690
Move StartStopButtons to ControlPanelBottom + improve scaling for bot…
PhlppKrmr Jan 11, 2023
e0551df
Create feature-board.PNG
dev3225 Jan 11, 2023
9f5403c
Delete feature-board.PNG
dev3225 Jan 11, 2023
43fb3d0
Create feature-board.PNG
dev3225 Jan 11, 2023
e92b483
Add files via upload
dev3225 Jan 11, 2023
28ef9b4
Merge pull request #157 from amosproj/feature/#122-rescale-window
jandegen Jan 11, 2023
9f3619f
#127 with new layout
nicolaskolbenschlag Jan 11, 2023
dbcc60b
#127 test with new ui
nicolaskolbenschlag Jan 11, 2023
cff3097
#127 rename test
nicolaskolbenschlag Jan 11, 2023
2ce33fe
Merge pull request #161 from amosproj/feature/#127-GND-new-layout
nicolaskolbenschlag Jan 11, 2023
6faf23e
Merge branch 'dev' into po/sprint-10
dev3225 Jan 15, 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
e12dd0a
Refactore code to use svelte stores
motschel123 Jan 17, 2023
2908496
Refactor Indicators to use offsetAdjustment store
motschel123 Jan 17, 2023
e43d24d
Remove unused imports and old code
motschel123 Jan 17, 2023
5b6e514
Remove unused code
motschel123 Jan 17, 2023
3dc3331
Indicators use the new store for channel activation
motschel123 Jan 17, 2023
1791b9e
Completed REST API endpoint and linted frontend & backend
jandegen Jan 17, 2023
9fdd919
Merge remote-tracking branch 'origin/dev' into feature/#117-distribut…
motschel123 Jan 17, 2023
4d21489
Removed clutter of merge + improved tests + added icon instead of tex…
PhlppKrmr Jan 17, 2023
d4c1a7b
Fixed bug where wave wason startup not vertically centered in coordin…
PhlppKrmr Jan 17, 2023
d2036c3
Fixed docker deployments for REST API
jandegen Jan 17, 2023
146f3f1
Forgot to change name to StartStopSwitch everywhere
PhlppKrmr 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
675b574
Merge remote-tracking branch 'origin/feature/#118-preset-save-save-pr…
motschel123 Jan 17, 2023
f0f4886
Merge remote-tracking branch 'origin/feature/#118-preset-save-save-pr…
motschel123 Jan 17, 2023
2f40347
Revert local helper modification
motschel123 Jan 17, 2023
a373917
Merge pull request #147 from amosproj/feature/#118-preset-save-save-p…
jandegen Jan 18, 2023
c81ea5d
Merge branch 'dev' into feature/#117-distribute-button
motschel123 Jan 18, 2023
51d4e34
Merge pull request #148 from amosproj/feature/#117-distribute-button
motschel123 Jan 18, 2023
5c71299
Merge branch 'dev' into PO-sprint-09
dev3225 Jan 18, 2023
95883d7
Fixed web config
jandegen Jan 18, 2023
25079ee
Merge branch 'dev' into feature/#118-preset-save-save-preset-button-a…
jandegen Jan 18, 2023
437e640
Merge pull request #172 from amosproj/feature/#118-preset-save-save-p…
jandegen Jan 18, 2023
46c05d6
Switched rest api port in web environments
jandegen Jan 18, 2023
30f857d
Merge remote-tracking branch 'origin/feature/#118-preset-save-save-pr…
jandegen Jan 18, 2023
0678277
Merge remote-tracking branch 'origin/dev' into PO-sprint-09
jenswaechtler Jan 18, 2023
ca73a99
Merge remote-tracking branch 'origin/dev' into po/sprint-10
jenswaechtler Jan 18, 2023
07b0a3c
Merge pull request #152 from amosproj/PO-sprint-09
jenswaechtler Jan 18, 2023
c76e4d3
Merge pull request #159 from amosproj/po/sprint-10
jenswaechtler Jan 18, 2023
f0a2396
Selecting correct docker service
jandegen Jan 18, 2023
d100148
Adapted strip prefix
jandegen Jan 18, 2023
85a17a6
Changed CORS policy
jandegen Jan 18, 2023
6fd75a4
Fixed path for dev environment
jandegen Jan 18, 2023
85d5ae1
Added docker volume for backend data to web environments
jandegen Jan 18, 2023
6858374
Popup disappears on load/save
jandegen Jan 18, 2023
220935a
Merge branch 'dev' into feature/#118-preset-save-save-preset-button-a…
jandegen Jan 18, 2023
23e5b53
Merge pull request #174 from amosproj/feature/#118-preset-save-save-p…
jandegen Jan 18, 2023
5cd367e
Merge pull request #175 from amosproj/dev
motschel123 Jan 18, 2023
314a29e
Merge branch 'main' into int
motschel123 Jan 18, 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