diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..a6d5d1b --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,30 @@ +module.exports = { + 'env': { + 'es2021': true + }, + 'extends': [ + 'eslint:recommended', + 'plugin:svelte/recommended', + 'plugin:prettier/recommended' + ], + 'parser': '@typescript-eslint/parser', + 'parserOptions': { + 'project': './tsconfig.json', + 'extraFileExtensions': ['.svelte'] + }, + 'overrides': [ + { + 'files': ['*.svelte'], + 'parser': 'svelte-eslint-parser', + 'parserOptions': { + 'parser': '@typescript-eslint/parser' + } + } + ], + 'rules': { + 'no-undef': 'off', + "svelte/valid-compile": [ + "warn", + ], + }, +} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..ee38a85 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,19 @@ +name: Lint Code + +on: + push: + pull_request: + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install Node.js + uses: actions/setup-node@v3 + with: + node-version: 18 + cache: npm + - run: npm install + - run: npm run lint diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..d42957e --- /dev/null +++ b/.prettierrc @@ -0,0 +1,5 @@ +{ + "plugins": [ + "prettier-plugin-svelte" + ] +} diff --git a/App_Resources/Android/src/main/res/drawable-hdpi/background.png b/App_Resources/Android/src/main/res/drawable-hdpi/background.png index bbefbf4..e1fb4ad 100644 Binary files a/App_Resources/Android/src/main/res/drawable-hdpi/background.png and b/App_Resources/Android/src/main/res/drawable-hdpi/background.png differ diff --git a/App_Resources/Android/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/App_Resources/Android/src/main/res/drawable-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..292b156 Binary files /dev/null and b/App_Resources/Android/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ diff --git a/App_Resources/Android/src/main/res/drawable-hdpi/logo.png b/App_Resources/Android/src/main/res/drawable-hdpi/logo.png index e788deb..2c3a1ce 100644 Binary files a/App_Resources/Android/src/main/res/drawable-hdpi/logo.png and b/App_Resources/Android/src/main/res/drawable-hdpi/logo.png differ diff --git a/App_Resources/Android/src/main/res/drawable-ldpi/background.png b/App_Resources/Android/src/main/res/drawable-ldpi/background.png index f6a08ee..e2aa2b2 100644 Binary files a/App_Resources/Android/src/main/res/drawable-ldpi/background.png and b/App_Resources/Android/src/main/res/drawable-ldpi/background.png differ diff --git a/App_Resources/Android/src/main/res/drawable-ldpi/ic_launcher_foreground.png b/App_Resources/Android/src/main/res/drawable-ldpi/ic_launcher_foreground.png new file mode 100644 index 0000000..d8c2b2c Binary files /dev/null and b/App_Resources/Android/src/main/res/drawable-ldpi/ic_launcher_foreground.png differ diff --git a/App_Resources/Android/src/main/res/drawable-ldpi/logo.png b/App_Resources/Android/src/main/res/drawable-ldpi/logo.png index e4cac1a..477034c 100644 Binary files a/App_Resources/Android/src/main/res/drawable-ldpi/logo.png and b/App_Resources/Android/src/main/res/drawable-ldpi/logo.png differ diff --git a/App_Resources/Android/src/main/res/drawable-mdpi/background.png b/App_Resources/Android/src/main/res/drawable-mdpi/background.png index 0c90f0f..de8e2c2 100644 Binary files a/App_Resources/Android/src/main/res/drawable-mdpi/background.png and b/App_Resources/Android/src/main/res/drawable-mdpi/background.png differ diff --git a/App_Resources/Android/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/App_Resources/Android/src/main/res/drawable-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..89e9a0a Binary files /dev/null and b/App_Resources/Android/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ diff --git a/App_Resources/Android/src/main/res/drawable-mdpi/logo.png b/App_Resources/Android/src/main/res/drawable-mdpi/logo.png index ce3c3a4..94f6309 100644 Binary files a/App_Resources/Android/src/main/res/drawable-mdpi/logo.png and b/App_Resources/Android/src/main/res/drawable-mdpi/logo.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xhdpi/background.png b/App_Resources/Android/src/main/res/drawable-xhdpi/background.png index 3541570..895b12d 100644 Binary files a/App_Resources/Android/src/main/res/drawable-xhdpi/background.png and b/App_Resources/Android/src/main/res/drawable-xhdpi/background.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/App_Resources/Android/src/main/res/drawable-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..e1e3c8d Binary files /dev/null and b/App_Resources/Android/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png b/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png index 88267df..040178b 100644 Binary files a/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png and b/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png index abb0fc7..dd456c7 100644 Binary files a/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png and b/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..ee8641f Binary files /dev/null and b/App_Resources/Android/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png index 55800c9..07fbc8b 100644 Binary files a/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png and b/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png index 1089775..cde759e 100644 Binary files a/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png and b/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..d2f3e4c Binary files /dev/null and b/App_Resources/Android/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png index 0703f90..07fbc8b 100644 Binary files a/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png and b/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png differ diff --git a/App_Resources/Android/src/main/res/drawable/ic_launcher_foreground.xml b/App_Resources/Android/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index fd826a3..0000000 --- a/App_Resources/Android/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/App_Resources/Android/src/main/res/mipmap-hdpi/ic_launcher.png b/App_Resources/Android/src/main/res/mipmap-hdpi/ic_launcher.png index 69948d2..afe6da4 100644 Binary files a/App_Resources/Android/src/main/res/mipmap-hdpi/ic_launcher.png and b/App_Resources/Android/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/App_Resources/Android/src/main/res/mipmap-mdpi/ic_launcher.png b/App_Resources/Android/src/main/res/mipmap-mdpi/ic_launcher.png index 90a58cd..1401b13 100644 Binary files a/App_Resources/Android/src/main/res/mipmap-mdpi/ic_launcher.png and b/App_Resources/Android/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/App_Resources/Android/src/main/res/mipmap-xhdpi/ic_launcher.png b/App_Resources/Android/src/main/res/mipmap-xhdpi/ic_launcher.png index 70a2a0d..56050e9 100644 Binary files a/App_Resources/Android/src/main/res/mipmap-xhdpi/ic_launcher.png and b/App_Resources/Android/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/App_Resources/Android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/App_Resources/Android/src/main/res/mipmap-xxhdpi/ic_launcher.png index 1ee5a94..89f2387 100644 Binary files a/App_Resources/Android/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/App_Resources/Android/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/App_Resources/Android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/App_Resources/Android/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 66e9d4b..55e0fdf 100644 Binary files a/App_Resources/Android/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/App_Resources/Android/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png index b46c8bb..f0814f4 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png index d73288a..1fb9473 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png index c8d24cd..8c925d4 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png index 1b00c84..a68c92e 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png index 72a1641..5aa6cea 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png index 05ab752..0a7eabc 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png index ee72082..ac75084 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png index 2859288..8c925d4 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png index 88824fa..64725b1 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png index 02a930c..263acc8 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png index d7b077f..263acc8 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png index 2f872dd..4b4d678 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png index 7fb23a7..299a839 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png index cb04c36..582ec85 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png index e882226..1246623 100644 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png index cb35cfa..895b12d 100644 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png and b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png index 6eefb9a..cde759e 100644 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png and b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@3x.png b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@3x.png index 0ef5102..c98aa3a 100644 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@3x.png and b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@3x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png index 280c30e..f6a06bf 100644 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png and b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png index f984b9e..b70427d 100644 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png and b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@3x.png b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@3x.png index 95d86f3..0fef171 100644 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@3x.png and b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@3x.png differ diff --git a/App_Resources/iOS/Info.plist b/App_Resources/iOS/Info.plist index 150b112..376b761 100644 --- a/App_Resources/iOS/Info.plist +++ b/App_Resources/iOS/Info.plist @@ -46,6 +46,8 @@ UIBackgroundModes location + audio + fetch diff --git a/app/App.svelte b/app/App.svelte index 289fca4..5167555 100644 --- a/app/App.svelte +++ b/app/App.svelte @@ -5,14 +5,15 @@ import { tabIndex } from "~/stores"; + - + - + diff --git a/app/api/index.ts b/app/api/index.ts index a382098..9bf9b1b 100644 --- a/app/api/index.ts +++ b/app/api/index.ts @@ -1 +1 @@ -export * from './routes'; +export * from "./routes"; diff --git a/app/api/routes.ts b/app/api/routes.ts index dd28e02..e7c2376 100644 --- a/app/api/routes.ts +++ b/app/api/routes.ts @@ -1,4 +1,4 @@ -import { Http } from '@nativescript/core'; +import { Http } from "@nativescript/core"; type GetRouteOptions = { origin: string; @@ -33,8 +33,8 @@ type TimeAndPlace = { }; type RouteApiGetParams = { - origin: LatLng, - destination: LatLng, + origin: LatLng; + destination: LatLng; arrivalTime?: Date; departureTime?: Date; lang?: string; @@ -47,7 +47,27 @@ type RouteApiGetParams = { }; // @see https://developer.here.com/documentation/intermodal-routing/dev_guide/concepts/modes.html -export type HereApiTransportMode = 'highSpeedTrain' | 'intercityTrain' | 'interRegionalTrain' | 'regionalTrain' | 'cityTrain' | 'bus' | 'ferry' | 'subway' | 'lightRail' | 'privateBus' | 'inclined' | 'aerial' | 'busRapid' | 'monorail' | 'flight' | 'walk' | 'car' | 'bicycle' | 'pedestrian' | string; +export type HereApiTransportMode = + | "highSpeedTrain" + | "intercityTrain" + | "interRegionalTrain" + | "regionalTrain" + | "cityTrain" + | "bus" + | "ferry" + | "subway" + | "lightRail" + | "privateBus" + | "inclined" + | "aerial" + | "busRapid" + | "monorail" + | "flight" + | "walk" + | "car" + | "bicycle" + | "pedestrian" + | string; export type HereApiRoute = { id: string; @@ -59,7 +79,7 @@ export type HereApiRoute = { summary?: { duration: number; length: number; - } + }; actions?: Array<{ action: string; duration: number; @@ -85,11 +105,11 @@ export type HereApiRoute = { textColor?: string; headsign?: string; shortName?: string; - }, + }; intermediateStops?: Array<{ departure: TimeAndPlace; duration?: number; - }>, + }>; agency?: { id: string; name: string; @@ -101,7 +121,7 @@ export type HereApiRoute = { name: string; website: string; }; -} +}; export type RouteApiGetResponse = { routes: Array; @@ -111,10 +131,8 @@ export type RouteApiGetResponse = { }>; }; - export const routeApi = { get: async (params: RouteApiGetParams) => { - const routeOptions: GetRouteOptions = { ...params, origin: `${params.origin.lat},${params.origin.lng}`, @@ -123,32 +141,33 @@ export const routeApi = { departureTime: params.departureTime?.toISOString() ?? undefined, }; - Object.keys(routeOptions).forEach(key => { + Object.keys(routeOptions).forEach((key) => { if (routeOptions[key as keyof typeof routeOptions] === undefined) { delete routeOptions[key as keyof typeof routeOptions]; } }); const response = await Http.request({ - url: process.env.BACKEND_SERVICE_ROUTE_URL ?? '', - method: 'POST', + url: process.env.BACKEND_SERVICE_ROUTE_URL ?? "", + method: "POST", headers: { - 'Content-Type': 'application/json', - 'return': 'actions,intermediate', - 'lang': 'de-de', - ...routeOptions + "Content-Type": "application/json", + return: "actions,intermediate", + lang: "de-de", + ...routeOptions, }, }); - console.log('response', response); + console.log("response", response); if (response.statusCode !== 200 || !response.content) { - throw new Error(response.content?.toString()) + throw new Error(response.content?.toString()); } - const responseJson = JSON.parse(response.content.toString()) as RouteApiGetResponse; + const responseJson = JSON.parse( + response.content.toString(), + ) as RouteApiGetResponse; return responseJson.routes; - } -} - + }, +}; diff --git a/app/app.scss b/app/app.scss index 03929f6..1a97694 100644 --- a/app/app.scss +++ b/app/app.scss @@ -8,7 +8,6 @@ .ns-root { @include font-normal; font-size: var(--s); - background-color: var(--color-background); } .icon { @@ -27,10 +26,3 @@ actionBar{ padding-top: var(--l); padding-bottom: var(--l); } - -.main-layout { - padding-left: var(--xl); - padding-right: var(--xl); - padding-top: var(--l); - padding-bottom: var(--l); -} diff --git a/app/app.ts b/app/app.ts index 9d54482..cf001cb 100644 --- a/app/app.ts +++ b/app/app.ts @@ -4,8 +4,8 @@ You can use this file to perform app-level initialization, but the primary purpose of the file is to pass control to the app’s first page. */ -import { svelteNativeNoFrame } from 'svelte-native' +import { svelteNativeNoFrame } from "svelte-native"; -import App from './App.svelte' +import App from "./App.svelte"; -svelteNativeNoFrame(App, {}) +svelteNativeNoFrame(App, {}); diff --git a/app/shared/components/Accordion.svelte b/app/shared/components/Accordion.svelte index d8797b9..6211bd2 100644 --- a/app/shared/components/Accordion.svelte +++ b/app/shared/components/Accordion.svelte @@ -8,19 +8,24 @@ - + -