Skip to content

Commit 71a598c

Browse files
HunterBarclayHunterBarclay
authored
Move UI elements to their own directory (#979)
2 parents a668f98 + fd22480 commit 71a598c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+249
-226
lines changed

‎fission/src/Synthesis.tsx

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
1-
import Scene from './components/Scene.tsx';
1+
import Scene from '@/components/Scene.tsx';
22
import MirabufSceneObject from './mirabuf/MirabufSceneObject.ts';
33
import { LoadMirabufRemote } from './mirabuf/MirabufLoader.ts';
44
import { mirabuf } from './proto/mirabuf';
55
import MirabufParser, { ParseErrorSeverity } from './mirabuf/MirabufParser.ts';
66
import MirabufInstance from './mirabuf/MirabufInstance.ts';
77
import { AnimatePresence, motion } from "framer-motion"
88
import { ReactElement, useEffect } from "react"
9-
import { ModalControlProvider, useModalManager } from "./ModalContext"
10-
import { PanelControlProvider, usePanelManager } from "./PanelContext"
11-
import { useTheme } from "./ThemeContext"
12-
import { ToastContainer, ToastProvider } from "./ToastContext"
9+
import { ModalControlProvider, useModalManager } from "@/ui/ModalContext"
10+
import { PanelControlProvider, usePanelManager } from "@/ui/PanelContext"
11+
import { useTheme } from "@/ui/ThemeContext"
12+
import { ToastContainer, ToastProvider } from "@/ui/ToastContext"
1313
import {
1414
TOOLTIP_DURATION,
1515
TooltipControl,
1616
TooltipControlProvider,
1717
TooltipType,
1818
useTooltipManager,
19-
} from "./TooltipContext"
20-
import MainHUD from "./components/MainHUD"
21-
import DownloadAssetsModal from "./modals/DownloadAssetsModal"
22-
import ExitSynthesisModal from "./modals/ExitSynthesisModal"
23-
import MatchResultsModal from "./modals/MatchResultsModal"
24-
import UpdateAvailableModal from "./modals/UpdateAvailableModal"
25-
import ViewModal from "./modals/ViewModal"
26-
import ConnectToMultiplayerModal from "./modals/aether/ConnectToMultiplayerModal"
27-
import ServerHostingModal from "./modals/aether/ServerHostingModal"
28-
import ChangeInputsModal from "./modals/configuring/ChangeInputsModal"
29-
import ChooseMultiplayerModeModal from "./modals/configuring/ChooseMultiplayerModeModal"
30-
import ChooseSingleplayerModeModal from "./modals/configuring/ChooseSingleplayerModeModal"
31-
import ConfigMotorModal from "./modals/configuring/ConfigMotorModal"
32-
import DrivetrainModal from "./modals/configuring/DrivetrainModal"
33-
import PracticeSettingsModal from "./modals/configuring/PracticeSettingsModal"
34-
import RoboRIOModal from "./modals/configuring/RoboRIOModal"
35-
import SettingsModal from "./modals/configuring/SettingsModal"
36-
import RCConfigEncoderModal from "./modals/configuring/rio-config/RCConfigEncoderModal"
37-
import RCConfigPwmGroupModal from "./modals/configuring/rio-config/RCConfigPwmGroupModal"
38-
import RCCreateDeviceModal from "./modals/configuring/rio-config/RCCreateDeviceModal"
39-
import DeleteAllThemesModal from "./modals/configuring/theme-editor/DeleteAllThemesModal"
40-
import DeleteThemeModal from "./modals/configuring/theme-editor/DeleteThemeModal"
41-
import NewThemeModal from "./modals/configuring/theme-editor/NewThemeModal"
42-
import ThemeEditorModal from "./modals/configuring/theme-editor/ThemeEditorModal"
43-
import MatchModeModal from "./modals/spawning/MatchModeModal"
44-
import RobotSwitchPanel from "./panels/RobotSwitchPanel"
45-
import SpawnLocationsPanel from "./panels/SpawnLocationPanel"
46-
import ConfigureGamepiecePickupPanel from "./panels/configuring/ConfigureGamepiecePickupPanel"
47-
import ConfigureShotTrajectoryPanel from "./panels/configuring/ConfigureShotTrajectoryPanel"
48-
import ScoringZonesPanel from "./panels/configuring/scoring/ScoringZonesPanel"
49-
import ZoneConfigPanel from "./panels/configuring/scoring/ZoneConfigPanel"
50-
import ScoreboardPanel from "./panels/information/ScoreboardPanel"
51-
import DriverStationPanel from "./panels/simulation/DriverStationPanel"
52-
import ManageAssembliesModal from './modals/spawning/ManageAssembliesModal.tsx';
53-
import World from './systems/World.ts';
54-
import { AddRobotsModal, AddFieldsModal, SpawningModal } from './modals/spawning/SpawningModals.tsx';
55-
import ImportMirabufModal from './modals/mirabuf/ImportMirabufModal.tsx';
19+
} from "@/ui/TooltipContext"
20+
import MainHUD from "@/components/MainHUD"
21+
import DownloadAssetsModal from "@/modals/DownloadAssetsModal"
22+
import ExitSynthesisModal from "@/modals/ExitSynthesisModal"
23+
import MatchResultsModal from "@/modals/MatchResultsModal"
24+
import UpdateAvailableModal from "@/modals/UpdateAvailableModal"
25+
import ViewModal from "@/modals/ViewModal"
26+
import ConnectToMultiplayerModal from "@/modals/aether/ConnectToMultiplayerModal"
27+
import ServerHostingModal from "@/modals/aether/ServerHostingModal"
28+
import ChangeInputsModal from "@/modals/configuring/ChangeInputsModal"
29+
import ChooseMultiplayerModeModal from "@/modals/configuring/ChooseMultiplayerModeModal"
30+
import ChooseSingleplayerModeModal from "@/modals/configuring/ChooseSingleplayerModeModal"
31+
import ConfigMotorModal from "@/modals/configuring/ConfigMotorModal"
32+
import DrivetrainModal from "@/modals/configuring/DrivetrainModal"
33+
import PracticeSettingsModal from "@/modals/configuring/PracticeSettingsModal"
34+
import RoboRIOModal from "@/modals/configuring/RoboRIOModal"
35+
import SettingsModal from "@/modals/configuring/SettingsModal"
36+
import RCConfigEncoderModal from "@/modals/configuring/rio-config/RCConfigEncoderModal"
37+
import RCConfigPwmGroupModal from "@/modals/configuring/rio-config/RCConfigPwmGroupModal"
38+
import RCCreateDeviceModal from "@/modals/configuring/rio-config/RCCreateDeviceModal"
39+
import DeleteAllThemesModal from "@/modals/configuring/theme-editor/DeleteAllThemesModal"
40+
import DeleteThemeModal from "@/modals/configuring/theme-editor/DeleteThemeModal"
41+
import NewThemeModal from "@/modals/configuring/theme-editor/NewThemeModal"
42+
import ThemeEditorModal from "@/modals/configuring/theme-editor/ThemeEditorModal"
43+
import MatchModeModal from "@/modals/spawning/MatchModeModal"
44+
import RobotSwitchPanel from "@/panels/RobotSwitchPanel"
45+
import SpawnLocationsPanel from "@/panels/SpawnLocationPanel"
46+
import ConfigureGamepiecePickupPanel from "@/panels/configuring/ConfigureGamepiecePickupPanel"
47+
import ConfigureShotTrajectoryPanel from "@/panels/configuring/ConfigureShotTrajectoryPanel"
48+
import ScoringZonesPanel from "@/panels/configuring/scoring/ScoringZonesPanel"
49+
import ZoneConfigPanel from "@/panels/configuring/scoring/ZoneConfigPanel"
50+
import ScoreboardPanel from "@/panels/information/ScoreboardPanel"
51+
import DriverStationPanel from "@/panels/simulation/DriverStationPanel"
52+
import ManageAssembliesModal from '@/modals/spawning/ManageAssembliesModal.tsx';
53+
import World from '@/systems/World.ts';
54+
import { AddRobotsModal, AddFieldsModal, SpawningModal } from '@/modals/spawning/SpawningModals.tsx';
55+
import ImportMirabufModal from '@/modals/mirabuf/ImportMirabufModal.tsx';
5656

