Compare commits

..

No commits in common. "1e6c10b96ef5eb0e706cad91e97c8306be15c6ba" and "d2224dfd222c85de81619e2c078602cba5bc1a00" have entirely different histories.

3 changed files with 21 additions and 30 deletions

View File

@ -19,12 +19,6 @@ public static partial class Db
.FirstOrDefault(i => i.Id == id); .FirstOrDefault(i => i.Id == id);
} }
public static UserAction? GetActionById(Int64? id)
{
return UserActions
.FirstOrDefault(i => i.Id == id);
}
public static User? GetUserById(Int64? id) public static User? GetUserById(Int64? id)
{ {
return Users return Users

View File

@ -276,30 +276,27 @@ function Installation(props: singleInstallationProps) {
/> />
</div> </div>
</div> </div>
{loading && {loading && currentTab != 'information' && currentTab != 'overview' && (
currentTab != 'information' && <Container
currentTab != 'overview' && maxWidth="xl"
currentTab != 'log' && ( sx={{
<Container display: 'flex',
maxWidth="xl" flexDirection: 'column',
sx={{ justifyContent: 'center',
display: 'flex', alignItems: 'center',
flexDirection: 'column', height: '70vh'
justifyContent: 'center', }}
alignItems: 'center', >
height: '70vh' <CircularProgress size={60} style={{ color: '#ffc04d' }} />
}} <Typography
variant="body2"
style={{ color: 'black', fontWeight: 'bold' }}
mt={2}
> >
<CircularProgress size={60} style={{ color: '#ffc04d' }} /> Connecting to the device...
<Typography </Typography>
variant="body2" </Container>
style={{ color: 'black', fontWeight: 'bold' }} )}
mt={2}
>
Connecting to the device...
</Typography>
</Container>
)}
<Card variant="outlined"> <Card variant="outlined">
<Grid <Grid

View File

@ -14,7 +14,7 @@ function SalidomoInstallationTabs() {
const location = useLocation(); const location = useLocation();
const context = useContext(UserContext); const context = useContext(UserContext);
const { currentUser } = context; const { currentUser } = context;
const tabList = ['batteryview', 'information', 'overview', 'log']; const tabList = ['batteryview', 'information'];
const [currentTab, setCurrentTab] = useState<string>(undefined); const [currentTab, setCurrentTab] = useState<string>(undefined);
const [fetchedInstallations, setFetchedInstallations] = const [fetchedInstallations, setFetchedInstallations] =