Merge branch 'master' into pi-updates

Pal0r · Dec 30, 2021 · 9e3abf9 · 9e3abf9
2 parents 4697cbd + 4324a92
commit 9e3abf9
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 111 deletions.
diff --git a/ble/com.moonboard.service b/ble/com.moonboard.service
@@ -1,4 +1,13 @@
-[D-BUS Service]
-Name=com.moonboard
-Exec=/usr/bin/python3 /home/pi/moonboard/ble/moonboard_BLE_service.py
+[Unit]
+Description=Moonboard DBUS Service
+After=multi-user.target
+
+[Service]
+Type=dbus
+BusName=com.moonboard
+ExecStart=/usr/bin/python3 /home/pi/moonboard/ble/moonboard_BLE_service.py
 User=root
+SystemdService=dbus-org.com.moonbooard.service
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ble/moonboard_BLE_service.py b/ble/moonboard_BLE_service.py
@@ -120,6 +120,7 @@ def register_app_error_cb(error):
     mainloop.quit()
 
 from subprocess import Popen
+
 def run(*popenargs, **kwargs):
     input = kwargs.pop("input", None)
     check = kwargs.pop("handle", False)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@material-ui/core": "4.0.0",
+    "@material-ui/core": "4.9.12",
     "@material-ui/icons": "^3.0.2",
     "formik": "^1.5.4",
     "material-table": "^1.35.1",

diff --git a/frontend/src/components/AppBar.js b/frontend/src/components/AppBar.js
@@ -9,7 +9,7 @@ import  WbIncandescent from '@material-ui/icons/WbIncandescent';
 import  Search from '@material-ui/icons/Search';
 import  Info from '@material-ui/icons/Info';
 import { connect } from 'react-redux';
-import {search_enter,illuminate_problem} from '../redux/actions'
+import {search_enter, illuminate_problem, set_selected_problem} from '../redux/actions'
 
 
 const styles = {
@@ -53,9 +53,8 @@ const MoonAppBar__ = withStyles(styles)(MoonAppBar_);
 
 const mapDispatchToProps = (dispatch) => ({
     onSearch: () => { dispatch(search_enter); },
-    onInfo: () => {dispatch(illuminate_problem)},
+    onInfo: (problem) =>()=> {dispatch(set_selected_problem(problem))},
     onIlluminate: (problem)=>() => { dispatch(illuminate_problem(problem))},
-
 }
 )
 const MoonAppBar = connect(

diff --git a/frontend/src/components/ProblemTable.js b/frontend/src/components/ProblemTable.js
@@ -37,8 +37,8 @@ const ProblemTable_ = ({data, dispatch}) =>{
     <MaterialTable
     data={data}
     columns = {[
-        {title: "Nome",render: rowData => rowData[1]},
-        {title: "Grado",render: rowData => rowData[2]},
+        {title: "Name",render: rowData => rowData[1]},
+        {title: "Grade",render: rowData => rowData[2]},
         {title: "Setter",render: rowData => rowData[3]},
         {title:"Benchmark" ,render: rowData => <Benchmark benchmark={rowData[4]}/> },
     ]}

diff --git a/frontend/src/components/SearchComponent.js b/frontend/src/components/SearchComponent.js
@@ -49,22 +49,23 @@ const styles = theme => ({
 });
 
 const MultipleSelect = ({classes, name, values, onChange, selected}) => {
+    const selectedArr = selected ? selected : [];
 
     return (
         <FormControl className={classes.formControl}>
             <InputLabel>{name}</InputLabel>
             <Select
                 multiple
                 autoWidth={false}
-                value={selected}
+                value={selectedArr}
                 onChange={onChange}
                 input={<Input />}
-                renderValue={selected => selected.sort().join(', ')}
+                renderValue={selectedArr => selectedArr.sort().join(', ')}
                 className={classes.myselect}
             >
                 {values.map(val => (
                     <MenuItem key={val} value={val} >
-                        <Checkbox checked={selected.indexOf(val) > -1} />
+                        <Checkbox checked={selectedArr.indexOf(val) > -1} />
                         <ListItemText primary={val} />
                     </MenuItem>
                 ))}
@@ -77,32 +78,32 @@ const SearchForm = ({ classes, grades, holds, search_param, onChange, onCancel,
         return (
             <div className={classes.root} >
                 <Typography variant="h3" align={'center'} gutterBottom>
-                    Ricerca problemi
+                    Search Problems
                 </Typography>
                 <div className={classes.row} >
                         <TextField
                             id="name"
-                            label="Nome"
+                            label="Name"
                             className={classes.textField}
-                            value={search_param.name}
-                            onChange={onChange('name')}
+                            value={search_param.Name}
+                            onChange={onChange('Name')}
                             margin="normal"
                         />
                         <TextField
                             id="author"
-                            label="Tracciatore"
+                            label="Author"
                             className={classes.textField}
-                            value={search_param.author}
-                        onChange={onChange('author')}
+                            value={search_param.Setter}
+                        onChange={onChange('Setter')}
                             margin="normal"
                         />
                 </div >
 
                 <MultipleSelect
                     name="grades"
                     values={grades}
-                    selected={search_param.grades}
-                    onChange={onChange("grades")}
+                    selected={search_param.Grades}
+                    onChange={onChange("Grades")}
                     classes={classes}
                 />
 
@@ -112,15 +113,15 @@ const SearchForm = ({ classes, grades, holds, search_param, onChange, onCancel,
                     className={classes.button} 
                     onClick={onCancel}
                     >
-                        Esci
+                        Back
                     </Button>
                     <Button 
                     variant="contained" 
                     color="primary" 
                     className={classes.button}
                     onClick={onSearch(search_param)}
                     >
-                        Cerca
+                        Search
                     </Button>
                 </span>
             </div>