refactor: shuffle things around in builder feature

prof-miles0 · Mar 3, 2024 · b5e823f · b5e823f
1 parent 832af96
commit b5e823f
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 16 deletions.
diff --git a/src/components/dialogs/DonorPage.jsx → src/features/builder/DonorPage.jsx b/src/components/dialogs/DonorPage.jsx → src/features/builder/DonorPage.jsx
@@ -7,10 +7,10 @@ import Dialog from '@mui/material/Dialog'
 import { CUSTOM_COMPONENT } from '@services/queries/config'
 import { useMemory } from '@hooks/useMemory'
 import { useLayoutStore } from '@hooks/useLayoutStore'
-import { CustomDialog } from '@features/builder/CustomDialog'
-import { CustomTile } from '@features/builder/CustomTile'
+import { Loading } from '@components/Loading'
 
-import { Loading } from '../Loading'
+import { CustomDialog } from './components/CustomDialog'
+import { CustomTile } from './components/CustomTile'
 
 const DEFAULT = {
   settings: {},
@@ -21,7 +21,7 @@ const DEFAULT = {
 
 const handleClose = () => useLayoutStore.setState({ donorPage: false })
 
-export default function DonorPage() {
+export function DonorPage() {
   const open = useLayoutStore((s) => s.donorPage)
   const isMobile = useMemory((s) => s.isMobile)
 

diff --git a/src/pages/login/CustomPage.jsx → src/features/builder/LoginPage.jsx b/src/pages/login/CustomPage.jsx → src/features/builder/LoginPage.jsx
@@ -6,7 +6,7 @@ import Grid from '@mui/material/Unstable_Grid2'
 import { useQuery } from '@apollo/client'
 
 import { CUSTOM_COMPONENT } from '@services/queries/config'
-import { CustomTile } from '@features/builder/CustomTile'
+import { CustomTile } from '@features/builder/components/CustomTile'
 import { Loading } from '@components/Loading'
 
 export function CustomLoginPage() {

diff --git a/src/components/dialogs/Motd.jsx → src/features/builder/Motd.jsx b/src/components/dialogs/Motd.jsx → src/features/builder/Motd.jsx
@@ -10,10 +10,10 @@ import { useLayoutStore } from '@hooks/useLayoutStore'
 import { useStorage } from '@hooks/useStorage'
 import { CUSTOM_COMPONENT, MOTD_CHECK } from '@services/queries/config'
 import Utility from '@services/Utility'
-import { CustomDialog } from '@features/builder/CustomDialog'
-import { CustomTile } from '@features/builder/CustomTile'
+import { CustomDialog } from '@features/builder/components/CustomDialog'
+import { CustomTile } from '@features/builder/components/CustomTile'
 
-import { Loading } from '../Loading'
+import { Loading } from '../../components/Loading'
 
 const DEFAULT =
   /** @type {import('@rm/types').Config['map']['messageOfTheDay']} */ ({
@@ -24,7 +24,7 @@ const DEFAULT =
     index: 0,
   })
 
-export default function MessageOfTheDay() {
+export function MessageOfTheDay() {
   const clientIndex = useStorage((s) => s.motdIndex)
   const tutorial = useStorage((s) => s.tutorial)
 

diff --git a/src/features/builder/CustomButton.jsx → ...tures/builder/components/CustomButton.jsx b/src/features/builder/CustomButton.jsx → ...tures/builder/components/CustomButton.jsx
diff --git a/src/features/builder/CustomDialog.jsx → ...tures/builder/components/CustomDialog.jsx b/src/features/builder/CustomDialog.jsx → ...tures/builder/components/CustomDialog.jsx
diff --git a/src/features/builder/CustomText.jsx → ...eatures/builder/components/CustomText.jsx b/src/features/builder/CustomText.jsx → ...eatures/builder/components/CustomText.jsx
diff --git a/src/features/builder/CustomTile.jsx → ...eatures/builder/components/CustomTile.jsx b/src/features/builder/CustomTile.jsx → ...eatures/builder/components/CustomTile.jsx
diff --git a/src/features/builder/Generator.jsx → ...features/builder/components/Generator.jsx b/src/features/builder/Generator.jsx → ...features/builder/components/Generator.jsx
diff --git a/src/features/builder/LinkWrapper.jsx → ...atures/builder/components/LinkWrapper.jsx b/src/features/builder/LinkWrapper.jsx → ...atures/builder/components/LinkWrapper.jsx
diff --git a/src/features/builder/index.js b/src/features/builder/index.js
@@ -1,2 +1,5 @@
-export * from './CustomTile'
-export * from './CustomDialog'
+export * from './DonorPage'
+export * from './Motd'
+export * from './LoginPage'
+export * from './components/CustomTile'
+export * from './components/CustomDialog'
diff --git a/src/pages/login/index.jsx b/src/pages/login/index.jsx
@@ -5,8 +5,8 @@ import Box from '@mui/material/Box'
 
 import { useMemory } from '@hooks/useMemory'
 import ThemeToggle from '@components/ThemeToggle'
+import { CustomLoginPage } from '@features/builder/LoginPage'
 
-import { CustomLoginPage } from './CustomPage'
 import { DefaultLoginPage } from './DefaultPage'
 
 export default function LoginPage() {

diff --git a/src/pages/map/components/Nav.jsx b/src/pages/map/components/Nav.jsx
@@ -8,8 +8,8 @@ import UserOptions from '@components/dialogs/UserOptions'
 import Tutorial from '@features/tutorial'
 import UserProfile from '@features/profile'
 import Search from '@features/search'
-import MessageOfTheDay from '@components/dialogs/Motd'
-import DonorPage from '@components/dialogs/DonorPage'
+import MessageOfTheDay from '@features/builder/Motd'
+import DonorPage from '@features/builder/DonorPage'
 import Feedback from '@components/dialogs/Feedback'
 import ResetFilters from '@components/dialogs/ResetFilters'
 import ScanDialog from '@features/scanner/ScanDialog'

diff --git a/src/pages/playground/components/Viewer.jsx b/src/pages/playground/components/Viewer.jsx
@@ -4,8 +4,7 @@ import * as React from 'react'
 import Grid from '@mui/material/Unstable_Grid2'
 import { useTranslation } from 'react-i18next'
 
-import CustomTile from '@features/builder/CustomTile'
-import CustomDialog from '@features/builder/CustomDialog'
+import { CustomTile, CustomDialog } from '@features/builder'
 import ErrorBoundary from '@components/ErrorBoundary'
 
 import { useSafeParse } from '../hooks/useSafeParse'