Rename components to use CamelCase convention (#336)

* renaming files: checkpoint

* Capitalize component filenamespart 2

* Rollback non-component names

* Fix remaining components
There was a problem in my git configuration

* there are more problems in my git configuration

* rename files

* Fix names now on linux

* rename ASNSelector and Stats

* change reference for test-info

* rename dash, default and ndt

* footer file permission

* Fix inconsistencies in renaming files

components/Layout.js

@@ -11,10 +11,10 @@ import {
 // the upgrade to `next@latest`
 import 'typeface-fira-sans/index.css'
 
-import Header from './header'
-import Footer from './footer'
+import Header from './Header'
+import Footer from './Footer'
 import withIntl from './withIntl'
-import FeedbackButton from '../components/feedback-float'
+import FeedbackButton from '../components/FeedbackFloat'
 
 theme.maxWidth = 1024
 

components/country/apps.js → components/country/Apps.js

@@ -2,12 +2,12 @@ import React from 'react'
 import { FormattedMessage } from 'react-intl'
 import { Text } from 'ooni-components'
 
-import SectionHeader from './section-header'
-import { SimpleBox } from './box'
-import PeriodFilter from './period-filter'
-import AppsStatsGroup from './apps-stats'
-import AppsStatsCircumvention from './apps-stats-circumvention'
-import FormattedMarkdown from '../formatted-markdown'
+import SectionHeader from './SectionHeader'
+import { SimpleBox } from './boxes'
+import PeriodFilter from './PeriodFilter'
+import AppsStatsGroup from './AppsStats'
+import AppsStatsCircumvention from './AppsStatsCircumvention'
+import FormattedMarkdown from '../FormattedMarkdown'
 
 const AppsSection = () => (
   <React.Fragment>

components/country/apps-stats.js → components/country/AppsStats.js

@@ -4,8 +4,8 @@ import styled from 'styled-components'
 import axios from 'axios'
 import { FormattedMessage } from 'react-intl'
 
-import { inCountry } from './country-context'
-import AppsStatRow from './apps-stats-row'
+import { inCountry } from './CountryContext'
+import AppsStatRow from './AppsStatsRow'
 import { AppSectionLoader } from './WebsiteChartLoader'
 
 const AppGroupHeading = styled(Box)`

components/country/apps-stats-chart.js → components/country/AppsStatsChart.js

@@ -9,8 +9,8 @@ import {
 } from 'victory'
 import { theme } from 'ooni-components'
 
-import { inCountry } from './country-context'
-import Tooltip from './tooltip'
+import { inCountry } from './CountryContext'
+import Tooltip from './Tooltip'
 import { AppsChartLoader } from './WebsiteChartLoader'
 
 class AppsStatChart extends React.Component {

components/country/apps-stats-circumvention.js → components/country/AppsStatsCircumvention.js

@@ -3,8 +3,8 @@ import { Box, Heading } from 'ooni-components'
 import styled from 'styled-components'
 import axios from 'axios'
 
-import { inCountry } from './country-context'
-import AppsStatsRowCircumvention from './apps-stats-circumvention-row'
+import { inCountry } from './CountryContext'
+import AppsStatsRowCircumvention from './AppsStatsCircumventionRow'
 import { AppSectionLoader } from './WebsiteChartLoader'
 
 const AppGroupHeading = styled(Box)`

components/country/apps-stats-circumvention-row.js → components/country/AppsStatsCircumventionRow.js

@@ -9,7 +9,7 @@ import {
 import moment from 'moment'
 
 import { testNames } from '../test-info'
-import { CountryContext } from './country-context'
+import { CountryContext } from './CountryContext'
 import { CollapseTrigger } from '../CollapseTrigger'
 
 const NETWORK_STATS_PER_PAGE = 4

components/country/apps-stats-row.js → components/country/AppsStatsRow.js

@@ -11,8 +11,8 @@ import {
 import moment from 'moment'
 
 import { testNames } from '../test-info'
-import AppsStatChart from './apps-stats-chart'
-import { CountryContext } from './country-context'
+import AppsStatChart from './AppsStatsChart'
+import { CountryContext } from './CountryContext'
 import { CollapseTrigger } from '../CollapseTrigger'
 
 const NETWORK_STATS_PER_PAGE = 4

components/country/network-properties.js → components/country/NetworkProperties.js

@@ -3,12 +3,12 @@ import { FormattedMessage } from 'react-intl'
 import { Flex, Box, Heading, Text, Link } from 'ooni-components'
 import axios from 'axios'
 
-import SectionHeader from './section-header'
-import { SimpleBox } from './box'
-// import PeriodFilter from './period-filter'
-import NetworkStats from './network-stats'
-import SpinLoader from '../vendor/spin-loader'
-import FormattedMarkdown from '../formatted-markdown'
+import SectionHeader from './SectionHeader'
+import { SimpleBox } from './boxes'
+// import PeriodFilter from './PeriodFilter'
+import NetworkStats from './NetworkStats'
+import SpinLoader from '../vendor/SpinLoader'
+import FormattedMarkdown from '../FormattedMarkdown'
 
 const NETWORK_STATS_PER_PAGE = 4
 

components/country/overview.js → components/country/Overview.js

@@ -3,10 +3,10 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl'
 import styled from 'styled-components'
 import { Flex, Box, Heading, Link } from 'ooni-components'
 import { Text } from 'rebass'
-import SectionHeader from './section-header'
-import { BoxWithTitle } from './box'
-import TestsByGroup from './overview-charts'
-import FormattedMarkdown from '../formatted-markdown'
+import SectionHeader from './SectionHeader'
+import { BoxWithTitle } from './boxes'
+import TestsByGroup from './OverviewCharts'
+import FormattedMarkdown from '../FormattedMarkdown'
 import {
   NettestGroupWebsites,
   NettestGroupInstantMessaging,

components/country/overview-charts.js → components/country/OverviewCharts.js

@@ -12,7 +12,7 @@ import {
 } from 'victory'
 import { injectIntl } from 'react-intl'
 
-import Tooltip from './tooltip'
+import Tooltip from './Tooltip'
 import VictoryTheme from '../VictoryTheme'
 import { testGroups } from '../test-info'
 

components/country/url-chart.js → components/country/URLChart.js

@@ -21,7 +21,7 @@ import {
   colorEmpty
 } from '../colors'
 
-import Tooltip from './tooltip'
+import Tooltip from './Tooltip'
 import { WebsiteChartLoader } from './WebsiteChartLoader'
 
 const Circle = styled.div`

components/country/websites.js → components/country/Websites.js

@@ -1,14 +1,14 @@
 import React from 'react'
-import { inCountry } from './country-context'
+import { inCountry } from './CountryContext'
 import { FormattedMessage } from 'react-intl'
 import axios from 'axios'
 import { Flex, Box, Heading, Text, Input } from 'ooni-components'
 
-import SectionHeader from './section-header'
-import { SimpleBox } from './box'
-import PeriodFilter from './period-filter'
-import TestsByCategoryInNetwork from './websites-charts'
-import FormattedMarkdown from '../formatted-markdown'
+import SectionHeader from './SectionHeader'
+import { SimpleBox } from './boxes'
+import PeriodFilter from './PeriodFilter'
+import TestsByCategoryInNetwork from './WebsitesCharts'
+import FormattedMarkdown from '../FormattedMarkdown'
 
 class WebsitesSection extends React.Component {
   constructor(props) {

components/country/websites-charts.js → components/country/WebsitesCharts.js

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types'
 import { FormattedMessage } from 'react-intl'
 import { Flex, Box, Heading, Text, Link } from 'ooni-components'
 import axios from 'axios'
-import URLChart from './url-chart'
-import ASNSelector from './asn-selector'
+import URLChart from './URLChart'
+import ASNSelector from './ASNSelector'
 import { WebsiteSectionLoader, WebsiteChartLoader } from './WebsiteChartLoader'
 
 const defaultState = {

components/landing/highlight-box.js → components/landing/HighlightBox.js

@@ -6,7 +6,7 @@ import { Text } from 'rebass'
 import styled from 'styled-components'
 import Markdown from 'markdown-to-jsx'
 
-import Flag from '../flag'
+import Flag from '../Flag'
 
 const LinkButton = styled(Box)`
   border-radius: 6px;

components/landing/highlights-section.js → components/landing/HighlightsSection.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import { Flex, Box } from 'ooni-components'
 import { Text } from 'rebass'
 
-import HighlightBox from './highlight-box'
+import HighlightBox from './HighlightBox'
 
 const HighlightSection = ({
   title,

components/landing/stats.js → components/landing/Stats.js

@@ -12,9 +12,9 @@ import moment from 'moment'
 import { Flex, Heading, Text, theme } from 'ooni-components'
 import { injectIntl } from 'react-intl'
 
-import SpinLoader from '../vendor/spin-loader'
-import Tooltip from '../country/tooltip'
-import FormattedMarkdown from '../formatted-markdown'
+import SpinLoader from '../vendor/SpinLoader'
+import Tooltip from '../country/Tooltip'
+import FormattedMarkdown from '../FormattedMarkdown'
 import VictoryTheme from '../VictoryTheme'
 import { ChartLoader } from './ChartLoader'
 

components/measurement/CommonSummary.js

@@ -10,7 +10,7 @@ import { Text } from 'rebass'
 import moment from 'moment'
 import { injectIntl, intlShape } from 'react-intl'
 
-import Flag from '../flag'
+import Flag from '../Flag'
 
 const SummaryContainer = styled(Box)`
   background-color: ${props => props.color};

components/measurement/DetailsHeader.js

@@ -8,7 +8,7 @@ import { Text } from 'rebass'
 import { FormattedMessage } from 'react-intl'
 
 import { getTestMetadata } from '../utils'
-import Badge from '../badge'
+import Badge from '../Badge'
 
 const TestGroupBadge = ({icon, name, color}) => (
   <Badge bg={color} color='white'>

components/measurement/MeasurementContainer.js

@@ -1,18 +1,18 @@
 import React from 'react'
 
-import WebConnectivityDetails from './nettests/web_connectivity'
-import TelegramDetails from './nettests/telegram'
-import WhatsAppDetails from './nettests/whatsapp'
-import DashDetails from './nettests/dash'
-import NdtDetails from './nettests/ndt'
+import WebConnectivityDetails from './nettests/WebConnectivity'
+import TelegramDetails from './nettests/Telegram'
+import WhatsAppDetails from './nettests/WhatsApp'
+import DashDetails from './nettests/Dash'
+import NdtDetails from './nettests/Ndt'
 
-import FacebookMessengerDetails from './nettests/facebook_messenger'
-import HttpHeaderFieldManipulationDetails from './nettests/http_header_field_manipulation'
-import HttpInvalidRequestLine from './nettests/http_invalid_request_line'
+import FacebookMessengerDetails from './nettests/FacebookMessenger'
+import HttpHeaderFieldManipulationDetails from './nettests/HTTPHeaderFieldManipulation'
+import HttpInvalidRequestLine from './nettests/HTTPInvalidRequestLine'
 
-import VanillaTorDetails from './nettests/vanilla_tor'
+import VanillaTorDetails from './nettests/VanillaTor'
 
-import DefaultTestDetails from './nettests/default'
+import DefaultTestDetails from './nettests/Default'
 
 const mapTestDetails = {
   web_connectivity: WebConnectivityDetails,

components/measurement/SummaryText.js

@@ -4,7 +4,7 @@ import moment from 'moment'
 import { Link, Text } from 'ooni-components'
 
 import { getTestMetadata } from '../utils'
-import FormattedMarkdown from '../formatted-markdown'
+import FormattedMarkdown from '../FormattedMarkdown'
 
 const SummaryText = ({
   testName,

components/measurement/nettests/ndt.js → components/measurement/nettests/Ndt.js

@@ -8,7 +8,7 @@ import { Text } from 'rebass'
 import { MdFlashOn } from 'react-icons/lib/md'
 import { injectIntl, intlShape } from 'react-intl'
 
-import { mlabServerDetails } from './mlab_utils.js'
+import { mlabServerDetails } from './mlab_utils'
 import PerformanceDetails from '../PerformanceDetails'
 
 const InfoBoxItem = ({

components/search/filter-sidebar.js → components/search/FilterSidebar.js

@@ -13,7 +13,7 @@ import {
 } from 'ooni-components'
 import moment from 'moment'
 
-import DatePicker from '../date-picker'
+import DatePicker from '../DatePicker'
 
 const StyledInputWithLabel = styled.div``
 const StyledLabel = styled(Label)`

components/search/results-list.js → components/search/ResultsList.js

@@ -17,7 +17,7 @@ import {
   colorConfirmed,
   colorAnomaly
 } from '../colors'
-import Flag from '../flag'
+import Flag from '../Flag'
 
 const StyledResultTag = styled.div`
   border-radius: 16px;

pages/_error.js

@@ -13,7 +13,7 @@ import {
 import styled from 'styled-components'
 import { FormattedMessage } from 'react-intl'
 
-import NavBar from '../components/nav-bar'
+import NavBar from '../components/NavBar'
 import Layout from '../components/Layout'
 import OONI404 from '../static/images/OONI_404.svg'
 

pages/about.js

@@ -8,7 +8,7 @@ import {
 } from 'ooni-components'
 
 import Layout from '../components/Layout'
-import NavBar from '../components/nav-bar'
+import NavBar from '../components/NavBar'
 
 export default class About extends React.Component {
   render () {

pages/countries.js

@@ -14,9 +14,9 @@ import {
 import { Text } from 'rebass'
 import { StickyContainer, Sticky } from 'react-sticky'
 
-import Flag from '../components/flag'
+import Flag from '../components/Flag'
 import Layout from '../components/Layout'
-import NavBar from '../components/nav-bar'
+import NavBar from '../components/NavBar'
 
 import countryUtil from 'country-util'
 

pages/country.js

@@ -12,15 +12,15 @@ import countryUtil from 'country-util'
 import styled from 'styled-components'
 import { StickyContainer, Sticky } from 'react-sticky'
 
-import NavBar from '../components/nav-bar'
-import Flag from '../components/flag'
+import NavBar from '../components/NavBar'
+import Flag from '../components/Flag'
 import Layout from '../components/Layout'
 import PageNavMenu from '../components/country/PageNavMenu'
-import Overview from '../components/country/overview'
-import WebsitesSection from '../components/country/websites'
-import AppsSection from '../components/country/apps'
-import NetworkPropertiesSection from '../components/country/network-properties'
-import { CountryContextProvider } from '../components/country/country-context'
+import Overview from '../components/country/Overview'
+import WebsitesSection from '../components/country/Websites'
+import AppsSection from '../components/country/Apps'
+import NetworkPropertiesSection from '../components/country/NetworkProperties'
+import { CountryContextProvider } from '../components/country/CountryContext'
 
 const getCountryReports = (countryCode, data) => {
   const reports = data.filter((article) => (

pages/index.js

@@ -3,7 +3,7 @@ import React from 'react'
 import Head from 'next/head'
 import NLink from 'next/link'
 import Router from 'next/router';
-import FormattedMarkdown from '../components/formatted-markdown'
+import FormattedMarkdown from '../components/FormattedMarkdown'
 import styled from 'styled-components'
 import axios from 'axios'
 import { FormattedMessage } from 'react-intl'
@@ -18,12 +18,12 @@ import {
 import { Text } from 'rebass'
 
 import Layout from '../components/Layout'
-import NavBar from '../components/nav-bar'
+import NavBar from '../components/NavBar'
 import { toCompactNumberUnit } from '../utils'
-import HighlightSection from '../components/landing/highlights-section'
+import HighlightSection from '../components/landing/HighlightsSection'
 import highlightContent from '../components/landing/highlights.json'
-import { Flag } from '../components/flag'
-import CoverageChart from '../components/landing/stats'
+import { Flag } from '../components/Flag'
+import CoverageChart from '../components/landing/Stats'
 
 const HeroUnit = styled.div`
   background: url(/static/images/world-dots.svg);

pages/measurement.js

@@ -13,7 +13,7 @@ import CommonDetails from '../components/measurement/CommonDetails'
 import MeasurementContainer from '../components/measurement/MeasurementContainer'
 
 import Layout from '../components/Layout'
-import NavBar from '../components/nav-bar'
+import NavBar from '../components/NavBar'
 
 const pageColors = {
   default: theme.colors.base,

pages/results.js

@@ -8,7 +8,7 @@ import {
 } from 'ooni-components'
 
 import Layout from '../components/Layout'
-import NavBar from '../components/nav-bar'
+import NavBar from '../components/NavBar'
 
 export default class Results extends React.Component {
   render () {

pages/search.js

@@ -13,12 +13,12 @@ import {
 } from 'ooni-components'
 import { FormattedMessage } from 'react-intl'
 
-import NavBar from '../components/nav-bar'
+import NavBar from '../components/NavBar'
 import Layout from '../components/Layout'
 
-import ResultsList from '../components/search/results-list'
-import FilterSidebar from '../components/search/filter-sidebar'
-import { Loader } from '../components/search/loader'
+import ResultsList from '../components/search/ResultsList'
+import FilterSidebar from '../components/search/FilterSidebar'
+import { Loader } from '../components/search/Loader'
 import OONI404 from '../static/images/OONI_404.svg'
 
 import { sortByKey } from '../utils'