5757
const DEFAULT_MIRA_PATH = '/api/mira/Robots/Team 2471 (2018)_v7.mira';
5858

‎fission/src/main.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import ReactDOM from "react-dom/client"
2-
import { Theme, ThemeProvider } from "./ThemeContext"
2+
import { Theme, ThemeProvider } from "@/ui/ThemeContext"
33
import Synthesis from "./Synthesis"
44
import "./index.css"
55

‎fission/src/ModalContext.tsx renamed to ‎fission/src/ui/ModalContext.tsx

File renamed without changes.

‎fission/src/PanelContext.tsx renamed to ‎fission/src/ui/PanelContext.tsx

File renamed without changes.

‎fission/src/ThemeContext.tsx renamed to ‎fission/src/ui/ThemeContext.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { ReactNode, createContext, useContext, useState } from "react"
22
import { RgbaColor } from "react-colorful"
3-
import { addGlobalFunc } from "./util/dom"
3+
import { addGlobalFunc } from "@/util/dom"
44

55
export const defaultThemeName = "Default"
66
export type ColorName =

‎fission/src/ToastContext.tsx renamed to ‎fission/src/ui/ToastContext.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import React, {
55
useCallback,
66
ReactNode,
77
} from "react"
8-
import Toast from "./components/Toast"
8+
import Toast from "@/components/Toast"
99
import { AnimatePresence, motion } from "framer-motion"
1010

