diff --git a/.gitignore b/.gitignore index e2ec1c2..618a320 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ package-lock.json npm-debug.log* yarn-debug.log* yarn-error.log* + +.svelte-kit diff --git a/bun.lockb b/bun.lockb index c10d1db..0722d6b 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/jsconfig.json b/jsconfig.json new file mode 100644 index 0000000..1394d6c --- /dev/null +++ b/jsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "./.svelte-kit/tsconfig.json", + "compilerOptions": { + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "sourceMap": true, + "module": "NodeNext", + "moduleResolution": "NodeNext" + } +} diff --git a/package.json b/package.json index 57cc781..9eb31d1 100644 --- a/package.json +++ b/package.json @@ -1,21 +1,49 @@ { - "name": "vite-svelte-starter", - "version": "0.1.0", - "description": "", - "keywords": [], - "devDependencies": { - "@sveltejs/vite-plugin-svelte": "^2.0.0", - "svelte": "^4.2.3", - "svelte-preprocess": "^5.1.3", - "sass": "^1.72.0", - "vite": "^4.0.3" - }, - "scripts": { - "dev": "vite", - "build": "vite build", - "preview": "vite preview" - }, - "browserslist": ["> 1%", "last 2 versions", "not dead"], - "type": "module", - "private": true + "name": "am-d-model.eu", + "version": "0.0.1", + "scripts": { + "dev": "vite dev", + "build": "vite build && npm run package", + "preview": "vite preview", + "package": "svelte-kit sync && svelte-package && publint", + "prepublishOnly": "npm run package" + }, + "files": [ + "dist", + "!dist/**/*.test.*", + "!dist/**/*.spec.*" + ], + "sideEffects": [ + "**/*.css" + ], + "svelte": "./dist/index.js", + "types": "./dist/index.d.ts", + "type": "module", + "exports": { + ".": { + "types": "./dist/index.d.ts", + "svelte": "./dist/index.js" + } + }, + "peerDependencies": { + "svelte": "^5.0.0" + }, + "devDependencies": { + "@sveltejs/adapter-auto": "^3.3.1", + "@sveltejs/kit": "^2.15.2", + "@sveltejs/package": "^2.3.7", + "@sveltejs/vite-plugin-svelte": "^4.0.4", + "svelte": "^5.17.3", + "svelte-preprocess": "^5.1.4", + "sass": "^1.83.1", + "autoprefixer": "^10.4.20", + "publint": "^0.2.12", + "tailwindcss": "^3.4.17", + "typescript": "^5.7.3", + "vite": "^5.4.11" + }, + "dependencies": { + "@tailwindcss/forms": "^0.5.10" + }, + "private": true } diff --git a/postcss.config.js b/postcss.config.js new file mode 100644 index 0000000..ba80730 --- /dev/null +++ b/postcss.config.js @@ -0,0 +1,6 @@ +export default { + plugins: { + tailwindcss: {}, + autoprefixer: {} + } +}; diff --git a/src/App.svelte b/src/App.svelte deleted file mode 100644 index 0a78853..0000000 --- a/src/App.svelte +++ /dev/null @@ -1,12 +0,0 @@ - - -
- -
- - diff --git a/src/app.css b/src/app.css new file mode 100644 index 0000000..6c8f99f --- /dev/null +++ b/src/app.css @@ -0,0 +1,3 @@ +@import 'tailwindcss/base'; +@import 'tailwindcss/components'; +@import 'tailwindcss/utilities' diff --git a/src/app.html b/src/app.html new file mode 100644 index 0000000..17df014 --- /dev/null +++ b/src/app.html @@ -0,0 +1,15 @@ + + + + + + + + %sveltekit.head% + + + +
%sveltekit.body%
+ + + diff --git a/src/shared_components/Button.svelte b/src/lib/components/Button.svelte similarity index 100% rename from src/shared_components/Button.svelte rename to src/lib/components/Button.svelte diff --git a/src/shared_components/Link.svelte b/src/lib/components/Link.svelte similarity index 100% rename from src/shared_components/Link.svelte rename to src/lib/components/Link.svelte diff --git a/src/shared_components/NavigationFooter.svelte b/src/lib/components/NavigationFooter.svelte similarity index 91% rename from src/shared_components/NavigationFooter.svelte rename to src/lib/components/NavigationFooter.svelte index 69c79fe..32b9c51 100644 --- a/src/shared_components/NavigationFooter.svelte +++ b/src/lib/components/NavigationFooter.svelte @@ -1,8 +1,7 @@
diff --git a/src/shared_components/NavigationHeader.svelte b/src/lib/components/NavigationHeader.svelte similarity index 84% rename from src/shared_components/NavigationHeader.svelte rename to src/lib/components/NavigationHeader.svelte index 4abb7f8..337b174 100644 --- a/src/shared_components/NavigationHeader.svelte +++ b/src/lib/components/NavigationHeader.svelte @@ -5,9 +5,9 @@ export let button_text_class; export let display_title = true; - import "./NavigationHeader.scss"; - import Button from "./Button.svelte"; - import Link from "./Link.svelte"; + import "$lib/styles/NavigationHeader.scss"; + import Button from "$lib/components/Button.svelte"; + import Link from "$lib/components/Link.svelte";
diff --git a/src/shared_components/ScrollToTop.svelte b/src/lib/components/ScrollToTop.svelte similarity index 100% rename from src/shared_components/ScrollToTop.svelte rename to src/lib/components/ScrollToTop.svelte diff --git a/src/shared_components/NavigationFooter.scss b/src/lib/styles/NavigationFooter.scss similarity index 100% rename from src/shared_components/NavigationFooter.scss rename to src/lib/styles/NavigationFooter.scss diff --git a/src/shared_components/NavigationHeader.scss b/src/lib/styles/NavigationHeader.scss similarity index 100% rename from src/shared_components/NavigationHeader.scss rename to src/lib/styles/NavigationHeader.scss diff --git a/src/styles.css b/src/lib/styles/styles.css similarity index 100% rename from src/styles.css rename to src/lib/styles/styles.css diff --git a/src/vars.css b/src/lib/styles/vars.css similarity index 93% rename from src/vars.css rename to src/lib/styles/vars.css index 3db858e..92b68cb 100644 --- a/src/vars.css +++ b/src/lib/styles/vars.css @@ -1,5 +1,5 @@ -@import url('https://fonts.cdnfonts.com/css/martel-2'); -@import url('https://fonts.cdnfonts.com/css/assistant'); +@import url("https://fonts.cdnfonts.com/css/martel-2"); +@import url("https://fonts.cdnfonts.com/css/assistant"); :root { /* Colors */ diff --git a/src/main.js b/src/main.js deleted file mode 100644 index e26d784..0000000 --- a/src/main.js +++ /dev/null @@ -1,7 +0,0 @@ -import App from './App.svelte'; - - -const app = new App({ - target: document.getElementById('app'), -}) -export default app diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte new file mode 100644 index 0000000..9e26bfd --- /dev/null +++ b/src/routes/+layout.svelte @@ -0,0 +1,8 @@ + + +{@render children()} diff --git a/src/LandingPage/LandingPage.svelte b/src/routes/+page.svelte similarity index 90% rename from src/LandingPage/LandingPage.svelte rename to src/routes/+page.svelte index 2bccd14..1fd11b4 100644 --- a/src/LandingPage/LandingPage.svelte +++ b/src/routes/+page.svelte @@ -1,8 +1,8 @@
diff --git a/src/LandingPage/InfoScroll.scss b/src/routes/InfoScroll.scss similarity index 100% rename from src/LandingPage/InfoScroll.scss rename to src/routes/InfoScroll.scss diff --git a/src/LandingPage/InfoScroll.svelte b/src/routes/InfoScroll.svelte similarity index 100% rename from src/LandingPage/InfoScroll.svelte rename to src/routes/InfoScroll.svelte diff --git a/src/LandingPage/LandingPage.scss b/src/routes/LandingPage.scss similarity index 100% rename from src/LandingPage/LandingPage.scss rename to src/routes/LandingPage.scss diff --git a/src/LandingPage/NavigationHeader.scss b/src/routes/NavigationHeader.scss similarity index 100% rename from src/LandingPage/NavigationHeader.scss rename to src/routes/NavigationHeader.scss diff --git a/src/LandingPage/Splash.scss b/src/routes/Splash.scss similarity index 100% rename from src/LandingPage/Splash.scss rename to src/routes/Splash.scss diff --git a/src/LandingPage/Splash.svelte b/src/routes/Splash.svelte similarity index 94% rename from src/LandingPage/Splash.svelte rename to src/routes/Splash.svelte index 2fb004d..6c4d7f9 100644 --- a/src/LandingPage/Splash.svelte +++ b/src/routes/Splash.svelte @@ -1,6 +1,6 @@
diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte new file mode 100644 index 0000000..64b0af7 --- /dev/null +++ b/src/routes/about/+page.svelte @@ -0,0 +1 @@ +About page placeholder diff --git a/src/routes/contact/+page.svelte b/src/routes/contact/+page.svelte new file mode 100644 index 0000000..65c730f --- /dev/null +++ b/src/routes/contact/+page.svelte @@ -0,0 +1 @@ +Contact page placeholder diff --git a/public/buildplate.webp b/static/buildplate.webp similarity index 100% rename from public/buildplate.webp rename to static/buildplate.webp diff --git a/public/data.webp b/static/data.webp similarity index 100% rename from public/data.webp rename to static/data.webp diff --git a/public/facebook.svg b/static/facebook.svg similarity index 100% rename from public/facebook.svg rename to static/facebook.svg diff --git a/static/favicon.png b/static/favicon.png new file mode 100644 index 0000000..825b9e6 Binary files /dev/null and b/static/favicon.png differ diff --git a/public/instagram.svg b/static/instagram.svg similarity index 100% rename from public/instagram.svg rename to static/instagram.svg diff --git a/public/landing.webm b/static/landing.webm similarity index 100% rename from public/landing.webm rename to static/landing.webm diff --git a/public/landing.webp b/static/landing.webp similarity index 100% rename from public/landing.webp rename to static/landing.webp diff --git a/public/linkedin.svg b/static/linkedin.svg similarity index 100% rename from public/linkedin.svg rename to static/linkedin.svg diff --git a/public/openscience.webp b/static/openscience.webp similarity index 100% rename from public/openscience.webp rename to static/openscience.webp diff --git a/public/youtube.svg b/static/youtube.svg similarity index 100% rename from public/youtube.svg rename to static/youtube.svg diff --git a/svelte.config.js b/svelte.config.js index 76dead7..ea1e108 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,8 +1,12 @@ import preprocess from "svelte-preprocess"; +import adapter from '@sveltejs/adapter-auto'; - const config = { - preprocess: preprocess({}), - }; - - export default config; - +/** @type {import('@sveltejs/kit').Config} */ +const config = { + preprocess: preprocess({}), + kit: { + adapter: adapter() + } +}; + +export default config; diff --git a/tailwind.config.js b/tailwind.config.js new file mode 100644 index 0000000..e325f7e --- /dev/null +++ b/tailwind.config.js @@ -0,0 +1,12 @@ +import forms from '@tailwindcss/forms'; + +/** @type {import('tailwindcss').Config} */ +export default { + content: ['./src/**/*.{html,js,svelte,ts}'], + + theme: { + extend: {} + }, + + plugins: [forms] +}; diff --git a/vite.config.js b/vite.config.js index e828b87..a3eb481 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,7 +1,6 @@ -import { defineConfig } from 'vite' -import {svelte} from '@sveltejs/vite-plugin-svelte' +import { sveltekit } from '@sveltejs/kit/vite'; +import { defineConfig } from 'vite'; -// https://vitejs.dev/config/ export default defineConfig({ - plugins: [svelte()], -}) + plugins: [sveltekit()] +});