diff --git a/dailyjs/basic-call/pages/index.js b/dailyjs/basic-call/pages/index.js index e3a40bd..1e0d432 100644 --- a/dailyjs/basic-call/pages/index.js +++ b/dailyjs/basic-call/pages/index.js @@ -5,6 +5,8 @@ import { ParticipantsProvider } from '@dailyjs/shared/contexts/ParticipantsProvi import { TracksProvider } from '@dailyjs/shared/contexts/TracksProvider'; import { UIStateProvider } from '@dailyjs/shared/contexts/UIStateProvider'; import { WaitingRoomProvider } from '@dailyjs/shared/contexts/WaitingRoomProvider'; +import getDemoProps from '@dailyjs/shared/lib/demoProps'; + import PropTypes from 'prop-types'; import App from '../components/App'; import { Intro, NotConfigured } from '../components/Intro'; @@ -20,7 +22,7 @@ import { Intro, NotConfigured } from '../components/Intro'; export default function Index({ domain, isConfigured = false, - predefinedRoom = false, + predefinedRoom = '', forceFetchToken = false, forceOwner = false, asides, @@ -28,7 +30,7 @@ export default function Index({ customTrayComponent, customAppComponent, }) { - const [roomName, setRoomName] = useState(predefinedRoom || ''); + const [roomName, setRoomName] = useState(predefinedRoom); const [fetchingToken, setFetchingToken] = useState(false); const [token, setToken] = useState(); const [tokenError, setTokenError] = useState(); @@ -126,7 +128,7 @@ export default function Index({ Index.propTypes = { isConfigured: PropTypes.bool.isRequired, - predefinedRoom: PropTypes.bool, + predefinedRoom: PropTypes.string, domain: PropTypes.string, asides: PropTypes.arrayOf(PropTypes.func), modals: PropTypes.arrayOf(PropTypes.func), @@ -137,19 +139,9 @@ Index.propTypes = { }; export async function getStaticProps() { - // Check that both domain and key env vars are set - const isConfigured = - !!process.env.DAILY_DOMAIN && !!process.env.DAILY_API_KEY; + const defaultProps = getDemoProps(); - // Have we predefined a room to use? - const predefinedRoom = process.env.DAILY_ROOM || false; - - // Pass through domain as prop return { - props: { - domain: process.env.DAILY_DOMAIN || null, - isConfigured, - predefinedRoom, - }, + props: defaultProps, }; } diff --git a/dailyjs/live-streaming/pages/index.js b/dailyjs/live-streaming/pages/index.js index b82698b..2668138 100644 --- a/dailyjs/live-streaming/pages/index.js +++ b/dailyjs/live-streaming/pages/index.js @@ -1,15 +1,12 @@ import Index from '@dailyjs/basic-call/pages'; +import getDemoProps from '@dailyjs/shared/lib/demoProps'; export async function getStaticProps() { - // Check that both domain and key env vars are set - const isConfigured = - !!process.env.DAILY_DOMAIN && !!process.env.DAILY_API_KEY; + const defaultProps = getDemoProps(); - // Pass through domain as prop return { props: { - domain: process.env.DAILY_DOMAIN || null, - isConfigured, + ...defaultProps, forceFetchToken: true, forceOwner: true, }, diff --git a/dailyjs/shared/lib/demoProps.js b/dailyjs/shared/lib/demoProps.js new file mode 100644 index 0000000..240b904 --- /dev/null +++ b/dailyjs/shared/lib/demoProps.js @@ -0,0 +1,9 @@ +export default function getDemoProps() { + return { + domain: process.env.DAILY_DOMAIN || null, + // Check that both domain and key env vars are set + isConfigured: !!process.env.DAILY_DOMAIN && !!process.env.DAILY_API_KEY, + // Have we predefined a room to use? + predefinedRoom: process.env.DAILY_ROOM || '', + }; +} diff --git a/dailyjs/text-chat/pages/index.js b/dailyjs/text-chat/pages/index.js index 5f31f95..d25e77e 100644 --- a/dailyjs/text-chat/pages/index.js +++ b/dailyjs/text-chat/pages/index.js @@ -1,16 +1,12 @@ import Index from '@dailyjs/basic-call/pages'; +import getDemoProps from '@dailyjs/shared/lib/demoProps'; export async function getStaticProps() { - // Check that both domain and key env vars are set - const isConfigured = - !!process.env.DAILY_DOMAIN && !!process.env.DAILY_API_KEY; + const defaultProps = getDemoProps(); // Pass through domain as prop return { - props: { - domain: process.env.DAILY_DOMAIN || null, - isConfigured, - }, + props: defaultProps, }; }