1111
export type ToastType = "info" | "warning" | "error"

‎fission/src/TooltipContext.tsx renamed to ‎fission/src/ui/TooltipContext.tsx

File renamed without changes.

‎fission/src/components/Button.tsx renamed to ‎fission/src/ui/components/Button.tsx

File renamed without changes.

‎fission/src/components/Checkbox.tsx renamed to ‎fission/src/ui/components/Checkbox.tsx

File renamed without changes.

‎fission/src/components/Container.tsx renamed to ‎fission/src/ui/components/Container.tsx

File renamed without changes.

‎fission/src/components/Dropdown.tsx renamed to ‎fission/src/ui/components/Dropdown.tsx

File renamed without changes.

‎fission/src/components/Input.tsx renamed to ‎fission/src/ui/components/Input.tsx

File renamed without changes.

‎fission/src/components/Label.tsx renamed to ‎fission/src/ui/components/Label.tsx

File renamed without changes.

‎fission/src/components/LabeledButton.tsx renamed to ‎fission/src/ui/components/LabeledButton.tsx

File renamed without changes.

‎fission/src/components/MainHUD.tsx renamed to ‎fission/src/ui/components/MainHUD.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import { GrFormClose } from "react-icons/gr"
66
import { GiSteeringWheel } from "react-icons/gi"
77
import { HiDownload } from "react-icons/hi"
88
import { IoGameControllerOutline, IoPeople } from "react-icons/io5"
9-
import { useModalControlContext } from "../ModalContext"
10-
import { usePanelControlContext } from "../PanelContext"
9+
import { useModalControlContext } from "@/ui/ModalContext"
10+
import { usePanelControlContext } from "@/ui/PanelContext"
1111
import { motion } from "framer-motion"
12-
import logo from "../assets/autodesk_logo.png"
13-
import { ToastType, useToastContext } from "../ToastContext"
12+
import logo from "@/assets/autodesk_logo.png"
13+
import { ToastType, useToastContext } from "@/ui/ToastContext"
1414
import { Random } from "@/util/Random"
1515
import APS, { APS_USER_INFO_UPDATE_EVENT } from "@/aps/APS"
1616
import { UserIcon } from "./UserIcon"

‎fission/src/components/Modal.tsx renamed to ‎fission/src/ui/components/Modal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { ReactNode } from "react"
2-
import { useModalControlContext } from "../ModalContext"
2+
import { useModalControlContext } from "@/ui/ModalContext"
33

