From 59ec4c73c5ef91e905df95eaca10d59ae9aa6531 Mon Sep 17 00:00:00 2001 From: Midou36O Date: Mon, 24 Jul 2023 17:41:54 +0100 Subject: [PATCH] rework this messy website partially --- .eslintignore | 13 ++++++++ .eslintrc.cjs | 20 +++++++++++++ .gitignore | 11 +++++++ .npmrc | 1 + .prettierignore | 13 ++++++++ .vscode/settings.json | 2 ++ package.json | 37 ++++++++++++----------- src/lib/ThemeToggle.svelte | 23 +++++++++++++++ src/lib/foote.svelte | 11 +++++++ src/lib/navi.svelte | 41 ++++++++++++++++++++++++++ src/lib/project.json | 18 +++++++++++ src/routes/+layout.svelte | 6 ++-- src/routes/+page.svelte | 30 ++++++++++--------- src/routes/about/+page.svelte | 10 ++----- src/routes/blog/+page.js | 12 ++++++++ src/routes/blog/+page.svelte | 25 ++++++++++++++++ src/routes/donate/+page.svelte | 29 ++++++++++++++++++ src/routes/donate/monero/+page.svelte | 19 ++++++++++++ src/routes/projects/+page.svelte | 14 ++++----- static/qr.png | Bin 0 -> 3240 bytes svelte.config.js | 13 ++++++-- unocss.config.ts | 2 +- 22 files changed, 298 insertions(+), 52 deletions(-) create mode 100644 .eslintignore create mode 100644 .eslintrc.cjs create mode 100644 .gitignore create mode 100644 .npmrc create mode 100644 .prettierignore create mode 100644 .vscode/settings.json create mode 100644 src/lib/ThemeToggle.svelte create mode 100644 src/lib/foote.svelte create mode 100644 src/lib/navi.svelte create mode 100644 src/lib/project.json create mode 100644 src/routes/blog/+page.js create mode 100644 src/routes/blog/+page.svelte create mode 100644 src/routes/donate/+page.svelte create mode 100644 src/routes/donate/monero/+page.svelte create mode 100644 static/qr.png diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..3897265 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,13 @@ +.DS_Store +node_modules +/build +/.svelte-kit +/package +.env +.env.* +!.env.example + +# Ignore files for PNPM, NPM and YARN +pnpm-lock.yaml +package-lock.json +yarn.lock diff --git a/.eslintrc.cjs b/.eslintrc.cjs new file mode 100644 index 0000000..3ccf435 --- /dev/null +++ b/.eslintrc.cjs @@ -0,0 +1,20 @@ +module.exports = { + root: true, + parser: '@typescript-eslint/parser', + extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'], + plugins: ['svelte3', '@typescript-eslint'], + ignorePatterns: ['*.cjs'], + overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }], + settings: { + 'svelte3/typescript': () => require('typescript') + }, + parserOptions: { + sourceType: 'module', + ecmaVersion: 2020 + }, + env: { + browser: true, + es2017: true, + node: true + } +}; diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b8901d0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +.DS_Store +node_modules +/build +/.svelte-kit +/package +.env +.env.* +!.env.example +vite.config.js.timestamp-* +vite.config.ts.timestamp-* +pnpm-lock.yaml diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..b6f27f1 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +engine-strict=true diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..3897265 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,13 @@ +.DS_Store +node_modules +/build +/.svelte-kit +/package +.env +.env.* +!.env.example + +# Ignore files for PNPM, NPM and YARN +pnpm-lock.yaml +package-lock.json +yarn.lock diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..7a73a41 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/package.json b/package.json index 0f405d4..f5ca5a6 100644 --- a/package.json +++ b/package.json @@ -12,30 +12,31 @@ "format": "prettier --plugin-search-dir . --write ." }, "devDependencies": { - "@iconify/json": "^2.2.8", - "@sveltejs/adapter-auto": "^1.0.0", - "@sveltejs/kit": "^1.0.0", - "@typescript-eslint/eslint-plugin": "^5.45.0", - "@typescript-eslint/parser": "^5.45.0", - "@unocss/preset-icons": "^0.48.4", - "@unocss/preset-web-fonts": "^0.48.4", - "eslint": "^8.28.0", - "eslint-config-prettier": "^8.5.0", + "@iconify/json": "^2.2.27", + "@sveltejs/adapter-auto": "^1.0.3", + "@sveltejs/adapter-static": "^2.0.1", + "@sveltejs/kit": "^1.8.3", + "@typescript-eslint/eslint-plugin": "^5.53.0", + "@typescript-eslint/parser": "^5.53.0", + "@unocss/preset-icons": "^0.48.5", + "@unocss/preset-web-fonts": "^0.48.5", + "eslint": "^8.34.0", + "eslint-config-prettier": "^8.6.0", "eslint-plugin-svelte3": "^4.0.0", - "prettier": "^2.8.0", - "prettier-plugin-svelte": "^2.8.1", - "svelte": "^3.54.0", - "svelte-check": "^3.0.1", + "prettier": "^2.8.4", + "prettier-plugin-svelte": "^2.9.0", + "svelte": "^3.55.1", + "svelte-check": "^3.0.4", "svelte-dark-mode": "^2.1.0", "svelte-time": "^0.7.1", - "tslib": "^2.4.1", - "typescript": "^4.9.3", - "unocss": "^0.48.4", - "vite": "^4.0.0" + "tslib": "^2.5.0", + "typescript": "^4.9.5", + "unocss": "^0.48.5", + "vite": "^4.1.4" }, "type": "module", "dependencies": { - "@unocss/reset": "^0.48.4", + "@unocss/reset": "^0.48.5", "dayjs": "^1.11.7" } } diff --git a/src/lib/ThemeToggle.svelte b/src/lib/ThemeToggle.svelte new file mode 100644 index 0000000..cdb2124 --- /dev/null +++ b/src/lib/ThemeToggle.svelte @@ -0,0 +1,23 @@ + + + + + diff --git a/src/lib/foote.svelte b/src/lib/foote.svelte new file mode 100644 index 0000000..34a77a5 --- /dev/null +++ b/src/lib/foote.svelte @@ -0,0 +1,11 @@ + + +
+
+ Made with
SvelteKit +
+
diff --git a/src/lib/navi.svelte b/src/lib/navi.svelte new file mode 100644 index 0000000..1af1df3 --- /dev/null +++ b/src/lib/navi.svelte @@ -0,0 +1,41 @@ + + + +
+
+
+
+

