From 1564201a8af60617e8f9b1c23a380e670c8767f6 Mon Sep 17 00:00:00 2001 From: Hasan Mohammad Fawzi Date: Tue, 15 Sep 2026 02:11:51 +0200 Subject: [PATCH 1/2] feat: add city weather and activity models --- web/src/data/activities.ts | 24 ++++++++++++++++++++++++ web/src/data/cities.ts | 34 ++++++++++++++++++++++++++++++++++ web/src/type/activity.ts | 6 ++++++ web/src/type/city.ts | 6 ++++++ web/src/type/weather.ts | 11 +++++++++++ 5 files changed, 81 insertions(+) create mode 100644 web/src/data/activities.ts create mode 100644 web/src/data/cities.ts create mode 100644 web/src/type/activity.ts create mode 100644 web/src/type/city.ts create mode 100644 web/src/type/weather.ts diff --git a/web/src/data/activities.ts b/web/src/data/activities.ts new file mode 100644 index 0000000..a05d767 --- /dev/null +++ b/web/src/data/activities.ts @@ -0,0 +1,24 @@ +import type { Activity } from '../types/activity'; + +export const activities: Activity[] = [ + { + id: 'walking', + name: 'Gåtur', + description: 'En rolig tur utendørs.', + }, + { + id: 'cycling', + name: 'Sykkeltur', + description: 'En tur på sykkel.', + }, + { + id: 'running', + name: 'Løping', + description: 'Løping eller jogging utendørs.', + }, + { + id: 'skiing', + name: 'Skitur', + description: 'Langrenn eller annen aktivitet på ski.', + }, +]; \ No newline at end of file diff --git a/web/src/data/cities.ts b/web/src/data/cities.ts new file mode 100644 index 0000000..df23203 --- /dev/null +++ b/web/src/data/cities.ts @@ -0,0 +1,34 @@ +import type { City } from '../types/city'; + +export const cities: City[] = [ + { + id: 'oslo', + name: 'Oslo', + latitude: 59.9139, + longitude: 10.7522, + }, + { + id: 'bergen', + name: 'Bergen', + latitude: 60.3913, + longitude: 5.3221, + }, + { + id: 'trondheim', + name: 'Trondheim', + latitude: 63.4305, + longitude: 10.3951, + }, + { + id: 'stavanger', + name: 'Stavanger', + latitude: 58.97, + longitude: 5.7331, + }, + { + id: 'tromso', + name: 'Tromsø', + latitude: 69.6492, + longitude: 18.9553, + }, +]; \ No newline at end of file diff --git a/web/src/type/activity.ts b/web/src/type/activity.ts new file mode 100644 index 0000000..fca4ad6 --- /dev/null +++ b/web/src/type/activity.ts @@ -0,0 +1,6 @@ +export interface City { + id: string; + name: string; + latitude: number; + longitude: number; +} \ No newline at end of file diff --git a/web/src/type/city.ts b/web/src/type/city.ts new file mode 100644 index 0000000..fca4ad6 --- /dev/null +++ b/web/src/type/city.ts @@ -0,0 +1,6 @@ +export interface City { + id: string; + name: string; + latitude: number; + longitude: number; +} \ No newline at end of file diff --git a/web/src/type/weather.ts b/web/src/type/weather.ts new file mode 100644 index 0000000..eb38e1e --- /dev/null +++ b/web/src/type/weather.ts @@ -0,0 +1,11 @@ +export interface WeatherData { + cityId: string; + time: string; + temperature: number; + apparentTemperature: number; + humidity: number; + precipitation: number; + weatherCode: number; + windSpeed: number; + isDay: boolean; +} \ No newline at end of file From 29c9d3e347887204cbcda5862034511a65a7544f Mon Sep 17 00:00:00 2001 From: Hasan Mohammad Fawzi Date: Tue, 15 Sep 2026 11:06:57 +0200 Subject: [PATCH 2/2] feat: Add correct code for acitivity.ts --- web/src/type/activity.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/web/src/type/activity.ts b/web/src/type/activity.ts index fca4ad6..65280d1 100644 --- a/web/src/type/activity.ts +++ b/web/src/type/activity.ts @@ -1,6 +1,11 @@ -export interface City { - id: string; +export type ActivityId = + | 'walking' + | 'cycling' + | 'running' + | 'skiing'; + +export interface Activity { + id: ActivityId; name: string; - latitude: number; - longitude: number; + description: string; } \ No newline at end of file