Url share #147
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| REACT_APP_API_URL=http://localhost:3001 | ||
| REACT_APP_PB_APP_URL=http://localhost:3000 | ||
| REACT_APP_VERSION=$npm_package_version | ||
| REACT_APP_GOOGLE_ANALYTICS_KEY=G-xxxxxx #Not necessary, can be omitted for development |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| import { CreatorActionButton } from "../CreatorActionButton"; | ||
| import DownloadIcon from '@mui/icons-material/Download'; | ||
| import { useContext, useState } from "react"; | ||
| import { Dialog, DialogContent, DialogTitle, InputAdornment, Stack, TextField } from "@mui/material"; | ||
| import { CreatorContext } from "../../CreatorContext"; | ||
| import { ShareButtons, CopyToClipboardButton } from "./ShareModalButtons"; | ||
| import { useTranslation } from "react-i18next"; | ||
|
|
||
| export const ShareButton = () => { | ||
|
|
||
| const [dialogOpen, setDialogOpen] = useState<boolean>(false) | ||
|
|
||
| return <> | ||
| <ShareDialog open={dialogOpen} setDialogOpen={setDialogOpen} /> | ||
| <CreatorActionButton onClick={() => { setDialogOpen(true) }} startIcon={<DownloadIcon />} nametag='share' isshortversion={true} /> | ||
| </> | ||
|
|
||
| } | ||
|
|
||
| const ShareDialog = ({ open, setDialogOpen }: { open: boolean, setDialogOpen: (open: boolean) => void }) => { | ||
|
|
||
| const { t } = useTranslation('creator'); | ||
|
|
||
| return <> | ||
| <Dialog open={open} onClose={() => { setDialogOpen(false) }}> | ||
| <DialogTitle>{t('editor.buttons.share')}</DialogTitle> | ||
| <DialogContent > | ||
| <ShareModal /> | ||
| </DialogContent> | ||
| </Dialog > | ||
| </> | ||
| } | ||
|
|
||
| export const ShareModal = () => { | ||
| const { sharedId } = useContext(CreatorContext) | ||
|
|
||
| const sharedLink = process.env.REACT_APP_PB_APP_URL + `/#/desafio/guardado/${sharedId}` | ||
|
|
||
| return <Stack> | ||
| {sharedId ? | ||
| <Stack direction='row'> | ||
| <TextField | ||
| sx={{ width: '100%', margin: 1}} | ||
| defaultValue={sharedLink} | ||
| InputProps={{ | ||
| readOnly: true, | ||
| endAdornment: ( | ||
| <InputAdornment position="end"> | ||
| <CopyToClipboardButton textToCopy={sharedLink} /> | ||
| </InputAdornment> | ||
| ) | ||
| }} | ||
| /> | ||
| </Stack> | ||
| : <></> | ||
| } | ||
| <ShareButtons /> | ||
| </Stack> | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
|
There was a problem hiding this comment. Estos componentes quedaron re prolijos, gente, felicitaciones ❤️ . Estoy contento con cómo quedó. Hice un comment abajo sobre un posible refactor y pequeño cambio de lógica. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| import ShareIcon from '@mui/icons-material/Share'; | ||
| import SaveIcon from '@mui/icons-material/Save'; | ||
| import ContentCopyIcon from '@mui/icons-material/ContentCopy'; | ||
| import { ReactNode, useContext, useState } from "react" | ||
| import { IconButtonTooltip } from "../../SceneEdition/IconButtonTooltip" | ||
| import { Snackbar, Stack, Tooltip } from "@mui/material" | ||
| import { CreatorContext } from '../../CreatorContext'; | ||
| import { LocalStorage } from '../../../../../localStorage'; | ||
| import { PilasBloquesApi } from '../../../../../pbApi'; | ||
| import { CreatorActionButton } from '../CreatorActionButton'; | ||
| import { DialogSnackbar } from '../../../../dialogSnackbar/DialogSnackbar'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import { SerializedChallenge } from '../../../../serializedChallenge'; | ||
| import { DownloadButton } from '../DownloadButton'; | ||
|
|
||
| export const CopyToClipboardButton = ({ textToCopy }: { textToCopy: string }) => { | ||
|
|
||
| const [openSnackbar, setOpenSnackbar] = useState(false) | ||
|
|
||
| const { t } = useTranslation('creator'); | ||
|
|
||
| const handleClick = () => { | ||
| setOpenSnackbar(true) | ||
| navigator.clipboard.writeText(textToCopy) | ||
| } | ||
|
|
||
| return <> | ||
| <IconButtonTooltip icon={<ContentCopyIcon />} onClick={handleClick} tooltip={t('editor.buttons.copyToClipboard')} /> | ||
| <Snackbar | ||
| open={openSnackbar} | ||
| onClose={() => setOpenSnackbar(false)} | ||
| autoHideDuration={2000} | ||
| message={t('editor.buttons.copiedToClipboard')} | ||
| /> | ||
| </> | ||
| } | ||
|
|
||
| export const ShareButtons = () => { | ||
| const { sharedId } = useContext(CreatorContext) | ||
|
|
||
| return <> | ||
| <Stack direction="row" justifyContent="space-between" alignItems='center'> | ||
| {sharedId ? <SaveButton /> : <ShareUrlButton />} | ||
tfloxolodeiro marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <DownloadButton /> | ||
| </Stack> | ||
| </> | ||
| } | ||
|
|
||
| const ShareUrlButton = () => { | ||
|
|
||
| const shareChallenge = async (): Promise<string> => { | ||
| const challenge: SerializedChallenge = LocalStorage.getCreatorChallenge()! | ||
| const sharedChallenge = await PilasBloquesApi.shareChallenge(challenge) | ||
| return sharedChallenge.sharedId | ||
|
There was a problem hiding this comment. Esta lógica está repetida en ambos ShareUrlButton y SaveButton. Debería estar abajo en ChallengeUpsertButton. el parámetro challengeUpsert no debería ser necesario. |
||
| } | ||
|
|
||
| return <ChallengeUpsertButton Icon={<ShareIcon />} nametag="shareUrl" challengeUpsert={shareChallenge} /> | ||
| } | ||
| const SaveButton = () => { | ||
| const [openSnackbar, setOpenSnackbar] = useState(false) | ||
|
|
||
| const { t } = useTranslation('creator'); | ||
|
|
||
| const saveChallenge = async (): Promise<string> => { | ||
| const savedChallenge = await PilasBloquesApi.saveChallenge(LocalStorage.getCreatorChallenge()!) | ||
| setOpenSnackbar(true) | ||
| return savedChallenge.sharedId | ||
| } | ||
|
|
||
| return <> | ||
| <ChallengeUpsertButton Icon={<SaveIcon />} nametag="save" challengeUpsert={saveChallenge} /> | ||
| <Snackbar | ||
| open={openSnackbar} | ||
| onClose={() => setOpenSnackbar(false)} | ||
| autoHideDuration={2000} | ||
| message={t('editor.buttons.savedCorrectly')} | ||
| /> | ||
| </> | ||
| } | ||
|
|
||
| export const ChallengeUpsertButton = ({ Icon, challengeUpsert, nametag }: { Icon: ReactNode, nametag: string, challengeUpsert: () => Promise<string> }) => { | ||
|
|
||
| const { setSharedId } = useContext(CreatorContext) | ||
| const userLoggedIn = !!LocalStorage.getUser() | ||
| const [serverError, setServerError] = useState<boolean>(false) | ||
| const { t } = useTranslation('creator'); | ||
|
|
||
| const handleClick = async () => { | ||
| try { | ||
| setSharedId(await challengeUpsert()) | ||
| } | ||
| catch (error) { | ||
| setServerError(true) | ||
| } | ||
| } | ||
|
|
||
| return <> | ||
| <Tooltip title={!userLoggedIn ? t('editor.loginWarning') : ''} followCursor> | ||
| <div> | ||
| <CreatorActionButton data-testid="upsertButton" onClick={handleClick} disabled={!userLoggedIn} startIcon={Icon} variant='contained' nametag={nametag} /> | ||
| </div> | ||
| </Tooltip> | ||
| <DialogSnackbar open={serverError} onClose={() => setServerError(false)} message={t('editor.serverError')} /> | ||
| </> | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
La de arriba y esta pueden ser directamente
(no sé bien cómo deben ser los caracteres finales, pero puede ser así, no son secretas esas url)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(Idem en los otros jobs)