Skip to content

Commit

Permalink
Merge pull request #917 from basedosdados/development
Browse files Browse the repository at this point in the history
WIP-feat_914
  • Loading branch information
AldemirLucas authored Aug 15, 2024
2 parents e92ec0b + c18828a commit 70759c5
Show file tree
Hide file tree
Showing 6 changed files with 319 additions and 213 deletions.
50 changes: 43 additions & 7 deletions next/components/molecules/DataInformationQuery.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import {
useClipboard,
Tooltip,
Skeleton,
Stack
Stack,
useDisclosure,
ModalCloseButton
} from "@chakra-ui/react";
import { useState, useEffect, useRef } from "react";
import hljs from "highlight.js/lib/core";
Expand All @@ -23,6 +25,8 @@ import 'highlight.js/styles/obsidian.css'
import GreenTab from "../atoms/GreenTab";
import Toggle from "../atoms/Toggle";
import ColumnsTable from "./ColumnsTable";
import { SectionPrice } from "../../pages/precos";
import { ModalGeneral } from "./uiUserPage";
import { AlertDiscalimerBox} from "./DisclaimerBox";
import { triggerGAEvent, formatBytes } from "../../utils";

Expand Down Expand Up @@ -182,6 +186,7 @@ export default function DataInformationQuery({ resource }) {
const [hasLoadingColumns, setHasLoadingColumns] = useState(true)
const [isLoadingCode, setIsLoadingCode] = useState(false)
const [hasLoadingResponse, setHasLoadingResponse] = useState(false)
const plansModal = useDisclosure()

const [gcpProjectID, setGcpProjectID] = useState("")
const [gcpDatasetID, setGcpDatasetID] = useState("")
Expand Down Expand Up @@ -297,6 +302,36 @@ export default function DataInformationQuery({ resource }) {
border="1px solid #DEDFE0"
borderRadius="16px"
>
<ModalGeneral
isOpen={plansModal.isOpen}
onClose={plansModal.onClose}
propsModalContent={{
minWidth: "fit-content"
}}
>
<Stack spacing={0} marginBottom="16px">
<Text
width="100%"
fontFamily="Roboto"
fontWeight="400"
color="#252A32"
fontSize="24px"
textAlign="center"
lineHeight="40px"
>
Compare os planos
</Text>
<ModalCloseButton
fontSize="14px"
top="34px"
right="26px"
_hover={{backgroundColor: "transparent", color:"#0B89E2"}}
/>
</Stack>

<SectionPrice/>
</ModalGeneral>

<Tabs
width="100%"
variant="unstyled"
Expand Down Expand Up @@ -563,9 +598,10 @@ export default function DataInformationQuery({ resource }) {

<Box
as="a"
href={`/api/tables/downloadTable?p=${btoa(gcpDatasetID)}&q=${btoa(gcpTableId)}&d=${btoa(downloadPermitted)}&s=${btoa(downloadWarning)}`}
href={isUserPro() || downloadWarning === "free" && `/api/tables/downloadTable?p=${btoa(gcpDatasetID)}&q=${btoa(gcpTableId)}&d=${btoa(downloadPermitted)}&s=${btoa(downloadWarning)}`}
target="_blank"
onClick={() => {
onClick={() => {
if(downloadWarning === "100mbBetween1gb") return plansModal.onOpen()
triggerGAEvent("download_da_tabela",`{
gcp: ${gcpProjectID+"."+gcpDatasetID+"."+gcpTableId},
tamanho: ${formatBytes(resource.uncompressedFileSize) || ""},
Expand All @@ -578,17 +614,17 @@ export default function DataInformationQuery({ resource }) {
height="40px"
width="fit-content"
borderRadius="8px"
backgroundColor={downloadPermitted ? "#2B8C4D" : "#ACAEB1"}
backgroundColor={downloadWarning !== "biggest1gb" ? "#2B8C4D" : "#ACAEB1"}
padding="8px 16px"
cursor={downloadPermitted ? "pointer" : "default"}
cursor={downloadWarning !== "biggest1gb" ? "pointer" : "default"}
color="#FFF"
fill="#FFF"
fontFamily="Roboto"
fontWeight="500"
fontSize="14px"
gap="8px"
lineHeight="20px"
pointerEvents={downloadPermitted ? "default" : "none"}
pointerEvents={downloadWarning !== "biggest1gb" ? "default" : "none"}
_hover={{
backgroundColor: "#22703E"
}}
Expand All @@ -597,7 +633,7 @@ export default function DataInformationQuery({ resource }) {
width="24px"
height="24px"
/>
Download da tabela {downloadPermitted && `(${formatBytes(resource.uncompressedFileSize)})`}
Download da tabela {downloadWarning !== "biggest1gb" && `(${formatBytes(resource.uncompressedFileSize)})`}
</Box>
</Stack>
</VStack>
Expand Down
38 changes: 36 additions & 2 deletions next/components/molecules/TemporalCoverageDisplay.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ import {
Text,
Box,
Tooltip,
useDisclosure,
ModalCloseButton
} from "@chakra-ui/react";
import { useState, useEffect } from "react";
import { CalendarComunIcon } from "../../public/img/icons/calendarIcon";
import { SectionPrice } from "../../pages/precos";
import { ModalGeneral } from "./uiUserPage";
import RedirectIcon from "../../public/img/icons/redirectIcon";

export function TemporalCoverage ({
Expand Down Expand Up @@ -126,6 +130,7 @@ export function TemporalCoverageString({

export function TemporalCoverageBar ({ value }) {
const [values, setValues] = useState({})
const plansModal = useDisclosure()

const TextData = ({ string, ...style }) => {
return (
Expand Down Expand Up @@ -168,6 +173,36 @@ export function TemporalCoverageBar ({ value }) {
alignItems="normal"
spacing={0}
>
<ModalGeneral
isOpen={plansModal.isOpen}
onClose={plansModal.onClose}
propsModalContent={{
minWidth: "fit-content"
}}
>
<Stack spacing={0} marginBottom="16px">
<Text
width="100%"
fontFamily="Roboto"
fontWeight="400"
color="#252A32"
fontSize="24px"
textAlign="center"
lineHeight="40px"
>
Compare os planos
</Text>
<ModalCloseButton
fontSize="14px"
top="34px"
right="26px"
_hover={{backgroundColor: "transparent", color:"#0B89E2"}}
/>
</Stack>

<SectionPrice/>
</ModalGeneral>

<Tooltip
hasArrow
padding="16px"
Expand Down Expand Up @@ -303,8 +338,7 @@ export function TemporalCoverageBar ({ value }) {
fill:"#0057A4",
backgroundColor:"#E4F2FF"
}}
href="/precos"
target="_blank"
onClick={() => plansModal.onOpen()}
>
PAGO
<RedirectIcon
Expand Down
Loading

0 comments on commit 70759c5

Please sign in to comment.