Home

+ +
+
+
+ +
+
+
+ diff --git a/src/lib/project.json b/src/lib/project.json new file mode 100644 index 0000000..1fd1897 --- /dev/null +++ b/src/lib/project.json @@ -0,0 +1,18 @@ +[ +{ + "name" : "Project Segfault", + "date" : "Sometime in 2022", + "desc" : "Open source development and hosted services.", + "url" : "https://projectsegfau.lt", + "image" : "https://github.com/ProjectSegfault/Logo/raw/main/png/logo_semi_transparent.png", + "imdes" : "" +}, +{ + "name" : "Mario Kart Wii 3DS", + "date" : "Sometime in 2018", + "desc" : "A mod that aims to port mario kart wii tracks and functions to mario kart 3DS.", + "url" : "https://github.com/orgs/MKW3DS/repositories", + "image" : "https://github.com/Midou36O/MKW3DS-Launcher/raw/master/BootNTR/romfs/sprites/topBackground.png", + "imdes" : "" +} +] diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index be453ac..1ca131d 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -3,13 +3,15 @@ import "$lib/style.css"; import Foote from "$lib/foote.svelte"; import "@unocss/reset/tailwind.css"; + import Navi from "$lib/navi.svelte"; + export const prerender = true; + +
- - \ No newline at end of file diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index f466df7..0c63396 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,22 +1,24 @@ - - +
-
+
-

{data.name}

-

{@html data.description}

-
-
-
-
- - - - +
+

{data.name}

+

{@html data.description}

+
+
+
+
+ + + + +

diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte index 4bc14c2..7522d06 100644 --- a/src/routes/about/+page.svelte +++ b/src/routes/about/+page.svelte @@ -1,7 +1,4 @@ -
-
+

About

@@ -26,7 +22,7 @@

Who i am

-
+

I'm a passionate programmer who has nothing to do with his life other than to just live in front of a computer and that's it. However i also have other passions and such. Well this is just temporary, don't really expect me to add something useful in it. @@ -38,4 +34,4 @@

-
\ No newline at end of file +
diff --git a/src/routes/blog/+page.js b/src/routes/blog/+page.js new file mode 100644 index 0000000..2000208 --- /dev/null +++ b/src/routes/blog/+page.js @@ -0,0 +1,12 @@ +export async function load( { data, fetch } ) { + + const endpoint = "http://127.0.0.1:8055/items/Data"; + + const res = await fetch(endpoint); + const content = await res.json(); + console.log(content.data); + return { + content: content + } + +} \ No newline at end of file diff --git a/src/routes/blog/+page.svelte b/src/routes/blog/+page.svelte new file mode 100644 index 0000000..8771fc2 --- /dev/null +++ b/src/routes/blog/+page.svelte @@ -0,0 +1,25 @@ + +
+ {#each content as data (data.id) } +
+
+
+ e +
+
+

{data.name}

+
{data.date}
+ +
+
+
+ {:else} +

Ayo wait a second

+ {/each} +
\ No newline at end of file diff --git a/src/routes/donate/+page.svelte b/src/routes/donate/+page.svelte new file mode 100644 index 0000000..ef30920 --- /dev/null +++ b/src/routes/donate/+page.svelte @@ -0,0 +1,29 @@ + + + +
+
+
+

Donate

+

Thanks a lot!

+
+
+ +
+
+ + diff --git a/src/routes/donate/monero/+page.svelte b/src/routes/donate/monero/+page.svelte new file mode 100644 index 0000000..cc64c54 --- /dev/null +++ b/src/routes/donate/monero/+page.svelte @@ -0,0 +1,19 @@ + + + +
+
+
+

Monero

+
+
+

QR code:

+ QR code +

Monero wallet:

+

44UzWvWS9wELmqPXzLqiPphXVYBbsjkbC7r4RwCSoXC4UyzC2NbPEoPEjxZsGVfbSPbAHUGtpc8GUYUZ8fdu1a4bNAyBPDe

+
+
+ diff --git a/src/routes/projects/+page.svelte b/src/routes/projects/+page.svelte index 3026278..1c39b2a 100644 --- a/src/routes/projects/+page.svelte +++ b/src/routes/projects/+page.svelte @@ -1,22 +1,20 @@ - -
+
{#each proj as { name, date, desc, url, image, imdes }}
- {imdes} + {imdes}
-
+

{name}

{date}

{desc}

- +
- {/each} -
\ No newline at end of file + {/each} +
diff --git a/static/qr.png b/static/qr.png new file mode 100644 index 0000000000000000000000000000000000000000..97b97fea918dd0801106af8670a73ebaf2c17134 GIT binary patch literal 3240 zcmbVPT}WhQ7@i8Ml?Ea4Mj`29cVY^L9f(mVcUPy{A^&DPQ>_%HU^hmCLZD$TMCi`Q zP&5pqD2O@^9@|~|VL?J1!rY6QyS=b3LUYQCSOXnu8QIyLp6C6}*qmcG#c<|~-#PF1 zz2Eab&+~qUyEGUEZp_96^fBafgn@j!Go%$Q(SMcnY3*EG&)MU8f1t^K{AorTT671C982a(Uzisw ztwnqTtJ6rW(Ldvqclra2Vea!?9EwF^ky7>~zrGtEMjOVjY=r{ye!tvek+gO+kx33O z<|ib%FuvPsJ)_(aBe?2#!5uGUWf3ID1anCh-U*PnDZ~yf4u5M-u{!uOz#3@4G zUf>b}{8EjR8=y#-Dt)iI7u8aAY{&GzEhKebFDA62OJ@nk76A~@N<}(Nfh0f;W|!9` zes~cZ3lk~S%mtvD{jyuB@a~_LWc%sD*v0**0yP!cW#!a7W%{UuW(C+9Kv3hHUn%@x z;_Buko_YurYT*?cVveDJ)Nwgd6Ze2d=i(t`KhnBCTUi?W{mH47bw8`e9SaH9{S4%~ z4z2m0M;uD)InT?Ldg0ztlqMY;Z9l;PxzBfD45Ks7hY29&!Q~skd*;;pN{3T?0t7lm zA|c>xh@dPNwXRy@U*Ru)7949~wW*fo1uAYG--^Ngfzc(3r;v)IO~4lqp9LbviuxX> zN}?uS!EUv8qpnOV{d<|3gs`xeHMD7u`}VQK8t_B;9LNF`(aN$L4ji?cY^6HgMq-RE zmFW~ii9!&SC|xm}m9|4l9&89~3LJ&aBzJW;0a{iy2K4L_PJ~yd4c|yXh2)=HGDFmGDvK|tD;VNY;&DSPBu|)pLK)6dx1wCBw9Cw& z;@8OEi%&8qDgZ%o$KO$ifu(0QS4nIOh_Jn|(5iE#xD1?jx(Fye2GG+ADS5NjiiZm_ z>G}e^7A&DZ)`O`t3~m)3i>c9G=DVy5Hem7%!zX8CE2udsNA2N(M`ny=>cztWYTlIb z#Dh(jq!$uz!akGG@-7@k$xm7Xdw?Vl?O9}6E&4EOg?BK$vIu%T2yzB6&q_7`3)Db{ zp^qx<^q^q_T2(#|P0+D8hX_@+EtX7Et*@Pz)>3BsLBqpI%*-j%Mw?=`fDR3criJAh zMN2mA`F1ryqmI@W#Mr11daIBNWq{AnS99Kd7yE~4)$z5rw>&zl6wBbQDThLCs8`hLwUy{rJqUJ!4`X13Xf0Utyg^K)09KJ6RzbJoHN*Brz3omh#r&B#^{6~p zoNS-J&G3#FK39ZqlOVD{=|EUaq`(m}29e6gsjF%!%>|Z7CU10O0_Hw$RXWC&H@6u^p&D=2{iD6rBuCdkcwDJJ4zr&N{&5)F4Ixw zRg<5#Bc=mOwRE8bN+_Ea6nP>*9=9R_y}nk^>K0 zS{M~q_^Dh7rP7eO{tfhdIm?Ku~L>eB>XlTJiP9qK@WQV&x_YCj(R zRNNYC)6ZU`7Z45j+`aF$y-b@rIa z^sW|+11m5BaJ+yKJC82sH2_WD;tDmDWriL1+^wn{`9J6X(qr#Gr)$Sg?9Jm}51a3m L4)4vDcR%?X%H2If literal 0 HcmV?d00001 diff --git a/svelte.config.js b/svelte.config.js index 87f198f..b779b72 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,4 +1,5 @@ -import adapter from '@sveltejs/adapter-auto'; +// import adapter from '@sveltejs/adapter-auto'; +import adapter from '@sveltejs/adapter-static'; import { vitePreprocess } from '@sveltejs/kit/vite'; /** @type {import('@sveltejs/kit').Config} */ @@ -8,7 +9,15 @@ const config = { preprocess: vitePreprocess(), kit: { - adapter: adapter() + adapter: adapter( + { + pages: 'build', + assets: 'build', + fallback: 'index.html', + precompress: false, + strict: true + } + ) } }; diff --git a/unocss.config.ts b/unocss.config.ts index 57d8704..145fad4 100644 --- a/unocss.config.ts +++ b/unocss.config.ts @@ -29,7 +29,7 @@ export default defineConfig({ presetWebFonts({ provider: 'bunny', fonts: { - sans: 'Outfit', + sans: ['Outfit', 'Comic Sans MS'], mono: ['Fira Code'], }