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-12-release #195

Merged
merged 95 commits into from
Jan 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
437793f
Improved readability for dark and light mode
PhlppKrmr Jan 17, 2023
3ddfb07
remove bouncing balls
Jan 17, 2023
e09ed29
add data-cy annotation
Jan 17, 2023
7b9a51b
fix reset of indicators
Jan 17, 2023
d97fcc1
Small responsiveness improvement for indicator labels
PhlppKrmr Jan 17, 2023
5076b67
Create feature-board.PNG
dev3225 Jan 18, 2023
eab0475
Add files via upload
dev3225 Jan 18, 2023
07363b6
Merge branch 'dev' of https://github.com/amosproj/amos2022ws03-softwa…
PhlppKrmr Jan 18, 2023
506ca8c
Merge remote-tracking branch 'origin/dev' into po/sprint-11
jenswaechtler Jan 18, 2023
37b202c
Merge branch 'dev' into po/sprint-11
dev3225 Jan 18, 2023
dbe664a
Added environment path
jandegen Jan 18, 2023
7777ec8
Merge pull request #170 from amosproj/po/sprint-11
dev3225 Jan 18, 2023
5c4cd83
Changed some icon buttons + linting
PhlppKrmr Jan 18, 2023
bf9b848
Merge branch 'dev' of https://github.com/amosproj/amos2022ws03-softwa…
PhlppKrmr Jan 18, 2023
407c181
Change some buttons to fit icon-button-size
PhlppKrmr Jan 18, 2023
8376341
Fix scrolling for ultrawide screens
PhlppKrmr Jan 18, 2023
fb54c0d
add sveltestrap, add tooltips for all general buttons
nicolaskolbenschlag Jan 19, 2023
548870e
change gnd-btn icon
nicolaskolbenschlag Jan 19, 2023
3d28670
move tooltip texts to labels.js #176
nicolaskolbenschlag Jan 19, 2023
316b64e
Channels now starting from 1 and made table scrollable as well as row…
jandegen Jan 19, 2023
71bba0b
Added preset components into settings view and added them to the gene…
jandegen Jan 19, 2023
b3e5d79
Adapted test cases to settings view
jandegen Jan 19, 2023
715e3c2
fixed test execution
jandegen Jan 19, 2023
e71aa4d
Merge branch 'dev' into feature/#168-rework-ui-preset-save-issue-118
jandegen Jan 19, 2023
d433e05
Removed old button from test cases
jandegen Jan 19, 2023
ff3f929
Searching for div instead of span in test cases
jandegen Jan 19, 2023
2462eb4
implement min max lines in webgl
Jan 20, 2023
e7c6011
adjust min max lines dimensions
Jan 20, 2023
e80eaf7
add text indicators to right side
Jan 20, 2023
512e8be
refactor
Jan 20, 2023
30fd553
Merge remote-tracking branch 'origin/dev' into feature/#166-indicator…
Jan 20, 2023
7b07910
use store for offset, amplitude and startstop
Jan 20, 2023
71abde8
use store for isActive
Jan 20, 2023
c1d4e06
Fixed bug where slider wasn't visible in Chrome + changed to preferre…
PhlppKrmr Jan 21, 2023
24233e6
add requested changes for #176
nicolaskolbenschlag Jan 22, 2023
7961ffd
Adapted to requested changes and Linting
Jan 22, 2023
61f150c
Optimized button disabled, changed test cases and linting
Jan 22, 2023
c01064c
Small changes to zebra colouring of table
PhlppKrmr Jan 22, 2023
2f1bdbb
Reverted prefers-color-scheme to light
PhlppKrmr Jan 22, 2023
d22a8d8
rename indicator scss classes
Jan 22, 2023
8defb01
remove font-family from .indicators--line
Jan 22, 2023
5e96243
rename indicator constants
Jan 22, 2023
c0dd0e4
rename indicatorShader.js to indicatorShaders.js
Jan 22, 2023
10e94d6
introduce constant for indicator update frequency
Jan 22, 2023
1792e49
remove unused update functions
Jan 22, 2023
7139853
Merge pull request #181 from amosproj/feature/#167-channel-naming-rework
jandegen Jan 22, 2023
b4593db
Merge remote-tracking branch 'origin/dev' into feature/#168-rework-ui…
Jan 22, 2023
6ca9a10
Solved merge conflicts friom dev and changed test cases to data-cy
Jan 22, 2023
80c50b6
removed empty fles
Jan 22, 2023
e4c8559
fixed deliverables folder naming
Jan 22, 2023
6e63a36
Fixed failing test case
Jan 22, 2023
75cb2c5
Merge branch 'dev' into feature/#176-tooltips
jandegen Jan 22, 2023
89e95cc
Merge pull request #182 from amosproj/feature/#168-rework-ui-preset-s…
jandegen Jan 22, 2023
4ecc8f5
Merge remote-tracking branch 'origin/dev' into feature/#166-indicator…
Jan 22, 2023
2605dbf
remove unused import in Oscilloscope
Jan 22, 2023
8ae85c5
Merge branch 'dev' of origin into feature/#171-responsive-web-design
PhlppKrmr Jan 22, 2023
54c4260
Merge branch 'dev' of https://github.com/amosproj/amos2022ws03-softwa…
PhlppKrmr Jan 22, 2023
e3162a2
Add new field prev_rand_value to TenChannelSampleGenerator
jenswaechtler Jan 22, 2023
40b8dcd
Add function for generating sample data between -1 and 1
jenswaechtler Jan 22, 2023
cec0cc4
Merge remote-tracking branch 'origin/dev' into feature/#171-responsiv…
Jan 22, 2023
f19dd3f
Merge remote-tracking branch 'origin/feature/#171-responsive-web-desi…
Jan 22, 2023
c47981e
Change forth signal to output of random_bounded_values
jenswaechtler Jan 22, 2023
2866b55
Add tests for random sample data
jenswaechtler Jan 22, 2023
c2ff660
Fixed table cell borders
Jan 22, 2023
735008c
Merge branch 'dev' of origin into feature/#171-responsive-web-design
PhlppKrmr Jan 22, 2023
4bd310f
Merge branch 'feature/#171-responsive-web-design' of origin into feat…
PhlppKrmr Jan 22, 2023
fd18a9d
Introduce const for random difference
jenswaechtler Jan 22, 2023
61549ae
Introduce sinus curve with changing amplitude
jenswaechtler Jan 22, 2023
bd77522
Add no noise signals
jenswaechtler Jan 22, 2023
e31e0f6
Change Wave to be in -1 1 range
jenswaechtler Jan 22, 2023
cdf4300
start channel numbers at 1
Jan 22, 2023
5f07247
use table for text indicators layout
Jan 23, 2023
30f21e0
#176 requested change label variable naming
nicolaskolbenschlag Jan 23, 2023
9935659
#176 lint two additional files
nicolaskolbenschlag Jan 23, 2023
7f3ba21
Fix test to respect not periodic functions
jenswaechtler Jan 23, 2023
44d32f4
Merge remote-tracking branch 'origin/dev' into feature/#164-channels-…
jenswaechtler Jan 23, 2023
8e0e65c
change labels #176
nicolaskolbenschlag Jan 23, 2023
ebd682f
Merge pull request #180 from amosproj/feature/#176-tooltips
nicolaskolbenschlag Jan 23, 2023
bcf4ce9
add label for new button settings #176
nicolaskolbenschlag Jan 23, 2023
69d6a1c
Merge pull request #185 from amosproj/feature/#176-tooltips
nicolaskolbenschlag Jan 23, 2023
adc9811
Merge branch 'dev' of origin into feature/#171-responsive-web-design
PhlppKrmr Jan 23, 2023
91c4e51
Merge branch 'dev' of origin into feature/#171-responsive-web-design
PhlppKrmr Jan 23, 2023
14175f9
Merge pull request #179 from amosproj/feature/#171-responsive-web-design
PhlppKrmr Jan 23, 2023
bc5365b
Merge remote-tracking branch 'origin/dev' into feature/#164-channels-…
jenswaechtler Jan 23, 2023
e3c641e
Merge pull request #184 from amosproj/feature/#164-channels-for-visua…
jenswaechtler Jan 23, 2023
f544267
Merge branch 'dev' of origin into feature/#166-indicators-remove-boun…
PhlppKrmr Jan 23, 2023
c4a7cc0
Linting
PhlppKrmr Jan 23, 2023
d80fbef
Merge pull request #173 from amosproj/feature/#166-indicators-remove-…
jandegen Jan 23, 2023
cda204b
Create feature-board.PNG
dev3225 Jan 25, 2023
248ec1a
Add files via upload
dev3225 Jan 25, 2023
7c4a186
Merge pull request #187 from amosproj/sprint-12
jandegen Jan 25, 2023
56eaf0a
Merge branch 'dev' into int
jandegen Jan 25, 2023
dc33d26
Merge pull request #193 from amosproj/int
jandegen Jan 25, 2023
6435371
Removed arm support
Jan 25, 2023
0661a05
Merge pull request #194 from amosproj/dev
jandegen Jan 25, 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
3 changes: 1 addition & 2 deletions .github/workflows/build-backend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ jobs:
uses: docker/build-push-action@v3
with:
context: ./Apps/backend
platforms: linux/amd64,linux/arm64
push: false
platforms: linux/amd64
tags: |
sosci/backend:${{ github.event.pull_request.title }}
sosci/backend:latest
2 changes: 1 addition & 1 deletion .github/workflows/build-frontend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
uses: docker/build-push-action@v3
with:
context: ./Apps/frontend
platforms: linux/amd64,linux/arm64
platforms: linux/amd64
build-args: |
MODE=production
push: false
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 @@ -71,7 +71,7 @@ jobs:
uses: docker/build-push-action@v3
with:
context: ./Apps/generator
platforms: linux/amd64,linux/arm64
platforms: linux/amd64
push: false
tags: |
sosci/generator:${{ github.event.pull_request.title }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-backend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
uses: docker/build-push-action@v3
with:
context: ./Apps/backend
platforms: linux/amd64,linux/arm64
platforms: linux/amd64
push: true
tags: |
sosci/backend:${{ github.event.pull_request.title }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-frontend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
uses: docker/build-push-action@v3
with:
context: ./Apps/frontend
platforms: linux/amd64,linux/arm64
platforms: linux/amd64
build-args: |
MODE=production
push: true
Expand Down
14 changes: 7 additions & 7 deletions Apps/frontend/cypress/e2e/2-control-panel/preset-config.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ describe("everything visible on front page", () => {
});

it("displays btn", () => {
cy.get("#managePresets").should("be.visible");
cy.get('[data-cy="settings-button"]').should("be.visible");
});

it("is clickable", () => {
cy.get('[data-cy="preset-config-open-popup"]').click();
cy.get("#getChannelConfig").should("be.visible");
cy.get("#availablePreset").should("be.visible");
cy.get("#presetName").should("be.visible");
cy.get("#storeChannelConfig").should("be.visible");
cy.get("#cancelChannelConfig").should("be.visible");
cy.get('[data-cy="settings-button"]').click();
cy.get('[data-cy="preset-config-open-popup"]').should("be.visible");
cy.get('[data-cy="load-channel-config"]').should("be.visible");
cy.get('[data-cy="available-presets-list"]').should("be.visible");
cy.get('[data-cy="selected-preset"]').should("be.visible");
cy.get('[data-cy="store-channel-config"]').should("be.visible");
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ describe("onOffButton", () => {

it("is clickable", () => {
cy.get('[data-cy="on-off-button"]').click();
cy.get('[data-cy="on-off-button"]').should("have.class", "mui-icon--off");
cy.get('[data-cy="on-off-button"]').should("have.class", "icon--off");
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ describe("amplitudeSlider", () => {
it(`has label that displays reciprocal value "Infinity"`, () => {
cy.get(`[data-cy="amplitudeSlider-0"]`).within(() => {
cy.get('[type="range"]').invoke("val", 2).trigger("change");
cy.get("span").should("have.text", "0.50");
cy.get("div").should("have.text", "0.50");
});
});

it(`has label that displays reciprocal value "Infinity" for value 0`, () => {
cy.get(`[data-cy="amplitudeSlider-1"]`).within(() => {
cy.get('[type="range"]').invoke("val", 0).trigger("change");
cy.get("span").should("have.text", "Infinity");
cy.get("div").should("have.text", "Infinity");
});
});

Expand Down
50 changes: 41 additions & 9 deletions Apps/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@
"prettier": "2.8.0",
"prettier-plugin-svelte": "^2.8.1",
"sass": "^1.56.2",
"svelte": "^3.52.0",
"svelte": "^3.55.1",
"svelte-toggle": "^3.1.0",
"vite": "^3.2.0"
},
"dependencies": {
"axios": "^1.2.1",
"sveltestrap": "^5.10.0",
"webgl-plot": "^0.7.0"
}
}
4 changes: 4 additions & 0 deletions Apps/frontend/src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
href="https://fonts.googleapis.com/icon?family=Material+Icons"
/>
<link rel="stylesheet" href="node_modules/svelte-material-ui/bare.css" />
<link
rel="stylesheet"
href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css"
/>
</svelte:head>
<main data-cy="oscilloscope">
<Layout />
Expand Down
Loading