From 70e82b176c653b0d127e20d2011c582a8c990e57 Mon Sep 17 00:00:00 2001 From: Aneet Singh Sahota Date: Mon, 6 May 2024 16:13:53 -0700 Subject: [PATCH 1/3] final commit --- README.md | 6 - actions/action.js | 43 ++++ api/index.js | 3 + api/weatherApi.js | 26 +++ app.js | 44 ++++ app/favicon.ico | Bin 25931 -> 0 bytes app/globals.css | 107 --------- app/layout.js | 17 -- app/page.js | 95 -------- components/humiditySparkline.js | 42 ++++ components/pressureSparkline.js | 40 ++++ components/searchForm.js | 29 +++ components/weatherComponent.js | 38 ++++ components/weatherSparkline.js | 43 ++++ index.js | 20 ++ layout.js | 16 ++ package-lock.json | 304 +++++++++++++++++++------ package.json | 12 +- app/page.module.css => page.module.css | 28 ++- reducers/rootReducer.js | 11 + reducers/weatherReducer.js | 42 ++++ store.js | 13 ++ 22 files changed, 685 insertions(+), 294 deletions(-) delete mode 100644 README.md create mode 100644 actions/action.js create mode 100644 api/index.js create mode 100644 api/weatherApi.js create mode 100644 app.js delete mode 100644 app/favicon.ico delete mode 100644 app/globals.css delete mode 100644 app/layout.js delete mode 100644 app/page.js create mode 100644 components/humiditySparkline.js create mode 100644 components/pressureSparkline.js create mode 100644 components/searchForm.js create mode 100644 components/weatherComponent.js create mode 100644 components/weatherSparkline.js create mode 100644 index.js create mode 100644 layout.js rename app/page.module.css => page.module.css (92%) create mode 100644 reducers/rootReducer.js create mode 100644 reducers/weatherReducer.js create mode 100644 store.js diff --git a/README.md b/README.md deleted file mode 100644 index 99d321a..0000000 --- a/README.md +++ /dev/null @@ -1,6 +0,0 @@ -## Weather Project - -This project has been created by a student at Parsity, an online software engineering course. The work in this repository is wholly of the student based on a sample starter project that can be accessed by looking at the repository that this project forks. - -If you have any questions about this project or the program in general, visit [parsity.io](https://parsity.io/) or email hello@parsity.io. - diff --git a/actions/action.js b/actions/action.js new file mode 100644 index 0000000..932dfe3 --- /dev/null +++ b/actions/action.js @@ -0,0 +1,43 @@ +// Async Action Creator +export const fetchWeatherData = (cityName) => { + + return async (dispatch) => { + dispatch(fetchWeatherRequest()); + try { + const apiKey = '281a2c6bad4d09515b929ae2c5dc15be'; + const apiUrl = `https://api.openweathermap.org/data/2.5/weather?q=${cityName}&appid=${apiKey}`; + + const response = await fetch(apiUrl); + if (!response.ok) { + throw new Error('Network response was not ok'); + } + const data = await response.json(); + + // Extract specific weather metrics + const temperature = extractTemperature(data); + const humidity = extractHumidity(data); + const pressure = extractPressure(data); + + // Dispatch success action with extracted data + dispatch(fetchWeatherSuccess({ temperature, humidity, pressure })); + } catch (error) { + dispatch(fetchWeatherFailure(error.message)); + } + }; +}; + +// Helper functions to extract specific weather metrics +const extractTemperature = (data) => { + // Extract temperature from data (example, you may need to convert units or access nested objects based on the API response structure) + return data.main.temp; +}; + +const extractHumidity = (data) => { + // Extract humidity from data + return data.main.humidity; +}; + +const extractPressure = (data) => { + // Extract pressure from data + return data.main.pressure; +}; diff --git a/api/index.js b/api/index.js new file mode 100644 index 0000000..4860c1e --- /dev/null +++ b/api/index.js @@ -0,0 +1,3 @@ +// api/index.js +export * from './weatherApi'; + diff --git a/api/weatherApi.js b/api/weatherApi.js new file mode 100644 index 0000000..a2f2135 --- /dev/null +++ b/api/weatherApi.js @@ -0,0 +1,26 @@ +// api/weatherApi.js + +import { fetchWeatherSuccess, fetchWeatherFailure } from '../redux/weatherActions'; +import { extractTemperature, extractHumidity, extractPressure } from './apiUtils'; + +const apiKey = '281a2c6bad4d09515b929ae2c5dc15be'; +const apiUrl = (cityName) => `https://api.openweathermap.org/data/2.5/weather?q=${cityName}&appid=${apiKey}`; + +export const fetchWeatherData = async (cityName, dispatch) => { + try { + const response = await fetch(apiUrl(cityName)); + if (!response.ok) { + throw new Error('Network response was not ok'); + } + const data = await response.json(); + + const temperature = extractTemperature(data); + const humidity = extractHumidity(data); + const pressure = extractPressure(data); + + dispatch(fetchWeatherSuccess({ temperature, humidity, pressure })); + } catch (error) { + dispatch(fetchWeatherFailure(error.message)); + } +}; + diff --git a/app.js b/app.js new file mode 100644 index 0000000..73a3d92 --- /dev/null +++ b/app.js @@ -0,0 +1,44 @@ +// App.js +import React from 'react'; +import { Provider } from 'react-redux'; +import store from './store'; +import WeatherComponent from './WeatherComponent'; +import { fetchWeatherData } from './weatherApi'; + +function App() { + const [forecastData, setForecastData] = useState([]); + + onst [loading, setLoading] = useState(true); + const [error, setError] = useState(null); + + useEffect(() => { + const fetchData = async () => { + try { + const data = await fetchWeatherData(); + setForecastData(data); + setLoading(false); + } catch (error) { + console.error('Error fetching weather data:', error); + setError(error); + setLoading(false); + } + }; + + fetchData(); + }, []); + + if (loading) return
Loading...
; + if (error) return
Error: {error.message}
; + + + return ( + +
+ +
+
+ ); +} + +export default App; + diff --git a/app/favicon.ico b/app/favicon.ico deleted file mode 100644 index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 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 LrJugUA?W`A8`#=m diff --git a/app/globals.css b/app/globals.css deleted file mode 100644 index d4f491e..0000000 --- a/app/globals.css +++ /dev/null @@ -1,107 +0,0 @@ -:root { - --max-width: 1100px; - --border-radius: 12px; - --font-mono: ui-monospace, Menlo, Monaco, 'Cascadia Mono', 'Segoe UI Mono', - 'Roboto Mono', 'Oxygen Mono', 'Ubuntu Monospace', 'Source Code Pro', - 'Fira Mono', 'Droid Sans Mono', 'Courier New', monospace; - - --foreground-rgb: 0, 0, 0; - --background-start-rgb: 214, 219, 220; - --background-end-rgb: 255, 255, 255; - - --primary-glow: conic-gradient( - from 180deg at 50% 50%, - #16abff33 0deg, - #0885ff33 55deg, - #54d6ff33 120deg, - #0071ff33 160deg, - transparent 360deg - ); - --secondary-glow: radial-gradient( - rgba(255, 255, 255, 1), - rgba(255, 255, 255, 0) - ); - - --tile-start-rgb: 239, 245, 249; - --tile-end-rgb: 228, 232, 233; - --tile-border: conic-gradient( - #00000080, - #00000040, - #00000030, - #00000020, - #00000010, - #00000010, - #00000080 - ); - - --callout-rgb: 238, 240, 241; - --callout-border-rgb: 172, 175, 176; - --card-rgb: 180, 185, 188; - --card-border-rgb: 131, 134, 135; -} - -@media (prefers-color-scheme: dark) { - :root { - --foreground-rgb: 255, 255, 255; - --background-start-rgb: 0, 0, 0; - --background-end-rgb: 0, 0, 0; - - --primary-glow: radial-gradient(rgba(1, 65, 255, 0.4), rgba(1, 65, 255, 0)); - --secondary-glow: linear-gradient( - to bottom right, - rgba(1, 65, 255, 0), - rgba(1, 65, 255, 0), - rgba(1, 65, 255, 0.3) - ); - - --tile-start-rgb: 2, 13, 46; - --tile-end-rgb: 2, 5, 19; - --tile-border: conic-gradient( - #ffffff80, - #ffffff40, - #ffffff30, - #ffffff20, - #ffffff10, - #ffffff10, - #ffffff80 - ); - - --callout-rgb: 20, 20, 20; - --callout-border-rgb: 108, 108, 108; - --card-rgb: 100, 100, 100; - --card-border-rgb: 200, 200, 200; - } -} - -* { - box-sizing: border-box; - padding: 0; - margin: 0; -} - -html, -body { - max-width: 100vw; - overflow-x: hidden; -} - -body { - color: rgb(var(--foreground-rgb)); - background: linear-gradient( - to bottom, - transparent, - rgb(var(--background-end-rgb)) - ) - rgb(var(--background-start-rgb)); -} - -a { - color: inherit; - text-decoration: none; -} - -@media (prefers-color-scheme: dark) { - html { - color-scheme: dark; - } -} diff --git a/app/layout.js b/app/layout.js deleted file mode 100644 index c93f806..0000000 --- a/app/layout.js +++ /dev/null @@ -1,17 +0,0 @@ -import './globals.css' -import { Inter } from 'next/font/google' - -const inter = Inter({ subsets: ['latin'] }) - -export const metadata = { - title: 'Create Next App', - description: 'Generated by create next app', -} - -export default function RootLayout({ children }) { - return ( - - {children} - - ) -} diff --git a/app/page.js b/app/page.js deleted file mode 100644 index f049c39..0000000 --- a/app/page.js +++ /dev/null @@ -1,95 +0,0 @@ -import Image from 'next/image' -import styles from './page.module.css' - -export default function Home() { - return ( -
-
-

