From 5b9ccd95d14f22fdb4ffff70d3b0b56cd6b17335 Mon Sep 17 00:00:00 2001 From: J Taylor Date: Tue, 22 Jun 2021 11:45:28 +0100 Subject: [PATCH] made asides dynamic and added public folder symlink --- dailyjs/basic-call/components/App/App.js | 11 ++++++++--- dailyjs/basic-call/components/App/Asides.js | 12 +++++++++--- dailyjs/basic-call/pages/index.js | 5 ++++- dailyjs/basic-call/public/public | 1 + dailyjs/text-chat/public | 1 + 5 files changed, 23 insertions(+), 7 deletions(-) create mode 120000 dailyjs/basic-call/public/public create mode 120000 dailyjs/text-chat/public diff --git a/dailyjs/basic-call/components/App/App.js b/dailyjs/basic-call/components/App/App.js index 0bf706e..8210988 100644 --- a/dailyjs/basic-call/components/App/App.js +++ b/dailyjs/basic-call/components/App/App.js @@ -2,11 +2,12 @@ import React, { useMemo } from 'react'; import { useCallState } from '@dailyjs/shared/contexts/CallProvider'; import { useCallUI } from '@dailyjs/shared/hooks/useCallUI'; +import PropTypes from 'prop-types'; import Room from '../Room'; import { Asides } from './Asides'; import { Modals } from './Modals'; -export const App = () => { +export const App = ({ asides }) => { const { state, leave } = useCallState(); const componentForState = useCallUI({ @@ -20,7 +21,7 @@ export const App = () => {
{componentForState()} - +
), - [componentForState] + [componentForState, asides] ); }; +App.propTypes = { + asides: PropTypes.arrayOf(PropTypes.func), +}; + export default App; diff --git a/dailyjs/basic-call/components/App/Asides.js b/dailyjs/basic-call/components/App/Asides.js index 0649b85..81f0ad6 100644 --- a/dailyjs/basic-call/components/App/Asides.js +++ b/dailyjs/basic-call/components/App/Asides.js @@ -1,10 +1,16 @@ import React from 'react'; -import { PeopleAside } from '@dailyjs/shared/components/Aside'; +import PropTypes from 'prop-types'; -export const Asides = () => ( +export const Asides = ({ asides }) => ( <> - + {asides.map((A) => ( + + ))} ); +Asides.propTypes = { + asides: PropTypes.arrayOf(PropTypes.func), +}; + export default Asides; diff --git a/dailyjs/basic-call/pages/index.js b/dailyjs/basic-call/pages/index.js index 43fd83e..0c6ad6b 100644 --- a/dailyjs/basic-call/pages/index.js +++ b/dailyjs/basic-call/pages/index.js @@ -1,4 +1,5 @@ import React, { useState, useCallback } from 'react'; +import { PeopleAside } from '@dailyjs/shared/components/Aside'; import { CallProvider } from '@dailyjs/shared/contexts/CallProvider'; import { MediaDeviceProvider } from '@dailyjs/shared/contexts/MediaDeviceProvider'; import { ParticipantsProvider } from '@dailyjs/shared/contexts/ParticipantsProvider'; @@ -98,7 +99,7 @@ export default function Index({ domain, isConfigured = false }) { - + @@ -113,6 +114,8 @@ Index.propTypes = { domain: PropTypes.string, }; +Index.asides = [PeopleAside]; + export async function getStaticProps() { // Check that both domain and key env vars are set const isConfigured = diff --git a/dailyjs/basic-call/public/public b/dailyjs/basic-call/public/public new file mode 120000 index 0000000..33a6e67 --- /dev/null +++ b/dailyjs/basic-call/public/public @@ -0,0 +1 @@ +../basic-call/public \ No newline at end of file diff --git a/dailyjs/text-chat/public b/dailyjs/text-chat/public new file mode 120000 index 0000000..33a6e67 --- /dev/null +++ b/dailyjs/text-chat/public @@ -0,0 +1 @@ +../basic-call/public \ No newline at end of file