From 7408293d74cf24ad4b51ed64d004db741761ed7a Mon Sep 17 00:00:00 2001 From: Kai Vandivier Date: Wed, 22 Jan 2025 13:52:10 +0100 Subject: [PATCH] chore: rename extensions to jsx as needed --- d2.config.js | 2 +- src/{App.js => App.jsx} | 2 +- .../{AboutPage.js => AboutPage.jsx} | 2 +- .../{ErrorPage.js => ErrorPage.jsx} | 0 src/components/{Root.js => Root.jsx} | 4 +- src/components/{Routes.js => Routes.jsx} | 40 +++++++++---------- .../check/{CheckPage.js => CheckPage.jsx} | 0 .../check/{OrgUnitTree.js => OrgUnitTree.jsx} | 0 .../explore/{Chart.js => Chart.jsx} | 0 ...yPeriodSelect.js => DailyPeriodSelect.jsx} | 2 +- .../{ExplorePage.js => ExplorePage.jsx} | 2 +- .../{MonthSelect.js => MonthSelect.jsx} | 0 ...eriodSelect.js => MonthlyPeriodSelect.jsx} | 2 +- .../explore/{OrgUnit.js => OrgUnit.jsx} | 2 +- .../{OrgUnitTree.js => OrgUnitTree.jsx} | 0 .../{OrgUnitType.js => OrgUnitType.jsx} | 0 ...riodTypeSelect.js => PeriodTypeSelect.jsx} | 0 ...iodSelect.js => ReferencePeriodSelect.jsx} | 0 src/components/explore/{Tabs.js => Tabs.jsx} | 0 .../{ClimateChange.js => ClimateChange.jsx} | 10 ++--- .../charts/temperatureAnomaly.js | 2 +- .../{DayForecast.js => DayForecast.jsx} | 4 +- .../forecast/{Forecast.js => Forecast.jsx} | 4 +- ...mperatureValue.js => TemperatureValue.jsx} | 0 .../{WeatherSymbol.js => WeatherSymbol.jsx} | 0 .../heat/{HeatDaily.js => HeatDaily.jsx} | 12 +++--- ...HeatDescription.js => HeatDescription.jsx} | 0 .../heat/{HeatMonthly.js => HeatMonthly.jsx} | 12 +++--- .../{HumidityDaily.js => HumidityDaily.jsx} | 12 +++--- ...Description.js => HumidityDescription.jsx} | 0 ...HumidityMonthly.js => HumidityMonthly.jsx} | 14 +++---- ...itationDaily.js => PrecipitationDaily.jsx} | 10 ++--- ...ionMonthly.js => PrecipitationMonthly.jsx} | 12 +++--- ...mperatureDaily.js => TemperatureDaily.jsx} | 10 ++--- ...atureMonthly.js => TemperatureMonthly.jsx} | 12 +++--- .../{DataElement.js => DataElement.jsx} | 0 .../import/{Dataset.js => Dataset.jsx} | 0 .../{ExtractData.js => ExtractData.jsx} | 6 +-- .../import/{ImportData.js => ImportData.jsx} | 6 +-- .../{ImportError.js => ImportError.jsx} | 2 +- .../import/{ImportPage.js => ImportPage.jsx} | 14 +++---- .../{ImportResponse.js => ImportResponse.jsx} | 0 .../{NoOrgUnitData.js => NoOrgUnitData.jsx} | 0 .../{OrgUnitLevel.js => OrgUnitLevel.jsx} | 0 .../{OrgUnitTree.js => OrgUnitTree.jsx} | 0 .../import/{OrgUnits.js => OrgUnits.jsx} | 4 +- .../import/{Period.js => Period.jsx} | 2 +- .../{ChartSettings.js => ChartSettings.jsx} | 4 +- .../{HeatCategory.js => HeatCategory.jsx} | 0 .../{NumberInput.js => NumberInput.jsx} | 0 .../{SettingsPage.js => SettingsPage.jsx} | 6 +-- ...StartPageSelect.js => StartPageSelect.jsx} | 2 +- .../{TimeZoneSelect.js => TimeZoneSelect.jsx} | 0 .../setup/{DataElement.js => DataElement.jsx} | 0 .../setup/{Legend.js => Legend.jsx} | 0 .../setup/{SetupPage.js => SetupPage.jsx} | 4 +- .../shared/{DataLoader.js => DataLoader.jsx} | 0 .../shared/{DatePicker.js => DatePicker.jsx} | 0 .../{ErrorMessage.js => ErrorMessage.jsx} | 0 .../{GEETokenCheck.js => GEETokenCheck.jsx} | 0 .../{MonthPicker.js => MonthPicker.jsx} | 0 .../{PeriodWarning.js => PeriodWarning.jsx} | 0 .../shared/{Resolution.js => Resolution.jsx} | 0 .../shared/{TimeZone.js => TimeZone.jsx} | 0 src/hooks/useExploreUri.js | 2 +- src/store/exploreStore.js | 2 +- 66 files changed, 113 insertions(+), 113 deletions(-) rename src/{App.js => App.jsx} (52%) rename src/components/{AboutPage.js => AboutPage.jsx} (98%) rename src/components/{ErrorPage.js => ErrorPage.jsx} (100%) rename src/components/{Root.js => Root.jsx} (96%) rename src/components/{Routes.js => Routes.jsx} (84%) rename src/components/check/{CheckPage.js => CheckPage.jsx} (100%) rename src/components/check/{OrgUnitTree.js => OrgUnitTree.jsx} (100%) rename src/components/explore/{Chart.js => Chart.jsx} (100%) rename src/components/explore/{DailyPeriodSelect.js => DailyPeriodSelect.jsx} (96%) rename src/components/explore/{ExplorePage.js => ExplorePage.jsx} (88%) rename src/components/explore/{MonthSelect.js => MonthSelect.jsx} (100%) rename src/components/explore/{MonthlyPeriodSelect.js => MonthlyPeriodSelect.jsx} (96%) rename src/components/explore/{OrgUnit.js => OrgUnit.jsx} (97%) rename src/components/explore/{OrgUnitTree.js => OrgUnitTree.jsx} (100%) rename src/components/explore/{OrgUnitType.js => OrgUnitType.jsx} (100%) rename src/components/explore/{PeriodTypeSelect.js => PeriodTypeSelect.jsx} (100%) rename src/components/explore/{ReferencePeriodSelect.js => ReferencePeriodSelect.jsx} (100%) rename src/components/explore/{Tabs.js => Tabs.jsx} (100%) rename src/components/explore/climateChange/{ClimateChange.js => ClimateChange.jsx} (91%) rename src/components/explore/forecast/{DayForecast.js => DayForecast.jsx} (95%) rename src/components/explore/forecast/{Forecast.js => Forecast.jsx} (97%) rename src/components/explore/forecast/{TemperatureValue.js => TemperatureValue.jsx} (100%) rename src/components/explore/forecast/{WeatherSymbol.js => WeatherSymbol.jsx} (100%) rename src/components/explore/heat/{HeatDaily.js => HeatDaily.jsx} (78%) rename src/components/explore/heat/{HeatDescription.js => HeatDescription.jsx} (100%) rename src/components/explore/heat/{HeatMonthly.js => HeatMonthly.jsx} (78%) rename src/components/explore/humidity/{HumidityDaily.js => HumidityDaily.jsx} (73%) rename src/components/explore/humidity/{HumidityDescription.js => HumidityDescription.jsx} (100%) rename src/components/explore/humidity/{HumidityMonthly.js => HumidityMonthly.jsx} (79%) rename src/components/explore/precipitation/{PrecipitationDaily.js => PrecipitationDaily.jsx} (81%) rename src/components/explore/precipitation/{PrecipitationMonthly.js => PrecipitationMonthly.jsx} (83%) rename src/components/explore/temperature/{TemperatureDaily.js => TemperatureDaily.jsx} (81%) rename src/components/explore/temperature/{TemperatureMonthly.js => TemperatureMonthly.jsx} (83%) rename src/components/import/{DataElement.js => DataElement.jsx} (100%) rename src/components/import/{Dataset.js => Dataset.jsx} (100%) rename src/components/import/{ExtractData.js => ExtractData.jsx} (92%) rename src/components/import/{ImportData.js => ImportData.jsx} (92%) rename src/components/import/{ImportError.js => ImportError.jsx} (95%) rename src/components/import/{ImportPage.js => ImportPage.jsx} (96%) rename src/components/import/{ImportResponse.js => ImportResponse.jsx} (100%) rename src/components/import/{NoOrgUnitData.js => NoOrgUnitData.jsx} (100%) rename src/components/import/{OrgUnitLevel.js => OrgUnitLevel.jsx} (100%) rename src/components/import/{OrgUnitTree.js => OrgUnitTree.jsx} (100%) rename src/components/import/{OrgUnits.js => OrgUnits.jsx} (92%) rename src/components/import/{Period.js => Period.jsx} (97%) rename src/components/settings/{ChartSettings.js => ChartSettings.jsx} (96%) rename src/components/settings/{HeatCategory.js => HeatCategory.jsx} (100%) rename src/components/settings/{NumberInput.js => NumberInput.jsx} (100%) rename src/components/settings/{SettingsPage.js => SettingsPage.jsx} (84%) rename src/components/settings/{StartPageSelect.js => StartPageSelect.jsx} (94%) rename src/components/settings/{TimeZoneSelect.js => TimeZoneSelect.jsx} (100%) rename src/components/setup/{DataElement.js => DataElement.jsx} (100%) rename src/components/setup/{Legend.js => Legend.jsx} (100%) rename src/components/setup/{SetupPage.js => SetupPage.jsx} (98%) rename src/components/shared/{DataLoader.js => DataLoader.jsx} (100%) rename src/components/shared/{DatePicker.js => DatePicker.jsx} (100%) rename src/components/shared/{ErrorMessage.js => ErrorMessage.jsx} (100%) rename src/components/shared/{GEETokenCheck.js => GEETokenCheck.jsx} (100%) rename src/components/shared/{MonthPicker.js => MonthPicker.jsx} (100%) rename src/components/shared/{PeriodWarning.js => PeriodWarning.jsx} (100%) rename src/components/shared/{Resolution.js => Resolution.jsx} (100%) rename src/components/shared/{TimeZone.js => TimeZone.jsx} (100%) diff --git a/d2.config.js b/d2.config.js index 06ed811..fcd1b5e 100644 --- a/d2.config.js +++ b/d2.config.js @@ -5,7 +5,7 @@ const config = { minDHIS2Version: '2.37', entryPoints: { - app: './src/App.js', + app: './src/App.jsx', }, } diff --git a/src/App.js b/src/App.jsx similarity index 52% rename from src/App.js rename to src/App.jsx index 33c6c9a..d314a70 100644 --- a/src/App.js +++ b/src/App.jsx @@ -1,4 +1,4 @@ -import Routes from './components/Routes' +import Routes from './components/Routes.jsx' const App = () => diff --git a/src/components/AboutPage.js b/src/components/AboutPage.jsx similarity index 98% rename from src/components/AboutPage.js rename to src/components/AboutPage.jsx index 4c5a532..9b53033 100644 --- a/src/components/AboutPage.js +++ b/src/components/AboutPage.jsx @@ -1,5 +1,5 @@ import i18n from '@dhis2/d2-i18n' -import GEETokenCheck from './shared/GEETokenCheck' +import GEETokenCheck from './shared/GEETokenCheck.jsx' import styles from './styles/AboutPage.module.css' // TODO: How to combine links and i18n.t? diff --git a/src/components/ErrorPage.js b/src/components/ErrorPage.jsx similarity index 100% rename from src/components/ErrorPage.js rename to src/components/ErrorPage.jsx diff --git a/src/components/Root.js b/src/components/Root.jsx similarity index 96% rename from src/components/Root.js rename to src/components/Root.jsx index c9bff50..6f4069e 100644 --- a/src/components/Root.js +++ b/src/components/Root.jsx @@ -3,8 +3,8 @@ import { CssVariables, CssReset, Menu, MenuItem } from '@dhis2/ui' import { Fragment, useEffect } from 'react' import { Outlet, useResolvedPath, useNavigate } from 'react-router-dom' import useAppSettings from '../hooks/useAppSettings' -import CheckOrgUnitTree from './check/OrgUnitTree' -import OrgUnitTree from './explore/OrgUnitTree' +import CheckOrgUnitTree from './check/OrgUnitTree.jsx' +import OrgUnitTree from './explore/OrgUnitTree.jsx' import styles from './styles/Root.module.css' export const appPages = [ diff --git a/src/components/Routes.js b/src/components/Routes.jsx similarity index 84% rename from src/components/Routes.js rename to src/components/Routes.jsx index 7fd5bf3..d06dbcd 100644 --- a/src/components/Routes.js +++ b/src/components/Routes.jsx @@ -2,26 +2,26 @@ import { useDataEngine } from '@dhis2/app-runtime' import { RouterProvider, createHashRouter } from 'react-router-dom' import checkPlaceLoader from '../utils/checkPlaceLoader' import orgUnitLoader from '../utils/orgUnitLoader' -import AboutPage from './AboutPage' -import CheckPage from './check/CheckPage' -import ErrorPage from './ErrorPage' -import ClimateChange from './explore/climateChange/ClimateChange' -import ExplorePage from './explore/ExplorePage' -import Forecast from './explore/forecast/Forecast' -import HeatDaily from './explore/heat/HeatDaily' -import HeatMonthly from './explore/heat/HeatMonthly' -import HumidityDaily from './explore/humidity/HumidityDaily' -import HumidityMonthly from './explore/humidity/HumidityMonthly' -import OrgUnit from './explore/OrgUnit' -import PrecipitationDaily from './explore/precipitation/PrecipitationDaily' -import PrecipitationMonthly from './explore/precipitation/PrecipitationMonthly' -import Tabs from './explore/Tabs' -import TemperatureDaily from './explore/temperature/TemperatureDaily' -import TemperatureMonthly from './explore/temperature/TemperatureMonthly' -import ImportPage from './import/ImportPage' -import Root from './Root' -import SettingsPage from './settings/SettingsPage' -import SetupPage from './setup/SetupPage' +import AboutPage from './AboutPage.jsx' +import CheckPage from './check/CheckPage.jsx' +import ErrorPage from './ErrorPage.jsx' +import ClimateChange from './explore/climateChange/ClimateChange.jsx' +import ExplorePage from './explore/ExplorePage.jsx' +import Forecast from './explore/forecast/Forecast.jsx' +import HeatDaily from './explore/heat/HeatDaily.jsx' +import HeatMonthly from './explore/heat/HeatMonthly.jsx' +import HumidityDaily from './explore/humidity/HumidityDaily.jsx' +import HumidityMonthly from './explore/humidity/HumidityMonthly.jsx' +import OrgUnit from './explore/OrgUnit.jsx' +import PrecipitationDaily from './explore/precipitation/PrecipitationDaily.jsx' +import PrecipitationMonthly from './explore/precipitation/PrecipitationMonthly.jsx' +import Tabs from './explore/Tabs.jsx' +import TemperatureDaily from './explore/temperature/TemperatureDaily.jsx' +import TemperatureMonthly from './explore/temperature/TemperatureMonthly.jsx' +import ImportPage from './import/ImportPage.jsx' +import Root from './Root.jsx' +import SettingsPage from './settings/SettingsPage.jsx' +import SetupPage from './setup/SetupPage.jsx' const monthlyPath = 'monthly/:startTime/:endTime/:referencePeriodId' const dailyPath = 'daily/:startTime/:endTime' diff --git a/src/components/check/CheckPage.js b/src/components/check/CheckPage.jsx similarity index 100% rename from src/components/check/CheckPage.js rename to src/components/check/CheckPage.jsx diff --git a/src/components/check/OrgUnitTree.js b/src/components/check/OrgUnitTree.jsx similarity index 100% rename from src/components/check/OrgUnitTree.js rename to src/components/check/OrgUnitTree.jsx diff --git a/src/components/explore/Chart.js b/src/components/explore/Chart.jsx similarity index 100% rename from src/components/explore/Chart.js rename to src/components/explore/Chart.jsx diff --git a/src/components/explore/DailyPeriodSelect.js b/src/components/explore/DailyPeriodSelect.jsx similarity index 96% rename from src/components/explore/DailyPeriodSelect.js rename to src/components/explore/DailyPeriodSelect.jsx index 01b6c4c..a5a34d6 100644 --- a/src/components/explore/DailyPeriodSelect.js +++ b/src/components/explore/DailyPeriodSelect.jsx @@ -3,7 +3,7 @@ import { Button } from '@dhis2/ui' import { useState } from 'react' import exploreStore from '../../store/exploreStore' import { getNumberOfDays } from '../../utils/time' -import DatePicker from '../shared/DatePicker' +import DatePicker from '../shared/DatePicker.jsx' import styles from './styles/Period.module.css' const maxDays = 1000 diff --git a/src/components/explore/ExplorePage.js b/src/components/explore/ExplorePage.jsx similarity index 88% rename from src/components/explore/ExplorePage.js rename to src/components/explore/ExplorePage.jsx index 3637c5b..2c8219e 100644 --- a/src/components/explore/ExplorePage.js +++ b/src/components/explore/ExplorePage.jsx @@ -1,5 +1,5 @@ import i18n from '@dhis2/d2-i18n' -import GEETokenCheck from '../shared/GEETokenCheck' +import GEETokenCheck from '../shared/GEETokenCheck.jsx' import styles from './styles/ExplorePage.module.css' const ExplorePage = () => ( diff --git a/src/components/explore/MonthSelect.js b/src/components/explore/MonthSelect.jsx similarity index 100% rename from src/components/explore/MonthSelect.js rename to src/components/explore/MonthSelect.jsx diff --git a/src/components/explore/MonthlyPeriodSelect.js b/src/components/explore/MonthlyPeriodSelect.jsx similarity index 96% rename from src/components/explore/MonthlyPeriodSelect.js rename to src/components/explore/MonthlyPeriodSelect.jsx index 618fdc8..781a373 100644 --- a/src/components/explore/MonthlyPeriodSelect.js +++ b/src/components/explore/MonthlyPeriodSelect.jsx @@ -3,7 +3,7 @@ import { Button } from '@dhis2/ui' import { useState } from 'react' import exploreStore from '../../store/exploreStore' import { getNumberOfMonths } from '../../utils/time' -import MonthPicker from '../shared/MonthPicker' +import MonthPicker from '../shared/MonthPicker.jsx' import styles from './styles/Period.module.css' const maxMonths = 60 diff --git a/src/components/explore/OrgUnit.js b/src/components/explore/OrgUnit.jsx similarity index 97% rename from src/components/explore/OrgUnit.js rename to src/components/explore/OrgUnit.jsx index 99e5302..3ef33e5 100644 --- a/src/components/explore/OrgUnit.js +++ b/src/components/explore/OrgUnit.jsx @@ -7,7 +7,7 @@ import { useNavigate, } from 'react-router-dom' import exploreStore from '../../store/exploreStore' -import OrgUnitType from './OrgUnitType' +import OrgUnitType from './OrgUnitType.jsx' import styles from './styles/OrgUnit.module.css' const tabIsValid = (tab, orgUnit) => diff --git a/src/components/explore/OrgUnitTree.js b/src/components/explore/OrgUnitTree.jsx similarity index 100% rename from src/components/explore/OrgUnitTree.js rename to src/components/explore/OrgUnitTree.jsx diff --git a/src/components/explore/OrgUnitType.js b/src/components/explore/OrgUnitType.jsx similarity index 100% rename from src/components/explore/OrgUnitType.js rename to src/components/explore/OrgUnitType.jsx diff --git a/src/components/explore/PeriodTypeSelect.js b/src/components/explore/PeriodTypeSelect.jsx similarity index 100% rename from src/components/explore/PeriodTypeSelect.js rename to src/components/explore/PeriodTypeSelect.jsx diff --git a/src/components/explore/ReferencePeriodSelect.js b/src/components/explore/ReferencePeriodSelect.jsx similarity index 100% rename from src/components/explore/ReferencePeriodSelect.js rename to src/components/explore/ReferencePeriodSelect.jsx diff --git a/src/components/explore/Tabs.js b/src/components/explore/Tabs.jsx similarity index 100% rename from src/components/explore/Tabs.js rename to src/components/explore/Tabs.jsx diff --git a/src/components/explore/climateChange/ClimateChange.js b/src/components/explore/climateChange/ClimateChange.jsx similarity index 91% rename from src/components/explore/climateChange/ClimateChange.js rename to src/components/explore/climateChange/ClimateChange.jsx index 74a635c..c33d73a 100644 --- a/src/components/explore/climateChange/ClimateChange.js +++ b/src/components/explore/climateChange/ClimateChange.jsx @@ -9,11 +9,11 @@ import useEarthEngineClimateNormals from '../../../hooks/useEarthEngineClimateNo import useEarthEngineTimeSeries from '../../../hooks/useEarthEngineTimeSeries' import exploreStore from '../../../store/exploreStore' import { getCurrentYear } from '../../../utils/time' -import DataLoader from '../../shared/DataLoader' -import Resolution from '../../shared/Resolution' -import Chart from '../Chart' -import MonthSelect from '../MonthSelect' -import ReferencePeriod from '../ReferencePeriodSelect' +import DataLoader from '../../shared/DataLoader.jsx' +import Resolution from '../../shared/Resolution.jsx' +import Chart from '../Chart.jsx' +import MonthSelect from '../MonthSelect.jsx' +import ReferencePeriod from '../ReferencePeriodSelect.jsx' import getChartConfig from './charts/temperatureAnomaly' import styles from './styles/ClimateChangeTab.module.css' diff --git a/src/components/explore/climateChange/charts/temperatureAnomaly.js b/src/components/explore/climateChange/charts/temperatureAnomaly.js index f6ae86d..b146aa8 100644 --- a/src/components/explore/climateChange/charts/temperatureAnomaly.js +++ b/src/components/explore/climateChange/charts/temperatureAnomaly.js @@ -3,7 +3,7 @@ import { colors } from '@dhis2/ui' import { roundOneDecimal } from '../../../../utils/calc' import { animation, credits } from '../../../../utils/chart' import { padWithZeroes } from '../../../../utils/time' -import { months } from '../../MonthSelect' +import { months } from '../../MonthSelect.jsx' const band = 'temperature_2m' diff --git a/src/components/explore/forecast/DayForecast.js b/src/components/explore/forecast/DayForecast.jsx similarity index 95% rename from src/components/explore/forecast/DayForecast.js rename to src/components/explore/forecast/DayForecast.jsx index e5972fa..4f999fc 100644 --- a/src/components/explore/forecast/DayForecast.js +++ b/src/components/explore/forecast/DayForecast.jsx @@ -3,8 +3,8 @@ import PropTypes from 'prop-types' import React from 'react' import { roundOneDecimal } from '../../../utils/calc' import styles from './styles/DayForecast.module.css' -import TemperatureValue from './TemperatureValue.js' -import WeatherSymbol from './WeatherSymbol.js' +import TemperatureValue from './TemperatureValue.jsx' +import WeatherSymbol from './WeatherSymbol.jsx' const sixHours = [ { start: '00', end: '06' }, diff --git a/src/components/explore/forecast/Forecast.js b/src/components/explore/forecast/Forecast.jsx similarity index 97% rename from src/components/explore/forecast/Forecast.js rename to src/components/explore/forecast/Forecast.jsx index e14c5bf..c328058 100644 --- a/src/components/explore/forecast/Forecast.js +++ b/src/components/explore/forecast/Forecast.jsx @@ -2,8 +2,8 @@ import i18n from '@dhis2/d2-i18n' import { useState, useEffect } from 'react' import useAppSettings from '../../../hooks/useAppSettings.js' import exploreStore from '../../../store/exploreStore' -import DataLoader from '../../shared/DataLoader.js' -import DayForecast from './DayForecast.js' +import DataLoader from '../../shared/DataLoader.jsx' +import DayForecast from './DayForecast.jsx' import styles from './styles/ForecastTab.module.css' const convertTimezone = (date, timeZone) => diff --git a/src/components/explore/forecast/TemperatureValue.js b/src/components/explore/forecast/TemperatureValue.jsx similarity index 100% rename from src/components/explore/forecast/TemperatureValue.js rename to src/components/explore/forecast/TemperatureValue.jsx diff --git a/src/components/explore/forecast/WeatherSymbol.js b/src/components/explore/forecast/WeatherSymbol.jsx similarity index 100% rename from src/components/explore/forecast/WeatherSymbol.js rename to src/components/explore/forecast/WeatherSymbol.jsx diff --git a/src/components/explore/heat/HeatDaily.js b/src/components/explore/heat/HeatDaily.jsx similarity index 78% rename from src/components/explore/heat/HeatDaily.js rename to src/components/explore/heat/HeatDaily.jsx index 7905b4f..e645552 100644 --- a/src/components/explore/heat/HeatDaily.js +++ b/src/components/explore/heat/HeatDaily.jsx @@ -2,13 +2,13 @@ import { era5HeatDaily } from '../../../data/datasets' import useAppSettings from '../../../hooks/useAppSettings' import useEarthEngineTimeSeries from '../../../hooks/useEarthEngineTimeSeries' import exploreStore from '../../../store/exploreStore' -import DataLoader from '../../shared/DataLoader' -import Resolution from '../../shared/Resolution' -import Chart from '../Chart' -import DailyPeriodSelect from '../DailyPeriodSelect' -import PeriodTypeSelect from '../PeriodTypeSelect' +import DataLoader from '../../shared/DataLoader.jsx' +import Resolution from '../../shared/Resolution.jsx' +import Chart from '../Chart.jsx' +import DailyPeriodSelect from '../DailyPeriodSelect.jsx' +import PeriodTypeSelect from '../PeriodTypeSelect.jsx' import getDailyConfig from './charts/thermalComfortDaily' -import HeatDescription from './HeatDescription' +import HeatDescription from './HeatDescription.jsx' const HeatDaily = () => { const orgUnit = exploreStore((state) => state.orgUnit) diff --git a/src/components/explore/heat/HeatDescription.js b/src/components/explore/heat/HeatDescription.jsx similarity index 100% rename from src/components/explore/heat/HeatDescription.js rename to src/components/explore/heat/HeatDescription.jsx diff --git a/src/components/explore/heat/HeatMonthly.js b/src/components/explore/heat/HeatMonthly.jsx similarity index 78% rename from src/components/explore/heat/HeatMonthly.js rename to src/components/explore/heat/HeatMonthly.jsx index 4777dff..c01b8e5 100644 --- a/src/components/explore/heat/HeatMonthly.js +++ b/src/components/explore/heat/HeatMonthly.jsx @@ -2,13 +2,13 @@ import { era5HeatMonthly } from '../../../data/datasets' import useAppSettings from '../../../hooks/useAppSettings' import useEarthEngineTimeSeries from '../../../hooks/useEarthEngineTimeSeries' import exploreStore from '../../../store/exploreStore' -import DataLoader from '../../shared/DataLoader' -import Resolution from '../../shared/Resolution' -import Chart from '../Chart' -import MonthlyPeriodSelect from '../MonthlyPeriodSelect' -import PeriodTypeSelect from '../PeriodTypeSelect' +import DataLoader from '../../shared/DataLoader.jsx' +import Resolution from '../../shared/Resolution.jsx' +import Chart from '../Chart.jsx' +import MonthlyPeriodSelect from '../MonthlyPeriodSelect.jsx' +import PeriodTypeSelect from '../PeriodTypeSelect.jsx' import getMonthlyConfig from './charts/thermalComfortMonthly' -import HeatDescription from './HeatDescription' +import HeatDescription from './HeatDescription.jsx' const HeatMonthly = () => { const orgUnit = exploreStore((state) => state.orgUnit) diff --git a/src/components/explore/humidity/HumidityDaily.js b/src/components/explore/humidity/HumidityDaily.jsx similarity index 73% rename from src/components/explore/humidity/HumidityDaily.js rename to src/components/explore/humidity/HumidityDaily.jsx index 26b8005..687290b 100644 --- a/src/components/explore/humidity/HumidityDaily.js +++ b/src/components/explore/humidity/HumidityDaily.jsx @@ -1,13 +1,13 @@ import { era5Daily } from '../../../data/datasets' import useEarthEngineTimeSeries from '../../../hooks/useEarthEngineTimeSeries' import exploreStore from '../../../store/exploreStore' -import DataLoader from '../../shared/DataLoader' -import Resolution from '../../shared/Resolution' -import Chart from '../Chart' -import DailyPeriodSelect from '../DailyPeriodSelect' -import PeriodTypeSelect from '../PeriodTypeSelect' +import DataLoader from '../../shared/DataLoader.jsx' +import Resolution from '../../shared/Resolution.jsx' +import Chart from '../Chart.jsx' +import DailyPeriodSelect from '../DailyPeriodSelect.jsx' +import PeriodTypeSelect from '../PeriodTypeSelect.jsx' import getDailyConfig from './charts/humidityDaily' -import HumidityDescription from './HumidityDescription' +import HumidityDescription from './HumidityDescription.jsx' const HumidityDaily = () => { const orgUnit = exploreStore((state) => state.orgUnit) diff --git a/src/components/explore/humidity/HumidityDescription.js b/src/components/explore/humidity/HumidityDescription.jsx similarity index 100% rename from src/components/explore/humidity/HumidityDescription.js rename to src/components/explore/humidity/HumidityDescription.jsx diff --git a/src/components/explore/humidity/HumidityMonthly.js b/src/components/explore/humidity/HumidityMonthly.jsx similarity index 79% rename from src/components/explore/humidity/HumidityMonthly.js rename to src/components/explore/humidity/HumidityMonthly.jsx index 31d699f..46c8a2b 100644 --- a/src/components/explore/humidity/HumidityMonthly.js +++ b/src/components/explore/humidity/HumidityMonthly.jsx @@ -2,14 +2,14 @@ import { era5Monthly, era5MonthlyNormals } from '../../../data/datasets' import useEarthEngineClimateNormals from '../../../hooks/useEarthEngineClimateNormals' import useEarthEngineTimeSeries from '../../../hooks/useEarthEngineTimeSeries' import exploreStore from '../../../store/exploreStore' -import DataLoader from '../../shared/DataLoader' -import Resolution from '../../shared/Resolution' -import Chart from '../Chart' -import MonthlyPeriodSelect from '../MonthlyPeriodSelect' -import PeriodTypeSelect from '../PeriodTypeSelect' -import ReferencePeriod from '../ReferencePeriodSelect' +import DataLoader from '../../shared/DataLoader.jsx' +import Resolution from '../../shared/Resolution.jsx' +import Chart from '../Chart.jsx' +import MonthlyPeriodSelect from '../MonthlyPeriodSelect.jsx' +import PeriodTypeSelect from '../PeriodTypeSelect.jsx' +import ReferencePeriod from '../ReferencePeriodSelect.jsx' import getMonthlyConfig from './charts/humidityMonthly' -import HumidityDescription from './HumidityDescription' +import HumidityDescription from './HumidityDescription.jsx' const HumidityMonthly = () => { const orgUnit = exploreStore((state) => state.orgUnit) diff --git a/src/components/explore/precipitation/PrecipitationDaily.js b/src/components/explore/precipitation/PrecipitationDaily.jsx similarity index 81% rename from src/components/explore/precipitation/PrecipitationDaily.js rename to src/components/explore/precipitation/PrecipitationDaily.jsx index 14010ab..496222c 100644 --- a/src/components/explore/precipitation/PrecipitationDaily.js +++ b/src/components/explore/precipitation/PrecipitationDaily.jsx @@ -2,11 +2,11 @@ import { era5Daily } from '../../../data/datasets' import useAppSettings from '../../../hooks/useAppSettings' import useEarthEngineTimeSeries from '../../../hooks/useEarthEngineTimeSeries' import exploreStore from '../../../store/exploreStore' -import DataLoader from '../../shared/DataLoader' -import Resolution from '../../shared/Resolution' -import Chart from '../Chart' -import DailyPeriodSelect from '../DailyPeriodSelect' -import PeriodTypeSelect from '../PeriodTypeSelect' +import DataLoader from '../../shared/DataLoader.jsx' +import Resolution from '../../shared/Resolution.jsx' +import Chart from '../Chart.jsx' +import DailyPeriodSelect from '../DailyPeriodSelect.jsx' +import PeriodTypeSelect from '../PeriodTypeSelect.jsx' import getDailyConfig from './charts/precipitationDaily' const PrecipitationDaily = () => { diff --git a/src/components/explore/precipitation/PrecipitationMonthly.js b/src/components/explore/precipitation/PrecipitationMonthly.jsx similarity index 83% rename from src/components/explore/precipitation/PrecipitationMonthly.js rename to src/components/explore/precipitation/PrecipitationMonthly.jsx index e2d90db..ca1d7cc 100644 --- a/src/components/explore/precipitation/PrecipitationMonthly.js +++ b/src/components/explore/precipitation/PrecipitationMonthly.jsx @@ -3,12 +3,12 @@ import useAppSettings from '../../../hooks/useAppSettings' import useEarthEngineClimateNormals from '../../../hooks/useEarthEngineClimateNormals' import useEarthEngineTimeSeries from '../../../hooks/useEarthEngineTimeSeries' import exploreStore from '../../../store/exploreStore' -import DataLoader from '../../shared/DataLoader' -import Resolution from '../../shared/Resolution' -import Chart from '../Chart' -import MonthlyPeriodSelect from '../MonthlyPeriodSelect' -import PeriodTypeSelect from '../PeriodTypeSelect' -import ReferencePeriod from '../ReferencePeriodSelect' +import DataLoader from '../../shared/DataLoader.jsx' +import Resolution from '../../shared/Resolution.jsx' +import Chart from '../Chart.jsx' +import MonthlyPeriodSelect from '../MonthlyPeriodSelect.jsx' +import PeriodTypeSelect from '../PeriodTypeSelect.jsx' +import ReferencePeriod from '../ReferencePeriodSelect.jsx' import getMonthlyConfig from './charts/precipitationMonthly' const PrecipitationMonthly = () => { diff --git a/src/components/explore/temperature/TemperatureDaily.js b/src/components/explore/temperature/TemperatureDaily.jsx similarity index 81% rename from src/components/explore/temperature/TemperatureDaily.js rename to src/components/explore/temperature/TemperatureDaily.jsx index 174ca95..c54ab81 100644 --- a/src/components/explore/temperature/TemperatureDaily.js +++ b/src/components/explore/temperature/TemperatureDaily.jsx @@ -2,11 +2,11 @@ import { era5Daily } from '../../../data/datasets' import useAppSettings from '../../../hooks/useAppSettings' import useEarthEngineTimeSeries from '../../../hooks/useEarthEngineTimeSeries' import exploreStore from '../../../store/exploreStore' -import DataLoader from '../../shared/DataLoader' -import Resolution from '../../shared/Resolution' -import Chart from '../Chart' -import DailyPeriodSelect from '../DailyPeriodSelect' -import PeriodTypeSelect from '../PeriodTypeSelect' +import DataLoader from '../../shared/DataLoader.jsx' +import Resolution from '../../shared/Resolution.jsx' +import Chart from '../Chart.jsx' +import DailyPeriodSelect from '../DailyPeriodSelect.jsx' +import PeriodTypeSelect from '../PeriodTypeSelect.jsx' import getDailyConfig from './charts/temperatureDaily' const TemperatureDaily = () => { diff --git a/src/components/explore/temperature/TemperatureMonthly.js b/src/components/explore/temperature/TemperatureMonthly.jsx similarity index 83% rename from src/components/explore/temperature/TemperatureMonthly.js rename to src/components/explore/temperature/TemperatureMonthly.jsx index 58aba8b..c766aea 100644 --- a/src/components/explore/temperature/TemperatureMonthly.js +++ b/src/components/explore/temperature/TemperatureMonthly.jsx @@ -3,12 +3,12 @@ import useAppSettings from '../../../hooks/useAppSettings' import useEarthEngineClimateNormals from '../../../hooks/useEarthEngineClimateNormals' import useEarthEngineTimeSeries from '../../../hooks/useEarthEngineTimeSeries' import exploreStore from '../../../store/exploreStore' -import DataLoader from '../../shared/DataLoader' -import Resolution from '../../shared/Resolution' -import Chart from '../Chart' -import MonthlyPeriodSelect from '../MonthlyPeriodSelect' -import PeriodTypeSelect from '../PeriodTypeSelect' -import ReferencePeriod from '../ReferencePeriodSelect' +import DataLoader from '../../shared/DataLoader.jsx' +import Resolution from '../../shared/Resolution.jsx' +import Chart from '../Chart.jsx' +import MonthlyPeriodSelect from '../MonthlyPeriodSelect.jsx' +import PeriodTypeSelect from '../PeriodTypeSelect.jsx' +import ReferencePeriod from '../ReferencePeriodSelect.jsx' import getMonthlyConfig from './charts/temperatureMonthly' const TemperatureMonthly = () => { diff --git a/src/components/import/DataElement.js b/src/components/import/DataElement.jsx similarity index 100% rename from src/components/import/DataElement.js rename to src/components/import/DataElement.jsx diff --git a/src/components/import/Dataset.js b/src/components/import/Dataset.jsx similarity index 100% rename from src/components/import/Dataset.js rename to src/components/import/Dataset.jsx diff --git a/src/components/import/ExtractData.js b/src/components/import/ExtractData.jsx similarity index 92% rename from src/components/import/ExtractData.js rename to src/components/import/ExtractData.jsx index 9ce0b38..ce69665 100644 --- a/src/components/import/ExtractData.js +++ b/src/components/import/ExtractData.jsx @@ -3,9 +3,9 @@ import PropTypes from 'prop-types' import useEarthEngineData from '../../hooks/useEarthEngineData' import useOrgUnits from '../../hooks/useOrgUnits' import { getNumberOfDaysFromPeriod } from '../../utils/time' -import DataLoader from '../shared/DataLoader' -import ErrorMessage from '../shared/ErrorMessage' -import ImportData from './ImportData' +import DataLoader from '../shared/DataLoader.jsx' +import ErrorMessage from '../shared/ErrorMessage.jsx' +import ImportData from './ImportData.jsx' import styles from './styles/ExtractData.module.css' const ExtractData = ({ dataset, period, orgUnits, dataElement }) => { diff --git a/src/components/import/ImportData.js b/src/components/import/ImportData.jsx similarity index 92% rename from src/components/import/ImportData.js rename to src/components/import/ImportData.jsx index 1eeca19..0d9e528 100644 --- a/src/components/import/ImportData.js +++ b/src/components/import/ImportData.jsx @@ -2,9 +2,9 @@ import { useDataMutation } from '@dhis2/app-runtime' import i18n from '@dhis2/d2-i18n' import PropTypes from 'prop-types' import { useState, useEffect } from 'react' -import ImportError from './ImportError' -import ImportResponse from './ImportResponse' -import NoOrgUnitData from './NoOrgUnitData' +import ImportError from './ImportError.jsx' +import ImportResponse from './ImportResponse.jsx' +import NoOrgUnitData from './NoOrgUnitData.jsx' import styles from './styles/ImportData.module.css' const dataImportMutation = { diff --git a/src/components/import/ImportError.js b/src/components/import/ImportError.jsx similarity index 95% rename from src/components/import/ImportError.js rename to src/components/import/ImportError.jsx index f53b110..c1433c0 100644 --- a/src/components/import/ImportError.js +++ b/src/components/import/ImportError.jsx @@ -1,6 +1,6 @@ import i18n from '@dhis2/d2-i18n' import PropTypes from 'prop-types' -import ImportResponse from './ImportResponse' +import ImportResponse from './ImportResponse.jsx' import styles from './styles/ImportError.module.css' const ImportError = ({ response = {} }) => { diff --git a/src/components/import/ImportPage.js b/src/components/import/ImportPage.jsx similarity index 96% rename from src/components/import/ImportPage.js rename to src/components/import/ImportPage.jsx index fde8897..286a35c 100644 --- a/src/components/import/ImportPage.js +++ b/src/components/import/ImportPage.jsx @@ -9,13 +9,13 @@ import { getNumberOfDaysFromPeriod, isValidPeriod, } from '../../utils/time' -import GEETokenCheck from '../shared/GEETokenCheck' -import Resolution from '../shared/Resolution' -import DataElement from './DataElement' -import Dataset from './Dataset' -import ExtractData from './ExtractData' -import OrgUnits from './OrgUnits' -import Period from './Period' +import GEETokenCheck from '../shared/GEETokenCheck.jsx' +import Resolution from '../shared/Resolution.jsx' +import DataElement from './DataElement.jsx' +import Dataset from './Dataset.jsx' +import ExtractData from './ExtractData.jsx' +import OrgUnits from './OrgUnits.jsx' +import Period from './Period.jsx' import styles from './styles/ImportPage.module.css' const maxValues = 50000 diff --git a/src/components/import/ImportResponse.js b/src/components/import/ImportResponse.jsx similarity index 100% rename from src/components/import/ImportResponse.js rename to src/components/import/ImportResponse.jsx diff --git a/src/components/import/NoOrgUnitData.js b/src/components/import/NoOrgUnitData.jsx similarity index 100% rename from src/components/import/NoOrgUnitData.js rename to src/components/import/NoOrgUnitData.jsx diff --git a/src/components/import/OrgUnitLevel.js b/src/components/import/OrgUnitLevel.jsx similarity index 100% rename from src/components/import/OrgUnitLevel.js rename to src/components/import/OrgUnitLevel.jsx diff --git a/src/components/import/OrgUnitTree.js b/src/components/import/OrgUnitTree.jsx similarity index 100% rename from src/components/import/OrgUnitTree.js rename to src/components/import/OrgUnitTree.jsx diff --git a/src/components/import/OrgUnits.js b/src/components/import/OrgUnits.jsx similarity index 92% rename from src/components/import/OrgUnits.js rename to src/components/import/OrgUnits.jsx index e7be7a3..5cd6eca 100644 --- a/src/components/import/OrgUnits.js +++ b/src/components/import/OrgUnits.jsx @@ -1,7 +1,7 @@ import i18n from '@dhis2/d2-i18n' import PropTypes from 'prop-types' -import OrgUnitLevel from './OrgUnitLevel' -import OrgUnitTree from './OrgUnitTree' +import OrgUnitLevel from './OrgUnitLevel.jsx' +import OrgUnitTree from './OrgUnitTree.jsx' import styles from './styles/OrgUnits.module.css' const OrgUnits = ({ selected = {}, onChange }) => { diff --git a/src/components/import/Period.js b/src/components/import/Period.jsx similarity index 97% rename from src/components/import/Period.js rename to src/components/import/Period.jsx index bae2c2c..93f2645 100644 --- a/src/components/import/Period.js +++ b/src/components/import/Period.jsx @@ -2,7 +2,7 @@ import { useDataQuery } from '@dhis2/app-runtime' import i18n from '@dhis2/d2-i18n' import { CalendarInput } from '@dhis2/ui' import PropTypes from 'prop-types' -import TimeZone from '../shared/TimeZone' +import TimeZone from '../shared/TimeZone.jsx' import styles from './styles/Period.module.css' const userSettingsQuery = { diff --git a/src/components/settings/ChartSettings.js b/src/components/settings/ChartSettings.jsx similarity index 96% rename from src/components/settings/ChartSettings.js rename to src/components/settings/ChartSettings.jsx index 2420aa6..8ebcf44 100644 --- a/src/components/settings/ChartSettings.js +++ b/src/components/settings/ChartSettings.jsx @@ -1,7 +1,7 @@ import i18n from '@dhis2/d2-i18n' import useAppSettings from '../../hooks/useAppSettings' -import HeatCategory from './HeatCategory' -import NumberInput from './NumberInput' +import HeatCategory from './HeatCategory.jsx' +import NumberInput from './NumberInput.jsx' const ChartSettings = () => { const { settings, changeSetting } = useAppSettings() diff --git a/src/components/settings/HeatCategory.js b/src/components/settings/HeatCategory.jsx similarity index 100% rename from src/components/settings/HeatCategory.js rename to src/components/settings/HeatCategory.jsx diff --git a/src/components/settings/NumberInput.js b/src/components/settings/NumberInput.jsx similarity index 100% rename from src/components/settings/NumberInput.js rename to src/components/settings/NumberInput.jsx diff --git a/src/components/settings/SettingsPage.js b/src/components/settings/SettingsPage.jsx similarity index 84% rename from src/components/settings/SettingsPage.js rename to src/components/settings/SettingsPage.jsx index 615003d..6c8f895 100644 --- a/src/components/settings/SettingsPage.js +++ b/src/components/settings/SettingsPage.jsx @@ -1,9 +1,9 @@ import i18n from '@dhis2/d2-i18n' import useAppSettings from '../../hooks/useAppSettings' -import ChartSettings from './ChartSettings' -import StartPageSelect from './StartPageSelect' +import ChartSettings from './ChartSettings.jsx' +import StartPageSelect from './StartPageSelect.jsx' import styles from './styles/SettingsPage.module.css' -import TimeZoneSelect from './TimeZoneSelect' +import TimeZoneSelect from './TimeZoneSelect.jsx' const SettingsPage = () => { const { settings, changeSetting } = useAppSettings() diff --git a/src/components/settings/StartPageSelect.js b/src/components/settings/StartPageSelect.jsx similarity index 94% rename from src/components/settings/StartPageSelect.js rename to src/components/settings/StartPageSelect.jsx index 9a211fc..0665825 100644 --- a/src/components/settings/StartPageSelect.js +++ b/src/components/settings/StartPageSelect.jsx @@ -1,7 +1,7 @@ import i18n from '@dhis2/d2-i18n' import { SingleSelectField, SingleSelectOption } from '@dhis2/ui' import PropTypes from 'prop-types' -import { appPages } from '../Root' +import { appPages } from '../Root.jsx' const StartPageSelect = ({ startPage, onChange }) => ( { diff --git a/src/components/shared/DataLoader.js b/src/components/shared/DataLoader.jsx similarity index 100% rename from src/components/shared/DataLoader.js rename to src/components/shared/DataLoader.jsx diff --git a/src/components/shared/DatePicker.js b/src/components/shared/DatePicker.jsx similarity index 100% rename from src/components/shared/DatePicker.js rename to src/components/shared/DatePicker.jsx diff --git a/src/components/shared/ErrorMessage.js b/src/components/shared/ErrorMessage.jsx similarity index 100% rename from src/components/shared/ErrorMessage.js rename to src/components/shared/ErrorMessage.jsx diff --git a/src/components/shared/GEETokenCheck.js b/src/components/shared/GEETokenCheck.jsx similarity index 100% rename from src/components/shared/GEETokenCheck.js rename to src/components/shared/GEETokenCheck.jsx diff --git a/src/components/shared/MonthPicker.js b/src/components/shared/MonthPicker.jsx similarity index 100% rename from src/components/shared/MonthPicker.js rename to src/components/shared/MonthPicker.jsx diff --git a/src/components/shared/PeriodWarning.js b/src/components/shared/PeriodWarning.jsx similarity index 100% rename from src/components/shared/PeriodWarning.js rename to src/components/shared/PeriodWarning.jsx diff --git a/src/components/shared/Resolution.js b/src/components/shared/Resolution.jsx similarity index 100% rename from src/components/shared/Resolution.js rename to src/components/shared/Resolution.jsx diff --git a/src/components/shared/TimeZone.js b/src/components/shared/TimeZone.jsx similarity index 100% rename from src/components/shared/TimeZone.js rename to src/components/shared/TimeZone.jsx diff --git a/src/hooks/useExploreUri.js b/src/hooks/useExploreUri.js index b090b88..f773372 100644 --- a/src/hooks/useExploreUri.js +++ b/src/hooks/useExploreUri.js @@ -1,6 +1,6 @@ import { useState, useMemo, useEffect } from 'react' import { useNavigationType, useLocation, useParams } from 'react-router-dom' -import { referencePeriods } from '../components/explore/ReferencePeriodSelect' +import { referencePeriods } from '../components/explore/ReferencePeriodSelect.jsx' import exploreStore from '../store/exploreStore' import { MONTHLY } from '../utils/time' diff --git a/src/store/exploreStore.js b/src/store/exploreStore.js index 1194126..28a24ec 100644 --- a/src/store/exploreStore.js +++ b/src/store/exploreStore.js @@ -1,5 +1,5 @@ import { create } from 'zustand' -import { defaultReferencePeriod } from '../components/explore/ReferencePeriodSelect' +import { defaultReferencePeriod } from '../components/explore/ReferencePeriodSelect.jsx' import { getDefaultMonthlyPeriod, getDefaultExplorePeriod,