- Get started by editing  - app/page.js -

- -
- -
- Next.js Logo -
- - -
- ) -} diff --git a/components/humiditySparkline.js b/components/humiditySparkline.js new file mode 100644 index 0000000..ed4649c --- /dev/null +++ b/components/humiditySparkline.js @@ -0,0 +1,42 @@ +// HumiditySparkline.js +import React from 'react'; +import { Line } from 'react-chartjs-2'; + +const HumiditySparkline = ({ humidityData }) => { + const humidityValues = humidityData.map(data => data.humidity); + const labels = humidityData.map(data => data.day); + + + const data = { + labels: humidityData.map(data => data.day), + datasets: [{ + label: 'Humidity', + data: humidityValues, + borderColor: 'rgba(75, 192, 192, 1)', + borderWidth: 1, + fill: false + }] + }; + + const options = { + responsive: true, + maintainAspectRatio: false, + legend: { + display: false + }, + scales: { + xAxes: [{ + display: false + }], + yAxes: [{ + display: false + }] + } + }; + + return ( + + ); +}; + +export default HumiditySparkline; diff --git a/components/pressureSparkline.js b/components/pressureSparkline.js new file mode 100644 index 0000000..a17e68d --- /dev/null +++ b/components/pressureSparkline.js @@ -0,0 +1,40 @@ +// PressureSparkline.js +import React from 'react'; +import { Line } from 'react-chartjs-2'; + +const PressureSparkline = ({ pressureData }) => { + const pressureValues = pressureData.map(data => data.pressure); // Assuming pressureData is an array of objects with 'pressure' property + + const data = { + labels: pressureData.map(data => data.day), + datasets: [{ + label: 'Pressure', + data: pressureValues, + borderColor: 'rgba(255, 99, 132, 1)', + borderWidth: 1, + fill: false + }] + }; + + const options = { + responsive: true, + maintainAspectRatio: false, + legend: { + display: false + }, + scales: { + xAxes: [{ + display: false + }], + yAxes: [{ + display: false + }] + } + }; + + return ( + + ); +}; + +export default PressureSparkline; diff --git a/components/searchForm.js b/components/searchForm.js new file mode 100644 index 0000000..1beb2dd --- /dev/null +++ b/components/searchForm.js @@ -0,0 +1,29 @@ +// components/SearchForm.js +import React, { useState } from 'react'; +import { useDispatch } from 'react-redux'; +import { fetchWeather } from '../actions/weatherActions'; + +const SearchForm = () => { + const [city, setCity] = useState(''); + const dispatch = useDispatch(); + + const handleSubmit = (e) => { + e.preventDefault(); + dispatch(fetchWeather(city)); + setCity(''); + }; + + return ( +
+ setCity(e.target.value)} + /> + +
+ ); +}; + +export default SearchForm; diff --git a/components/weatherComponent.js b/components/weatherComponent.js new file mode 100644 index 0000000..4f2a79f --- /dev/null +++ b/components/weatherComponent.js @@ -0,0 +1,38 @@ +// WeatherComponent.js +import React, { useEffect } from 'react'; +import { useSelector, useDispatch } from 'react-redux'; +import { fetchWeatherData } from './actions/weatherActions'; +import WeatherSparkline from './weatherSparkline'; + +const WeatherComponent = () => { + const dispatch = useDispatch(); + const weatherData = useSelector(state => state.weather.weatherData); + const humidityData = useSelector(state => state.weather.humidityData); + const pressureData = useSelector(state => state.weather.pressureData); + const loading = useSelector(state => state.weather.loading); + const error = useSelector(state => state.weather.error); + + useEffect(() => { + dispatch(fetchWeatherData('weather')); // Fetch weather data + dispatch(fetchWeatherData('humidity')); // Fetch humidity data + dispatch(fetchWeatherData('pressure')); // Fetch pressure data + }, [dispatch]); + + if (loading) return
Loading forecasts...
; + if (error) return
Error: {error.message}
; + + return ( +
+

Weather Forecast

+ + +

Humidity Forecast

+ + +

Pressure Forecast

+ +
+ ); +}; + +export default WeatherComponent; diff --git a/components/weatherSparkline.js b/components/weatherSparkline.js new file mode 100644 index 0000000..165d17d --- /dev/null +++ b/components/weatherSparkline.js @@ -0,0 +1,43 @@ +import React from 'react'; +import { Line } from 'react-chartjs-2'; + +const WeatherSparkline = ({ weatherData }) => { + // Extract temperature values for sparkline + const temperatures = weatherData.map(data => data.temperature); + + // Define chart data + const data = { + labels: weatherData.map(data => data.day), + datasets: [{ + label: 'Temperature', + data: temperatures, + borderColor: 'rgba(75, 192, 192, 1)', + borderWidth: 1, + fill: false + }] + }; + + // Define chart options + const options = { + responsive: true, + maintainAspectRatio: false, + legend: { + display: false + }, + scales: { + xAxes: [{ + display: false + }], + yAxes: [{ + display: false + }] + } + }; + + return ( + + ); +}; + +export default WeatherSparkline; + diff --git a/index.js b/index.js new file mode 100644 index 0000000..490148d --- /dev/null +++ b/index.js @@ -0,0 +1,20 @@ +import React from 'react'; +import { useDispatch } from 'react-redux'; // Import the useDispatch hook +import styles from './page.module.css'; +import SearchForm from './components/SearchForm'; +import { fetchWeatherData } from './actions/weatherActions'; // Import the action creator + +export default function Home() { + const dispatch = useDispatch(); // Initialize useDispatch hook + + const handleSubmit = (city) => { + console.log('Submitted city:', city); + dispatch(fetchWeatherData(city)); // Dispatch an action to fetch weather data based on the city + }; + + return ( +
+ +
+ ); +} diff --git a/layout.js b/layout.js new file mode 100644 index 0000000..2001c0a --- /dev/null +++ b/layout.js @@ -0,0 +1,16 @@ +'use client'; +import './globals.css'; +import { Inter } from 'next/font/google'; +import { Provider } from 'react-redux'; +import store from './store/configureStore'; +const inter = Inter({ subsets: ['latin'] }); + +export default function RootLayout({ children }) { + return ( + + + {children} + + + ); +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 90f6bb1..b45ba45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,11 +8,19 @@ "name": "parsity_rtk_weather", "version": "0.1.0", "dependencies": { + "axios": "^1.6.8", + "chart.js": "^4.4.2", "eslint": "8.50.0", "eslint-config-next": "13.5.3", - "next": "13.5.3", + "next": "^13.5.6", "react": "18.2.0", - "react-dom": "18.2.0" + "react-chartjs-2": "^5.2.0", + "react-dom": "18.2.0", + "react-redux": "^9.1.0", + "redux": "^5.0.1" + }, + "devDependencies": { + "@types/redux": "^3.6.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -116,10 +124,15 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==" }, + "node_modules/@kurkle/color": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz", + "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==" + }, "node_modules/@next/env": { - "version": "13.5.3", - "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.3.tgz", - "integrity": "sha512-X4te86vsbjsB7iO4usY9jLPtZ827Mbx+WcwNBGUOIuswuTAKQtzsuoxc/6KLxCMvogKG795MhrR1LDhYgDvasg==" + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.6.tgz", + "integrity": "sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==" }, "node_modules/@next/eslint-plugin-next": { "version": "13.5.3", @@ -130,9 +143,9 @@ } }, "node_modules/@next/swc-darwin-arm64": { - "version": "13.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.3.tgz", - "integrity": "sha512-6hiYNJxJmyYvvKGrVThzo4nTcqvqUTA/JvKim7Auaj33NexDqSNwN5YrrQu+QhZJCIpv2tULSHt+lf+rUflLSw==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz", + "integrity": "sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA==", "cpu": [ "arm64" ], @@ -145,9 +158,9 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "13.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.3.tgz", - "integrity": "sha512-UpBKxu2ob9scbpJyEq/xPgpdrgBgN3aLYlxyGqlYX5/KnwpJpFuIHU2lx8upQQ7L+MEmz+fA1XSgesoK92ppwQ==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.6.tgz", + "integrity": "sha512-6cgBfxg98oOCSr4BckWjLLgiVwlL3vlLj8hXg2b+nDgm4bC/qVXXLfpLB9FHdoDu4057hzywbxKvmYGmi7yUzA==", "cpu": [ "x64" ], @@ -160,9 +173,9 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "13.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.3.tgz", - "integrity": "sha512-5AzM7Yx1Ky+oLY6pHs7tjONTF22JirDPd5Jw/3/NazJ73uGB05NqhGhB4SbeCchg7SlVYVBeRMrMSZwJwq/xoA==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.6.tgz", + "integrity": "sha512-txagBbj1e1w47YQjcKgSU4rRVQ7uF29YpnlHV5xuVUsgCUf2FmyfJ3CPjZUvpIeXCJAoMCFAoGnbtX86BK7+sg==", "cpu": [ "arm64" ], @@ -175,9 +188,9 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "13.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.3.tgz", - "integrity": "sha512-A/C1shbyUhj7wRtokmn73eBksjTM7fFQoY2v/0rTM5wehpkjQRLOXI8WJsag2uLhnZ4ii5OzR1rFPwoD9cvOgA==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.6.tgz", + "integrity": "sha512-cGd+H8amifT86ZldVJtAKDxUqeFyLWW+v2NlBULnLAdWsiuuN8TuhVBt8ZNpCqcAuoruoSWynvMWixTFcroq+Q==", "cpu": [ "arm64" ], @@ -190,9 +203,9 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "13.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.3.tgz", - "integrity": "sha512-FubPuw/Boz8tKkk+5eOuDHOpk36F80rbgxlx4+xty/U71e3wZZxVYHfZXmf0IRToBn1Crb8WvLM9OYj/Ur815g==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.6.tgz", + "integrity": "sha512-Mc2b4xiIWKXIhBy2NBTwOxGD3nHLmq4keFk+d4/WL5fMsB8XdJRdtUlL87SqVCTSaf1BRuQQf1HvXZcy+rq3Nw==", "cpu": [ "x64" ], @@ -205,9 +218,9 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "13.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.3.tgz", - "integrity": "sha512-DPw8nFuM1uEpbX47tM3wiXIR0Qa+atSzs9Q3peY1urkhofx44o7E1svnq+a5Q0r8lAcssLrwiM+OyJJgV/oj7g==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.6.tgz", + "integrity": "sha512-CFHvP9Qz98NruJiUnCe61O6GveKKHpJLloXbDSWRhqhkJdZD2zU5hG+gtVJR//tyW897izuHpM6Gtf6+sNgJPQ==", "cpu": [ "x64" ], @@ -220,9 +233,9 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "13.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.3.tgz", - "integrity": "sha512-zBPSP8cHL51Gub/YV8UUePW7AVGukp2D8JU93IHbVDu2qmhFAn9LWXiOOLKplZQKxnIPUkJTQAJDCWBWU4UWUA==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.6.tgz", + "integrity": "sha512-aFv1ejfkbS7PUa1qVPwzDHjQWQtknzAZWGTKYIAaS4NMtBlk3VyA6AYn593pqNanlicewqyl2jUhQAaFV/qXsg==", "cpu": [ "arm64" ], @@ -235,9 +248,9 @@ } }, "node_modules/@next/swc-win32-ia32-msvc": { - "version": "13.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.3.tgz", - "integrity": "sha512-ONcL/lYyGUj4W37D4I2I450SZtSenmFAvapkJQNIJhrPMhzDU/AdfLkW98NvH1D2+7FXwe7yclf3+B7v28uzBQ==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.6.tgz", + "integrity": "sha512-XqqpHgEIlBHvzwG8sp/JXMFkLAfGLqkbVsyN+/Ih1mR8INb6YCc2x/Mbwi6hsAgUnqQztz8cvEbHJUbSl7RHDg==", "cpu": [ "ia32" ], @@ -250,9 +263,9 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "13.5.3", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.3.tgz", - "integrity": "sha512-2Vz2tYWaLqJvLcWbbTlJ5k9AN6JD7a5CN2pAeIzpbecK8ZF/yobA39cXtv6e+Z8c5UJuVOmaTldEAIxvsIux/Q==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.6.tgz", + "integrity": "sha512-Cqfe1YmOS7k+5mGu92nl5ULkzpKuxJrP3+4AEuPmrpFZ3BHxTY3TnHmU1On3bFmFFs6FbTcdF58CCUProGpIGQ==", "cpu": [ "x64" ], @@ -314,6 +327,21 @@ "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==" }, + "node_modules/@types/redux": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@types/redux/-/redux-3.6.0.tgz", + "integrity": "sha512-ic+60DXHW5seNyqFvfr7Sk5cnXs+HsF9tIeIaxjOuSP5kzgDXC+AzKTYmjAfuLx4Sccm/0vjwBQj3OOkUkwOqg==", + "deprecated": "This is a stub types definition for Redux (https://github.com/reactjs/redux). Redux provides its own type definitions, so you don't need @types/redux installed!", + "dev": true, + "dependencies": { + "redux": "*" + } + }, + "node_modules/@types/use-sync-external-store": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz", + "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==" + }, "node_modules/@typescript-eslint/parser": { "version": "6.7.3", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.3.tgz", @@ -615,6 +643,11 @@ "has-symbols": "^1.0.3" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/available-typed-arrays": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", @@ -634,6 +667,16 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", + "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/axobject-query": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", @@ -732,6 +775,17 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/chart.js": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.2.tgz", + "integrity": "sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==", + "dependencies": { + "@kurkle/color": "^0.3.0" + }, + "engines": { + "pnpm": ">=8" + } + }, "node_modules/client-only": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", @@ -753,6 +807,17 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -826,6 +891,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/dequal": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", @@ -1491,6 +1564,25 @@ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==" }, + "node_modules/follow-redirects": { + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", @@ -1499,6 +1591,19 @@ "is-callable": "^1.1.3" } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -2270,6 +2375,25 @@ "node": ">=8.6" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -2295,9 +2419,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "funding": [ { "type": "github", @@ -2317,18 +2441,17 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" }, "node_modules/next": { - "version": "13.5.3", - "resolved": "https://registry.npmjs.org/next/-/next-13.5.3.tgz", - "integrity": "sha512-4Nt4HRLYDW/yRpJ/QR2t1v63UOMS55A38dnWv3UDOWGezuY0ZyFO1ABNbD7mulVzs9qVhgy2+ppjdsANpKP1mg==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", + "integrity": "sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw==", "dependencies": { - "@next/env": "13.5.3", + "@next/env": "13.5.6", "@swc/helpers": "0.5.2", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001406", - "postcss": "8.4.14", + "postcss": "8.4.31", "styled-jsx": "5.1.1", - "watchpack": "2.4.0", - "zod": "3.21.4" + "watchpack": "2.4.0" }, "bin": { "next": "dist/bin/next" @@ -2337,15 +2460,15 @@ "node": ">=16.14.0" }, "optionalDependencies": { - "@next/swc-darwin-arm64": "13.5.3", - "@next/swc-darwin-x64": "13.5.3", - "@next/swc-linux-arm64-gnu": "13.5.3", - "@next/swc-linux-arm64-musl": "13.5.3", - "@next/swc-linux-x64-gnu": "13.5.3", - "@next/swc-linux-x64-musl": "13.5.3", - "@next/swc-win32-arm64-msvc": "13.5.3", - "@next/swc-win32-ia32-msvc": "13.5.3", - "@next/swc-win32-x64-msvc": "13.5.3" + "@next/swc-darwin-arm64": "13.5.6", + "@next/swc-darwin-x64": "13.5.6", + "@next/swc-linux-arm64-gnu": "13.5.6", + "@next/swc-linux-arm64-musl": "13.5.6", + "@next/swc-linux-x64-gnu": "13.5.6", + "@next/swc-linux-x64-musl": "13.5.6", + "@next/swc-win32-arm64-msvc": "13.5.6", + "@next/swc-win32-ia32-msvc": "13.5.6", + "@next/swc-win32-x64-msvc": "13.5.6" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", @@ -2588,9 +2711,9 @@ } }, "node_modules/postcss": { - "version": "8.4.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz", - "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "funding": [ { "type": "opencollective", @@ -2599,10 +2722,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -2628,6 +2755,11 @@ "react-is": "^16.13.1" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/punycode": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", @@ -2666,6 +2798,15 @@ "node": ">=0.10.0" } }, + "node_modules/react-chartjs-2": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-5.2.0.tgz", + "integrity": "sha512-98iN5aguJyVSxp5U3CblRLH67J8gkfyGNbiK3c+l1QI/G4irHMPQw44aEPmjVag+YKTyQ260NcF82GTQ3bdscA==", + "peerDependencies": { + "chart.js": "^4.1.1", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/react-dom": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", @@ -2683,6 +2824,37 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, + "node_modules/react-redux": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.1.0.tgz", + "integrity": "sha512-6qoDzIO+gbrza8h3hjMA9aq4nwVFCKFtY2iLxCtVT38Swyy2C/dJCGBXHeHLtx6qlg/8qzc2MrhOeduf5K32wQ==", + "dependencies": { + "@types/use-sync-external-store": "^0.0.3", + "use-sync-external-store": "^1.0.0" + }, + "peerDependencies": { + "@types/react": "^18.2.25", + "react": "^18.0", + "react-native": ">=0.69", + "redux": "^5.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "react-native": { + "optional": true + }, + "redux": { + "optional": true + } + } + }, + "node_modules/redux": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz", + "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==" + }, "node_modules/reflect.getprototypeof": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz", @@ -2906,9 +3078,9 @@ } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "engines": { "node": ">=0.10.0" } @@ -3225,6 +3397,14 @@ "punycode": "^2.1.0" } }, + "node_modules/use-sync-external-store": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz", + "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/watchpack": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", @@ -3343,14 +3523,6 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } - }, - "node_modules/zod": { - "version": "3.21.4", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz", - "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==", - "funding": { - "url": "https://github.com/sponsors/colinhacks" - } } } } diff --git a/package.json b/package.json index 6ca0f8f..3c92dea 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,18 @@ "lint": "next lint" }, "dependencies": { + "axios": "^1.6.8", + "chart.js": "^4.4.2", "eslint": "8.50.0", "eslint-config-next": "13.5.3", - "next": "13.5.3", + "next": "^13.5.6", "react": "18.2.0", - "react-dom": "18.2.0" + "react-chartjs-2": "^5.2.0", + "react-dom": "18.2.0", + "react-redux": "^9.1.0", + "redux": "^5.0.1" + }, + "devDependencies": { + "@types/redux": "^3.6.0" } } diff --git a/app/page.module.css b/page.module.css similarity index 92% rename from app/page.module.css rename to page.module.css index 6676d2c..13460df 100644 --- a/app/page.module.css +++ b/page.module.css @@ -7,6 +7,32 @@ min-height: 100vh; } +.form { + display: flex; + flex-direction: column; + align-items: center; +} + +.inputRow, +.buttonRow { + display: flex; + justify-content: center; +} + +.inputRow { + margin-bottom: 10px; +} + +.labels { + display: flex; + flex-wrap: wrap; + justify-content: center; +} + +.label { + margin-right: 10px; +} + .description { display: inherit; justify-content: inherit; @@ -97,7 +123,7 @@ .center::before, .center::after { - content: ''; + content: ""; left: 50%; position: absolute; filter: blur(45px); diff --git a/reducers/rootReducer.js b/reducers/rootReducer.js new file mode 100644 index 0000000..94334db --- /dev/null +++ b/reducers/rootReducer.js @@ -0,0 +1,11 @@ +// rootReducer.js +import { combineReducers } from 'redux'; +import weatherReducer from './weatherReducer'; +import anotherReducer from './anotherReducer'; + +const rootReducer = combineReducers({ + weather: weatherReducer, + another: anotherReducer, +}); + +export default rootReducer; diff --git a/reducers/weatherReducer.js b/reducers/weatherReducer.js new file mode 100644 index 0000000..3d611ba --- /dev/null +++ b/reducers/weatherReducer.js @@ -0,0 +1,42 @@ +import { + FETCH_WEATHER_REQUEST, + FETCH_WEATHER_SUCCESS, + FETCH_WEATHER_FAILURE, +} from '../actions/weatherActions'; + +const initialState = { + weatherData: null, // Change from array to object or null + humidityData: null, // Change from array to object or null + pressureData: null, // Change from array to object or null + loading: false, + error: null, +}; + +const weatherReducer = (state = initialState, action) => { + switch (action.type) { + case FETCH_WEATHER_REQUEST: + return { + ...state, + loading: true, + error: null, + }; + case FETCH_WEATHER_SUCCESS: + return { + ...state, + weatherData: action.payload.weatherData, + humidityData: action.payload.humidityData, + pressureData: action.payload.pressureData, + loading: false, + }; + case FETCH_WEATHER_FAILURE: + return { + ...state, + loading: false, + error: action.payload, + }; + default: + return state; + } +}; + +export default weatherReducer; diff --git a/store.js b/store.js new file mode 100644 index 0000000..0daa1fe --- /dev/null +++ b/store.js @@ -0,0 +1,13 @@ +import { createStore, applyMiddleware } from 'redux'; +import thunk from 'redux-thunk'; +import rootReducer from './reducers/weatherReducer'; + +const middleware = [thunk]; + +const store = createStore( + rootReducer, + applyMiddleware(...middleware) +); + +export default store; + From 7929fe3614cab183ffca4c84d9d90214618db3fe Mon Sep 17 00:00:00 2001 From: Aneet Singh Sahota Date: Tue, 7 May 2024 14:08:57 -0700 Subject: [PATCH 2/3] add page folder --- index.js => pages/index.js | 6 +++--- reducers/rootReducer.js | 5 ++--- store.js | 14 ++++++-------- 3 files changed, 11 insertions(+), 14 deletions(-) rename index.js => pages/index.js (72%) diff --git a/index.js b/pages/index.js similarity index 72% rename from index.js rename to pages/index.js index 490148d..e1e79c2 100644 --- a/index.js +++ b/pages/index.js @@ -1,8 +1,8 @@ import React from 'react'; import { useDispatch } from 'react-redux'; // Import the useDispatch hook -import styles from './page.module.css'; -import SearchForm from './components/SearchForm'; -import { fetchWeatherData } from './actions/weatherActions'; // Import the action creator +import styles from '@/page.module.css'; +import SearchForm from '../../components/SearchForm'; +import { fetchWeatherData } from '../../actions/weatherActions'; // Import the action creator export default function Home() { const dispatch = useDispatch(); // Initialize useDispatch hook diff --git a/reducers/rootReducer.js b/reducers/rootReducer.js index 94334db..f562697 100644 --- a/reducers/rootReducer.js +++ b/reducers/rootReducer.js @@ -1,11 +1,10 @@ // rootReducer.js import { combineReducers } from 'redux'; import weatherReducer from './weatherReducer'; -import anotherReducer from './anotherReducer'; + const rootReducer = combineReducers({ weather: weatherReducer, - another: anotherReducer, -}); + }); export default rootReducer; diff --git a/store.js b/store.js index 0daa1fe..5d0e620 100644 --- a/store.js +++ b/store.js @@ -1,13 +1,11 @@ -import { createStore, applyMiddleware } from 'redux'; -import thunk from 'redux-thunk'; +import { configureStore } from '@reduxjs/toolkit'; // Import configureStore from Redux Toolkit import rootReducer from './reducers/weatherReducer'; +import { clear } from 'console'; -const middleware = [thunk]; - -const store = createStore( - rootReducer, - applyMiddleware(...middleware) -); +const store = configureStore({ + reducer: rootReducer, // Pass the root reducer directly + middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(thunk), // Add thunk middleware +}); export default store; From 5b4294f91dd26f24cded0c4009ba28cca4dd3277 Mon Sep 17 00:00:00 2001 From: Aneet Singh Sahota Date: Wed, 29 May 2024 03:16:35 -0700 Subject: [PATCH 3/3] final draft --- .gitignore | 2 +- actions/action.js | 43 ------- api/index.js | 3 - api/weatherApi.js | 26 ----- app.js | 44 ------- components/humiditySparkline.js | 42 ------- components/pressureSparkline.js | 40 ------- components/searchForm.js | 9 +- components/weatherComponent.js | 118 ++++++++++++++----- components/weatherSparkline.js | 43 ------- jsconfig.json | 9 +- next.config.js | 8 +- package-lock.json | 199 ++++++++++++++++++++------------ package.json | 7 +- pages/_app.js | 18 +++ pages/index.js | 31 +++-- reducers/rootReducer.js | 10 -- reducers/weatherReducer.js | 74 ++++++------ store.js | 11 -- store/configureStore.js | 10 ++ 20 files changed, 325 insertions(+), 422 deletions(-) delete mode 100644 actions/action.js delete mode 100644 api/index.js delete mode 100644 api/weatherApi.js delete mode 100644 app.js delete mode 100644 components/humiditySparkline.js delete mode 100644 components/pressureSparkline.js delete mode 100644 components/weatherSparkline.js create mode 100644 pages/_app.js delete mode 100644 reducers/rootReducer.js delete mode 100644 store.js create mode 100644 store/configureStore.js diff --git a/.gitignore b/.gitignore index 8f322f0..339af6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - +.env # dependencies /node_modules /.pnp diff --git a/actions/action.js b/actions/action.js deleted file mode 100644 index 932dfe3..0000000 --- a/actions/action.js +++ /dev/null @@ -1,43 +0,0 @@ -// Async Action Creator -export const fetchWeatherData = (cityName) => { - - return async (dispatch) => { - dispatch(fetchWeatherRequest()); - try { - const apiKey = '281a2c6bad4d09515b929ae2c5dc15be'; - const apiUrl = `https://api.openweathermap.org/data/2.5/weather?q=${cityName}&appid=${apiKey}`; - - const response = await fetch(apiUrl); - if (!response.ok) { - throw new Error('Network response was not ok'); - } - const data = await response.json(); - - // Extract specific weather metrics - const temperature = extractTemperature(data); - const humidity = extractHumidity(data); - const pressure = extractPressure(data); - - // Dispatch success action with extracted data - dispatch(fetchWeatherSuccess({ temperature, humidity, pressure })); - } catch (error) { - dispatch(fetchWeatherFailure(error.message)); - } - }; -}; - -// Helper functions to extract specific weather metrics -const extractTemperature = (data) => { - // Extract temperature from data (example, you may need to convert units or access nested objects based on the API response structure) - return data.main.temp; -}; - -const extractHumidity = (data) => { - // Extract humidity from data - return data.main.humidity; -}; - -const extractPressure = (data) => { - // Extract pressure from data - return data.main.pressure; -}; diff --git a/api/index.js b/api/index.js deleted file mode 100644 index 4860c1e..0000000 --- a/api/index.js +++ /dev/null @@ -1,3 +0,0 @@ -// api/index.js -export * from './weatherApi'; - diff --git a/api/weatherApi.js b/api/weatherApi.js deleted file mode 100644 index a2f2135..0000000 --- a/api/weatherApi.js +++ /dev/null @@ -1,26 +0,0 @@ -// api/weatherApi.js - -import { fetchWeatherSuccess, fetchWeatherFailure } from '../redux/weatherActions'; -import { extractTemperature, extractHumidity, extractPressure } from './apiUtils'; - -const apiKey = '281a2c6bad4d09515b929ae2c5dc15be'; -const apiUrl = (cityName) => `https://api.openweathermap.org/data/2.5/weather?q=${cityName}&appid=${apiKey}`; - -export const fetchWeatherData = async (cityName, dispatch) => { - try { - const response = await fetch(apiUrl(cityName)); - if (!response.ok) { - throw new Error('Network response was not ok'); - } - const data = await response.json(); - - const temperature = extractTemperature(data); - const humidity = extractHumidity(data); - const pressure = extractPressure(data); - - dispatch(fetchWeatherSuccess({ temperature, humidity, pressure })); - } catch (error) { - dispatch(fetchWeatherFailure(error.message)); - } -}; - diff --git a/app.js b/app.js deleted file mode 100644 index 73a3d92..0000000 --- a/app.js +++ /dev/null @@ -1,44 +0,0 @@ -// App.js -import React from 'react'; -import { Provider } from 'react-redux'; -import store from './store'; -import WeatherComponent from './WeatherComponent'; -import { fetchWeatherData } from './weatherApi'; - -function App() { - const [forecastData, setForecastData] = useState([]); - - onst [loading, setLoading] = useState(true); - const [error, setError] = useState(null); - - useEffect(() => { - const fetchData = async () => { - try { - const data = await fetchWeatherData(); - setForecastData(data); - setLoading(false); - } catch (error) { - console.error('Error fetching weather data:', error); - setError(error); - setLoading(false); - } - }; - - fetchData(); - }, []); - - if (loading) return
Loading...
; - if (error) return
Error: {error.message}
; - - - return ( - -
- -
-
- ); -} - -export default App; - diff --git a/components/humiditySparkline.js b/components/humiditySparkline.js deleted file mode 100644 index ed4649c..0000000 --- a/components/humiditySparkline.js +++ /dev/null @@ -1,42 +0,0 @@ -// HumiditySparkline.js -import React from 'react'; -import { Line } from 'react-chartjs-2'; - -const HumiditySparkline = ({ humidityData }) => { - const humidityValues = humidityData.map(data => data.humidity); - const labels = humidityData.map(data => data.day); - - - const data = { - labels: humidityData.map(data => data.day), - datasets: [{ - label: 'Humidity', - data: humidityValues, - borderColor: 'rgba(75, 192, 192, 1)', - borderWidth: 1, - fill: false - }] - }; - - const options = { - responsive: true, - maintainAspectRatio: false, - legend: { - display: false - }, - scales: { - xAxes: [{ - display: false - }], - yAxes: [{ - display: false - }] - } - }; - - return ( - - ); -}; - -export default HumiditySparkline; diff --git a/components/pressureSparkline.js b/components/pressureSparkline.js deleted file mode 100644 index a17e68d..0000000 --- a/components/pressureSparkline.js +++ /dev/null @@ -1,40 +0,0 @@ -// PressureSparkline.js -import React from 'react'; -import { Line } from 'react-chartjs-2'; - -const PressureSparkline = ({ pressureData }) => { - const pressureValues = pressureData.map(data => data.pressure); // Assuming pressureData is an array of objects with 'pressure' property - - const data = { - labels: pressureData.map(data => data.day), - datasets: [{ - label: 'Pressure', - data: pressureValues, - borderColor: 'rgba(255, 99, 132, 1)', - borderWidth: 1, - fill: false - }] - }; - - const options = { - responsive: true, - maintainAspectRatio: false, - legend: { - display: false - }, - scales: { - xAxes: [{ - display: false - }], - yAxes: [{ - display: false - }] - } - }; - - return ( - - ); -}; - -export default PressureSparkline; diff --git a/components/searchForm.js b/components/searchForm.js index 1beb2dd..c62d042 100644 --- a/components/searchForm.js +++ b/components/searchForm.js @@ -1,7 +1,6 @@ -// components/SearchForm.js import React, { useState } from 'react'; import { useDispatch } from 'react-redux'; -import { fetchWeather } from '../actions/weatherActions'; +import { fetchWeather } from '../reducers/weatherReducer'; const SearchForm = () => { const [city, setCity] = useState(''); @@ -9,8 +8,10 @@ const SearchForm = () => { const handleSubmit = (e) => { e.preventDefault(); - dispatch(fetchWeather(city)); - setCity(''); + if (city.trim() !== '') { + dispatch(fetchWeather(city.trim())); + setCity(''); // Clear input after dispatch + } }; return ( diff --git a/components/weatherComponent.js b/components/weatherComponent.js index 4f2a79f..53acc6a 100644 --- a/components/weatherComponent.js +++ b/components/weatherComponent.js @@ -1,36 +1,100 @@ -// WeatherComponent.js -import React, { useEffect } from 'react'; -import { useSelector, useDispatch } from 'react-redux'; -import { fetchWeatherData } from './actions/weatherActions'; -import WeatherSparkline from './weatherSparkline'; +import React from 'react'; +import { useSelector } from 'react-redux'; +import { Sparklines, SparklinesLine, SparklinesReferenceLine } from 'react-sparklines'; + +// Convert Kelvin to Fahrenheit +const kelvinToFahrenheit = (kelvin) => { + return ((kelvin - 273.15) * 9 / 5) + 32; +}; + +// Calculate mean of an array of numbers +const calculateMean = (data) => { + if (data.length === 0) return 0; + const sum = data.reduce((a, b) => a + b, 0); + return sum / data.length; +}; const WeatherComponent = () => { - const dispatch = useDispatch(); - const weatherData = useSelector(state => state.weather.weatherData); - const humidityData = useSelector(state => state.weather.humidityData); - const pressureData = useSelector(state => state.weather.pressureData); - const loading = useSelector(state => state.weather.loading); - const error = useSelector(state => state.weather.error); - - useEffect(() => { - dispatch(fetchWeatherData('weather')); // Fetch weather data - dispatch(fetchWeatherData('humidity')); // Fetch humidity data - dispatch(fetchWeatherData('pressure')); // Fetch pressure data - }, [dispatch]); - - if (loading) return
Loading forecasts...
; - if (error) return
Error: {error.message}
; + const { entries, loading, error } = useSelector(state => state.weather); + + // Group entries by city + const groupedEntries = entries.reduce((acc, entry) => { + if (!acc[entry.city]) { + acc[entry.city] = []; + } + acc[entry.city].push(entry); + return acc; + }, {}); return (
-

