Mirrors/Dispatcharr
1
0
Fork 1
mirror of https://github.com/Dispatcharr/Dispatcharr.git synced 2026-08-03 15:22:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

now proxying api requests through dev react server, no need for api configuration

Browse source
This commit is contained in:
kappa118 2025-02-26 21:45:16 -05:00
parent 2ae8499ec0
commit 6e62179416
14 changed files with 47 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dispatcharr/urls.py
View file

@ -26,7 +26,6 @@ urlpatterns = [
path('api/', include(('apps.api.urls', 'api'), namespace='api')),
# Admin
path('grappelli/', include('grappelli.urls')), # Grappelli admin
path('admin/', admin.site.urls),
# Swagger UI

4
docker/docker-compose.yml
View file

@ -6,6 +6,7 @@ services:
container_name: dispatcharr_web
ports:
- "9191:9191"
- "3031:3031"
depends_on:
- db
- redis
@ -25,11 +26,10 @@ services:
ui:
image: alpine
container_name: dispatcharr_ui
network_mode: service:web
volumes:
- ../frontend:/app
entrypoint: ["/bin/sh", "/app/entrypoint.sh"]
ports:
- 3031:3031
celery:
build:

3
frontend/package.json
View file

@ -48,5 +48,6 @@
"last 1 firefox version",
"last 1 safari version"
]
}
},
"proxy": "http://127.0.0.1:9191"
}

4
frontend/src/App.js
View file

