Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
f0a8b25
Added temp ranges to routine upsert
martinosimani Oct 17, 2017
4745ce7
Merge pull request #15 from OpenFermentor/feature/temp_ranges
martinosimani Oct 22, 2017
70d4f29
Fixed experiment upsert form
martinosimani Oct 31, 2017
98ab02d
Merge pull request #16 from OpenFermentor/fix/experiment_details_attr…
martinosimani Oct 31, 2017
a273085
Added pagination for experiments (#17)
martinosimani Nov 8, 2017
6ac0c3e
Feature/alerts (#18)
martinosimani Nov 8, 2017
0b48446
Added component for loope delay. Fixed loope delay to milliseconds fo…
martinosimani Nov 11, 2017
c5d83c3
Merge pull request #19 from OpenFermentor/fix/loop_delay_format
martinosimani Nov 11, 2017
07b4445
Fixed date visualization in experiment creation form
martinosimani Nov 17, 2017
98edb0a
Fixed error visualization
martinosimani Nov 20, 2017
b3b04e7
Implemented routine log entries redux and sagas
martinosimani Nov 20, 2017
5746af9
Implemented event presentation
martinosimani Nov 20, 2017
3f6d565
Updated 'Empujar' acid/base to 'Bombear'
martinosimani Nov 20, 2017
cacd4dd
Updated sensor status with new data
martinosimani Nov 20, 2017
42b872b
Fixed started date in experiments list
martinosimani Nov 20, 2017
1c2b8d1
Merge pull request #24 from OpenFermentor/fix/experiments_started_date
martinosimani Nov 20, 2017
4f42421
Merge pull request #23 from OpenFermentor/feature/sensor_status_new_data
martinosimani Nov 20, 2017
ddb199a
Merge pull request #22 from OpenFermentor/fix/experiment_creation_tim…
martinosimani Nov 20, 2017
1cc441e
Merge pull request #21 from OpenFermentor/feature/log_entries
martinosimani Nov 20, 2017
5181ef5
Merge pull request #20 from OpenFermentor/fix/pump_terminology_correc…
martinosimani Nov 20, 2017
50f02dc
Implemented experiment tags
martinosimani Nov 23, 2017
000c65c
Implemented experiment search using backend services
martinosimani Nov 23, 2017
9ddf719
Merge pull request #26 from OpenFermentor/feautre/search
martinosimani Nov 23, 2017
9b4b2e7
Merge pull request #25 from OpenFermentor/feature/experiment_tags
martinosimani Nov 23, 2017
8eb99a9
Fixed resume current experiment
martinosimani Nov 29, 2017
221da46
Merge pull request #27 from OpenFermentor/fix/resume_current_experiment
martinosimani Nov 29, 2017
820e884
Added external readings input and visualization
martinosimani Dec 6, 2017
7b48d4c
Merge pull request #28 from OpenFermentor/feature/external_readings
martinosimani Dec 6, 2017
6a687d9
pH calibration redesign
diegomedina248 Dec 6, 2017
5391a14
Merge pull request #29 from OpenFermentor/feature/ph-cal-redesign
martinosimani Dec 7, 2017
6b0bd66
Fixed several issues
diegomedina248 Dec 14, 2017
82a03e3
Fixed styles in the analysis view
diegomedina248 Dec 19, 2017
b7c1f47
Implemented calculations
martinosimani Dec 19, 2017
db7c1c2
Merge pull request #32 from OpenFermentor/feature/calculations
martinosimani Dec 19, 2017
02cdc6c
Merge branch 'develop' into feature/ui-enhancements
martinosimani Dec 19, 2017
fd2e122
Merge pull request #31 from OpenFermentor/feature/ui-enhancements
martinosimani Dec 19, 2017
31c282f
Implmented remote web client
martinosimani Dec 21, 2017
579c6ef
Implemented login
martinosimani Dec 27, 2017
59d7eca
Merge pull request #33 from OpenFermentor/feature/remote_server
martinosimani Dec 27, 2017
0d95dd7
Fixed sign in screen (#34)
martinosimani Jan 8, 2018
7f580e1
Fixed pump status
mcousillas6 Jan 11, 2018
a690dc5
Repositioned external reading button (#35)
martinosimani Jan 18, 2018
88a492b
Update README.md
Jan 23, 2018
7b16e6d
Fixed external reading creation (#36)
martinosimani Jan 25, 2018
39311df
Fixed running experiment readings visualization (#37)
martinosimani Jan 31, 2018
c24cc4e
Added licence, issues and pr files
mcousillas6 Feb 9, 2018
60c36f1
Fixed paddings
martinosimani Feb 13, 2018
d59d61a
Fixed timeline navigation
martinosimani Feb 13, 2018
7411618
Merge pull request #40 from OpenFermentor/fix/report_timeline_navigation
martinosimani Feb 13, 2018
37c76fc
Merge pull request #39 from OpenFermentor/fix/paddings
martinosimani Feb 13, 2018
3239a78
Several fixes
martinosimani Mar 12, 2018
51b27ff
Merge pull request #41 from OpenFermentor/fix/dashboard
martinosimani Mar 12, 2018
dd25c4f
- Fixed experiments breadcrump urls && - Fixed create / update experi…
martinosimani Mar 24, 2018
05f8b6f
Fixed experiment search (#43)
martinosimani Apr 8, 2018
30e7e24
Fixed report charts (#44)
martinosimani Apr 12, 2018
5702809
Fixed line redraw
martinosimani Apr 14, 2018
fc0cec8
Fixed dashboard charts
martinosimani Apr 17, 2018
2dec345
Merge pull request #46 from OpenFermentor/fix/dashboard_charts
martinosimani Apr 30, 2018
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: 2 additions & 0 deletions .env.development.local
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
REACT_APP_BASE_API_URL="http://localhost:4000/api"
REACT_APP_BASE_SOCKET_URL="ws://localhost:4000/socket"

REACT_APP_REMOTE_WEB_APPLICATION=false
22 changes: 22 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "attach",
"name": "Attach to Chrome",
"port": 9222,
"webRoot": "${workspaceFolder}"
},
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:8080",
"webRoot": "${workspaceFolder}"
}
]
}
17 changes: 17 additions & 0 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!--
Please post questions in Stack Overflow under the react-native-navigation tag
https://stackoverflow.com/questions/tagged/react-native-navigation
-->

### Issue Description

[ENTER DESCRIPTION HERE]

### Steps to Reproduce / Code Snippets / Screenshots

[FILL THIS OUT - It will be extremely helpful]

---
### Environment
* NodeJS version: FILL THIS OUT
* Browser version: FILL THIS OUT
21 changes: 21 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2018 OpenFermentor

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
10 changes: 10 additions & 0 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
### Description
- [] Please explain the changes you made here.
- [] Link to any related issues or other PRs.


### Checklist
- [ ] Code compiles correctly
- [ ] Created tests which fail without the change (if possible)
- [ ] All tests passing
- [ ] Extended the README / documentation, if necessary
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: bin/boot
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# MonitorFrontend
This repo contains the code related to the local backend that is in charge of running and monitoring the routine run on the fermentor.
This server will run locally inside the terminal that will be directly connected to the micro-controller.
# Web-Monitor
This repo contains the code related to the frontend of the [Local-Monitor](https://openfermentor.github.io/Local-Monitor/) and [Cloud-Backend](https://github.com/OpenFermentor/Cloud-Backend/).

This repo contains the code related to the frontend of the [MonitorBackend](https://openfermentor.github.io/MonitorBackend/)


# Instalation
To run the MonitorBackend follow these steps:
## Instalation
To run the Web-Monitor follow these steps:
1. Clone the repo.
2. Installs the dependencies using the yarn package manager `yarn`
4. Run the server: `yarn start`
3. Run the server: `yarn start`

## Contributing
please refer to our [contributing guide](https://github.com/OpenFermentor/Guidelines/blob/master/contributing_guide.md) for more information.
Loading