Merge pull request 'Add data for email to participant POST' (#1) from feat-send-email into master

Reviewed-on: https://git.armada.digital/meeting-planner/frontend/pulls/1
This commit is contained in:
Rui Hildt 2020-09-04 11:04:23 +00:00
commit c254e9ca27
5 changed files with 10 additions and 3 deletions

View File

@ -90,6 +90,7 @@ export default function App() {
path='/invite' path='/invite'
component={Invite} component={Invite}
currentMeeting={currentMeeting} currentMeeting={currentMeeting}
currentUser={currentUser}
/> />
</Switch> </Switch>
</Router> </Router>

View File

@ -45,7 +45,7 @@ export default function IntervalSelector({
const timegridBody = el.querySelectorAll('div.fc-timegrid-body'); const timegridBody = el.querySelectorAll('div.fc-timegrid-body');
const timegridSlots = el.querySelectorAll('div.fc-timegrid-slots'); const timegridSlots = el.querySelectorAll('div.fc-timegrid-slots');
const timegridScroll = el.querySelectorAll( const timegridScroll = el.querySelectorAll(
'table.fc-col-header.fc-scrollgrid-sync-table', '.fc-col-header.fc-scrollgrid-sync-table',
); );
console.log(timegridScroll); console.log(timegridScroll);

View File

@ -7,7 +7,7 @@ import { backend } from '../helpers/http-common';
import './styles/Invite.less'; import './styles/Invite.less';
import './styles/layout.less'; import './styles/layout.less';
export default function Invite({ currentMeeting }) { export default function Invite({ currentMeeting, currentUser }) {
const [emailList, setEmailList] = useState([]); const [emailList, setEmailList] = useState([]);
const [contactDropdown, setContactDropdown] = useState([]); const [contactDropdown, setContactDropdown] = useState([]);
const [status, setStatus] = useState({ const [status, setStatus] = useState({
@ -72,6 +72,9 @@ export default function Invite({ currentMeeting }) {
mandatory: false, // update when implementing functionality mandatory: false, // update when implementing functionality
host: 0, // update when implementing functionality host: 0, // update when implementing functionality
answered: 0, answered: 0,
// Info for invite email
senderUsername: currentUser.username,
meetingTitle: currentMeeting.title,
}; };
}); });

View File

@ -53,7 +53,7 @@ export default function Login() {
}; };
if (isAuthenticated) { if (isAuthenticated) {
return <Redirect to='/dashboard' />; return <Redirect to='/schedule' />;
} }
return ( return (

View File

@ -155,6 +155,9 @@ export default function Schedule({
mandatory: 0, // 'false' while functionality not implemented mandatory: 0, // 'false' while functionality not implemented
host: 1, host: 1,
answered: 0, answered: 0,
// Info for invite email
senderUsername: currentUser.username,
meetingTitle: currentMeeting.title,
}); });
}) })
.catch((error) => { .catch((error) => {