44
export type ModalPropsImpl = {
55
modalId: string

‎fission/src/components/Panel.tsx renamed to ‎fission/src/ui/components/Panel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { ReactNode } from "react"
2-
import { usePanelControlContext } from "../PanelContext"
2+
import { usePanelControlContext } from "@/ui/PanelContext"
33

44
export type PanelPropsImpl = {
55
panelId: string

‎fission/src/components/Radio.tsx renamed to ‎fission/src/ui/components/Radio.tsx

File renamed without changes.

‎fission/src/components/Scene.css renamed to ‎fission/src/ui/components/Scene.css

File renamed without changes.

‎fission/src/components/Scene.tsx renamed to ‎fission/src/ui/components/Scene.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import './Scene.css';
22
import { useEffect, useRef } from "react";
33
import Stats from 'stats.js';
44
import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
5-
import SceneObject from "../systems/scene/SceneObject";
5+
import SceneObject from "@/systems/scene/SceneObject";
66
import World from '@/systems/World';
77

88
let stats: Stats | null;
@@ -64,4 +64,4 @@ function Scene({ useStats }: SceneProps) {
6464
);
6565
}
6666

67-
export default Scene;
67+
export default Scene;

‎fission/src/components/ScrollView.tsx renamed to ‎fission/src/ui/components/ScrollView.tsx

File renamed without changes.

‎fission/src/components/SelectButton.tsx renamed to ‎fission/src/ui/components/SelectButton.tsx

File renamed without changes.

‎fission/src/components/Slider.tsx renamed to ‎fission/src/ui/components/Slider.tsx

File renamed without changes.

‎fission/src/components/Stack.tsx renamed to ‎fission/src/ui/components/Stack.tsx

File renamed without changes.

‎fission/src/components/Toast.tsx renamed to ‎fission/src/ui/components/Toast.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { ReactElement, useEffect } from "react"
2-
import { ToastData, useToastContext } from "../ToastContext"
2+
import { ToastData, useToastContext } from "@/ui/ToastContext"
33
import { GrFormClose } from "react-icons/gr"
44
import { BsFillWrenchAdjustableCircleFill } from "react-icons/bs"
55
import { AiFillWarning } from "react-icons/ai"

‎fission/src/components/Tooltip.tsx renamed to ‎fission/src/ui/components/Tooltip.tsx

File renamed without changes.

‎fission/src/components/UserIcon.tsx renamed to ‎fission/src/ui/components/UserIcon.tsx

File renamed without changes.

‎fission/src/modals/DownloadAssetsModal.tsx renamed to ‎fission/src/ui/modals/DownloadAssetsModal.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from "react"
2-
import Modal, { ModalPropsImpl } from "../components/Modal"
3-
import Stack, { StackDirection } from "../components/Stack"
4-
import Label, { LabelSize } from "../components/Label"
5-
import LabeledButton, { LabelPlacement } from "../components/LabeledButton"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
3+
import Stack, { StackDirection } from "@/components/Stack"
4+
import Label, { LabelSize } from "@/components/Label"
5+
import LabeledButton, { LabelPlacement } from "@/components/LabeledButton"
66
import { HiDownload } from "react-icons/hi"
77

88
const DownloadAssetsModal: React.FC<ModalPropsImpl> = ({ modalId }) => (

‎fission/src/modals/ExitSynthesisModal.tsx renamed to ‎fission/src/ui/modals/ExitSynthesisModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react"
2-
import Modal, { ModalPropsImpl } from "../components/Modal"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
33
import { GrFormClose } from "react-icons/gr"
4-
import Label from "../components/Label"
4+
import Label from "@/components/Label"
55

66
const ExitSynthesisModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
77
const isOnMainMenu = false

‎fission/src/modals/MatchResultsModal.tsx renamed to ‎fission/src/ui/modals/MatchResultsModal.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from "react"
2-
import Modal, { ModalPropsImpl } from "../components/Modal"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
33
import { GrFormClose } from "react-icons/gr"
4-
import Stack, { StackDirection } from "../components/Stack"
5-
import Label from "../components/Label"
4+
import Stack, { StackDirection } from "@/components/Stack"
5+
import Label from "@/components/Label"
66

77
type Entry = {
88
name: string

‎fission/src/modals/UpdateAvailableModal.tsx renamed to ‎fission/src/ui/modals/UpdateAvailableModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react"
2-
import Modal, { ModalPropsImpl } from "../components/Modal"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
33
import { GrFormClose } from "react-icons/gr"
4-
import Label from "../components/Label"
4+
import Label from "@/components/Label"
55

66
const UpdateAvailableModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
77
return (

‎fission/src/modals/ViewModal.tsx renamed to ‎fission/src/ui/modals/ViewModal.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { useState } from "react"
2-
import Modal, { ModalPropsImpl } from "../components/Modal"
3-
import Dropdown from "../components/Dropdown"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
3+
import Dropdown from "@/components/Dropdown"
44
import { FaMagnifyingGlass } from "react-icons/fa6"
5-
import { TooltipControl, useTooltipControlContext } from "@/TooltipContext"
5+
import { TooltipControl, useTooltipControlContext } from "@/ui/TooltipContext"
66

77
type ViewType = "Orbit" | "Freecam" | "Overview" | "Driver Station"
88

‎fission/src/modals/aether/ConnectToMultiplayerModal.tsx renamed to ‎fission/src/ui/modals/aether/ConnectToMultiplayerModal.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from "react"
2-
import Modal, { ModalPropsImpl } from "../../components/Modal"
3-
import Button from "../../components/Button"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
3+
import Button from "@/components/Button"
44
import { FaGear } from "react-icons/fa6"
5-
import Stack, { StackDirection } from "../../components/Stack"
6-
import Dropdown from "../../components/Dropdown"
7-
import Label from "../../components/Label"
5+
import Stack, { StackDirection } from "@/components/Stack"
6+
import Dropdown from "@/components/Dropdown"
7+
import Label from "@/components/Label"
88

99
const ConnectToMultiplayerModal: React.FC<ModalPropsImpl> = ({ modalId }) => (
1010
<Modal

‎fission/src/modals/aether/ServerHostingModal.tsx renamed to ‎fission/src/ui/modals/aether/ServerHostingModal.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { useEffect, useState } from "react"
2-
import Modal, { ModalPropsImpl } from "../../components/Modal"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
33
import { FaPlus } from "react-icons/fa6"
4-
import Label from "../../components/Label"
5-
import Stack, { StackDirection } from "../../components/Stack"
4+
import Label from "@/components/Label"
5+
import Stack, { StackDirection } from "@/components/Stack"
66

77
type Client = {
88
name: string

‎fission/src/modals/configuring/ChangeInputsModal.tsx renamed to ‎fission/src/ui/modals/configuring/ChangeInputsModal.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React, { useEffect, useState } from "react"
2-
import Modal, { ModalPropsImpl } from "../../components/Modal"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
33
import { FaGamepad } from "react-icons/fa6"
4-
import Stack, { StackDirection } from "../../components/Stack"
5-
import Label, { LabelSize } from "../../components/Label"
6-
import LabeledButton, { LabelPlacement } from "../../components/LabeledButton"
4+
import Stack, { StackDirection } from "@/components/Stack"
5+
import Label, { LabelSize } from "@/components/Label"
6+
import LabeledButton, { LabelPlacement } from "@/components/LabeledButton"
77

88
type ModifierState = {
99
alt?: boolean

‎fission/src/modals/configuring/ChooseMultiplayerModeModal.tsx renamed to ‎fission/src/ui/modals/configuring/ChooseMultiplayerModeModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react"
2-
import Modal, { ModalPropsImpl } from "../../components/Modal"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
33
import { FaGear } from "react-icons/fa6"
4-
import Button from "../../components/Button"
4+
import Button from "@/components/Button"
55

66
const ChooseMultiplayerModeModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
77
return (

‎fission/src/modals/configuring/ChooseSingleplayerModeModal.tsx renamed to ‎fission/src/ui/modals/configuring/ChooseSingleplayerModeModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react"
2-
import Modal, { ModalPropsImpl } from "../../components/Modal"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
33
import { FaGear } from "react-icons/fa6"
4-
import Button from "../../components/Button"
4+
import Button from "@/components/Button"
55

66
const ChooseSingleplayerModeModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
77
return (

‎fission/src/modals/configuring/ConfigMotorModal.tsx renamed to ‎fission/src/ui/modals/configuring/ConfigMotorModal.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FaGear } from "react-icons/fa6"
2-
import Modal, { ModalPropsImpl } from "../../components/Modal"
3-
import Slider from "../../components/Slider"
4-
import Label, { LabelSize } from "../../components/Label"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
3+
import Slider from "@/components/Slider"
4+
import Label, { LabelSize } from "@/components/Label"
55
import { useState } from "react"
66

77
type Motor = {

‎fission/src/modals/configuring/DrivetrainModal.tsx renamed to ‎fission/src/ui/modals/configuring/DrivetrainModal.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { useState } from "react"
2-
import Modal, { ModalPropsImpl } from "../../components/Modal"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
33
import { FaCar } from "react-icons/fa6"
4-
import Dropdown from "../../components/Dropdown"
5-
import { TooltipControl, useTooltipControlContext } from "@/TooltipContext"
4+
import Dropdown from "@/components/Dropdown"
5+
import { TooltipControl, useTooltipControlContext } from "@/ui/TooltipContext"
66

77
type DrivetrainType = "None" | "Tank" | "Arcade" | "Swerve"
88

‎fission/src/modals/configuring/PracticeSettingsModal.tsx renamed to ‎fission/src/ui/modals/configuring/PracticeSettingsModal.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from "react"
2-
import Modal, { ModalPropsImpl } from "../../components/Modal"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
33
import { FaGear } from "react-icons/fa6"
4-
import Button from "../../components/Button"
5-
import Label, { LabelSize } from "../../components/Label"
6-
import Stack, { StackDirection } from "../../components/Stack"
7-
import Dropdown from "../../components/Dropdown"
4+
import Button from "@/components/Button"
5+
import Label, { LabelSize } from "@/components/Label"
6+
import Stack, { StackDirection } from "@/components/Stack"
7+
import Dropdown from "@/components/Dropdown"
88

99
const PracticeSettingsModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
1010
return (

‎fission/src/modals/configuring/RoboRIOModal.tsx renamed to ‎fission/src/ui/modals/configuring/RoboRIOModal.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react"
2-
import Modal, { ModalPropsImpl } from "../../components/Modal"
3-
import LabeledButton, { LabelPlacement } from "../../components/LabeledButton"
4-
import { useModalControlContext } from "../../ModalContext"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
3+
import LabeledButton, { LabelPlacement } from "@/components/LabeledButton"
4+
import { useModalControlContext } from "@/ui/ModalContext"
55
import { BsCodeSquare } from "react-icons/bs"
66

77
const RoboRIOModal: React.FC<ModalPropsImpl> = ({ modalId }) => {

‎fission/src/modals/configuring/SettingsModal.tsx renamed to ‎fission/src/ui/modals/configuring/SettingsModal.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React from "react"
2-
import { useModalControlContext } from "../../ModalContext"
3-
import Modal, { ModalPropsImpl } from "../../components/Modal"
2+
import { useModalControlContext } from "@/ui/ModalContext"
3+
import Modal, { ModalPropsImpl } from "@/components/Modal"
44
import { FaGear } from "react-icons/fa6"
5-
import Label, { LabelSize } from "../../components/Label"
6-
import Dropdown from "../../components/Dropdown"
7-
import Button from "../../components/Button"
8-
import Slider from "../../components/Slider"
9-
import Checkbox from "../../components/Checkbox"
5+
import Label, { LabelSize } from "@/components/Label"
6+
import Dropdown from "@/components/Dropdown"
7+
import Button from "@/components/Button"
8+
import Slider from "@/components/Slider"
9+
import Checkbox from "@/components/Checkbox"
1010

1111
const SettingsModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
1212
const { openModal } = useModalControlContext()

‎fission/src/modals/configuring/rio-config/RCConfigEncoderModal.tsx renamed to ‎fission/src/ui/modals/configuring/rio-config/RCConfigEncoderModal.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React, { useState } from "react"
2-
import Modal, { ModalPropsImpl } from "../../../components/Modal"
3-
import { useModalControlContext } from "../../../ModalContext"
2+
import Modal, { ModalPropsImpl } from "@/components/Modal"
3+
import { useModalControlContext } from "@/ui/ModalContext"
44
import { FaPlus } from "react-icons/fa6"
5-
import Label, { LabelSize } from "../../../components/Label"
6-
import Input from "../../../components/Input"
7-
import Dropdown from "../../../components/Dropdown"
5+
import Label, { LabelSize } from "@/components/Label"
6+
import Input from "@/components/Input"
7+
import Dropdown from "@/components/Dropdown"
88

99
const RCConfigEncoderModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
1010
const { openModal } = useModalControlContext()

0 commit comments

Comments
 (0)