From 67b1cabf5a221b298ee848725e08a2ae1b6947d5 Mon Sep 17 00:00:00 2001 From: Hugo Gresse Date: Fri, 6 Sep 2024 18:55:18 +0200 Subject: [PATCH] Disable conference hall integration (#143) --- .../RequireConferenceHallLogin.tsx | 74 ++----------------- ...ConferenceHallProposalsPickerConnected.tsx | 27 ++----- src/events/page/settings/EventSettings.tsx | 2 +- 3 files changed, 13 insertions(+), 90 deletions(-) diff --git a/src/conferencehall/RequireConferenceHallLogin.tsx b/src/conferencehall/RequireConferenceHallLogin.tsx index eb49168..1b1aab6 100644 --- a/src/conferencehall/RequireConferenceHallLogin.tsx +++ b/src/conferencehall/RequireConferenceHallLogin.tsx @@ -1,78 +1,16 @@ import * as React from 'react' -import { Box, Button, ButtonProps, Typography } from '@mui/material' -import { conferenceHallLogin, ConferenceHallProviders, useConferenceHallUser } from './firebase/authConferenceHall' -import GoogleIcon from '@mui/icons-material/Google' -import TwitterIcon from '@mui/icons-material/Twitter' -import GitHubIcon from '@mui/icons-material/GitHub' -import styled from '@emotion/styled' -import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline' - -const GoogleButton = styled(Button)(() => ({ - color: 'white', - backgroundColor: '#ea2533', - '&:hover': { - backgroundColor: '#a31b25', - }, -})) -const TwitterButton = styled(Button)(() => ({ - color: 'white', - backgroundColor: '#34ccfe', - '&:hover': { - backgroundColor: '#1a728f', - }, -})) -const GitHubButton = styled(Button)(() => ({ - color: 'white', - backgroundColor: '#000000', - '&:hover': { - backgroundColor: '#3a3a3a', - }, -})) +import { Box, Typography } from '@mui/material' export type RequireConferenceHallLoginProps = { children: (userId: string) => React.ReactNode } export const RequireConferenceHallLogin = (props: RequireConferenceHallLoginProps) => { - const user = useConferenceHallUser() - - if (user) { - return ( - <> - - You are logged in to Conference-Hall.io as{' '} - {user.displayName} - - {props.children(user.uid)} - - ) - } - return ( - - { - conferenceHallLogin(ConferenceHallProviders.Google) - }}> - - Google - - { - conferenceHallLogin(ConferenceHallProviders.Twitter) - }}> - - Twitter - - { - conferenceHallLogin(ConferenceHallProviders.GitHub) - }}> - - GitHub - + + + ⚠️ Conference Hall integration is disabled (major revamp needed for Conference Hall v2). You can track + the status here. + ) } diff --git a/src/conferencehall/components/ConferenceHallProposalsPickerConnected.tsx b/src/conferencehall/components/ConferenceHallProposalsPickerConnected.tsx index 6ffce3f..9ba5304 100644 --- a/src/conferencehall/components/ConferenceHallProposalsPickerConnected.tsx +++ b/src/conferencehall/components/ConferenceHallProposalsPickerConnected.tsx @@ -1,9 +1,6 @@ -import { ConferenceHallProposalsPicker } from './ConferenceHallProposalsPicker' -import React, { useState } from 'react' +import React from 'react' import { ConferenceHallProposal, Format } from '../../types' -import { ConferenceHallFormatsMapping } from './ConferenceHallFormatsMapping' -import { useConferenceHallProposals } from '../hooks/useConferenceHallProposals' -import { mapConferenceHallFormatsToOpenPlanner } from '../../events/actions/conferenceHallUtils/mapFromConferenceHallToOpenPlanner' +import { Typography } from '@mui/material' type ConferenceHallProposalsPickerConnectedProps = { conferenceHallEventId: string @@ -27,24 +24,12 @@ export const ConferenceHallProposalsPickerConnected = ({ onSubmit, submitText, }: ConferenceHallProposalsPickerConnectedProps) => { - const proposals = useConferenceHallProposals(conferenceHallEventId) - const [formats, setFormatDurations] = useState(mapConferenceHallFormatsToOpenPlanner(chFormats)) - - const submitSelectedProposalsAndFormats = (proposals: ConferenceHallProposal[]) => { - return onSubmit({ - proposals, - formats: formats, - }) - } - return ( <> - - + + Conference Hall integration is disabled (major revamp needed for Conference Hall v2). You can track the + status here https://github.com/HugoGresse/OpenPlanner/issues/133 + ) } diff --git a/src/events/page/settings/EventSettings.tsx b/src/events/page/settings/EventSettings.tsx index 8c982a8..9c503df 100644 --- a/src/events/page/settings/EventSettings.tsx +++ b/src/events/page/settings/EventSettings.tsx @@ -338,7 +338,7 @@ export const EventSettings = ({ event }: EventSettingsProps) => { open={reImportOpen} title="Re-import from Conference Hall?" acceptButton="Re-import" - disabled={loading} + disabled={true} loading={loading} cancelButton="cancel" handleClose={() => setReimportOpen(false)}