diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..b512c09 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml new file mode 100644 index 0000000..ab35745 --- /dev/null +++ b/.onedev-buildspec.yml @@ -0,0 +1,28 @@ +version: 31 +jobs: +- name: portfolio ci + steps: + - !CheckoutStep + name: checkout + cloneCredential: !DefaultCredential {} + withLfs: false + withSubmodules: false + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !CommandStep + name: build + runInContainer: false + interpreter: !DefaultInterpreter + commands: | + npm build + useTTY: true + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + - !BuildImageStep + name: build image + tags: rannes.dev/portfolio + publish: false + removeDanglingImages: true + condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL + retryCondition: never + maxRetries: 3 + retryDelay: 30 + timeout: 3600 diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5ec9285 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM node:12 AS build + +WORKDIR /app + +COPY package.json ./ +COPY package-lock.json ./ +RUN npm install +COPY . ./ +RUN npm run build + +FROM nginx:1.19-alpine +COPY --from=build /app/public /usr/share/nginx/html \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 3c9d2ec..bda5233 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,12 @@ "": { "name": "my-portfolio", "version": "0.0.1", +<<<<<<< HEAD + "dependencies": { + "@sveltejs/adapter-node": "^5.0.1" + }, +======= +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "devDependencies": { "@sveltejs/adapter-auto": "^3.0.0", "@sveltejs/kit": "^2.0.0", @@ -49,7 +55,10 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" @@ -65,7 +74,10 @@ "cpu": [ "ppc64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "aix" @@ -81,7 +93,10 @@ "cpu": [ "arm" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "android" @@ -97,7 +112,10 @@ "cpu": [ "arm64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "android" @@ -113,7 +131,10 @@ "cpu": [ "x64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "android" @@ -129,7 +150,10 @@ "cpu": [ "arm64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "darwin" @@ -145,7 +169,10 @@ "cpu": [ "x64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "darwin" @@ -161,7 +188,10 @@ "cpu": [ "arm64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "freebsd" @@ -177,7 +207,10 @@ "cpu": [ "x64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "freebsd" @@ -193,7 +226,10 @@ "cpu": [ "arm" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -209,7 +245,10 @@ "cpu": [ "arm64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -225,7 +264,10 @@ "cpu": [ "ia32" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -241,7 +283,10 @@ "cpu": [ "loong64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -257,7 +302,10 @@ "cpu": [ "mips64el" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -273,7 +321,10 @@ "cpu": [ "ppc64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -289,7 +340,10 @@ "cpu": [ "riscv64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -305,7 +359,10 @@ "cpu": [ "s390x" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -321,7 +378,10 @@ "cpu": [ "x64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -337,7 +397,10 @@ "cpu": [ "x64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "netbsd" @@ -353,7 +416,10 @@ "cpu": [ "x64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "openbsd" @@ -369,7 +435,10 @@ "cpu": [ "x64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "sunos" @@ -385,7 +454,10 @@ "cpu": [ "arm64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "win32" @@ -401,7 +473,10 @@ "cpu": [ "ia32" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "win32" @@ -417,7 +492,10 @@ "cpu": [ "x64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "win32" @@ -563,7 +641,10 @@ "version": "0.3.5", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -577,7 +658,10 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": ">=6.0.0" } @@ -586,7 +670,10 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": ">=6.0.0" } @@ -594,14 +681,21 @@ "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", +<<<<<<< HEAD + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" +======= "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -655,8 +749,155 @@ "node_modules/@polka/url": { "version": "1.0.0-next.25", "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz", +<<<<<<< HEAD + "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==" + }, + "node_modules/@rollup/plugin-commonjs": { + "version": "25.0.7", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.7.tgz", + "integrity": "sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==", + "dependencies": { + "@rollup/pluginutils": "^5.0.1", + "commondir": "^1.0.1", + "estree-walker": "^2.0.2", + "glob": "^8.0.3", + "is-reference": "1.2.1", + "magic-string": "^0.30.3" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^2.68.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" + }, + "node_modules/@rollup/plugin-commonjs/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/is-reference": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", + "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==", + "dependencies": { + "@types/estree": "*" + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@rollup/plugin-json": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.1.0.tgz", + "integrity": "sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==", + "dependencies": { + "@rollup/pluginutils": "^5.1.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/plugin-node-resolve": { + "version": "15.2.3", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz", + "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==", + "dependencies": { + "@rollup/pluginutils": "^5.0.1", + "@types/resolve": "1.20.2", + "deepmerge": "^4.2.2", + "is-builtin-module": "^3.2.1", + "is-module": "^1.0.0", + "resolve": "^1.22.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^2.78.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/pluginutils": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", + "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", + "dependencies": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/pluginutils/node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" +======= "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.14.0", @@ -665,7 +906,10 @@ "cpu": [ "arm" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "android" @@ -678,7 +922,10 @@ "cpu": [ "arm64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "android" @@ -691,7 +938,10 @@ "cpu": [ "arm64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "darwin" @@ -704,7 +954,10 @@ "cpu": [ "x64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "darwin" @@ -717,7 +970,10 @@ "cpu": [ "arm" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -730,7 +986,10 @@ "cpu": [ "arm64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -743,7 +1002,10 @@ "cpu": [ "arm64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -756,7 +1018,10 @@ "cpu": [ "ppc64le" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -769,7 +1034,10 @@ "cpu": [ "riscv64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -782,7 +1050,10 @@ "cpu": [ "s390x" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -795,7 +1066,10 @@ "cpu": [ "x64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -808,7 +1082,10 @@ "cpu": [ "x64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "linux" @@ -821,7 +1098,10 @@ "cpu": [ "arm64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "win32" @@ -834,7 +1114,10 @@ "cpu": [ "ia32" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "win32" @@ -847,7 +1130,10 @@ "cpu": [ "x64" ], +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "optional": true, "os": [ "win32" @@ -865,11 +1151,31 @@ "@sveltejs/kit": "^2.0.0" } }, +<<<<<<< HEAD + "node_modules/@sveltejs/adapter-node": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@sveltejs/adapter-node/-/adapter-node-5.0.1.tgz", + "integrity": "sha512-eYdmxdUWMW+dad1JfMsWBPY2vjXz9eE+52A2AQnXPScPJlIxIVk5mmbaEEzrZivLfO2wEcLTZ5vdC03W69x+iA==", + "dependencies": { + "@rollup/plugin-commonjs": "^25.0.7", + "@rollup/plugin-json": "^6.1.0", + "@rollup/plugin-node-resolve": "^15.2.3", + "rollup": "^4.9.5" + }, + "peerDependencies": { + "@sveltejs/kit": "^2.4.0" + } + }, +======= +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "node_modules/@sveltejs/kit": { "version": "2.5.5", "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.5.5.tgz", "integrity": "sha512-ULe3PB00q4+wYRL+IS5FDPsCEVnhEITofm7b9Yz8malcH3r1SAnW/JJ6T13hIMeu8QNRIuVQWo+P4+2VklbnLQ==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "hasInstallScript": true, "dependencies": { "@types/cookie": "^0.6.0", @@ -901,7 +1207,10 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-3.0.2.tgz", "integrity": "sha512-MpmF/cju2HqUls50WyTHQBZUV3ovV/Uk8k66AN2gwHogNAG8wnW8xtZDhzNBsFJJuvmq1qnzA5kE7YfMJNFv2Q==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "@sveltejs/vite-plugin-svelte-inspector": "^2.0.0", "debug": "^4.3.4", @@ -923,7 +1232,10 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-2.0.0.tgz", "integrity": "sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "debug": "^4.3.4" }, @@ -939,8 +1251,12 @@ "node_modules/@types/cookie": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", +<<<<<<< HEAD + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" +======= "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/@types/eslint": { "version": "8.56.7", @@ -955,8 +1271,12 @@ "node_modules/@types/estree": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", +<<<<<<< HEAD + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==" +======= "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/@types/json-schema": { "version": "7.0.15", @@ -964,6 +1284,14 @@ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, +<<<<<<< HEAD + "node_modules/@types/resolve": { + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", + "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==" + }, +======= +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "node_modules/@ungap/structured-clone": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", @@ -974,7 +1302,10 @@ "version": "8.11.3", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "bin": { "acorn": "bin/acorn" }, @@ -1066,7 +1397,10 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "dequal": "^2.0.3" } @@ -1112,7 +1446,10 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.0.0.tgz", "integrity": "sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "dequal": "^2.0.3" } @@ -1120,8 +1457,12 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", +<<<<<<< HEAD + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" +======= "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/binary-extensions": { "version": "2.3.0", @@ -1189,6 +1530,20 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, +<<<<<<< HEAD + "node_modules/builtin-modules": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", + "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, +======= +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -1283,7 +1638,10 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/code-red/-/code-red-1.0.4.tgz", "integrity": "sha512-7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15", "@types/estree": "^1.0.1", @@ -1319,6 +1677,14 @@ "node": ">= 6" } }, +<<<<<<< HEAD + "node_modules/commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==" + }, +======= +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1329,7 +1695,10 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": ">= 0.6" } @@ -1352,7 +1721,10 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "mdn-data": "2.0.30", "source-map-js": "^1.0.1" @@ -1377,7 +1749,10 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "ms": "2.1.2" }, @@ -1400,7 +1775,10 @@ "version": "4.3.1", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": ">=0.10.0" } @@ -1409,7 +1787,10 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": ">=6" } @@ -1417,8 +1798,12 @@ "node_modules/devalue": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/devalue/-/devalue-4.3.2.tgz", +<<<<<<< HEAD + "integrity": "sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==" +======= "integrity": "sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/didyoumean": { "version": "1.2.2", @@ -1466,7 +1851,10 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "hasInstallScript": true, "bin": { "esbuild": "bin/esbuild" @@ -1666,8 +2054,12 @@ "node_modules/esm-env": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.0.0.tgz", +<<<<<<< HEAD + "integrity": "sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA==" +======= "integrity": "sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/espree": { "version": "9.6.1", @@ -1723,7 +2115,10 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "@types/estree": "^1.0.0" } @@ -1884,14 +2279,21 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", +<<<<<<< HEAD + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" +======= "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "hasInstallScript": true, "optional": true, "os": [ @@ -1905,7 +2307,10 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -1960,14 +2365,22 @@ "node_modules/globalyzer": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz", +<<<<<<< HEAD + "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==" +======= "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/globrex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", +<<<<<<< HEAD + "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==" +======= "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/graphemer": { "version": "1.4.0", @@ -1988,7 +2401,10 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "function-bind": "^1.1.2" }, @@ -2025,7 +2441,10 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.0.0.tgz", "integrity": "sha512-okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -2044,7 +2463,10 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -2053,8 +2475,12 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", +<<<<<<< HEAD + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" +======= "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/is-binary-path": { "version": "2.1.0", @@ -2068,11 +2494,31 @@ "node": ">=8" } }, +<<<<<<< HEAD + "node_modules/is-builtin-module": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", + "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", + "dependencies": { + "builtin-modules": "^3.3.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, +======= +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "node_modules/is-core-module": { "version": "2.13.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "hasown": "^2.0.0" }, @@ -2110,6 +2556,14 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD + "node_modules/is-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", + "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==" + }, +======= +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -2132,7 +2586,10 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.2.tgz", "integrity": "sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "@types/estree": "*" } @@ -2213,7 +2670,10 @@ "version": "4.1.5", "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": ">=6" } @@ -2255,8 +2715,12 @@ "node_modules/locate-character": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz", +<<<<<<< HEAD + "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==" +======= "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/locate-path": { "version": "6.0.0", @@ -2295,7 +2759,10 @@ "version": "0.30.8", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" }, @@ -2306,8 +2773,12 @@ "node_modules/mdn-data": { "version": "2.0.30", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", +<<<<<<< HEAD + "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==" +======= "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/merge2": { "version": "1.4.1", @@ -2356,7 +2827,10 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": ">=4" } @@ -2365,7 +2839,10 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz", "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": ">=10" } @@ -2373,8 +2850,12 @@ "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", +<<<<<<< HEAD + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" +======= "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/mz": { "version": "2.7.0", @@ -2391,7 +2872,10 @@ "version": "3.3.7", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "funding": [ { "type": "github", @@ -2457,7 +2941,10 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "wrappy": "1" } @@ -2551,8 +3038,12 @@ "node_modules/path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", +<<<<<<< HEAD + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" +======= "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/path-scurry": { "version": "1.10.2", @@ -2583,7 +3074,10 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz", "integrity": "sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^3.0.0", @@ -2593,14 +3087,21 @@ "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", +<<<<<<< HEAD + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" +======= "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": ">=8.6" }, @@ -2630,7 +3131,10 @@ "version": "8.4.38", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "funding": [ { "type": "opencollective", @@ -2887,7 +3391,10 @@ "version": "1.22.8", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -2938,7 +3445,10 @@ "version": "4.14.0", "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.0.tgz", "integrity": "sha512-Qe7w62TyawbDzB4yt32R0+AbIo6m1/sqO7UPzFS8Z/ksL5mrfhA0v4CavfdmFav3D+ub4QeAgsGEe84DoWe/nQ==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "@types/estree": "1.0.5" }, @@ -2995,7 +3505,10 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz", "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "mri": "^1.1.0" }, @@ -3021,8 +3534,12 @@ "node_modules/set-cookie-parser": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz", +<<<<<<< HEAD + "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==" +======= "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/shebang-command": { "version": "2.0.0", @@ -3061,7 +3578,10 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz", "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "@polka/url": "^1.0.0-next.24", "mrmime": "^2.0.0", @@ -3075,7 +3595,10 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": ">=0.10.0" } @@ -3266,7 +3789,10 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": ">= 0.4" }, @@ -3278,7 +3804,10 @@ "version": "4.2.12", "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.12.tgz", "integrity": "sha512-d8+wsh5TfPwqVzbm4/HCXC783/KPHV60NvwitJnyTA5lWn1elhXMNWhXGCJ7PwPa8qFUnyJNIyuIRt2mT0WMug==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "@ampproject/remapping": "^2.2.1", "@jridgewell/sourcemap-codec": "^1.4.15", @@ -3330,7 +3859,10 @@ "version": "0.15.3", "resolved": "https://registry.npmjs.org/svelte-hmr/-/svelte-hmr-0.15.3.tgz", "integrity": "sha512-41snaPswvSf8TJUhlkoJBekRrABDXDMdpNpT2tfHIv4JuhgvHqLMhEPGtaQn0BmbNSTkuz2Ed20DF2eHw0SmBQ==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": "^12.20 || ^14.13.1 || >= 16" }, @@ -3465,7 +3997,10 @@ "version": "0.2.9", "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz", "integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "globalyzer": "0.1.0", "globrex": "^0.1.2" @@ -3487,7 +4022,10 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "engines": { "node": ">=6" } @@ -3571,7 +4109,10 @@ "version": "5.2.8", "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz", "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "dependencies": { "esbuild": "^0.20.1", "postcss": "^8.4.38", @@ -3626,7 +4167,10 @@ "version": "0.2.5", "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.5.tgz", "integrity": "sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef "peerDependencies": { "vite": "^3.0.0 || ^4.0.0 || ^5.0.0" }, @@ -3748,8 +4292,12 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", +<<<<<<< HEAD + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" +======= "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, "node_modules/yallist": { "version": "4.0.0", diff --git a/package.json b/package.json index dd0b98f..ce452f5 100644 --- a/package.json +++ b/package.json @@ -25,5 +25,12 @@ "tailwindcss": "^3.4.3", "vite": "^5.0.3" }, +<<<<<<< HEAD + "type": "module", + "dependencies": { + "@sveltejs/adapter-node": "^5.0.1" + } +======= "type": "module" +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef } diff --git a/src/app.html b/src/app.html index c271083..6cb0ad1 100644 --- a/src/app.html +++ b/src/app.html @@ -9,7 +9,11 @@ %sveltekit.head% +<<<<<<< HEAD + +======= +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
%sveltekit.body%
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 18f2ee2..c073139 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -15,11 +15,23 @@ }, { name: "portfolio", +<<<<<<< HEAD subPages: ["learnings", "project a", "project b", "project c"], +======= +<<<<<<< HEAD + subPages: ["project_a", "project_b", "project_c"], + }, + { + name: "contact", + subPages: ["get_in_touch", "socials"], +======= + subPages: ["project a", "project, b", "project c"], +>>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1 }, { name: "contact", subPages: ["get in touch", "socials"], +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef }, { name: "login", @@ -35,6 +47,10 @@ selected = nav[event.srcElement.id]; intSelected = event.srcElement.id; } +<<<<<<< HEAD + +======= +>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef +<<<<<<< HEAD
+======= +<<<<<<< HEAD +
+======= +
+>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef +>>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1
\ No newline at end of file diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 8be9ed5..ce3436c 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,4 +1,12 @@ +<<<<<<< HEAD
+======= +<<<<<<< HEAD +
+======= +
+>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef +>>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1

Welcome to my personal webpage

My name is Christian and I live in Copenhagen. In my professional life, I recruit in product and engineering.

diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte index 1b73053..e174731 100644 --- a/src/routes/about/+page.svelte +++ b/src/routes/about/+page.svelte @@ -1,3 +1,8 @@ +<<<<<<< HEAD +

Life is good in Copenhagen

+

I live in Copenhagen with my partner and children.

+=======

This is the about page

My name is Christian, and I live in Denmark with my partner and kids.

+>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef

testing

\ No newline at end of file diff --git a/src/routes/get_in_touch/+page.svelte b/src/routes/get_in_touch/+page.svelte new file mode 100644 index 0000000..3691322 --- /dev/null +++ b/src/routes/get_in_touch/+page.svelte @@ -0,0 +1 @@ +

does it work?

\ No newline at end of file diff --git a/src/routes/homelab/+page.svelte b/src/routes/homelab/+page.svelte index 59e86ab..bf2e53f 100644 --- a/src/routes/homelab/+page.svelte +++ b/src/routes/homelab/+page.svelte @@ -1,3 +1,4 @@ +<<<<<<< HEAD

What should this look like?

@@ -9,4 +10,7 @@
  • Raports style
  • Mix of them all
    • -
    \ No newline at end of file +
    +======= +

    aaaawwww yea the pride of my life

    +>>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1 diff --git a/src/routes/resume/+page.svelte b/src/routes/resume/+page.svelte new file mode 100644 index 0000000..f702054 --- /dev/null +++ b/src/routes/resume/+page.svelte @@ -0,0 +1,2 @@ +

    Get ready for my resume baby!

    +

    resumes are getting longer and longer these day, and this one is no exception!

    \ No newline at end of file