Skip to content

Commit

Permalink
Biome formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
majakomel committed Apr 15, 2024
1 parent c3872ef commit 48adbd9
Show file tree
Hide file tree
Showing 423 changed files with 10,252 additions and 10,290 deletions.
30 changes: 0 additions & 30 deletions .editorconfig

This file was deleted.

15 changes: 0 additions & 15 deletions .eslintrc.json

This file was deleted.

5 changes: 0 additions & 5 deletions .prettierrc

This file was deleted.

37 changes: 0 additions & 37 deletions Todo.md

This file was deleted.

25 changes: 25 additions & 0 deletions biome.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.1/schema.json",
"organizeImports": {
"enabled": true
},
"linter": {
"enabled": true,
"rules": {
"recommended": true
}
},
"formatter": {
"indentStyle": "space",
"indentWidth": 2
},
"javascript": {
"formatter": {
"semicolons": "asNeeded",
"quoteStyle": "single"
}
},
"files": {
"ignore": [".next/", "scripts/", "public/"]
}
}
11 changes: 8 additions & 3 deletions components/Badge.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Box, Flex, Text, theme } from 'ooni-components'
import * as icons from 'ooni-components/icons'
import PropTypes from 'prop-types'
import { cloneElement } from 'react'
import { FormattedMessage } from 'react-intl'
import styled from 'styled-components'
import { getTestMetadata } from './utils'
import * as icons from 'ooni-components/icons'

// XXX replace what is inside of search/results-list.StyledResultTag
export const Badge = styled(Box)`
Expand All @@ -15,7 +15,8 @@ export const Badge = styled(Box)`
font-size: 12px;
text-transform: uppercase;
background-color: ${(props) => props.bg || props.theme.colors.gray8};
border: ${(props) => (props.borderColor ? `1px solid ${props.borderColor}` : 'none')};
border: ${(props) =>
props.borderColor ? `1px solid ${props.borderColor}` : 'none'};
color: ${(props) => props.color || props.theme.colors.white};
letter-spacing: 1.25px;
font-weight: 600;
Expand Down Expand Up @@ -43,7 +44,11 @@ export const CategoryBadge = ({ categoryCode }) => {
}

