Skip to content

Commit

Permalink
Merge pull request #21 from lnls-sirius/dev
Browse files Browse the repository at this point in the history
Bug fixes
  • Loading branch information
RafaelLyra8 authored Aug 9, 2023
2 parents f12e71b + a85fb8f commit 4ca2df9
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
Binary file modified back_end/__pycache__/__init__.cpython-39.pyc
Binary file not shown.
2 changes: 1 addition & 1 deletion back_end/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"integrated_dose", "probe", "gamma",
"gamma_status_probe", "color"
"""
@app.route("/load", methods=["POST"])
@app.route("/load")
def load():
data = {}
with open('./assets/pvs_rad.json', 'r') as file:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ version: '3.8'
services:
backend:
container_name: 'rad-det-api'
image: 'ghcr.io/lnls-sirius/rad-det-backend:1.2.0'
image: 'ghcr.io/lnls-sirius/rad-det-backend:1.2.1'
build:
context: ./back_end
ports:
- 80:80
frontend:
container_name: 'rad-det'
image: 'ghcr.io/lnls-sirius/rad-det-frontend:1.2.1'
image: 'ghcr.io/lnls-sirius/rad-det-frontend:1.2.2'
build:
context: ./front_end
ports:
Expand Down
2 changes: 1 addition & 1 deletion front_end/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "rad-detectors",
"version": "1.2.1",
"homepage": "http://rad-mon.lnls.br",
"homepage": "https://rad-mon.lnls.br",
"private": true,
"dependencies": {
"@fortawesome/free-solid-svg-icons": "^6.2.1",
Expand Down
8 changes: 3 additions & 5 deletions front_end/src/data-access/Rad_server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { PvsRadInterface } from "../../assets/interfaces/access-data";

const url: string = `${window.location.protocol}//rad-mon-api.lnls.br`;


/**
* Add a log register.
*/
Expand All @@ -19,12 +20,9 @@ async function fetchDetectorsData(req_type: string="detectors"): Promise<PvsRadI
const jsonurl:string = url + '/load';

return await axios
.post(jsonurl, {
method: "post",
.get(jsonurl, {
method: "get",
timeout: 2000,
data: {
type: req_type
},
headers : {
'Content-Type':'application/json',
'Access-Control-Allow-Origin': '*'
Expand Down

0 comments on commit 4ca2df9

Please sign in to comment.