Skip to content

Commit

Permalink
Cleanup and file case changes
Browse files Browse the repository at this point in the history
  • Loading branch information
samderanova committed Mar 1, 2024
1 parent 42c8e9f commit e2e9a0c
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 11 deletions.
6 changes: 2 additions & 4 deletions control-station/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import Navbar from "@/components/Navbar/Navbar";
import SensorBoxContainer from "@/components/SensorBoxes/SensorBoxContainer";
import ControlPanel from "@/components/ControlPanel/ControlPanel";
import { ControlPanel, Navbar, SensorData } from "@/components";

export default function App() {
return (
<main>
<Navbar />
<SensorBoxContainer />
<SensorData />
<ControlPanel />
</main>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.sensorboxcontainer {
.sensordata {
display: flex;
flex-grow: 1;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import SensorContainer from "./Sensors/SensorsContainer";
import "./sensorboxct.css";
import Camera from "./Camera";
import Console from "./Console";
export default function SensorBoxContainer() {
import SensorContainer from "./Sensors/SensorsContainer";

import "./SensorData.css";

export default function SensorData() {
return (
<div className="sensorboxcontainer">
<div className="sensordata">
<SensorContainer />
<div style={{ width: "50%" }}>
<Camera />
Expand Down
4 changes: 4 additions & 0 deletions control-station/src/components/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
export { default as ControlPanel } from "./ControlPanel/ControlPanel";
export { default as Navbar } from "./Navbar/Navbar";
export { default as SensorData } from "./SensorBoxes/SensorData";
export { default as Status } from "./status/Status";

3 changes: 1 addition & 2 deletions control-station/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ export default defineConfig({
plugins: [react()],
resolve: {
alias: {
"@/": "/src/",
"$/":"/public/"
"@/": "/src/"
},
},
});

0 comments on commit e2e9a0c

Please sign in to comment.