Skip to content

🐛 adding button to see video recording on mobile #2021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 28, 2025
Merged

🐛 adding button to see video recording on mobile #2021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
987f93f
:bug: adding button to see video recording on mobile
lumi-tip May 27, 2025
2c0ea79
Delete rjservice_homepage.html
lumi-tip May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bun.lockb
View file
Open in desktop
Binary file not shown.
35 changes: 28 additions & 7 deletions src/pages/workshops/[event_slug].jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,15 +976,15 @@ function Workshop({ eventData, asset }) {
<Text textAlign="center">{t('form.joined-description-in-person')}</Text>
</>
)}
{(finishedEvent || isFreeForConsumables || existsConsumables) ? (
{(isFreeForConsumables || existsConsumables) ? (
<Box display="flex" gap="10px">
<Button
fontSize="17px"
color={hexColor.greenLight}
background="white"
width="100%"
display={(alreadyApplied || readyToJoinEvent) && !event?.online_event ? 'none' : 'block'}
isDisabled={((finishedEvent && !recordingUrl) || !readyToJoinEvent) && (alreadyApplied || (eventNotExists && !isAuthenticated))}
isDisabled={!readyToJoinEvent && (alreadyApplied || (eventNotExists && !isAuthenticated))}
_disabled={{
background: buttonEnabled ? '' : 'gray.350',
cursor: buttonEnabled ? 'pointer' : 'not-allowed',
Expand All @@ -998,10 +998,11 @@ function Workshop({ eventData, asset }) {
cursor: buttonEnabled ? 'pointer' : 'not-allowed',
}}
onClick={() => {
if (finishedEvent && recordingUrl) {
setIsVideoModalOpen(true);
} else if (!event?.online_event && (isAuthenticated && !alreadyApplied && !readyToJoinEvent)) setIsModalConfirmOpen(true);
else handleJoin();
if (!event?.online_event && isAuthenticated && !alreadyApplied && !readyToJoinEvent) {
setIsModalConfirmOpen(true);
} else {
handleJoin();
}
}}
>
{getWording()}
Expand Down Expand Up @@ -1041,13 +1042,33 @@ function Workshop({ eventData, asset }) {
</>
) : (
<>
<Box marginBottom="10px" padding="5px" textAlign="center">
<Box textAlign="center">
<Heading size="sm">
{formInfo?.title}
</Heading>
<Text>
{eventRecap || formInfo?.description}
</Text>
<Button
type="submit"
variant="default"
margin="0 auto"
mt="10px"
display={(alreadyApplied || readyToJoinEvent) && !event?.online_event ? 'none' : 'block'}
className={readyToJoinEvent && !finishedEvent ? 'pulse-blue' : ''}
background={buttonEnabled ? 'white' : 'gray.350'}
color={buttonEnabled ? hexColor.greenLight : 'white'}
textTransform={readyToJoinEvent ? 'uppercase' : 'inherit'}
isDisabled={((finishedEvent && !recordingUrl) || !readyToJoinEvent) && (alreadyApplied || (eventNotExists && !isAuthenticated))}
onClick={() => {
if (finishedEvent && recordingUrl) {
setIsVideoModalOpen(true);
} else if (!event?.online_event && (isAuthenticated && !alreadyApplied && !readyToJoinEvent)) setIsModalConfirmOpen(true);
else handleJoin();
}}
>
{getWording()}
</Button>
</Box>
</>
)}
Expand Down