Skip to content

Commit

Permalink
Merge pull request #464 from kikeelectronico/dev
Browse files Browse the repository at this point in the history
Corrects a bug
  • Loading branch information
kikeelectronico authored Mar 19, 2023
2 parents 017dafb + b54ab35 commit b3da66b
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 27 deletions.
2 changes: 1 addition & 1 deletion back/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Data:
"""Access to the Homeware database and files."""


version = 'v1.10'
version = 'v1.10.1'
homewareFile = 'homeware.json'

def __init__(self):
Expand Down
50 changes: 25 additions & 25 deletions front/package-lock.json

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

2 changes: 1 addition & 1 deletion front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"react-json-view": "^1.21.3",
"react-markdown": "^8.0.1",
"react-router": "^6.8.2",
"react-router-dom": "^6.8.2",
"react-router-dom": "^6.9.0",
"react-router-link": "^2.0.2",
"react-scripts": "^5.0.1",
"react-switch": "^7.0.0",
Expand Down
2 changes: 2 additions & 0 deletions front/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,12 @@ class App extends React.Component {
<Routes>
<Route exact={ true } path="/" element={<Devices/>}> </Route>
<Route exact={ true } path="/devices" element={<Devices/>}> </Route>
<Route path="/devices/editor/" element={<Editor/>}> </Route>
<Route path="/devices/editor/:deviceId" element={<Editor/>}> </Route>
<Route path="/devices/info/:deviceId" element={<Info/>}> </Route>
<Route path="/devices/connecting/:deviceId" element={<Connecting/>}> </Route>
<Route exact={ true } path="/tasks" element={<Tasks/>}> </Route>
<Route path="/tasks/manager/" element={<Manager/>}> </Route>
<Route path="/tasks/manager/:taskId" element={<Manager/>}> </Route>
<Route path="/settings" element={<Settings/>}> </Route>
<Route path="/system" element={<System git={this.state.git} version={this.state.version}/>}> </Route>
Expand Down

0 comments on commit b3da66b

Please sign in to comment.