return (
<Badge bg="#ffffff" borderColor={theme.colors.gray5} color={theme.colors.gray7}>
<Badge
bg="#ffffff"
borderColor={theme.colors.gray5}
color={theme.colors.gray7}
>
<Flex sx={{ gap: 1 }} alignItems="center">
<Box>
<FormattedMessage id={`CategoryCode.${categoryCode}.Name`} />
Expand Down
8 changes: 4 additions & 4 deletions components/BlockText.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import styled from 'styled-components'
import { Box } from 'ooni-components'
import styled from 'styled-components'

const BlockText = styled(Box)`
background-color: ${props => props.theme.colors.gray0};
border-left: 10px solid ${props => props.theme.colors.blue5};
background-color: ${(props) => props.theme.colors.gray0};
border-left: 10px solid ${(props) => props.theme.colors.blue5};
`

BlockText.defaultProps = {
p: 3,
fontSize: 1,
}

export default BlockText
export default BlockText
20 changes: 8 additions & 12 deletions components/CallToActionBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,18 @@ import NLink from 'next/link'
import { Box, Button, Flex, Heading, Text } from 'ooni-components'
import { FormattedMessage } from 'react-intl'

const CallToActionBox = ({title, text}) => {
const CallToActionBox = ({ title, text }) => {
return (
<Flex my={4} bg='gray3' flexWrap='wrap'>
<Flex my={4} bg="gray3" flexWrap="wrap">
<Box width={1} mx={4} my={2}>
<Heading h={4}>
{title}
</Heading>
<Text fontSize={2}>
{text}
</Text>
<Heading h={4}>{title}</Heading>
<Text fontSize={2}>{text}</Text>
</Box>
<Flex alignItems='center' mx={4} my={4} flexDirection={['column', 'row']}>
<Flex alignItems="center" mx={4} my={4} flexDirection={['column', 'row']}>
<Box mr={4} mb={[3, 0]}>
<NLink href='https://ooni.org/install'>
<NLink href="https://ooni.org/install">
<Button>
<FormattedMessage id='Country.Overview.NoData.Button.InstallProbe' />
<FormattedMessage id="Country.Overview.NoData.Button.InstallProbe" />
</Button>
</NLink>
</Box>
Expand All @@ -26,4 +22,4 @@ const CallToActionBox = ({title, text}) => {
)
}

export default CallToActionBox
export default CallToActionBox
83 changes: 54 additions & 29 deletions components/Chart.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import GridChart, { prepareDataForGridChart } from 'components/aggregation/mat/GridChart'
import GridChart, {
prepareDataForGridChart,
} from 'components/aggregation/mat/GridChart'
import { MATContextProvider } from 'components/aggregation/mat/MATContext'
import { DetailsBox } from 'components/measurement/DetailsBox'
import NLink from 'next/link'
Expand All @@ -23,51 +25,69 @@ export const MATLink = ({ query }) => {
const showMATButton = !Array.isArray(query.test_name)

return (
<Flex mt={3} justifyContent='space-between' alignItems='center' flexWrap="wrap" sx={{gap: 3}}>
<Flex
mt={3}
justifyContent="space-between"
alignItems="center"
flexWrap="wrap"
sx={{ gap: 3 }}
>
<Box>
{showMATButton &&
{showMATButton && (
<NLink href={`/chart/mat?${queryToSearchParams}`}>
<StyledHollowButton>
{intl.formatMessage({id: 'MAT.Charts.SeeOnMAT'})} <MdBarChart size={20} style={{verticalAlign: 'bottom'}} />
{intl.formatMessage({ id: 'MAT.Charts.SeeOnMAT' })}{' '}
<MdBarChart size={20} style={{ verticalAlign: 'bottom' }} />
</StyledHollowButton>
</NLink>
}
)}
</Box>
<Flex sx={{gap: 3}} flexWrap="wrap">
<Flex sx={{ gap: 3 }} flexWrap="wrap">
<NLink href={apiUrl}>
{intl.formatMessage({id: 'MAT.Charts.DownloadJSONData'})} <MdOutlineFileDownload style={{verticalAlign: 'bottom'}} size={20} />
{intl.formatMessage({ id: 'MAT.Charts.DownloadJSONData' })}{' '}
<MdOutlineFileDownload
style={{ verticalAlign: 'bottom' }}
size={20}
/>
</NLink>
<NLink href={`${apiUrl}&format=CSV`}>
{intl.formatMessage({id: 'MAT.Charts.DownloadCSVData'})} <MdOutlineFileDownload style={{verticalAlign: 'bottom'}} size={20} />
{intl.formatMessage({ id: 'MAT.Charts.DownloadCSVData' })}{' '}
<MdOutlineFileDownload
style={{ verticalAlign: 'bottom' }}
size={20}
/>
</NLink>
</Flex>
</Flex>
)
}

const Chart = React.memo(function Chart({testGroup = null, queryParams = {}, setState}) {
const Chart = React.memo(function Chart({
testGroup = null,
queryParams = {},
setState,
}) {
const apiQuery = useMemo(() => {
const qs = new URLSearchParams(queryParams).toString()
return qs
}, [queryParams])

const { data, error } = useSWR(
apiQuery,
MATFetcher,
swrOptions
)
const { data, error } = useSWR(apiQuery, MATFetcher, swrOptions)

const [chartData, rowKeys, rowLabels] = useMemo(() => {
if (!data) {
return [null, 0]
}
let chartData = data.data
const chartData = data.data
const graphQuery = queryParams
const [reshapedData, rowKeys, rowLabels] = prepareDataForGridChart(chartData, graphQuery)
const [reshapedData, rowKeys, rowLabels] = prepareDataForGridChart(
chartData,
graphQuery,
)
return [reshapedData, rowKeys, rowLabels]
}, [data, queryParams])

useEffect(()=> {
useEffect(() => {
if (setState && data?.data) setState(data.data)
}, [data, setState])

Expand All @@ -76,9 +96,9 @@ const Chart = React.memo(function Chart({testGroup = null, queryParams = {}, set
return (
// <MATContextProvider key={name} test_name={name} {...queryParams}>
<MATContextProvider {...queryParams}>
<Flex flexDirection='column'>
<Flex flexDirection="column">
<Box>
{(!chartData && !error) ? (
{!chartData && !error ? (
<FormattedMessage id="General.Loading" />
) : (
<>
Expand All @@ -91,16 +111,21 @@ const Chart = React.memo(function Chart({testGroup = null, queryParams = {}, set
</>
)}
</Box>
{error &&
<DetailsBox collapsed={false} content={<>
<details>
<summary><span>Error: {error.message}</span></summary>
<Box as='pre'>
{JSON.stringify(error, null, 2)}
</Box>
</details>
</>}/>
}
{error && (
<DetailsBox
collapsed={false}
content={
<>
<details>
<summary>
<span>Error: {error.message}</span>
</summary>
<Box as="pre">{JSON.stringify(error, null, 2)}</Box>
</details>
</>
}
/>
)}
</Flex>
</MATContextProvider>
)
Expand Down
6 changes: 3 additions & 3 deletions components/CollapseTrigger.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react'
import styled from 'styled-components'
import { MdExpandLess } from 'react-icons/md'
import styled from 'styled-components'

export const CollapseTrigger = styled(MdExpandLess)`
cursor: pointer;
background-color: ${props => props.$bg || '#ffffff'};
background-color: ${(props) => props.$bg || '#ffffff'};
border-radius: 50%;
transform: ${props => props.$open ? 'rotate(0deg)': 'rotate(180deg)'};
transform: ${(props) => (props.$open ? 'rotate(0deg)' : 'rotate(180deg)')};
transition: transform 0.1s linear;
`
Loading

0 comments on commit 48adbd9

Please sign in to comment.