adjusted some spacing stuff on the bin page

This commit is contained in:
Carter 2025-05-06 11:17:35 -06:00
parent ee86ec176c
commit 59c14e3f8b
5 changed files with 39 additions and 34 deletions

View file

@ -13,8 +13,8 @@ dependencies:production:
only: only:
refs: refs:
- master - master
before_script: # before_script:
- npm -g config set user root # - npm -g config set user root
script: script:
- npm ci - npm ci
cache: cache:
@ -28,17 +28,17 @@ dependencies:production:
paths: paths:
- node_modules/ - node_modules/
test: # test:
image: node:$NODE_VERSION # image: node:$NODE_VERSION
stage: setup # stage: setup
dependencies: # dependencies:
- dependencies:production # - dependencies:production
only: # only:
- master # - master
before_script: # before_script:
- npm run lint # - npm run lint
script: # script:
- CI=true npm run test # - CI=true npm run test
setup:production: setup:production:
image: node:$NODE_VERSION image: node:$NODE_VERSION

28
package-lock.json generated
View file

@ -8481,10 +8481,11 @@
} }
}, },
"node_modules/fdir": { "node_modules/fdir": {
"version": "6.4.3", "version": "6.4.4",
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
"integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==", "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
"dev": true, "dev": true,
"license": "MIT",
"peerDependencies": { "peerDependencies": {
"picomatch": "^3 || ^4" "picomatch": "^3 || ^4"
}, },
@ -12754,12 +12755,13 @@
"dev": true "dev": true
}, },
"node_modules/tinyglobby": { "node_modules/tinyglobby": {
"version": "0.2.12", "version": "0.2.13",
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz", "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
"integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==", "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"fdir": "^6.4.3", "fdir": "^6.4.4",
"picomatch": "^4.0.2" "picomatch": "^4.0.2"
}, },
"engines": { "engines": {
@ -13735,14 +13737,18 @@
} }
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "6.2.6", "version": "6.3.5",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
"integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==", "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"esbuild": "^0.25.0", "esbuild": "^0.25.0",
"fdir": "^6.4.4",
"picomatch": "^4.0.2",
"postcss": "^8.5.3", "postcss": "^8.5.3",
"rollup": "^4.30.1" "rollup": "^4.34.9",
"tinyglobby": "^0.2.13"
}, },
"bin": { "bin": {
"vite": "bin/vite.js" "vite": "bin/vite.js"

View file

@ -401,7 +401,7 @@ export default function BinStorageConditions(props: Props) {
alignContent="center" alignContent="center"
alignItems="center" alignItems="center"
justifyContent="space-between"> justifyContent="space-between">
<Grid size={{ xs: 6 }}> <Grid size={{ xs: 8 }}>
<Box display="flex" alignContent="center" alignItems="center"> <Box display="flex" alignContent="center" alignItems="center">
<TemperatureIcon /> <TemperatureIcon />
<Typography noWrap style={{ fontWeight: 650 }}> <Typography noWrap style={{ fontWeight: 650 }}>

View file

@ -816,9 +816,9 @@ export default function Bin(props: Props) {
const desktopView = () => { const desktopView = () => {
return ( return (
<Card style={{ padding: 15 }}> <Card sx={{ padding: 1 }}>
<Grid container spacing={2} direction={"row"} justifyContent="center" alignItems="stretch"> <Grid container spacing={2} direction={"row"} justifyContent="center" alignItems="stretch">
<Grid size={{ xs: 12, sm: 12, md: 6, lg: 3 }}> <Grid size={{ xs: 12, sm: 12, md: 12, lg: 6, xl: 4 }}>
<Box <Box
paddingX={1} paddingX={1}
marginBottom={1} marginBottom={1}
@ -844,7 +844,7 @@ export default function Bin(props: Props) {
{overview()} {overview()}
{preferences && binComponents(preferences)} {preferences && binComponents(preferences)}
</Grid> </Grid>
<Grid size={{ xs: 12, sm: 12, md: 6, lg: 3 }}> <Grid size={{ xs: 12, sm: 12, md: 12, lg: 6, xl: 2.6 }}>
{(bin.settings.mode === pond.BinMode.BIN_MODE_DRYING || {(bin.settings.mode === pond.BinMode.BIN_MODE_DRYING ||
bin.settings.mode === pond.BinMode.BIN_MODE_HYDRATING) && ( bin.settings.mode === pond.BinMode.BIN_MODE_HYDRATING) && (
<BinConditioningCard <BinConditioningCard
@ -862,7 +862,7 @@ export default function Bin(props: Props) {
<BinStorageConditions bin={bin} headspaceCO2={headspaceCO2} cables={grainCables} /> <BinStorageConditions bin={bin} headspaceCO2={headspaceCO2} cables={grainCables} />
</Box> </Box>
</Grid> </Grid>
<Grid id="tour-graphs" size={{ xs: 12, sm: 12, md: 12, lg: 6 }}> <Grid id="tour-graphs" size={{ xs: 12, sm: 12, md: 12, lg: 6, xl: 5.3 }}>
<Box paddingBottom={2}> <Box paddingBottom={2}>
<StyledToggleButtonGroup <StyledToggleButtonGroup
id="tour-graph-tabs" id="tour-graph-tabs"
@ -1089,11 +1089,12 @@ export default function Bin(props: Props) {
}; };
return ( return (
<PageContainer> <PageContainer padding={1}>
{showPlenumError()} {showPlenumError()}
<Box <Box
paddingBottom={isMobile || displayMobile ? 1 : 2} paddingBottom={isMobile || displayMobile ? 1 : 2}
paddingX={isMobile || displayMobile ? 1 : 2}> paddingX={1}
>
{tabs()} {tabs()}
{isMobile && ( {isMobile && (
<Box <Box

View file

@ -1,6 +1,5 @@
import { useHTTP, usePermissionAPI } from "hooks"; import { useHTTP, usePermissionAPI } from "hooks";
// import { useWebsocket } from "websocket"; import { Component, deviceScope, User } from "models";
import { /*Component,*/ Component, deviceScope, Team, User } from "models";
import { pond } from "protobuf-ts/pond"; import { pond } from "protobuf-ts/pond";
import { createContext, PropsWithChildren, useContext } from "react"; import { createContext, PropsWithChildren, useContext } from "react";
import { pondURL } from "./pond"; import { pondURL } from "./pond";
@ -9,7 +8,6 @@ import { useGlobalState } from "providers";
import moment from "moment"; import moment from "moment";
import { or } from "utils/types"; import { or } from "utils/types";
import { dateRange } from "providers/http"; import { dateRange } from "providers/http";
// import { reject, result } from "lodash";
export interface IDeviceAPIContext { export interface IDeviceAPIContext {
add: (name: string, description: string, backpack: pond.BackpackSettings, otherTeam?: string) => Promise<AxiosResponse<pond.AddDeviceResponse>>; add: (name: string, description: string, backpack: pond.BackpackSettings, otherTeam?: string) => Promise<AxiosResponse<pond.AddDeviceResponse>>;