diff --git a/.gitea/workflows/pipeline.yaml b/.gitea/workflows/pipeline.yaml index 441ba8c..2c36c4f 100644 --- a/.gitea/workflows/pipeline.yaml +++ b/.gitea/workflows/pipeline.yaml @@ -33,9 +33,8 @@ jobs: envkey_PLACES_API: ${{ secrets.PLACES_API }} directory: . file_name: .env.production - fail_on_empty: false + fail_on_empty: true sort_keys: false - - name: Build and push 🏗️ uses: docker/build-push-action@v5 with: diff --git a/app/actions.ts b/app/actions.ts index b2903ae..211561c 100644 --- a/app/actions.ts +++ b/app/actions.ts @@ -1,34 +1,33 @@ -'use server' +"use server"; import { Forecast, LocationType, coordType } from "@/types/types"; //takes address and returns coords in obj as {lat: number, lng: number} -export async function getLocation(searchLocation: string): Promise{ - const placesKey = process.env.PLACES_API; - const url = `https://maps.googleapis.com/maps/api/geocode/json?address=${searchLocation}&key=${placesKey}`; - const res = await fetch(url); - if (!res.ok) { - throw new Error(`There was an error fetching the data`); - } - const data: LocationType = await res.json(); - if (!data.results[0].formatted_address){ - throw new Error(`Unable to find the address`); - } - return { - name: data.results[0].formatted_address, - geo: data.results[0].geometry.location - } +export async function getLocation(searchLocation: string): Promise { + const url = `https://maps.googleapis.com/maps/api/geocode/json?address=${searchLocation}&key=${process.env.PLACES_API}`; + const res = await fetch(url); + if (!res.ok) { + throw new Error(`There was an error fetching the data`); } - - - -export async function getHourlyForecast(geoLocation: coordType): Promise { - const { lat, lng } = geoLocation.geo; - const tz = Intl.DateTimeFormat().resolvedOptions().timeZone; - const url = `https://api.open-meteo.com/v1/forecast?latitude=${lat}&longitude=${lng}¤t=temperature_2m,apparent_temperature,is_day,precipitation,rain,showers,snowfall,weather_code,cloud_cover,wind_speed_10m,wind_direction_10m&hourly=temperature_2m,apparent_temperature,precipitation_probability,precipitation,weather_code,wind_speed_10m,is_day&daily=weather_code,temperature_2m_max,temperature_2m_min,apparent_temperature_max,apparent_temperature_min,sunrise,sunset,daylight_duration,sunshine_duration,uv_index_max,precipitation_sum,precipitation_hours,wind_speed_10m_max&timezone=${tz}` - const res = await fetch(url); - if (!res.ok) { - throw new Error(`Failed to fetch the weather data`); - } - const data: Forecast = await res.json(); - return data; + const data: LocationType = await res.json(); + if (!data.results[0].formatted_address) { + throw new Error(`Unable to find the address`); + } + return { + name: data.results[0].formatted_address, + geo: data.results[0].geometry.location, + }; +} + +export async function getHourlyForecast( + geoLocation: coordType +): Promise { + const { lat, lng } = geoLocation.geo; + const tz = Intl.DateTimeFormat().resolvedOptions().timeZone; + const url = `https://api.open-meteo.com/v1/forecast?latitude=${lat}&longitude=${lng}¤t=temperature_2m,apparent_temperature,is_day,precipitation,rain,showers,snowfall,weather_code,cloud_cover,wind_speed_10m,wind_direction_10m&hourly=temperature_2m,apparent_temperature,precipitation_probability,precipitation,weather_code,wind_speed_10m,is_day&daily=weather_code,temperature_2m_max,temperature_2m_min,apparent_temperature_max,apparent_temperature_min,sunrise,sunset,daylight_duration,sunshine_duration,uv_index_max,precipitation_sum,precipitation_hours,wind_speed_10m_max&timezone=${tz}`; + const res = await fetch(url); + if (!res.ok) { + throw new Error(`Failed to fetch the weather data`); + } + const data: Forecast = await res.json(); + return data; }