diff --git a/package-lock.json b/package-lock.json index 8c43e2a..32eb2fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,10 @@ "": { "name": "minibusservice.no", "version": "0.0.0", + "dependencies": { + "leaflet": "^1.9.4", + "tailwind-merge": "^3.5.0" + }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "^7.0.0", "@tailwindcss/vite": "^0.0.0-insiders.aaaefe8", @@ -14,7 +18,6 @@ "@types/node": "^24.12.0", "svelte": "^5.53.7", "svelte-check": "^4.4.5", - "tailwind-merge": "^3.5.0", "tailwindcss": "^0.0.0-insiders.aaaefe8", "typescript": "~5.9.3", "vite": "^8.0.0" @@ -1200,6 +1203,12 @@ "jiti": "lib/jiti-cli.mjs" } }, + "node_modules/leaflet": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz", + "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==", + "license": "BSD-2-Clause" + }, "node_modules/lightningcss": { "version": "1.32.0", "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", @@ -1694,7 +1703,6 @@ "version": "3.5.0", "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz", "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==", - "dev": true, "license": "MIT", "funding": { "type": "github", diff --git a/package.json b/package.json index 673f288..49e5759 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,12 @@ "@types/node": "^24.12.0", "svelte": "^5.53.7", "svelte-check": "^4.4.5", - "tailwind-merge": "^3.5.0", "tailwindcss": "^0.0.0-insiders.aaaefe8", "typescript": "~5.9.3", "vite": "^8.0.0" + }, + "dependencies": { + "leaflet": "^1.9.4", + "tailwind-merge": "^3.5.0" } } diff --git a/src/App.svelte b/src/App.svelte index fe0978f..8545d9c 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -1,15 +1,40 @@ - - {#snippet notfound()} -

Not found

-

Sorry, the page you are looking for does not exist.

-

Return to home.

- {/snippet} -
+
+ +
+
+ + {#snippet notfound()} +

Not found

+

+ Sorry, the page you are looking for does not exist. +

+

Return to home.

+ {/snippet} +
+
+
+ +
+ diff --git a/src/Footer.svelte b/src/Footer.svelte new file mode 100644 index 0000000..4dc49d5 --- /dev/null +++ b/src/Footer.svelte @@ -0,0 +1,31 @@ + + + diff --git a/src/Navigation.svelte b/src/Navigation.svelte new file mode 100644 index 0000000..5d35adc --- /dev/null +++ b/src/Navigation.svelte @@ -0,0 +1,138 @@ + + +
+
+ + + + +
+ +
+
+ {#if sidebarOpen} + + {/if} +
+ + + + + + + diff --git a/src/lib/components/ContactForm.svelte b/src/lib/components/ContactForm.svelte index 929b773..285de50 100644 --- a/src/lib/components/ContactForm.svelte +++ b/src/lib/components/ContactForm.svelte @@ -1,122 +1,38 @@ - - -
-
-

- Spørsmål?
Kontakt oss via tlf, e-post eller via skjemaet under -

- - - Tlf: +47 45 25 61 61 - - - E-post: minibusstur@hotmail.com - - - -
- -
- - - -