Skip to content

Commit

Permalink
Updated for initial 2023 version.
Browse files Browse the repository at this point in the history
  • Loading branch information
We-Gold committed Feb 28, 2023
1 parent 904e757 commit fff3e61
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions 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 package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Cougar-Dashboard",
"author": "FRC Team 2539",
"version": "0.2.14",
"version": "0.3.0",
"main": "public/electron.js",
"scripts": {
"dev": "vite",
Expand Down
6 changes: 5 additions & 1 deletion src/components/camerafeed.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@ export default class CameraFeed extends Component {
super(props)

this.ip = this.props.cameraIP

this.isThumbnail = this.props.isThumbnail
}

render() {
let className = "max-h-full m-auto " + (this.isThumbnail ? "" : "h-full")

return (
<div className="h-full w-full relative">
<img className="max-h-full h-full m-auto" src={this.ip} />
<img className={className} src={this.ip} />
</div>
)
}
Expand Down
4 changes: 2 additions & 2 deletions src/home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ export default class Home extends Component {
<ConfigurableAutos nt={this.props.nt} ntMap={this.props.ntMap} putValueNT={this.props.putValueNT}/>
</div>
<div className="col-span-6 flex flex-row justify-around p-3">
<CameraFeed cameraIP={"http://10.25.39.11:5800"}/>
<CameraFeed cameraIP={"http://10.25.39.11:5800"} isThumbnail={false}/>
</div>
<div className="col-span-3 flex flex-col justify-between p-3">
<CameraFeed cameraIP={"http://photonvision.local:1181"}/>
<CameraFeed cameraIP={"http://photonvision.local:1182/stream.mjpg"} isThumbnail={true}/>
<Robot nt={this.props.nt} />
</div>
</div>
Expand Down

0 comments on commit fff3e61

Please sign in to comment.