cleanup code after rebase

chrisbenincasa · Jan 19, 2024 · a9b1f96 · a9b1f96
1 parent 5009d22
commit a9b1f96
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 58 deletions.
diff --git a/web2/src/pages/settings/FfmpegSettingsPage.tsx b/web2/src/pages/settings/FfmpegSettingsPage.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'React';
+import React, { useEffect } from 'react';
 import {
   Button,
   Checkbox,

diff --git a/web2/src/pages/settings/GeneralSettingsPage.tsx b/web2/src/pages/settings/GeneralSettingsPage.tsx
@@ -1,9 +1,8 @@
-import { Button, Paper, Stack } from '@mui/material';
+import { Button, Stack } from '@mui/material';
 
 export default function GeneralSettingsPage() {
   return (
     <>
-      <Paper></Paper>
       <Stack spacing={2} direction="row" justifyContent="right" sx={{ mt: 2 }}>
         <Button variant="outlined">Reset Options</Button>
         <Button variant="contained">Save</Button>

diff --git a/web2/src/pages/settings/SettingsLayout.tsx b/web2/src/pages/settings/SettingsLayout.tsx
@@ -72,10 +72,11 @@ export default function SettingsLayout() {
             />
           </Tabs>
         </Box>
+
+        <Box sx={{ py: 3 }}>
+          <Outlet />
+        </Box>
       </Paper>
-      <Box sx={{ py: 3 }}>
-        <Outlet />
-      </Box>
     </Box>
   );
 }
diff --git a/web2/src/pages/settings/XmlTvSettingsPage.tsx b/web2/src/pages/settings/XmlTvSettingsPage.tsx
@@ -82,61 +82,58 @@ export default function XmlTvSettingsPage() {
 
   return (
     <>
-      <Paper>
+      <TextField
+        fullWidth
+        id="output-path"
+        label="Output Path"
+        value={outputPath}
+        InputProps={{ readOnly: true }}
+        variant="filled"
+        margin="normal"
+        sx={{ mt: 2, mb: 2 }}
+        helperText="You can edit this location in file xmltv-settings.json."
+      />
+      {showFormError && (
+        <Alert severity="error" sx={{ my: 2 }}>
+          Invalid input. Please make sure EPG Hours & Refresh Timer is a number
+        </Alert>
+      )}
+      <Stack spacing={2} direction={{ sm: 'column', md: 'row' }}>
         <TextField
           fullWidth
-          id="output-path"
-          label="Output Path"
-          value={outputPath}
-          InputProps={{ readOnly: true }}
-          variant="filled"
-          margin="normal"
-          sx={{ mt: 2, mb: 2 }}
-          helperText="You can edit this location in file xmltv-settings.json."
+          label="EPG (Hours)"
+          value={programmingHours}
+          onChange={handleProgrammingHours}
+          onBlur={handleValidateFields}
+          helperText="How many hours of programming to include in the xmltv file."
         />
-        {showFormError && (
-          <Alert severity="error" sx={{ my: 2 }}>
-            Invalid input. Please make sure EPG Hours & Refresh Timer is a
-            number
-          </Alert>
-        )}
-        <Stack spacing={2} direction={{ sm: 'column', md: 'row' }}>
-          <TextField
-            fullWidth
-            label="EPG (Hours)"
-            value={programmingHours}
-            onChange={handleProgrammingHours}
-            onBlur={handleValidateFields}
-            helperText="How many hours of programming to include in the xmltv file."
-          />
-          <TextField
-            fullWidth
-            label="Refresh Timer (Hours)"
-            value={refreshHours}
-            onChange={handleRefreshHours}
-            onBlur={handleValidateFields}
-            helperText="How often should the xmltv file be updated."
-          />
-        </Stack>
-        <FormControl>
-          <FormControlLabel
-            control={
-              <Checkbox
-                checked={enableImageCache}
-                onChange={handleEnableImageCache}
-              />
-            }
-            label="Image Cache"
-          />
-          <FormHelperText>
-            If enabled the pictures used for Movie and TV Show posters will be
-            cached in dizqueTV's .dizqueTV folder and will be delivered by
-            dizqueTV's server instead of requiring calls to Plex. Note that
-            using fixed xmltv location in Plex (as opposed to url) will not work
-            correctly in this case.
-          </FormHelperText>
-        </FormControl>
-      </Paper>
+        <TextField
+          fullWidth
+          label="Refresh Timer (Hours)"
+          value={refreshHours}
+          onChange={handleRefreshHours}
+          onBlur={handleValidateFields}
+          helperText="How often should the xmltv file be updated."
+        />
+      </Stack>
+      <FormControl>
+        <FormControlLabel
+          control={
+            <Checkbox
+              checked={enableImageCache}
+              onChange={handleEnableImageCache}
+            />
+          }
+          label="Image Cache"
+        />
+        <FormHelperText>
+          If enabled the pictures used for Movie and TV Show posters will be
+          cached in dizqueTV's .dizqueTV folder and will be delivered by
+          dizqueTV's server instead of requiring calls to Plex. Note that using
+          fixed xmltv location in Plex (as opposed to url) will not work
+          correctly in this case.
+        </FormHelperText>
+      </FormControl>
       <Stack spacing={2} direction="row" justifyContent="right" sx={{ mt: 2 }}>
         <Button variant="outlined">Reset Options</Button>
         <Button variant="contained" disabled={showFormError}>