Skip to content

Commit

Permalink
Merge pull request #18 from lnls-sirius/dev
Browse files Browse the repository at this point in the history
Feedback modifications
  • Loading branch information
RafaelLyra8 authored Jun 12, 2023
2 parents 5037bea + 8c5c2d3 commit 722f055
Show file tree
Hide file tree
Showing 22 changed files with 1,176 additions and 662 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- 80:80
frontend:
container_name: 'rad-det'
image: 'ghcr.io/lnls-sirius/rad-det-frontend:1.1.5'
image: 'ghcr.io/lnls-sirius/rad-det-frontend:1.1.6'
build:
context: ./front_end
ports:
Expand Down
104 changes: 103 additions & 1 deletion front_end/package-lock.json

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

6 changes: 6 additions & 0 deletions front_end/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,21 @@
"@svgr/webpack": "^6.5.1",
"@testing-library/react": "^14.0.0",
"@types/crypto-js": "^4.1.1",
"@types/hammerjs": "^2.0.41",
"@types/react": "^18.0.26",
"@types/react-color": "^3.0.6",
"@types/react-dom": "^18.0.10",
"@types/react-router-dom": "^5.3.3",
"@types/styled-components": "^5.1.26",
"axios": "^1.2.2",
"buffer": "^6.0.3",
"chart.js": "^3.9.1",
"chartjs-adapter-moment": "^1.0.1",
"chartjs-plugin-zoom": "^2.0.1",
"crypto-js": "^4.1.1",
"fs": "^0.0.1-security",
"hammerjs": "^2.0.8",
"jsencrypt": "^3.3.2",
"react": "^18.2.0",
"react-color": "^2.19.3",
"react-dom": "^18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions front_end/src/assets/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { DDictStr, DictEnumStr, DictNum, DictStr } from "./interfaces/patterns"

// const git_version = GitInfo()
const version: string = "v1.0.0."//+git_version.commit.shortHash + " / " + git_version.commit.date;
const version: string = "v1.1.6"//+git_version.commit.shortHash + " / " + git_version.commit.date;

// Integrated dose limits parameters
const led_limits: DictNum = {
Expand All @@ -20,7 +20,7 @@ const status_legend: string[] = [
"OK (<"+led_limits["alert"]+"μSv)",
"Alert ("+led_limits["alert"]+"-"+led_limits["alarm"]+"μSv)",
"Alarm (≥"+led_limits["alarm"]+"μSv)",
"Failed"
"Disconnected"
]

// Styled string of probe type
Expand Down
Loading

0 comments on commit 722f055

Please sign in to comment.