move pages

webserver/web-interface/src/App.tsx

@@ -6,9 +6,9 @@ import {
   Route,
   Outlet,
 } from 'react-router-dom';
-import Home from './pages/home/Home';
-import Profiles from './pages/home/Profiles';
-import Settings from './pages/home/Settings';
+import Home from './pages/Home';
+import Profiles from './pages/Profiles';
+import Settings from './pages/Settings';
 import MainAppBar from './components/appbar/MainAppBar';
 import ThemeWrapper from './components/theme/ThemeWrapper';
 import useWebSocket from './api/websocket';

webserver/web-interface/src/components/appbar/MainAppBar.tsx

@@ -18,7 +18,7 @@ import {
   Menu,
 } from '@mui/material';
 import Logo from '../icons/Logo';
-import ShotDialog from '../../pages/home/ShotDialog';
+import ShotDialog from '../../pages/ShotDialog';
 import useShotDataStore from '../../state/ShotDataStore';
 import useSystemStateStore from '../../state/SystemStateStore';
 import formatTime from '../../models/time_format';

webserver/web-interface/src/components/shot/ShotHistory.tsx

@@ -12,7 +12,7 @@ import {
 import React, { useCallback, useEffect, useState } from 'react';
 import formatTime from '../../models/time_format';
 import useShotDataStore from '../../state/ShotDataStore';
-import ShotDialog from '../../pages/home/ShotDialog';
+import ShotDialog from '../../pages/ShotDialog';
 import { Shot } from '../../models/models';
 
 enum TimeOfDay {

webserver/web-interface/src/pages/home/Home.tsx → webserver/web-interface/src/pages/Home.tsx

@@ -22,29 +22,29 @@ import {
 import React, {
   useCallback, useEffect, useState,
 } from 'react';
-import { selectActiveProfile } from '../../components/client/ProfileClient';
-import { updateOperationMode, updateTarePending } from '../../components/client/SystemStateClient';
-import { SettingsNumberIncrementButtons } from '../../components/inputs/settings_inputs';
-import AspectRatioBox from '../../components/layout/AspectRatioBox';
-import AvailableProfileSelector from '../../components/profile/AvailableProfileSelector';
-import { ProfileReview } from '../../components/profile/ProfilePreview';
-import ShotHistory from '../../components/shot/ShotHistory';
+import { selectActiveProfile } from '../components/client/ProfileClient';
+import { updateOperationMode, updateTarePending } from '../components/client/SystemStateClient';
+import { SettingsNumberIncrementButtons } from '../components/inputs/settings_inputs';
+import AspectRatioBox from '../components/layout/AspectRatioBox';
+import AvailableProfileSelector from '../components/profile/AvailableProfileSelector';
+import { ProfileReview } from '../components/profile/ProfilePreview';
+import ShotHistory from '../components/shot/ShotHistory';
 import {
   DescalingState,
   GaggiaSettings, NotificationType, OperationMode,
-} from '../../models/models';
-import { Profile } from '../../models/profile';
-import useProfileStore from '../../state/ProfileStore';
-import useSensorStateStore from '../../state/SensorStateStore';
-import useSettingsStore from '../../state/SettingsStore';
-import useSystemStateStore from '../../state/SystemStateStore';
-import useNotificationStore from '../../state/NotificationDataStore';
-import { SwitchLedButton, SwitchLedState } from '../../components/inputs/SwitchLedButton';
-import PressureGauge from '../../components/gauges/PressureGauge';
-import WaterLevelGauge from '../../components/gauges/WaterLevelGauge';
-import TemperatureGauge from '../../components/gauges/TemperatureGauge';
-import DescalingDialog from '../DescalingDialog';
-import useDescalingProgressStore from '../../state/DescalingProgressDataStore';
+} from '../models/models';
+import { Profile } from '../models/profile';
+import useProfileStore from '../state/ProfileStore';
+import useSensorStateStore from '../state/SensorStateStore';
+import useSettingsStore from '../state/SettingsStore';
+import useSystemStateStore from '../state/SystemStateStore';
+import useNotificationStore from '../state/NotificationDataStore';
+import { SwitchLedButton, SwitchLedState } from '../components/inputs/SwitchLedButton';
+import PressureGauge from '../components/gauges/PressureGauge';
+import WaterLevelGauge from '../components/gauges/WaterLevelGauge';
+import TemperatureGauge from '../components/gauges/TemperatureGauge';
+import DescalingDialog from './DescalingDialog';
+import useDescalingProgressStore from '../state/DescalingProgressDataStore';
 
 const colorScaling = (theme: Theme) => (theme.palette.mode === 'light' ? lighten : darken);
 

webserver/web-interface/src/pages/home/Profiles.tsx → webserver/web-interface/src/pages/Profiles.tsx

@@ -25,12 +25,12 @@ import Grid from '@mui/material/Unstable_Grid2';
 import React, { useCallback, useState } from 'react';
 import {
   createProfile, deleteProfileById, getProfileById, updateProfile,
-} from '../../components/client/ProfileClient';
-import AvailableProfileSelector from '../../components/profile/AvailableProfileSelector';
-import { ProfileReview } from '../../components/profile/ProfilePreview';
-import { Profile } from '../../models/profile';
-import useProfileStore from '../../state/ProfileStore';
-import ProfileEditDialog from '../../components/profile/edit/ProfileEditDialog';
+} from '../components/client/ProfileClient';
+import AvailableProfileSelector from '../components/profile/AvailableProfileSelector';
+import { ProfileReview } from '../components/profile/ProfilePreview';
+import { Profile } from '../models/profile';
+import useProfileStore from '../state/ProfileStore';
+import ProfileEditDialog from '../components/profile/edit/ProfileEditDialog';
 
 export default function Profiles() {
   const theme = useTheme();

webserver/web-interface/src/pages/home/Settings.tsx → webserver/web-interface/src/pages/Settings.tsx

@@ -16,12 +16,12 @@ import IconButton from '@mui/material/IconButton';
 import AttachFileOutlinedIcon from '@mui/icons-material/AttachFileOutlined';
 import Grid from '@mui/material/Unstable_Grid2';
 import SaveIcon from '@mui/icons-material/Save';
-import WifiSettingsCard from '../../components/wifi/WifiSettingsCard';
-import ProgressBar from '../../components/inputs/ProgressBar';
-import TabbedSettings from '../../components/settings/tabs_settings';
-import useSettingsStore from '../../state/SettingsStore';
-import { GaggiaSettings, NotificationType } from '../../models/models';
-import useNotificationStore from '../../state/NotificationDataStore';
+import WifiSettingsCard from '../components/wifi/WifiSettingsCard';
+import ProgressBar from '../components/inputs/ProgressBar';
+import TabbedSettings from '../components/settings/tabs_settings';
+import useSettingsStore from '../state/SettingsStore';
+import { GaggiaSettings, NotificationType } from '../models/models';
+import useNotificationStore from '../state/NotificationDataStore';
 
 export default function Settings() {
   const theme = useTheme();

webserver/web-interface/src/pages/home/ShotDialog.tsx → webserver/web-interface/src/pages/ShotDialog.tsx

@@ -5,13 +5,13 @@ import {
 } from '@mui/material';
 import CloseIcon from '@mui/icons-material/Close';
 import Grid from '@mui/material/Unstable_Grid2';
-import ShotChart from '../../components/chart/ShotChart';
+import ShotChart from '../components/chart/ShotChart';
 import {
   PressureStatBox, PumpFlowStatBox, TemperatureStatBox, TimeStatBox, WeightFlowStatBox, WeightStatBox,
-} from '../../components/chart/StatBox';
-import useShotDataStore from '../../state/ShotDataStore';
-import { Shot, ShotSnapshot } from '../../models/models';
-import ShotSpeedDial from '../../components/inputs/ShotSpeedDial';
+} from '../components/chart/StatBox';
+import useShotDataStore from '../state/ShotDataStore';
+import { Shot, ShotSnapshot } from '../models/models';
+import ShotSpeedDial from '../components/inputs/ShotSpeedDial';
 
 interface ShotDialogProps {
   open?: boolean;