From 42d2f7fc1d56c29d6f39d478a7b3875feae6063d Mon Sep 17 00:00:00 2001 From: Kathryn Fabbroni Date: Sun, 23 Feb 2025 10:53:49 -0500 Subject: [PATCH 1/3] Basic structure set up --- app/components/WeatherApp.js | 40 +++++++++++++ app/favicon.ico | Bin 25931 -> 0 bytes app/page.js | 98 +++---------------------------- app/redux/store.js | 12 ++++ app/redux/weatherSlice.js | 62 +++++++++++++++++++ package-lock.json | 111 ++++++++++++++++++++++++++++++++++- package.json | 5 +- 7 files changed, 236 insertions(+), 92 deletions(-) create mode 100644 app/components/WeatherApp.js delete mode 100644 app/favicon.ico create mode 100644 app/redux/store.js create mode 100644 app/redux/weatherSlice.js diff --git a/app/components/WeatherApp.js b/app/components/WeatherApp.js new file mode 100644 index 0000000..8705111 --- /dev/null +++ b/app/components/WeatherApp.js @@ -0,0 +1,40 @@ +'use client' + + +import React, { useState, useEffect } from 'react'; +import { useSelector, useDispatch } from 'react-redux'; +import { fetchWeatherData, setCity } from "app/redux/weatherSlice.js"; + +function WeatherApp(){ + const dispatch = useDispatch; + const { city, weatherData, loading, error } = useSelector((state) => state.weather); + const [inputCity, setInputCity] = useState(city); + + useEffect(() => { + if (city) { + dispatch(fetchWeatherData(city)) + } + }, [city, dispatch]); + + const handleInputChange = (e) => {setInputCity(e.target.value);}; + + const handleFormSubmit = (e) => { + e.preventDefault(); + dispatch(setCity(inputCity)); + }; + + return ( +
+
+ + +
+
+ ) +} + +export default WeatherApp \ No newline at end of file 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/page.js b/app/page.js index f049c39..ccc7a5b 100644 --- a/app/page.js +++ b/app/page.js @@ -1,95 +1,13 @@ -import Image from 'next/image' -import styles from './page.module.css' +'use client' +import React from 'react'; +import { Provider } from 'react-redux'; +import store from "app/redux/store.js"; +import WeatherApp from "./components/WeatherApp.js"; export default function Home() { return ( -
-
-

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

- -
- -
- Next.js Logo -
- - -
+ + + ) } diff --git a/app/redux/store.js b/app/redux/store.js new file mode 100644 index 0000000..8175c38 --- /dev/null +++ b/app/redux/store.js @@ -0,0 +1,12 @@ +import { configureStore } from "@reduxjs/toolkit"; +import weatherReducer from "app/redux/weatherSlice.js"; + + + +const store = configureStore({ + reducer: { + weather: weatherReducer + } +}) + +export default store; \ No newline at end of file diff --git a/app/redux/weatherSlice.js b/app/redux/weatherSlice.js new file mode 100644 index 0000000..2d75856 --- /dev/null +++ b/app/redux/weatherSlice.js @@ -0,0 +1,62 @@ +import { createSlice, createAsyncThunk } from '@reduxjs/toolkit'; + +const API_KEY = process.env.NEXT_PUBLIC_OPENWEATHER_API; +const API_URL = 'https://api.openweathermap.org/data/2.5/forecast'; + +export const fetchWeatherData = createAsyncThunk('weather/fetchWeatherData', +async (ctiy) => { + try { + const apiURL = `${API_URL}?Q=${city}&appid=${API_KEY}&units=metric`; + console.log('Fetching weather data from:', apiURL); + + const response = await fetch(apiURL); + + if(!response.ok) { + throw new Error (`HTTP error! status: ${response.status}`); + } + + const data = await response.json(); + return data; + } catch (error) { + return Promise.reject(error.message) + }}) + + const initialState = { + city: '', + weatherData: null, + loading: false, + error: null + } + + const weatherSlice = createSlice({ + name: "weather", + initialState: { + city: "", + weatherData: null, + loading: false, + error: null, + }, + reducers: { + setCity: (state, action) => { + state.city = action.payload; + }, + }, + extraReducers: (builder) => { + builder + .addCase(fetchWeatherData.pending, (state) => { + state.loading = true; + state.error = null; + }) + .addCase(fetchWeatherData.fulfilled, (state, action) => { + state.loading = false; + state.weatherData = action.payload; + }) + .addCase(fetchWeatherData.rejected, (state, action) => { + state.loading = false; + state.error = action.error.message; + }); + }, + }); + +export const { setCity } = weatherSlice.actions; +export default weatherSlice.reducer; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 90f6bb1..5a175d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,11 +8,14 @@ "name": "parsity_rtk_weather", "version": "0.1.0", "dependencies": { + "@reduxjs/toolkit": "^2.5.1", "eslint": "8.50.0", "eslint-config-next": "13.5.3", "next": "13.5.3", "react": "18.2.0", - "react-dom": "18.2.0" + "react-dom": "18.2.0", + "react-redux": "^9.2.0", + "react-sparklines": "^1.7.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -296,6 +299,30 @@ "node": ">= 8" } }, + "node_modules/@reduxjs/toolkit": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.5.1.tgz", + "integrity": "sha512-UHhy3p0oUpdhnSxyDjaRDYaw8Xra75UiLbCiRozVPHjfDwNYkh0TsVm/1OmTW8Md+iDAJmYPWUKMvsMc2GtpNg==", + "license": "MIT", + "dependencies": { + "immer": "^10.0.3", + "redux": "^5.0.1", + "redux-thunk": "^3.1.0", + "reselect": "^5.1.0" + }, + "peerDependencies": { + "react": "^16.9.0 || ^17.0.0 || ^18 || ^19", + "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", @@ -314,6 +341,12 @@ "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==" }, + "node_modules/@types/use-sync-external-store": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz", + "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==", + "license": "MIT" + }, "node_modules/@typescript-eslint/parser": { "version": "6.7.3", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.3.tgz", @@ -1759,6 +1792,16 @@ "node": ">= 4" } }, + "node_modules/immer": { + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz", + "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==", + "license": "MIT", + "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", @@ -2683,6 +2726,57 @@ "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.2.0", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz", + "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==", + "license": "MIT", + "dependencies": { + "@types/use-sync-external-store": "^0.0.6", + "use-sync-external-store": "^1.4.0" + }, + "peerDependencies": { + "@types/react": "^18.2.25 || ^19", + "react": "^18.0 || ^19", + "redux": "^5.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "redux": { + "optional": true + } + } + }, + "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==", + "license": "MIT", + "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==", + "license": "MIT" + }, + "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==", + "license": "MIT", + "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", @@ -2723,6 +2817,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/reselect": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz", + "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==", + "license": "MIT" + }, "node_modules/resolve": { "version": "1.22.6", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz", @@ -3225,6 +3325,15 @@ "punycode": "^2.1.0" } }, + "node_modules/use-sync-external-store": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz", + "integrity": "sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==", + "license": "MIT", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + } + }, "node_modules/watchpack": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", diff --git a/package.json b/package.json index 6ca0f8f..505d50f 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,13 @@ "lint": "next lint" }, "dependencies": { + "@reduxjs/toolkit": "^2.5.1", "eslint": "8.50.0", "eslint-config-next": "13.5.3", "next": "13.5.3", "react": "18.2.0", - "react-dom": "18.2.0" + "react-dom": "18.2.0", + "react-redux": "^9.2.0", + "react-sparklines": "^1.7.0" } } From 01e776ff1131afa26d8a313f0b0e46be080887d8 Mon Sep 17 00:00:00 2001 From: Kathryn Fabbroni Date: Sun, 23 Feb 2025 13:09:56 -0500 Subject: [PATCH 2/3] removed tests, added sparkline charts --- app/components/WeatherApp.js | 67 +++++++++++++++++---- app/components/WeatherChart.js | 29 +++++++++ app/redux/weatherSlice.js | 105 ++++++++++++++++----------------- 3 files changed, 135 insertions(+), 66 deletions(-) create mode 100644 app/components/WeatherChart.js diff --git a/app/components/WeatherApp.js b/app/components/WeatherApp.js index 8705111..319f3f8 100644 --- a/app/components/WeatherApp.js +++ b/app/components/WeatherApp.js @@ -1,28 +1,45 @@ -'use client' +"use client"; - -import React, { useState, useEffect } from 'react'; -import { useSelector, useDispatch } from 'react-redux'; +import React, { useState, useEffect } from "react"; +import { useSelector, useDispatch } from "react-redux"; import { fetchWeatherData, setCity } from "app/redux/weatherSlice.js"; +import WeatherChart from "./WeatherChart"; -function WeatherApp(){ - const dispatch = useDispatch; - const { city, weatherData, loading, error } = useSelector((state) => state.weather); +function WeatherApp() { + const dispatch = useDispatch(); + const { city, weatherData, loading, error } = useSelector( + (state) => state.weather + ); const [inputCity, setInputCity] = useState(city); useEffect(() => { if (city) { - dispatch(fetchWeatherData(city)) + dispatch(fetchWeatherData(city)); } }, [city, dispatch]); - const handleInputChange = (e) => {setInputCity(e.target.value);}; + const handleInputChange = (e) => { + setInputCity(e.target.value); + }; const handleFormSubmit = (e) => { e.preventDefault(); dispatch(setCity(inputCity)); }; + if (loading) return

Fetching weather data for {city}...

; + if (error) return

Failed to fetch weather data for {city} {error}

; + + const temperatureData = weatherData + ? weatherData.list.map((item) => (item.main.temp - 273.15) * (9 / 5) + 32) + : []; // Convert to Fahrenheit + const pressureData = weatherData + ? weatherData.list.map((item) => item.main.pressure) + : []; + const humidityData = weatherData + ? weatherData.list.map((item) => item.main.humidity) + : []; + return (
@@ -30,11 +47,35 @@ function WeatherApp(){ type="text" value={inputCity} onChange={handleInputChange} - placeholder="Enter City"/> - + placeholder="Enter City" + /> +
+ + {weatherData && ( + <> + + + + + )}
- ) + ); } -export default WeatherApp \ No newline at end of file +export default WeatherApp; diff --git a/app/components/WeatherChart.js b/app/components/WeatherChart.js new file mode 100644 index 0000000..095934c --- /dev/null +++ b/app/components/WeatherChart.js @@ -0,0 +1,29 @@ +"use client"; + +import React from "react"; +import { + Sparklines, + SparklinesLine, + SparklinesReferenceLine, +} from "react-sparklines"; + +function WeatherChart({ data, title, units, color }) { + const average = data.reduce((sum, point) => sum + point, 0) / data.length; + + return ( +
+

+ {title} ({units}) +

+ + + + +

+ Average: {average.toFixed(2)} {units} +

+
+ ); +} + +export default WeatherChart; diff --git a/app/redux/weatherSlice.js b/app/redux/weatherSlice.js index 2d75856..4a9dda3 100644 --- a/app/redux/weatherSlice.js +++ b/app/redux/weatherSlice.js @@ -1,62 +1,61 @@ -import { createSlice, createAsyncThunk } from '@reduxjs/toolkit'; +import { createSlice, createAsyncThunk } from "@reduxjs/toolkit"; -const API_KEY = process.env.NEXT_PUBLIC_OPENWEATHER_API; -const API_URL = 'https://api.openweathermap.org/data/2.5/forecast'; +const API_KEY = process.env.NEXT_PUBLIC_OPENWEATHER_API_KEY +const API_URL = "https://api.openweathermap.org/data/2.5/forecast"; -export const fetchWeatherData = createAsyncThunk('weather/fetchWeatherData', -async (ctiy) => { - try { - const apiURL = `${API_URL}?Q=${city}&appid=${API_KEY}&units=metric`; - console.log('Fetching weather data from:', apiURL); +export const fetchWeatherData = createAsyncThunk( + "weather/fetchWeatherData", + async (city) => { + try { + const apiUrl = `${API_URL}?q=${city}&appid=${API_KEY}&units=metric`; - const response = await fetch(apiURL); + const response = await fetch(apiUrl); - if(!response.ok) { - throw new Error (`HTTP error! status: ${response.status}`); - } + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); + } - const data = await response.json(); - return data; - } catch (error) { - return Promise.reject(error.message) - }}) - - const initialState = { - city: '', - weatherData: null, - loading: false, - error: null + const data = await response.json(); + console.log("API Response Data:", data); + return data; + } catch (error) { + return Promise.reject(error.message); + } } - - const weatherSlice = createSlice({ - name: "weather", - initialState: { - city: "", - weatherData: null, - loading: false, - error: null, - }, - reducers: { - setCity: (state, action) => { - state.city = action.payload; - }, - }, - extraReducers: (builder) => { - builder - .addCase(fetchWeatherData.pending, (state) => { - state.loading = true; - state.error = null; - }) - .addCase(fetchWeatherData.fulfilled, (state, action) => { - state.loading = false; - state.weatherData = action.payload; - }) - .addCase(fetchWeatherData.rejected, (state, action) => { - state.loading = false; - state.error = action.error.message; - }); +); + +const initialState = { + city: "", + weatherData: null, + loading: false, + error: null, +}; + +const weatherSlice = createSlice({ + name: "weather", + initialState, + reducers: { + setCity: (state, action) => { + state.city = action.payload; + state.error = null; }, - }); + }, + extraReducers: (builder) => { + builder + .addCase(fetchWeatherData.pending, (state) => { + state.loading = true; + state.error = null; + }) + .addCase(fetchWeatherData.fulfilled, (state, action) => { + state.loading = false; + state.weatherData = action.payload; + }) + .addCase(fetchWeatherData.rejected, (state, action) => { + state.loading = false; + state.error = action.error.message; + }); + }, +}); export const { setCity } = weatherSlice.actions; -export default weatherSlice.reducer; \ No newline at end of file +export default weatherSlice.reducer; From 24694adf33a3888cde00a648ff396fa925b69ebd Mon Sep 17 00:00:00 2001 From: Kathryn Fabbroni Date: Sun, 23 Feb 2025 14:32:10 -0500 Subject: [PATCH 3/3] added styling. fixed bug that was returning wrong temp avg. --- app/components/WeatherApp.js | 71 +++++++++------ app/components/WeatherChart.js | 34 ++++++-- app/globals.css | 153 ++++++++++++++------------------- app/redux/weatherSlice.js | 1 - 4 files changed, 137 insertions(+), 122 deletions(-) diff --git a/app/components/WeatherApp.js b/app/components/WeatherApp.js index 319f3f8..adb2646 100644 --- a/app/components/WeatherApp.js +++ b/app/components/WeatherApp.js @@ -25,56 +25,71 @@ function WeatherApp() { const handleFormSubmit = (e) => { e.preventDefault(); dispatch(setCity(inputCity)); + setInputCity('') }; - if (loading) return

Fetching weather data for {city}...

; - if (error) return

Failed to fetch weather data for {city} {error}

; + if (loading) return

Fetching weather data for {city}...

; + if (error) return

Failed to fetch weather data for {city} {error}

; - const temperatureData = weatherData - ? weatherData.list.map((item) => (item.main.temp - 273.15) * (9 / 5) + 32) - : []; // Convert to Fahrenheit + const temperatureData = weatherData + ? weatherData.list.map((item) => { + console.log(item) + const celsius = item.main.temp + const fahrenheit = (celsius * (9 / 5) + 32); // Convert Celsius to Fahrenheit + + return fahrenheit + }) + : []; const pressureData = weatherData ? weatherData.list.map((item) => item.main.pressure) : []; const humidityData = weatherData ? weatherData.list.map((item) => item.main.humidity) : []; - + return ( -
-
+ <> +

Weather Data

+ - +
{weatherData && ( <> - - - +
+
+ + + + +
+
)} -
+ ); } diff --git a/app/components/WeatherChart.js b/app/components/WeatherChart.js index 095934c..9586d0b 100644 --- a/app/components/WeatherChart.js +++ b/app/components/WeatherChart.js @@ -7,19 +7,43 @@ import { SparklinesReferenceLine, } from "react-sparklines"; -function WeatherChart({ data, title, units, color }) { - const average = data.reduce((sum, point) => sum + point, 0) / data.length; +function calculateAverage(data) { + if (!data || data.length === 0) { + return 0; // Return 0 for empty or invalid data + } + + let sum = 0; + let validCount = 0; + for (const point of data) { + if (typeof point === "number" && !isNaN(point)) { + sum += point; + validCount++; + } else { + console.warn("Invalid data point:", point); + } + + } + + if (validCount === 0) { + return 0; // Return 0 if no valid data points + } + return sum / validCount; +} + +function WeatherChart({ data, title, units, color }) { + const average = calculateAverage(data) + console.log(average) return ( -
-

+
+

{title} ({units})

-

+

Average: {average.toFixed(2)} {units}

diff --git a/app/globals.css b/app/globals.css index d4f491e..99c4a7e 100644 --- a/app/globals.css +++ b/app/globals.css @@ -1,107 +1,84 @@ :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) - ); + background-color: #000000; + color: blanchedalmond; + font-family: "Lucida Console", Monaco, monospace; + font-size: 16px; + letter-spacing: 2px; + word-spacing: 2px; + color: #000000; + font-weight: normal; + text-decoration: none; + font-style: normal; + font-variant: small-caps; + text-transform: uppercase; +} - --tile-start-rgb: 239, 245, 249; - --tile-end-rgb: 228, 232, 233; - --tile-border: conic-gradient( - #00000080, - #00000040, - #00000030, - #00000020, - #00000010, - #00000010, - #00000080 - ); +.content { + max-width: 600px; + margin: 20px auto; + padding: 20px; + border: 3px solid #ccc; + border-radius: 5px; +} - --callout-rgb: 238, 240, 241; - --callout-border-rgb: 172, 175, 176; - --card-rgb: 180, 185, 188; - --card-border-rgb: 131, 134, 135; +.loading, +.error { + text-align: center; + margin-top: 20px; } -@media (prefers-color-scheme: dark) { - :root { - --foreground-rgb: 255, 255, 255; - --background-start-rgb: 0, 0, 0; - --background-end-rgb: 0, 0, 0; +.error { + color: red; +} - --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) - ); +.form { + margin-bottom: 20px; + text-align: center; +} - --tile-start-rgb: 2, 13, 46; - --tile-end-rgb: 2, 5, 19; - --tile-border: conic-gradient( - #ffffff80, - #ffffff40, - #ffffff30, - #ffffff20, - #ffffff10, - #ffffff10, - #ffffff80 - ); +.heading { + text-align: center; + margin-bottom: 20px; + color: #595757; +} - --callout-rgb: 20, 20, 20; - --callout-border-rgb: 108, 108, 108; - --card-rgb: 100, 100, 100; - --card-border-rgb: 200, 200, 200; - } +.btn { + margin-top: 20px; + padding: 4px 10px; + background-color: #425263; + color: white; + border: none; + border-radius: 3px; + cursor: pointer; } -* { - box-sizing: border-box; - padding: 0; - margin: 0; +.weatherChart { + padding: 20px; + border: 1px solid #595757; + border-radius: 8px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + background-color: #e2e1e1; } -html, -body { - max-width: 100vw; - overflow-x: hidden; +.chartHeading { + margin-bottom: 10px; + text-align: center; + color: #333; } -body { - color: rgb(var(--foreground-rgb)); - background: linear-gradient( - to bottom, - transparent, - rgb(var(--background-end-rgb)) - ) - rgb(var(--background-start-rgb)); +Sparklines { + height: 120px; + width: 200px; } -a { - color: inherit; - text-decoration: none; +.avg { + margin-top: 10px; + text-align: center; + color: #555; } -@media (prefers-color-scheme: dark) { - html { - color-scheme: dark; - } +.chartsDiv { + display: flex; + flex-direction: column; + gap: 20px; } diff --git a/app/redux/weatherSlice.js b/app/redux/weatherSlice.js index 4a9dda3..6293a00 100644 --- a/app/redux/weatherSlice.js +++ b/app/redux/weatherSlice.js @@ -16,7 +16,6 @@ export const fetchWeatherData = createAsyncThunk( } const data = await response.json(); - console.log("API Response Data:", data); return data; } catch (error) { return Promise.reject(error.message);