Skip to content
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.

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

Staging #906

Merged
merged 80 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
9f6461d
feat: ajust menu for new layout of dataset
AldemirLucas Jun 4, 2024
07a3ba2
feat: new input mobile in datasets
AldemirLucas Jun 4, 2024
7a63974
feat: add new font Roboto
AldemirLucas Jun 5, 2024
ca07a64
feat: add new controlledInput for menu
AldemirLucas Jun 5, 2024
2e00e9b
feat: new input for menu add
AldemirLucas Jun 5, 2024
9eb88db
chore: readjust menu height
AldemirLucas Jun 5, 2024
fd4b6a1
feat: reformulated the readMore component
AldemirLucas Jun 7, 2024
71c4074
feat: tabs in dataset att
AldemirLucas Jun 7, 2024
f001efb
fea: fix accordion in dataset select source
AldemirLucas Jun 7, 2024
d624f5a
feat: wip temporalBar in bdmTable
AldemirLucas Jun 10, 2024
e1e827b
feat: temporalBar
AldemirLucas Jun 11, 2024
a511e77
fix: readmore component
AldemirLucas Jun 11, 2024
cd02fb9
fix: err dom <p> in readmore
AldemirLucas Jun 11, 2024
d100a0c
feat: wip bdmtable new layout
AldemirLucas Jun 11, 2024
183342f
feat: add new style footer
AldemirLucas Jun 14, 2024
967c627
feat: add new fields in bdmtables
AldemirLucas Jun 14, 2024
863b031
feat: temporalcoverage and DataInfomation ajusts
AldemirLucas Jun 17, 2024
0c3160b
chore: remove prism and terminal css
AldemirLucas Jun 17, 2024
e9d7a08
chore: remover prism and terminal in code
AldemirLucas Jun 17, 2024
acc0e6d
feat: wip tradução de tabelas
AldemirLucas Jun 17, 2024
a8d3058
feat: new icons additions
AldemirLucas Jun 18, 2024
1f3cc20
feat: wip code section SQL and python
AldemirLucas Jun 18, 2024
fab0f2a
feat: wip updates info
AldemirLucas Jun 20, 2024
49be5a3
feat: wip columns
AldemirLucas Jun 20, 2024
c4f6d62
feat: add simple input
AldemirLucas Jun 22, 2024
b66469f
feat: att footer
AldemirLucas Jun 24, 2024
9a8682e
feat: wip search columns
AldemirLucas Jun 24, 2024
e88cd79
feat: checkbox att visual
AldemirLucas Jun 25, 2024
aaa5d49
feat: columns checkbox ajusts
AldemirLucas Jun 25, 2024
60371d4
feat: wip getTableOneBigTableQuery in informationQuerys
AldemirLucas Jun 25, 2024
cbcd95d
feat: wip highlight codes
AldemirLucas Jun 27, 2024
c071cfa
feat: wip loading code in sql, python and R
AldemirLucas Jun 27, 2024
98f0c94
feat: wip consult sql in sql section, python and r
AldemirLucas Jun 27, 2024
5b5ca9f
feat: rawDataSource and InformationRequest complet
AldemirLucas Jun 28, 2024
94c6115
Merge pull request #871 from basedosdados/feat/857
AldemirLucas Jun 28, 2024
65c5649
feat: visual ajusts
AldemirLucas Jul 1, 2024
48dd6af
feat: ajust visuais
AldemirLucas Jul 1, 2024
ae7aaf3
Merge pull request #873 from basedosdados/feat/857
AldemirLucas Jul 1, 2024
df504c9
feat: wip FAQ updates
AldemirLucas Jul 3, 2024
fd7b176
Merge pull request #874 from basedosdados/feat/857
AldemirLucas Jul 3, 2024
c47de9d
feat: includeTranslation in getBigTableQuery
AldemirLucas Jul 3, 2024
3a4485f
Merge pull request #875 from basedosdados/feat/857
AldemirLucas Jul 3, 2024
0a02ff8
feat: wip Dataset page
AldemirLucas Jul 4, 2024
6c79080
feat: latest updates required
AldemirLucas Jul 5, 2024
52db726
feat: included download link and name for dataset and table in Downlo…
AldemirLucas Jul 5, 2024
662e9db
Merge pull request #877 from basedosdados/feat/857
AldemirLucas Jul 5, 2024
eacfb41
feat: ajust Dataset Card and filter Accordion
AldemirLucas Jul 9, 2024
82fb68a
Merge pull request #878 from basedosdados/feat/870
AldemirLucas Jul 9, 2024
c444881
feat: pagination style change
AldemirLucas Jul 9, 2024
f286452
feat: ajust filter accordion and bugs
AldemirLucas Jul 10, 2024
ddd04e2
Merge pull request #879 from basedosdados/feat/870
AldemirLucas Jul 10, 2024
e496e1b
feat: tags add in dataset page
AldemirLucas Jul 10, 2024
37c0cf3
Merge pull request #880 from basedosdados/feat/870
AldemirLucas Jul 10, 2024
0dd50f8
feat: fix bug Tab's and ajust style in Menu
AldemirLucas Jul 11, 2024
65f80de
feat: addicioned bigquery id field in table page
AldemirLucas Jul 12, 2024
185a75f
feat: add link in dataInformationQuery and ajust checkbox logic
AldemirLucas Jul 12, 2024
3a0faeb
Merge pull request #881 from basedosdados/chore/table-translation
AldemirLucas Jul 12, 2024
d5f0e6f
feat: add disclaimer and show dictionaries for SAEB
AldemirLucas Jul 15, 2024
bcb9e59
feat: add trigger for GA and ajusts
AldemirLucas Jul 16, 2024
58ce8f1
Merge pull request #888 from basedosdados/feat/882
AldemirLucas Jul 16, 2024
d0c307f
feat: fix bug in dataset page and ajust height table
AldemirLucas Jul 16, 2024
885f894
feat: redirect google olympics dataset
AldemirLucas Jul 16, 2024
68f8769
fix: FAQ link for terms
AldemirLucas Jul 17, 2024
ee38150
feat: isClosed columns download and info
AldemirLucas Jul 17, 2024
164fe49
Merge pull request #890 from basedosdados/feat/889
AldemirLucas Jul 17, 2024
32dec17
feat: page contato-consultoria up
AldemirLucas Jul 18, 2024
738ac72
Merge pull request #891 from basedosdados/feat/883
AldemirLucas Jul 18, 2024
c262878
feat: ajust page dataset and GA trigger
AldemirLucas Jul 19, 2024
2165fee
feat: ajust visual in input and tabs
AldemirLucas Jul 22, 2024
d9c1bfa
feat: Ajust of hover and styles
AldemirLucas Jul 22, 2024
28f87bf
feat: ajust text in download section dataset
AldemirLucas Jul 23, 2024
a806f50
feat: Survey for user login
AldemirLucas Jul 24, 2024
c5b12a5
fix: ajust tables select in dataset page style
AldemirLucas Jul 24, 2024
8a2d2b7
feat: add trigger GA in survey page
AldemirLucas Jul 24, 2024
6844ebf
Merge pull request #895 from basedosdados/development
AldemirLucas Jul 25, 2024
25bdbf1
feat: clean feature download for translate table
AldemirLucas Aug 5, 2024
8c2aa78
feat: ajust TranslationColumnException
AldemirLucas Aug 6, 2024
d9d0ccb
feat: dictionary download in table column
AldemirLucas Aug 9, 2024
94559a7
feat: Add support for setup intents in PaymentForm
jhonylucas74 Aug 11, 2024
4ecf97a
Merge pull request #905 from basedosdados/fix/accept-setup-intent-stripe
AldemirLucas Aug 12, 2024
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
33 changes: 33 additions & 0 deletions next/components/atoms/Button.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import {
Box,
} from "@chakra-ui/react";

