Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 1 addition & 19 deletions country-explorer/src/components/App.css
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
.country-selection {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
gap: 0.5rem;
margin: 1rem;
}

.country-selection select {
min-width: 0;
max-width: 100%;
padding: 0.5rem;
font: inherit;
color: var(--text-h);
background: var(--bg);
border: 1px solid var(--border);
border-radius: 4px;
}
/* Main layout styles go here. */
65 changes: 41 additions & 24 deletions country-explorer/src/components/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,41 @@ import './App.css';
import { useState } from 'react';
import { useCountries } from '../hooks/useCountries';
import CountryCard from './CountryCard';
import CountrySelector from './CountrySelector';
import RegionFilter from './RegionFilter';
import Loading from './Loading';
import ErrorMessage from './ErrorMessage';
import NavigationControls from './NavigationControls';

function App() {
const { countries, isLoading, isError, error, refetch } = useCountries();
const [selectedRegion, setSelectedRegion] = useState('');
// The fetched countries are European, so filter by their geographic subregion.
const getRegion = (country: (typeof countries)[number]) =>
country.subregion?.trim() || country.region?.trim() || 'Unknown region';
const regions = [...new Set(countries.map(getRegion))].sort();
const availableRegions =
regions.includes(selectedRegion) || !selectedRegion
? regions
: [...regions, selectedRegion].sort();
const filteredCountries = selectedRegion
? countries.filter((country) => getRegion(country) === selectedRegion)
: countries;
const [selectedCountryCode, setSelectedCountryCode] = useState<string | null>(null);
const selectedCountry =
countries.find((country) => country.code === selectedCountryCode) ?? countries[0];
filteredCountries.find((country) => country.code === selectedCountryCode) ??
filteredCountries[0];
const activeCountryCode = selectedCountry?.code ?? null;
const activeCountryIndex = countries.findIndex((country) => country.code === activeCountryCode);
const activeCountryIndex = filteredCountries.findIndex(
(country) => country.code === activeCountryCode,
);

function navigateCountry(direction: -1 | 1) {
setSelectedCountryCode((currentCode) => {
const currentIndex = countries.findIndex((country) => country.code === currentCode);
if (currentIndex === -1) return countries[0]?.code ?? null;
const currentIndex = filteredCountries.findIndex((country) => country.code === currentCode);
if (currentIndex === -1) return filteredCountries[0]?.code ?? null;

return countries[currentIndex + direction]?.code ?? currentCode;
return filteredCountries[currentIndex + direction]?.code ?? currentCode;
});
}

Expand All @@ -39,23 +56,19 @@ function App() {
<main>
<section aria-labelledby="controls-heading">
<h2 id="controls-heading">Filters and selection</h2>
{/* RegionFilter and SortSelector go here */}
<div className="country-selection">
<label htmlFor="country-select">Country</label>
<select
id="country-select"
value={activeCountryCode ?? ''}
onChange={(event) => setSelectedCountryCode(event.target.value)}
disabled={isLoading || isError || countries.length === 0}
>
{countries.length === 0 && <option value="">No countries available</option>}
{countries.map((country) => (
<option key={country.code} value={country.code}>
{country.name || country.code}
</option>
))}
</select>
</div>
{/* SortSelector goes here */}
<RegionFilter
regions={availableRegions}
selectedRegion={selectedRegion}
onRegionChange={setSelectedRegion}
disabled={isLoading || isError}
/>
<CountrySelector
countries={filteredCountries}
selectedCountryCode={activeCountryCode}
onSelectCountry={setSelectedCountryCode}
disabled={isLoading || isError}
/>
</section>

<section aria-labelledby="country-heading">
Expand All @@ -72,13 +85,17 @@ function App() {
<CountryCard country={selectedCountry} />
<NavigationControls
currentIndex={activeCountryIndex}
totalCountries={countries.length}
totalCountries={filteredCountries.length}
onPrevious={() => navigateCountry(-1)}
onNext={() => navigateCountry(1)}
/>
</>
) : (
<p>No countries available.</p>
<p role="status">
{selectedRegion
? 'No countries match the selected region.'
: 'No countries available.'}
</p>
)}
{/* FavoriteButton goes here */}
</section>
Expand Down
24 changes: 24 additions & 0 deletions country-explorer/src/components/CountrySelector.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.country-selection {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
gap: 0.5rem;
margin: 1rem;
}

.country-selection select {
min-width: 0;
max-width: 100%;
padding: 0.5rem;
font: inherit;
color: var(--text-h);
background: var(--bg);
border: 1px solid var(--border);
border-radius: 4px;
}

.country-selection select:focus-visible {
outline: 2px solid var(--accent);
outline-offset: 3px;
}
46 changes: 46 additions & 0 deletions country-explorer/src/components/CountrySelector.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { useId } from 'react';
import type { Country } from '../types/country';
import './CountrySelector.css';

interface CountrySelectorProps {
countries: Country[];
selectedCountryCode: string | null;
onSelectCountry: (code: string) => void;
disabled?: boolean;
}

function CountrySelector({
countries,
selectedCountryCode,
onSelectCountry,
disabled = false,
}: CountrySelectorProps) {
const selectId = useId();

return (
<div className="country-selection">
<label htmlFor={selectId}>Country</label>
<select
id={selectId}
value={selectedCountryCode ?? ''}
onChange={(event) => onSelectCountry(event.target.value)}
disabled={disabled || countries.length === 0}
>
{countries.length === 0 ? (
<option value="">No countries available</option>
) : (
<>
{selectedCountryCode === null && <option value="">Select a country</option>}
{countries.map((country) => (
<option key={country.code} value={country.code}>
{country.name || country.code}
</option>
))}
</>
)}
</select>
</div>
);
}

export default CountrySelector;
24 changes: 24 additions & 0 deletions country-explorer/src/components/RegionFilter.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.region-filter {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
gap: 0.5rem;
margin: 1rem;
}

.region-filter select {
min-width: 0;
max-width: 100%;
padding: 0.5rem;
font: inherit;
color: var(--text-h);
background: var(--bg);
border: 1px solid var(--border);
border-radius: 4px;
}

.region-filter select:focus-visible {
outline: 2px solid var(--accent);
outline-offset: 3px;
}
39 changes: 39 additions & 0 deletions country-explorer/src/components/RegionFilter.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { useId } from 'react';
import './RegionFilter.css';

interface RegionFilterProps {
regions: string[];
selectedRegion: string;
onRegionChange: (region: string) => void;
disabled?: boolean;
}

function RegionFilter({
regions,
selectedRegion,
onRegionChange,
disabled = false,
}: RegionFilterProps) {
const selectId = useId();

return (
<div className="region-filter">
<label htmlFor={selectId}>Region</label>
<select
id={selectId}
value={selectedRegion}
onChange={(event) => onRegionChange(event.target.value)}
disabled={disabled}
>
<option value="">All regions</option>
{regions.map((region) => (
<option key={region} value={region}>
{region}
</option>
))}
</select>
</div>
);
}

export default RegionFilter;