Skip to content

Moved SettingsModal to main.jsx #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NexInfinite merged 1 commit into from
Mar 1, 2025
Merged

Moved SettingsModal to main.jsx #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions gcs/src/dashboard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ const tailwindColors = resolveConfig(tailwindConfig).theme.colors
// Sounds
import armSound from "./assets/sounds/armed.mp3"
import disarmSound from "./assets/sounds/disarmed.mp3"
import SettingsModal from "./components/settingsModal"

export default function Dashboard() {
// Local Storage
Expand Down Expand Up @@ -354,7 +353,6 @@ export default function Dashboard() {
return (
<Layout currentPage="dashboard">
<div className="relative flex flex-auto w-full h-full overflow-hidden">
<SettingsModal isOpen={true}/>
<div className="w-full">
<MapSection
passedRef={mapRef}
Expand Down
2 changes: 2 additions & 0 deletions gcs/src/main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import SingleRunWrapper from "./components/SingleRunWrapper.jsx"
import Toolbar from "./components/toolbar/toolbar.jsx"
import { ErrorBoundary } from "./components/error/errorBoundary"
import { SettingsProvider } from "./helpers/settingsProvider.jsx"
import SettingsModal from "./components/settingsModal"
import { Commands } from "./components/spotlight/commandHandler.js"

ReactDOM.createRoot(document.getElementById("root")).render(
Expand All @@ -41,6 +42,7 @@ ReactDOM.createRoot(document.getElementById("root")).render(
<SingleRunWrapper>
<Toolbar />
<ErrorBoundary>
<SettingsModal/>
<Routes>
<Route path="/" element={<Dashboard />} />
<Route path="/graphs" element={<Graphs />} />
Expand Down