export default function Button({ children, onClick, ...props }) {
return (
<Box
as="button"
onClick={onClick}
display="flex"
alignItems="center"
height="40px"
width="fit-content"
borderRadius="8px"
backgroundColor="#2B8C4D"
padding="8px 16px"
cursor="pointer"
color="#FFF"
fill="#FFF"
fontFamily="Roboto"
fontWeight="500"
fontSize="14px"
gap="8px"
lineHeight="20px"
_hover={{
backgroundColor:"#22703E"
}}
{...props}
>
{children}
</Box>
)
}
59 changes: 59 additions & 0 deletions next/components/atoms/Checkbox.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import {
Checkbox,
Icon
} from '@chakra-ui/react';

function CustomCheckbockIcon({ variant, isIndeterminate, isChecked, ...props }) {
function variantIcon() {
if(isIndeterminate) return "M5.06135 11.0002C4.76599 11.0002 4.51496 10.9029 4.30826 10.7084C4.10157 10.514 3.99823 10.2778 3.99823 9.99984C3.99823 9.72193 4.10157 9.48573 4.30826 9.29124C4.51496 9.09676 4.76599 8.99951 5.06135 8.99951H14.9391C15.2344 8.99951 15.4855 9.09676 15.6922 9.29124C15.8988 9.48573 16.0022 9.72193 16.0022 9.99984C16.0022 10.2778 15.8988 10.514 15.6922 10.7084C15.4855 10.9029 15.2344 11.0002 14.9391 11.0002H5.06135Z"
return "M7.17894 10.9259L13.306 4.7988C13.5043 4.60057 13.7378 4.50146 14.0068 4.50146C14.2758 4.50146 14.5094 4.60057 14.7076 4.7988C14.9058 4.99702 15.0049 5.23196 15.0049 5.50364C15.0049 5.7753 14.9058 6.01024 14.7076 6.20846L7.87972 13.0444C7.6815 13.2427 7.44791 13.3418 7.17894 13.3418C6.90998 13.3418 6.67639 13.2427 6.47817 13.0444L3.2943 9.86058C3.09609 9.66236 2.99834 9.42742 3.00103 9.15576C3.00373 8.88408 3.10418 8.64914 3.30241 8.45091C3.50063 8.25269 3.73557 8.15358 4.00725 8.15358C4.27891 8.15358 4.51385 8.25269 4.71207 8.45091L7.17894 10.9259Z"
}

return (
<Icon
backgroundColor="#2b8c4d"
boxSizing="border-box"
borderColor="#2b8c4d"
width={isIndeterminate ? "24px" : "20px"}
height="20px"
viewBox={isIndeterminate ? "0 0 16 18" : "0 0 18 18"}
_focus={{
boxShadow: "none",
outline: "none"
}}
{...props}
>
<path fill="currentColor" d={variantIcon()} />
</Icon>
)
}