@ -22,7 +22,7 @@ import {
} from '@mui/material';
import theme from './theme';
import EPG from './pages/EPG';
// import Guide from './pages/Guide';
import Guide from './pages/Guide';
import StreamProfiles from './pages/StreamProfiles';
import useAuthStore from './store/auth';
import logo from './images/logo.png';
@ -150,7 +150,7 @@ const App = () => {
path="/stream-profiles"
element={<StreamProfiles />}
/>
{/* <Route exact path="/guide" element={<Guide />} /> */}
<Route exact path="/guide" element={<Guide />} />
</>
) : (
<Route path="/login" element={<Login />} />

3
frontend/src/api.js
View file

@ -10,8 +10,7 @@ import useStreamProfilesStore from './store/streamProfiles';
// withCredentials: true,
// });
const host = 'http://127.0.0.1:9191';
// const host = '';
const host = '';
const getAuthToken = async () => {
const token = await useAuthStore.getState().getToken(); // Assuming token is stored in Zustand store

2
frontend/src/components/tables/ChannelsTable.js
View file

@ -217,7 +217,7 @@ const Example = () => {
),
muiTableContainerProps: {
sx: {
height: 'calc(100vh - 90px)', // Subtract padding to avoid cutoff
height: 'calc(100vh - 75px)', // Subtract padding to avoid cutoff
overflowY: 'auto', // Internal scrolling for the table
},
},

4
frontend/src/components/tables/EPGsTable.js
View file

@ -149,7 +149,7 @@ const EPGsTable = () => {
),
muiTableContainerProps: {
sx: {
height: 'calc(42vh - 0px)',
height: 'calc(43vh - 0px)',
},
},
renderTopToolbarCustomActions: ({ table }) => (
@ -177,7 +177,7 @@ const EPGsTable = () => {
return (
<Box
sx={{
padding: 2,
padding: 1,
}}
>
<MaterialReactTable table={table} />

4
frontend/src/components/tables/M3UsTable.js
View file

@ -193,7 +193,7 @@ const Example = () => {
),
muiTableContainerProps: {
sx: {
height: 'calc(42vh - 0px)',
height: 'calc(43vh - 0px)',
},
},
renderTopToolbarCustomActions: ({ table }) => (
@ -221,7 +221,7 @@ const Example = () => {
return (
<Box
sx={{
padding: 2,
padding: 1,
}}
>
<MaterialReactTable table={table} />

4
frontend/src/components/tables/StreamProfilesTable.js
View file

@ -173,7 +173,7 @@ const StreamProfiles = () => {
),
muiTableContainerProps: {
sx: {
height: 'calc(100vh - 100px)', // Subtract padding to avoid cutoff
height: 'calc(100vh - 73px)', // Subtract padding to avoid cutoff
overflowY: 'auto', // Internal scrolling for the table
},
},
@ -202,7 +202,7 @@ const StreamProfiles = () => {
return (
<Box
sx={{
padding: 2,
padding: 1,
}}
>
<MaterialReactTable table={table} />

2
frontend/src/components/tables/StreamsTable.js
View file

@ -160,7 +160,7 @@ const Example = () => {
),
muiTableContainerProps: {
sx: {
height: 'calc(100vh - 90px)', // Subtract padding to avoid cutoff
height: 'calc(100vh - 75px)', // Subtract padding to avoid cutoff
overflowY: 'auto', // Internal scrolling for the table
},
},

4
frontend/src/components/tables/UserAgentsTable.js
View file

@ -173,7 +173,7 @@ const UserAgentsTable = () => {
),
muiTableContainerProps: {
sx: {
height: 'calc(42vh - 10px)',
height: 'calc(42vh + 5px)',
},
},
renderTopToolbarCustomActions: ({ table }) => (
@ -202,7 +202,7 @@ const UserAgentsTable = () => {
<>
<Box
sx={{
padding: 2,
padding: 1,
}}
>
<MaterialReactTable table={table} />

36
frontend/src/pages/Channels.js
View file

@ -1,7 +1,7 @@
import React from "react";
import ChannelsTable from "../components/tables/ChannelsTable";
import StreamsTable from "../components/tables/StreamsTable";
import { Grid2, Box } from "@mui/material";
import React from 'react';
import ChannelsTable from '../components/tables/ChannelsTable';
import StreamsTable from '../components/tables/StreamsTable';
import { Grid2, Box } from '@mui/material';
const ChannelsPage = () => {
return (
@ -9,13 +9,13 @@ const ChannelsPage = () => {
<Grid2 size={6}>
<Box
sx={{
height: "100vh", // Full viewport height
paddingTop: "20px", // Top padding
paddingBottom: "20px", // Bottom padding
paddingRight: "10px",
paddingLeft: "20px",
boxSizing: "border-box", // Include padding in height calculation
overflow: "hidden", // Prevent parent scrolling
height: '100vh', // Full viewport height
paddingTop: 1, // Top padding
paddingBottom: 1, // Bottom padding
paddingRight: 0.5,
paddingLeft: 1,
boxSizing: 'border-box', // Include padding in height calculation
overflow: 'hidden', // Prevent parent scrolling
}}
>
<ChannelsTable />
@ -24,13 +24,13 @@ const ChannelsPage = () => {
<Grid2 size={6}>
<Box
sx={{
height: "100vh", // Full viewport height
paddingTop: "20px", // Top padding
paddingBottom: "20px", // Bottom padding
paddingRight: "20px",
paddingLeft: "10px",
boxSizing: "border-box", // Include padding in height calculation
overflow: "hidden", // Prevent parent scrolling
height: '100vh', // Full viewport height
paddingTop: 1, // Top padding
paddingBottom: 1, // Bottom padding
paddingRight: 1,
paddingLeft: 0.5,
boxSizing: 'border-box', // Include padding in height calculation
overflow: 'hidden', // Prevent parent scrolling
}}
>
<StreamsTable />

16
frontend/src/pages/Guide.js
View file

@ -3,6 +3,7 @@ import { Box, Typography, Avatar, Paper, Tooltip, Stack } from '@mui/material';
import dayjs from 'dayjs';
import API from '../api';
import useChannelsStore from '../store/channels';
import logo from '../images/logo.png';
const CHANNEL_WIDTH = 100;
const PROGRAM_HEIGHT = 80;
@ -13,6 +14,7 @@ const TVChannelGuide = ({ startDate, endDate }) => {
const [programs, setPrograms] = useState([]);
const [guideChannels, setGuideChannels] = useState([]);
const [now, setNow] = useState(dayjs());
const guideRef = useRef(null);
@ -36,8 +38,6 @@ const TVChannelGuide = ({ startDate, endDate }) => {
fetchPrograms();
}, [channels]);
const now = dayjs();
const latestHalfHour = new Date();
// Round down the minutes to the nearest half hour
@ -126,6 +126,14 @@ const TVChannelGuide = ({ startDate, endDate }) => {
);
};
useEffect(() => {
const interval = setInterval(() => {
setNow(dayjs());
}, 60000); // Update every minute
return () => clearInterval(interval);
}, []);
const nowPosition = useMemo(() => {
if (now.isBefore(start) || now.isAfter(end)) return -1;
const totalMinutes = end.diff(start, 'minute');
@ -175,7 +183,7 @@ const TVChannelGuide = ({ startDate, endDate }) => {
}}
>
<Avatar
src={channel.logo_url || '/static/images/logo.png'}
src={channel.logo_url || logo}
alt={channel.channel_name}
/>
{/* <Typography variant="body2" sx={{ marginLeft: 1 }}>
@ -188,7 +196,7 @@ const TVChannelGuide = ({ startDate, endDate }) => {
</Box>
{/* Timeline and Lineup */}
<Box sx={{ overflowY: 'auto', height: '100%' }}>
<Box ref={guideRef} sx={{ overflowY: 'auto', height: '100%' }}>
<Box
sx={{
display: 'flex',

0
frontend/src/pages/Guide2.js
View file