Weather Forecast

- - -

Humidity Forecast

- +
+ {loading &&

Loading...

} + {error &&

Error: {error.message}

} -

Pressure Forecast

- + + + + + + + + + + + {Object.keys(groupedEntries).map(city => { + const cityEntries = groupedEntries[city]; + const temperatureData = cityEntries.map(entry => kelvinToFahrenheit(entry.main.temp)); + const pressureData = cityEntries.map(entry => entry.main.pressure); + const humidityData = cityEntries.map(entry => entry.main.humidity); + + const meanTemperature = calculateMean(temperatureData).toFixed(2); + const meanPressure = calculateMean(pressureData).toFixed(2); + const meanHumidity = calculateMean(humidityData).toFixed(2); + + return ( + + {cityEntries.map((entry, index) => ( + + {index === 0 && ( + + )} + + + + + ))} + + + + + + + + + + + + ); + })} + +
CityTemperature (°F)Pressure (hPa)Humidity (%)
{city}{kelvinToFahrenheit(entry.main.temp).toFixed(2).hide}{entry.main.pressure.hide}{entry.main.humidity.hide}
+ + + + + + + + + + + + + + +
{meanTemperature}{meanPressure}{meanHumidity}
+
); }; diff --git a/components/weatherSparkline.js b/components/weatherSparkline.js deleted file mode 100644 index 165d17d..0000000 --- a/components/weatherSparkline.js +++ /dev/null @@ -1,43 +0,0 @@ -import React from 'react'; -import { Line } from 'react-chartjs-2'; - -const WeatherSparkline = ({ weatherData }) => { - // Extract temperature values for sparkline - const temperatures = weatherData.map(data => data.temperature); - - // Define chart data - const data = { - labels: weatherData.map(data => data.day), - datasets: [{ - label: 'Temperature', - data: temperatures, - borderColor: 'rgba(75, 192, 192, 1)', - borderWidth: 1, - fill: false - }] - }; - - // Define chart options - const options = { - responsive: true, - maintainAspectRatio: false, - legend: { - display: false - }, - scales: { - xAxes: [{ - display: false - }], - yAxes: [{ - display: false - }] - } - }; - - return ( - - ); -}; - -export default WeatherSparkline; - diff --git a/jsconfig.json b/jsconfig.json index 2a2e4b3..f3dc8b0 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -1,7 +1,12 @@ { "compilerOptions": { + "baseUrl": ".", "paths": { - "@/*": ["./*"] + "@/components/*": ["components/*"], + "@/pages/*": ["pages/*"], + "@/reducers/*": ["reducers/*"], + "@/store/*": ["store/*"] } - } + }, + "exclude": ["node_modules", ".next"] } diff --git a/next.config.js b/next.config.js index 767719f..0566366 100644 --- a/next.config.js +++ b/next.config.js @@ -1,4 +1,10 @@ /** @type {import('next').NextConfig} */ const nextConfig = {} -module.exports = nextConfig +module.exports = { + env: { + NEXT_PUBLIC_API_KEY: process.env.NEXT_PUBLIC_API_KEY, + }, +}; + + diff --git a/package-lock.json b/package-lock.json index b45ba45..871aa9c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,16 +8,19 @@ "name": "parsity_rtk_weather", "version": "0.1.0", "dependencies": { + "@reduxjs/toolkit": "^2.2.3", "axios": "^1.6.8", "chart.js": "^4.4.2", "eslint": "8.50.0", "eslint-config-next": "13.5.3", - "next": "^13.5.6", + "next": "^14.2.3", "react": "18.2.0", "react-chartjs-2": "^5.2.0", "react-dom": "18.2.0", "react-redux": "^9.1.0", - "redux": "^5.0.1" + "react-sparklines": "^1.7.0", + "redux": "^5.0.1", + "redux-thunk": "^3.1.0" }, "devDependencies": { "@types/redux": "^3.6.0" @@ -130,9 +133,9 @@ "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==" }, "node_modules/@next/env": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.6.tgz", - "integrity": "sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==" + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.3.tgz", + "integrity": "sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA==" }, "node_modules/@next/eslint-plugin-next": { "version": "13.5.3", @@ -143,9 +146,9 @@ } }, "node_modules/@next/swc-darwin-arm64": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz", - "integrity": "sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA==", + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz", + "integrity": "sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==", "cpu": [ "arm64" ], @@ -158,9 +161,9 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.6.tgz", - "integrity": "sha512-6cgBfxg98oOCSr4BckWjLLgiVwlL3vlLj8hXg2b+nDgm4bC/qVXXLfpLB9FHdoDu4057hzywbxKvmYGmi7yUzA==", + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz", + "integrity": "sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==", "cpu": [ "x64" ], @@ -173,9 +176,9 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.6.tgz", - "integrity": "sha512-txagBbj1e1w47YQjcKgSU4rRVQ7uF29YpnlHV5xuVUsgCUf2FmyfJ3CPjZUvpIeXCJAoMCFAoGnbtX86BK7+sg==", + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz", + "integrity": "sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==", "cpu": [ "arm64" ], @@ -188,9 +191,9 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.6.tgz", - "integrity": "sha512-cGd+H8amifT86ZldVJtAKDxUqeFyLWW+v2NlBULnLAdWsiuuN8TuhVBt8ZNpCqcAuoruoSWynvMWixTFcroq+Q==", + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz", + "integrity": "sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==", "cpu": [ "arm64" ], @@ -203,9 +206,9 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.6.tgz", - "integrity": "sha512-Mc2b4xiIWKXIhBy2NBTwOxGD3nHLmq4keFk+d4/WL5fMsB8XdJRdtUlL87SqVCTSaf1BRuQQf1HvXZcy+rq3Nw==", + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz", + "integrity": "sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==", "cpu": [ "x64" ], @@ -218,9 +221,9 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.6.tgz", - "integrity": "sha512-CFHvP9Qz98NruJiUnCe61O6GveKKHpJLloXbDSWRhqhkJdZD2zU5hG+gtVJR//tyW897izuHpM6Gtf6+sNgJPQ==", + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz", + "integrity": "sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==", "cpu": [ "x64" ], @@ -233,9 +236,9 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.6.tgz", - "integrity": "sha512-aFv1ejfkbS7PUa1qVPwzDHjQWQtknzAZWGTKYIAaS4NMtBlk3VyA6AYn593pqNanlicewqyl2jUhQAaFV/qXsg==", + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz", + "integrity": "sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==", "cpu": [ "arm64" ], @@ -248,9 +251,9 @@ } }, "node_modules/@next/swc-win32-ia32-msvc": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.6.tgz", - "integrity": "sha512-XqqpHgEIlBHvzwG8sp/JXMFkLAfGLqkbVsyN+/Ih1mR8INb6YCc2x/Mbwi6hsAgUnqQztz8cvEbHJUbSl7RHDg==", + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz", + "integrity": "sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==", "cpu": [ "ia32" ], @@ -263,9 +266,9 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.6.tgz", - "integrity": "sha512-Cqfe1YmOS7k+5mGu92nl5ULkzpKuxJrP3+4AEuPmrpFZ3BHxTY3TnHmU1On3bFmFFs6FbTcdF58CCUProGpIGQ==", + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz", + "integrity": "sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==", "cpu": [ "x64" ], @@ -309,16 +312,45 @@ "node": ">= 8" } }, + "node_modules/@reduxjs/toolkit": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.3.tgz", + "integrity": "sha512-76dll9EnJXg4EVcI5YNxZA/9hSAmZsFqzMmNRHvIlzw2WS/twfcVX3ysYrWGJMClwEmChQFC4yRq74tn6fdzRA==", + "dependencies": { + "immer": "^10.0.3", + "redux": "^5.0.1", + "redux-thunk": "^3.1.0", + "reselect": "^5.0.1" + }, + "peerDependencies": { + "react": "^16.9.0 || ^17.0.0 || ^18", + "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0" + }, + "peerDependenciesMeta": { + "react": { + "optional": true + }, + "react-redux": { + "optional": true + } + } + }, "node_modules/@rushstack/eslint-patch": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.5.0.tgz", "integrity": "sha512-EF3948ckf3f5uPgYbQ6GhyA56Dmv8yg0+ir+BroRjwdxyZJsekhZzawOecC2rOTPCz173t7ZcR1HHZu0dZgOCw==" }, + "node_modules/@swc/counter": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz", + "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==" + }, "node_modules/@swc/helpers": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz", - "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.5.tgz", + "integrity": "sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==", "dependencies": { + "@swc/counter": "^0.1.3", "tslib": "^2.4.0" } }, @@ -742,9 +774,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001541", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001541.tgz", - "integrity": "sha512-bLOsqxDgTqUBkzxbNlSBt8annkDpQB9NdzdTbO2ooJ+eC/IQcvDspDc058g84ejCelF7vHUx57KIOjEecOHXaw==", + "version": "1.0.30001621", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001621.tgz", + "integrity": "sha512-+NLXZiviFFKX0fk8Piwv3PfLPGtRqJeq2TiNoUff/qB5KJgwecJTvCXDpmlyP/eCI/GUEmp/h/y5j0yckiiZrA==", "funding": [ { "type": "opencollective", @@ -1709,11 +1741,6 @@ "node": ">=10.13.0" } }, - "node_modules/glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" - }, "node_modules/globals": { "version": "13.22.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz", @@ -1864,6 +1891,15 @@ "node": ">= 4" } }, + "node_modules/immer": { + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz", + "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/immer" + } + }, "node_modules/import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -2441,37 +2477,38 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" }, "node_modules/next": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", - "integrity": "sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw==", + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/next/-/next-14.2.3.tgz", + "integrity": "sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==", "dependencies": { - "@next/env": "13.5.6", - "@swc/helpers": "0.5.2", + "@next/env": "14.2.3", + "@swc/helpers": "0.5.5", "busboy": "1.6.0", - "caniuse-lite": "^1.0.30001406", + "caniuse-lite": "^1.0.30001579", + "graceful-fs": "^4.2.11", "postcss": "8.4.31", - "styled-jsx": "5.1.1", - "watchpack": "2.4.0" + "styled-jsx": "5.1.1" }, "bin": { "next": "dist/bin/next" }, "engines": { - "node": ">=16.14.0" + "node": ">=18.17.0" }, "optionalDependencies": { - "@next/swc-darwin-arm64": "13.5.6", - "@next/swc-darwin-x64": "13.5.6", - "@next/swc-linux-arm64-gnu": "13.5.6", - "@next/swc-linux-arm64-musl": "13.5.6", - "@next/swc-linux-x64-gnu": "13.5.6", - "@next/swc-linux-x64-musl": "13.5.6", - "@next/swc-win32-arm64-msvc": "13.5.6", - "@next/swc-win32-ia32-msvc": "13.5.6", - "@next/swc-win32-x64-msvc": "13.5.6" + "@next/swc-darwin-arm64": "14.2.3", + "@next/swc-darwin-x64": "14.2.3", + "@next/swc-linux-arm64-gnu": "14.2.3", + "@next/swc-linux-arm64-musl": "14.2.3", + "@next/swc-linux-x64-gnu": "14.2.3", + "@next/swc-linux-x64-musl": "14.2.3", + "@next/swc-win32-arm64-msvc": "14.2.3", + "@next/swc-win32-ia32-msvc": "14.2.3", + "@next/swc-win32-x64-msvc": "14.2.3" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", + "@playwright/test": "^1.41.2", "react": "^18.2.0", "react-dom": "^18.2.0", "sass": "^1.3.0" @@ -2480,6 +2517,9 @@ "@opentelemetry/api": { "optional": true }, + "@playwright/test": { + "optional": true + }, "sass": { "optional": true } @@ -2850,11 +2890,31 @@ } } }, + "node_modules/react-sparklines": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/react-sparklines/-/react-sparklines-1.7.0.tgz", + "integrity": "sha512-bJFt9K4c5Z0k44G8KtxIhbG+iyxrKjBZhdW6afP+R7EnIq+iKjbWbEFISrf3WKNFsda+C46XAfnX0StS5fbDcg==", + "dependencies": { + "prop-types": "^15.5.10" + }, + "peerDependencies": { + "react": "*", + "react-dom": "*" + } + }, "node_modules/redux": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz", "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==" }, + "node_modules/redux-thunk": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz", + "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==", + "peerDependencies": { + "redux": "^5.0.0" + } + }, "node_modules/reflect.getprototypeof": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz", @@ -2895,6 +2955,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/reselect": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.0.tgz", + "integrity": "sha512-aw7jcGLDpSgNDyWBQLv2cedml85qd95/iszJjN988zX1t7AVRJi19d9kto5+W7oCfQ94gyo40dVbT6g2k4/kXg==" + }, "node_modules/resolve": { "version": "1.22.6", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz", @@ -3405,18 +3470,6 @@ "react": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, - "node_modules/watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", - "dependencies": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index 3c92dea..0afe1d0 100644 --- a/package.json +++ b/package.json @@ -9,16 +9,19 @@ "lint": "next lint" }, "dependencies": { + "@reduxjs/toolkit": "^2.2.3", "axios": "^1.6.8", "chart.js": "^4.4.2", "eslint": "8.50.0", "eslint-config-next": "13.5.3", - "next": "^13.5.6", + "next": "^14.2.3", "react": "18.2.0", "react-chartjs-2": "^5.2.0", "react-dom": "18.2.0", "react-redux": "^9.1.0", - "redux": "^5.0.1" + "react-sparklines": "^1.7.0", + "redux": "^5.0.1", + "redux-thunk": "^3.1.0" }, "devDependencies": { "@types/redux": "^3.6.0" diff --git a/pages/_app.js b/pages/_app.js new file mode 100644 index 0000000..fbd9944 --- /dev/null +++ b/pages/_app.js @@ -0,0 +1,18 @@ +import React from 'react'; +import { Provider } from 'react-redux'; +import store from '../store/configureStore'; +import WeatherComponent from '../components/weatherComponent'; +import SearchForm from '../components/searchForm'; + +function App() { + return ( + +
+ + +
+
+ ); +} + +export default App; diff --git a/pages/index.js b/pages/index.js index e1e79c2..714f96c 100644 --- a/pages/index.js +++ b/pages/index.js @@ -1,20 +1,19 @@ import React from 'react'; -import { useDispatch } from 'react-redux'; // Import the useDispatch hook -import styles from '@/page.module.css'; -import SearchForm from '../../components/SearchForm'; -import { fetchWeatherData } from '../../actions/weatherActions'; // Import the action creator - -export default function Home() { - const dispatch = useDispatch(); // Initialize useDispatch hook - - const handleSubmit = (city) => { - console.log('Submitted city:', city); - dispatch(fetchWeatherData(city)); // Dispatch an action to fetch weather data based on the city - }; +import { Provider } from 'react-redux'; +import store from '../store/configureStore'; +import WeatherComponent from '../components/weatherComponent'; +import SearchForm from '../components/searchForm'; +const Index = () => { return ( -
- -
+ +
+ + +
+
); -} +}; + +export default Index; + diff --git a/reducers/rootReducer.js b/reducers/rootReducer.js deleted file mode 100644 index f562697..0000000 --- a/reducers/rootReducer.js +++ /dev/null @@ -1,10 +0,0 @@ -// rootReducer.js -import { combineReducers } from 'redux'; -import weatherReducer from './weatherReducer'; - - -const rootReducer = combineReducers({ - weather: weatherReducer, - }); - -export default rootReducer; diff --git a/reducers/weatherReducer.js b/reducers/weatherReducer.js index 3d611ba..42c3599 100644 --- a/reducers/weatherReducer.js +++ b/reducers/weatherReducer.js @@ -1,42 +1,48 @@ -import { - FETCH_WEATHER_REQUEST, - FETCH_WEATHER_SUCCESS, - FETCH_WEATHER_FAILURE, -} from '../actions/weatherActions'; +import { createAsyncThunk, createSlice } from '@reduxjs/toolkit'; +import axios from 'axios'; const initialState = { - weatherData: null, // Change from array to object or null - humidityData: null, // Change from array to object or null - pressureData: null, // Change from array to object or null + city: '', + entries: [], loading: false, error: null, }; -const weatherReducer = (state = initialState, action) => { - switch (action.type) { - case FETCH_WEATHER_REQUEST: - return { - ...state, - loading: true, - error: null, - }; - case FETCH_WEATHER_SUCCESS: - return { - ...state, - weatherData: action.payload.weatherData, - humidityData: action.payload.humidityData, - pressureData: action.payload.pressureData, - loading: false, - }; - case FETCH_WEATHER_FAILURE: - return { - ...state, - loading: false, - error: action.payload, - }; - default: - return state; +export const fetchWeather = createAsyncThunk( + 'weather/fetchWeather', + async (city, { rejectWithValue }) => { + try { + const apiKey = process.env.NEXT_PUBLIC_API_KEY; + const response = await axios.get(`https://api.openweathermap.org/data/2.5/forecast?q=${city}&appid=${apiKey}`); + return response.data; + } catch (error) { + return rejectWithValue(error.response.data); + } } -}; +); + +const weatherSlice = createSlice({ + name: 'weather', + initialState, + reducers: {}, + extraReducers: (builder) => { + builder + .addCase(fetchWeather.pending, (state) => { + state.loading = true; + state.error = null; + }) + .addCase(fetchWeather.fulfilled, (state, action) => { + state.loading = false; + const newEntries = action.payload.list + .filter((_, index) => index % 8 === 0) + .map(entry => ({ ...entry, city: action.payload.city.name })); + state.entries = [...state.entries, ...newEntries]; + }) + .addCase(fetchWeather.rejected, (state, action) => { + state.loading = false; + state.error = action.payload; + }); + }, +}); -export default weatherReducer; +export default weatherSlice.reducer; diff --git a/store.js b/store.js deleted file mode 100644 index 5d0e620..0000000 --- a/store.js +++ /dev/null @@ -1,11 +0,0 @@ -import { configureStore } from '@reduxjs/toolkit'; // Import configureStore from Redux Toolkit -import rootReducer from './reducers/weatherReducer'; -import { clear } from 'console'; - -const store = configureStore({ - reducer: rootReducer, // Pass the root reducer directly - middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(thunk), // Add thunk middleware -}); - -export default store; - diff --git a/store/configureStore.js b/store/configureStore.js new file mode 100644 index 0000000..91150ff --- /dev/null +++ b/store/configureStore.js @@ -0,0 +1,10 @@ +import { configureStore } from '@reduxjs/toolkit'; +import weatherReducer from '../reducers/weatherReducer'; + +const store = configureStore({ + reducer: { + weather: weatherReducer, + }, +}); + +export default store;