export default function CustomCheckbox({ children, hasIndeterminate = false , icon, ...props}) {
return (
<Checkbox
width="20px"
height="20px"
borderRadius="4px"
borderWidth={hasIndeterminate ? "0" : "3px"}
borderColor={hasIndeterminate ? "transparent" : "#878A8E"}
backgroundColor="#FFF"
overflow="hidden"
_checked={{
borderColor: "#2b8c4d",
backgroundColor: "#2b8c4d",
}}
_focus={{
boxShadow: "none",
outline: "none"
}}
icon={
<CustomCheckbockIcon
{...icon}
/>
}
{...props}
>
{children}
</Checkbox>
)
}
75 changes: 74 additions & 1 deletion next/components/atoms/ControlledInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import {
InputGroup,
InputRightAddon,
InputRightElement,
InputLeftElement
} from "@chakra-ui/react";
import { useEffect, useState } from "react";

export default function ControlledInput({
placeholder,
variant,
value,
onChange,
onEnterPress,
Expand Down Expand Up @@ -117,3 +117,76 @@ export function DebouncedControlledInput({
</InputGroup>
);
}

export function ControlledInputSimple({
refInput = null,
placeholder,
value,
onChange,
onEnterPress,
inputFocus,
changeInputFocus,
icon = null,
inputStyle,
inputElementStyle,
fill,
...props
}) {
async function checkForEnter(e) {
if (e.key === "Enter" && onEnterPress) {
onEnterPress();
}
}

return (
<InputGroup
maxWidth="480px"
width="480px"
alignSelf="center"
justifyContent="center"
fill={fill}
{...props}
>
<InputLeftElement
width="24px"
height="24px"
margin="8px 8px 8px 16px"
children={icon}
{...inputElementStyle}
/>

<Input
ref={refInput}
value={value}
placeholder={placeholder}
onChange={(e) => onChange(e.target.value)}
onKeyDown={checkForEnter}
onFocus={() => changeInputFocus(true)}
onBlur={() => changeInputFocus(false)}
autoComplete="off"
variant="outline"
border="2px solid transparent !important"
color="#464A51"
_hover={{
border:"2px solid transparent !important",
backgroundColor:"#DEDFE0",
}}
_focus={{
border:"2px solid #0068C5 !important",
backgroundColor: "#FFF",
}}
paddingLeft="52px !important"
backgroundColor="#EEEEEE"
height="40px"
fontSize="14px"
lineHeight="20px"
width="100%"
fontFamily="Roboto"
fontWeight="400"
borderRadius="14px"
_placeholder={{color: "#464A51", opacity: 1}}
{...inputStyle}
/>
</InputGroup>
)
}
Loading
Loading