diff --git a/.idea/runConfigurations/dev.xml b/.idea/runConfigurations/dev.xml
new file mode 100644
index 0000000..46d8ec8
--- /dev/null
+++ b/.idea/runConfigurations/dev.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/webResources.xml b/.idea/webResources.xml
new file mode 100644
index 0000000..7ede49a
--- /dev/null
+++ b/.idea/webResources.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/index.html b/index.html
index 5901279..64d5621 100644
--- a/index.html
+++ b/index.html
@@ -3,8 +3,9 @@
-
- Martials.no
+
+ Hjem | Martials.no
+
diff --git a/package-lock.json b/package-lock.json
index 49ad2b0..6190cd0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -482,9 +482,9 @@
}
},
"node_modules/@esbuild/android-arm": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.17.tgz",
- "integrity": "sha512-ay6Ken4u+JStjYmqIgh71jMT0bs/rXpCCDKaMfl78B20QYWJglT5P6Ejfm4hWf6Zi+uUWNe7ZmqakRs2BQYIeg==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz",
+ "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==",
"cpu": [
"arm"
],
@@ -498,9 +498,9 @@
}
},
"node_modules/@esbuild/linux-loong64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.17.tgz",
- "integrity": "sha512-IA1O7f7qxw2DX8oqTpugHElr926phs7Rq8ULXleBMk4go5K05BU0mI8BfCkWcYAvcmVaMc13bv5W3LIUlU6Y9w==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz",
+ "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==",
"cpu": [
"loong64"
],
@@ -692,9 +692,9 @@
}
},
"node_modules/babel-plugin-jsx-dom-expressions": {
- "version": "0.35.6",
- "resolved": "https://registry.npmjs.org/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.35.6.tgz",
- "integrity": "sha512-z8VBym+Scol38MiR97iqQGsANjhsDqscRRemk+po+z3TWKV/fb9kux/gdKOJJSC/ARyUL3HExBFVtr+Efd24uw==",
+ "version": "0.35.8",
+ "resolved": "https://registry.npmjs.org/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.35.8.tgz",
+ "integrity": "sha512-IzObXlDFA80wyEW/IUtCxaUAoJnq4CTpvcvC1xBZBlMpJDwmK6mIYnTZ9xgFyGCrAjC0LxVcqeDQx31gJJ4UJQ==",
"dev": true,
"dependencies": {
"@babel/helper-module-imports": "7.16.0",
@@ -719,12 +719,12 @@
}
},
"node_modules/babel-preset-solid": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/babel-preset-solid/-/babel-preset-solid-1.6.2.tgz",
- "integrity": "sha512-5sFI34g7Jtp4r04YFWkuC1o+gnekBdPXQTJb5/6lmxi5YwzazVgKAXRwEAToC3zRaPyIYJbZUVLpOi5mDzPEuw==",
+ "version": "1.6.6",
+ "resolved": "https://registry.npmjs.org/babel-preset-solid/-/babel-preset-solid-1.6.6.tgz",
+ "integrity": "sha512-uG6svyjDRmQxLtRyydlJjFkvlOGYEd/xvfUZu58UuzJdiv40lZ34K+EcgbAFD85JPUdlnkr6bbHUpUXP/VK+Jg==",
"dev": true,
"dependencies": {
- "babel-plugin-jsx-dom-expressions": "^0.35.4"
+ "babel-plugin-jsx-dom-expressions": "^0.35.8"
},
"peerDependencies": {
"@babel/core": "^7.0.0"
@@ -789,9 +789,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001436",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz",
- "integrity": "sha512-ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg==",
+ "version": "1.0.30001439",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz",
+ "integrity": "sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==",
"dev": true,
"funding": [
{
@@ -963,9 +963,9 @@
"dev": true
},
"node_modules/esbuild": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.17.tgz",
- "integrity": "sha512-8MbkDX+kh0kaeYGd6klMbn1uTOXHoDw7UYMd1dQYA5cqBZivf5+pzfaXZSL1RNamJfXW/uWC5+9wX5ejDgpSqg==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
+ "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
"dev": true,
"hasInstallScript": true,
"bin": {
@@ -975,34 +975,34 @@
"node": ">=12"
},
"optionalDependencies": {
- "@esbuild/android-arm": "0.15.17",
- "@esbuild/linux-loong64": "0.15.17",
- "esbuild-android-64": "0.15.17",
- "esbuild-android-arm64": "0.15.17",
- "esbuild-darwin-64": "0.15.17",
- "esbuild-darwin-arm64": "0.15.17",
- "esbuild-freebsd-64": "0.15.17",
- "esbuild-freebsd-arm64": "0.15.17",
- "esbuild-linux-32": "0.15.17",
- "esbuild-linux-64": "0.15.17",
- "esbuild-linux-arm": "0.15.17",
- "esbuild-linux-arm64": "0.15.17",
- "esbuild-linux-mips64le": "0.15.17",
- "esbuild-linux-ppc64le": "0.15.17",
- "esbuild-linux-riscv64": "0.15.17",
- "esbuild-linux-s390x": "0.15.17",
- "esbuild-netbsd-64": "0.15.17",
- "esbuild-openbsd-64": "0.15.17",
- "esbuild-sunos-64": "0.15.17",
- "esbuild-windows-32": "0.15.17",
- "esbuild-windows-64": "0.15.17",
- "esbuild-windows-arm64": "0.15.17"
+ "@esbuild/android-arm": "0.15.18",
+ "@esbuild/linux-loong64": "0.15.18",
+ "esbuild-android-64": "0.15.18",
+ "esbuild-android-arm64": "0.15.18",
+ "esbuild-darwin-64": "0.15.18",
+ "esbuild-darwin-arm64": "0.15.18",
+ "esbuild-freebsd-64": "0.15.18",
+ "esbuild-freebsd-arm64": "0.15.18",
+ "esbuild-linux-32": "0.15.18",
+ "esbuild-linux-64": "0.15.18",
+ "esbuild-linux-arm": "0.15.18",
+ "esbuild-linux-arm64": "0.15.18",
+ "esbuild-linux-mips64le": "0.15.18",
+ "esbuild-linux-ppc64le": "0.15.18",
+ "esbuild-linux-riscv64": "0.15.18",
+ "esbuild-linux-s390x": "0.15.18",
+ "esbuild-netbsd-64": "0.15.18",
+ "esbuild-openbsd-64": "0.15.18",
+ "esbuild-sunos-64": "0.15.18",
+ "esbuild-windows-32": "0.15.18",
+ "esbuild-windows-64": "0.15.18",
+ "esbuild-windows-arm64": "0.15.18"
}
},
"node_modules/esbuild-android-64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.17.tgz",
- "integrity": "sha512-sUs6cKMAuAyWnJ/66ezWVr9SMRGFSwoMagxzdhXYggSA12zF7krXSuc1Y9JwxHq56wtv/gFAVo97TFm7RBc1Ig==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz",
+ "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==",
"cpu": [
"x64"
],
@@ -1016,9 +1016,9 @@
}
},
"node_modules/esbuild-android-arm64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.17.tgz",
- "integrity": "sha512-RLZuCgIx1rexwxwsXTEW40ZiZzdBI1MBphwDRFyms/iiJGwLxqCH7v75iSJk5s6AF6oa80KC6r/RmzyaX/uJNg==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz",
+ "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==",
"cpu": [
"arm64"
],
@@ -1032,9 +1032,9 @@
}
},
"node_modules/esbuild-darwin-64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.17.tgz",
- "integrity": "sha512-+6RTCZ0hfAb+RqTNq1uVsBcP441yZOSi6CyV9BIBryGGVg8RM3Bc6L45e5b68jdRloddN92ekS50e4ElI+cHQA==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz",
+ "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==",
"cpu": [
"x64"
],
@@ -1048,9 +1048,9 @@
}
},
"node_modules/esbuild-darwin-arm64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.17.tgz",
- "integrity": "sha512-ne4UWUHEKWLgYSE5SLr0/TBcID3k9LPnrzzRXzFLTfD+ygjnW1pMEgdMfmOKIe8jYBUYv8x/YoksriTdQb9r/Q==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz",
+ "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==",
"cpu": [
"arm64"
],
@@ -1064,9 +1064,9 @@
}
},
"node_modules/esbuild-freebsd-64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.17.tgz",
- "integrity": "sha512-6my3DrwLOe1zhR8UzVRKeo9AFM9XkApJBcx0IE+qKaEbKKBxYAiDBtd2ZMtRA2agqIwRP0kuHofTiDEzpfA+ZA==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz",
+ "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==",
"cpu": [
"x64"
],
@@ -1080,9 +1080,9 @@
}
},
"node_modules/esbuild-freebsd-arm64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.17.tgz",
- "integrity": "sha512-LQL7+f+bz+xmAu1FcDBB304Wm2CjONUcOeF4f3TqG7wYXMxjjYQZBFv+0OVapNXyYrM2vy9JMDbps+SheuOnHg==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz",
+ "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==",
"cpu": [
"arm64"
],
@@ -1096,9 +1096,9 @@
}
},
"node_modules/esbuild-linux-32": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.17.tgz",
- "integrity": "sha512-7E9vZXMZhINQ4/KcxBxioJ2ao5gbXJ6Pa4/LEUd102g3gadSalpg0LrityFgw7ao6qmjcNWwdEYrXaDnOzyyYA==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz",
+ "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==",
"cpu": [
"ia32"
],
@@ -1112,9 +1112,9 @@
}
},
"node_modules/esbuild-linux-64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.17.tgz",
- "integrity": "sha512-TnedHtFQSUVlc0J0D4ZMMalYaQ0Zbt7HSwGy4sav7BlXVqDVc/rchJ/a9dathK51apzLgRyXQMseLf6bkloaSQ==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
+ "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
"cpu": [
"x64"
],
@@ -1128,9 +1128,9 @@
}
},
"node_modules/esbuild-linux-arm": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.17.tgz",
- "integrity": "sha512-+ugCmBTTDIlh+UuC7E/GvyJqjGTX2pNOA+g3isG78aYcfgswrHjvstTtIfljaU95AS30qrVNLgI5h/8TsRWTrg==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz",
+ "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==",
"cpu": [
"arm"
],
@@ -1144,9 +1144,9 @@
}
},
"node_modules/esbuild-linux-arm64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.17.tgz",
- "integrity": "sha512-oupYfh0lTHg+F/2ZoTNrioB+KLd6x0Zlhjz2Oa1jhl8wCGkNvwe25RytR2/SGPYpoNVcvCeoayWQRwwRuWGgfQ==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz",
+ "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==",
"cpu": [
"arm64"
],
@@ -1160,9 +1160,9 @@
}
},
"node_modules/esbuild-linux-mips64le": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.17.tgz",
- "integrity": "sha512-aUVyHwUXJF1hi9jsAT+At+cBxZh2yGICi/e757N6d/zzOD+eVK3PKQj68tAvIflx6/ZpnuCTKol1GpgGYrzERg==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz",
+ "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==",
"cpu": [
"mips64el"
],
@@ -1176,9 +1176,9 @@
}
},
"node_modules/esbuild-linux-ppc64le": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.17.tgz",
- "integrity": "sha512-i7789iFTLfLccHPNADCbaZPx9CuQblsBqv2j4XqIBN1jKIJbpQ8iqCkWoHep4PLqqKLtBLtTWh919GsrFGdeJA==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz",
+ "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==",
"cpu": [
"ppc64"
],
@@ -1192,9 +1192,9 @@
}
},
"node_modules/esbuild-linux-riscv64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.17.tgz",
- "integrity": "sha512-fEQ/8tnZ2sDniBlPfTXEdg+0OP1olps96HvYdwl8ywJdAlD7AK761EL3lRbRdfMHNOId2N6+CVca43/Fiu/0AQ==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz",
+ "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==",
"cpu": [
"riscv64"
],
@@ -1208,9 +1208,9 @@
}
},
"node_modules/esbuild-linux-s390x": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.17.tgz",
- "integrity": "sha512-ZBQekST4gYgTKHAvUJtR1kFFulHTDlRZSE8T0wRQCmQqydNkC1teWxlR31xS6MZevjZGfa7OMVJD24bBhei/2Q==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz",
+ "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==",
"cpu": [
"s390x"
],
@@ -1224,9 +1224,9 @@
}
},
"node_modules/esbuild-netbsd-64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.17.tgz",
- "integrity": "sha512-onNBFaZVN9GzGJMm3aZJJv74n/Q8FjW20G9OfSDhHjvamqJ5vbd42hNk6igQX4lgBCHTZvvBlWDJAMy+tbJAAw==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz",
+ "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==",
"cpu": [
"x64"
],
@@ -1240,9 +1240,9 @@
}
},
"node_modules/esbuild-openbsd-64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.17.tgz",
- "integrity": "sha512-QFxHmvjaRrmTCvH/A3EmzqKUSZHRQ7/pbrJeATsb/Q6qckCeL9e7zg/1A3HiZqDXeBUV3yNeBeV1GJBjY6yVyA==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz",
+ "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==",
"cpu": [
"x64"
],
@@ -1256,9 +1256,9 @@
}
},
"node_modules/esbuild-sunos-64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.17.tgz",
- "integrity": "sha512-7dHZA8Kc6U8rBTKojJatXtzHTUKJ3CRYimvOGIQQ1yUDOqGx/zZkCH/HkEi3Zg5SWyDj/57E5e1YJPo4ySSw/w==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz",
+ "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==",
"cpu": [
"x64"
],
@@ -1272,9 +1272,9 @@
}
},
"node_modules/esbuild-windows-32": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.17.tgz",
- "integrity": "sha512-yDrNrwQ/0k4N3OZItZ6k6YnBUch8+of06YRYc3hFI8VDm7X1rkNZwhttZNAzF6+TtbnK4cIz7H2/EwdSoaGZ3g==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz",
+ "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==",
"cpu": [
"ia32"
],
@@ -1288,9 +1288,9 @@
}
},
"node_modules/esbuild-windows-64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.17.tgz",
- "integrity": "sha512-jPnXvB4zMMToNPpCBdt+OEQiYFVs9wlQ5G8vMoJkrYJBp1aEt070MRpBFa6pfBFrgXquqgUiNAohMcTdy+JVFg==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz",
+ "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==",
"cpu": [
"x64"
],
@@ -1304,9 +1304,9 @@
}
},
"node_modules/esbuild-windows-arm64": {
- "version": "0.15.17",
- "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.17.tgz",
- "integrity": "sha512-I5QeSsz0X66V8rxVhmw03Wzn8Tz63H3L9GrsA7C5wvBXMk3qahLWuEL+l7SZ2DleKkFeZZMu1dPxOak9f1TZ4A==",
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz",
+ "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==",
"cpu": [
"arm64"
],
@@ -1561,9 +1561,9 @@
}
},
"node_modules/json5": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
- "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz",
+ "integrity": "sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==",
"dev": true,
"bin": {
"json5": "lib/cli.js"
@@ -1646,9 +1646,9 @@
}
},
"node_modules/node-releases": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
- "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
+ "version": "2.0.8",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
+ "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==",
"dev": true
},
"node_modules/normalize-path": {
@@ -1712,9 +1712,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.19",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
- "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
+ "version": "8.4.20",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
+ "integrity": "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==",
"dev": true,
"funding": [
{
@@ -1966,9 +1966,9 @@
}
},
"node_modules/solid-js": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.6.2.tgz",
- "integrity": "sha512-AZBsj+Yn1xliniTTeuQKG9V7VQVkQ8lZmSKvBjpcVSoZeF7nvt/N5f7Kcsx6QSufioa2YgvBjkIiA0cM0qhotw==",
+ "version": "1.6.6",
+ "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.6.6.tgz",
+ "integrity": "sha512-5x33mEbPI8QLuywvFjQP4krjWDr8xiYFgZx9KCBH7b0ZzypQCHaUubob7bK6i+1u6nhaAqhWtvXS587Kb8DShA==",
"dependencies": {
"csstype": "^3.1.0"
}
@@ -2083,9 +2083,9 @@
}
},
"node_modules/typescript": {
- "version": "4.9.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz",
- "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==",
+ "version": "4.9.4",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
+ "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
"dev": true,
"bin": {
"tsc": "bin/tsc",
@@ -2128,9 +2128,9 @@
"dev": true
},
"node_modules/vite": {
- "version": "3.2.4",
- "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.4.tgz",
- "integrity": "sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw==",
+ "version": "3.2.5",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.5.tgz",
+ "integrity": "sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ==",
"dev": true,
"dependencies": {
"esbuild": "^0.15.9",
@@ -2177,30 +2177,30 @@
}
},
"node_modules/vite-plugin-solid": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/vite-plugin-solid/-/vite-plugin-solid-2.4.0.tgz",
- "integrity": "sha512-Rr+t2sr9TWIvH16yzBZzx6O9YSpYAvcwKUMPqbi/4iU3mRumXQ4O10i1XGtQIynC7U3XwJsMzAJigDFGbiJBiw==",
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/vite-plugin-solid/-/vite-plugin-solid-2.5.0.tgz",
+ "integrity": "sha512-VneGd3RyFJvwaiffsqgymeMaofn0IzQLPwDzafTV2f1agoWeeJlk5VrI5WqT9BTtLe69vNNbCJWqLhHr9fOdDw==",
"dev": true,
"dependencies": {
- "@babel/core": "^7.18.6",
+ "@babel/core": "^7.20.5",
"@babel/preset-typescript": "^7.18.6",
- "babel-preset-solid": "^1.4.6",
- "merge-anything": "^5.0.2",
+ "babel-preset-solid": "^1.6.3",
+ "merge-anything": "^5.1.4",
"solid-refresh": "^0.4.1",
- "vitefu": "^0.1.1"
+ "vitefu": "^0.2.3"
},
"peerDependencies": {
- "solid-js": "^1.3.17",
- "vite": "^3.0.0"
+ "solid-js": "^1.3.17 || ^1.4.0 || ^1.5.0 || ^1.6.0",
+ "vite": "^3.0.0 || ^4.0.0"
}
},
"node_modules/vitefu": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.1.1.tgz",
- "integrity": "sha512-HClD14fjMJ+NQgXBqT3dC3RdO/+Chayil+cCPYZKY3kT+KcJomKzrdgzfCHJkIL2L0OAY+VPvrSW615iPtc7ag==",
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.4.tgz",
+ "integrity": "sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==",
"dev": true,
"peerDependencies": {
- "vite": "^3.0.0"
+ "vite": "^3.0.0 || ^4.0.0"
},
"peerDependenciesMeta": {
"vite": {
diff --git a/package.json b/package.json
index b82badc..b8f9189 100644
--- a/package.json
+++ b/package.json
@@ -10,13 +10,13 @@
"license": "MIT",
"devDependencies": {
"autoprefixer": "^10.4.13",
- "postcss": "^8.4.19",
+ "postcss": "^8.4.20",
"tailwindcss": "^3.2.4",
- "typescript": "^4.9.3",
- "vite": "^3.2.4",
- "vite-plugin-solid": "^2.4.0"
+ "typescript": "^4.9.4",
+ "vite": "^3.2.5",
+ "vite-plugin-solid": "^2.5.0"
},
"dependencies": {
- "solid-js": "^1.6.2"
+ "solid-js": "^1.6.6"
}
}
diff --git a/resources/code.svg b/resources/code.svg
new file mode 100644
index 0000000..c4954b5
--- /dev/null
+++ b/resources/code.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/card.tsx b/src/components/card.tsx
new file mode 100644
index 0000000..1391a1b
--- /dev/null
+++ b/src/components/card.tsx
@@ -0,0 +1,23 @@
+/* @refresh reload */
+import { type Component } from "solid-js";
+import type { CardProps } from "../types/interfaces";
+import { H3 } from "./text";
+import { A } from "./link";
+
+const Card: Component = ({ children, className, title, to, newTab = false }) => {
+ return (
+ <>
+
+
+
+
{ title }
+ { children }
+
+
+
+ >
+ );
+};
+
+export default Card;
diff --git a/src/components/footer.tsx b/src/components/footer.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/header.ts b/src/components/header.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/header.tsx b/src/components/header.tsx
new file mode 100644
index 0000000..3890a38
--- /dev/null
+++ b/src/components/header.tsx
@@ -0,0 +1,18 @@
+/* @refresh reload */
+
+import { Component } from "solid-js";
+import { SimpleProps, TitleProps } from "../types/interfaces";
+import { H1 } from "./text";
+
+const Header: Component = ({ className, title }) => {
+ return (
+
+ { title }
+
+
Av Martin Berg Alstad
+
+
+ );
+};
+
+export default Header;
diff --git a/src/components/layout.tsx b/src/components/layout.tsx
index e69de29..4557ddb 100644
--- a/src/components/layout.tsx
+++ b/src/components/layout.tsx
@@ -0,0 +1,17 @@
+/* @refresh reload */
+import { type Component } from "solid-js";
+import type { TitleProps } from "../types/interfaces";
+import Header from "./header";
+
+export const Layout: Component = ({ children, title, className }) => {
+ return (
+
+
+
+
+ { children }
+
+
+
+ );
+};
diff --git a/src/components/link.tsx b/src/components/link.tsx
index 45ec6e3..ac0153b 100644
--- a/src/components/link.tsx
+++ b/src/components/link.tsx
@@ -1,5 +1,6 @@
-import { Component, JSX } from "solid-js";
-import { LinkProps } from "../types/interfaces";
+/* @refresh reload */
+import { type Component } from "solid-js";
+import type { LinkProps } from "../types/interfaces";
export const A: Component = (
{
@@ -9,7 +10,7 @@ export const A: Component = (
className,
id,
newTab = true,
- }): JSX.Element => {
+ }) => {
return (
= ({ children, className }) => {
+ return (
+ <>
+ { children }
+ >
+ );
+};
+
+export const H3: Component = ({ children, className }) => {
+ return (
+ <>
+ { children }
+ >
+ );
+};
diff --git a/src/index.css b/src/index.css
index 9f39d0f..a53f322 100644
--- a/src/index.css
+++ b/src/index.css
@@ -4,6 +4,11 @@
@layer components {
+ .debug {
+ @apply border border-red-500;
+ @apply after:content-['DEBUG'] after:absolute;
+ }
+
.link {
@apply hover:underline text-blue-500;
}
diff --git a/src/index.tsx b/src/index.tsx
index 9fdf5d9..55abc31 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,14 +1,36 @@
/* @refresh reload */
-import { render } from "solid-js/web";
+import { For, render } from "solid-js/web";
import "./index.css";
import type { Component } from "solid-js";
+import { Layout } from "./components/layout";
+import Card from "./components/card";
+import type { CardProps } from "./types/interfaces";
+
+const cards = [
+ {
+ title: "API-er",
+ children: Sjekk ut mine API-er
,
+ to: "https://api.martials.no/",
+ },
+ {
+ title: "Hjemmeside",
+ children: Sjekk ut mine andre prosjekter
,
+ to: "https://h600878.github.io/",
+ }
+] satisfies CardProps[];
const HomePage: Component = () => {
return (
- <>
- Hello tailwind!
- >
+
+
+
+ { card =>
+ { card.children }
+ }
+
+
+
);
};
diff --git a/src/types/interfaces.ts b/src/types/interfaces.ts
index 229e9de..27765ac 100644
--- a/src/types/interfaces.ts
+++ b/src/types/interfaces.ts
@@ -1,13 +1,25 @@
import { JSX } from "solid-js";
-export interface ChildProps {
- children?: JSX.Element,
+export interface SimpleProps {
className?: string,
+ style?: JSX.CSSProperties,
id?: string,
}
+export interface ChildProps extends SimpleProps {
+ children?: JSX.Element,
+}
+
export interface LinkProps extends ChildProps {
to?: string,
rel?: string,
newTab?: boolean,
+}
+
+export interface TitleProps extends ChildProps {
+ title: string,
+}
+
+export interface CardProps extends LinkProps {
+ title: string;
}
\ No newline at end of file
diff --git a/tailwind.config.js b/tailwind.config.js
index f59497c..c538530 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -6,7 +6,11 @@ module.exports = {
],
darkMode: 'class',
theme: {
- extend: {},
+ extend: {
+ colors: {
+ "default-bg": "#181a1b",
+ }
+ },
},
plugins: [],
};