From ffe39e0825331e773e70783fb889e557de0f0d8d Mon Sep 17 00:00:00 2001 From: Lindwen Date: Sat, 13 Jul 2024 09:06:02 +0200 Subject: [PATCH 1/2] format files with prettier --- public/assets/css/styles.css | 11 +- public/assets/js/oneko-webring.js | 18 +- public/assets/js/oneko.js | 28 +- public/index.html | 593 ++++++++++++++++-------------- public/old/assets/css/common.css | 107 +++--- 5 files changed, 399 insertions(+), 358 deletions(-) diff --git a/public/assets/css/styles.css b/public/assets/css/styles.css index 714229c..0878c89 100644 --- a/public/assets/css/styles.css +++ b/public/assets/css/styles.css @@ -1,9 +1,8 @@ ::selection { - color: #00FF78; + color: #00ff78; } @keyframes bounce { - 0%, 100%, 20%, @@ -11,19 +10,19 @@ 80% { -webkit-transform: translateY(0); -ms-transform: translateY(0); - transform: translateY(0) + transform: translateY(0); } 40% { -webkit-transform: translateY(-30px); -ms-transform: translateY(-30px); - transform: translateY(-30px) + transform: translateY(-30px); } 60% { -webkit-transform: translateY(-15px); -ms-transform: translateY(-15px); - transform: translateY(-15px) + transform: translateY(-15px); } } @@ -44,4 +43,4 @@ figure:hover { cursor: grab; animation-name: bounce; -moz-animation-name: bounce; -} \ No newline at end of file +} diff --git a/public/assets/js/oneko-webring.js b/public/assets/js/oneko-webring.js index 52515f5..c417137 100644 --- a/public/assets/js/oneko-webring.js +++ b/public/assets/js/oneko-webring.js @@ -17,10 +17,8 @@ // please use data-neko="true" on your A elements that link to another site with oneko-webring.js instead of this // this is deprecated and will eventually be removed - const nekoSites = [ - "localhost", - ]; - + const nekoSites = ["localhost"]; + try { const searchParams = location.search .replace("?", "") @@ -154,10 +152,10 @@ nekoEl.style.top = `${nekoPosY - 16}px`; nekoEl.style.zIndex = Number.MAX_VALUE; - let nekoFile = "assets/img/oneko.gif" - const curScript = document.currentScript + let nekoFile = "assets/img/oneko.gif"; + const curScript = document.currentScript; if (curScript && curScript.dataset.cat) { - nekoFile = curScript.dataset.cat + nekoFile = curScript.dataset.cat; } nekoEl.style.backgroundImage = `url(${nekoFile})`; @@ -182,8 +180,8 @@ lastFrameTimestamp = timestamp; } if (timestamp - lastFrameTimestamp > 100) { - lastFrameTimestamp = timestamp - frame() + lastFrameTimestamp = timestamp; + frame(); } window.requestAnimationFrame(onAnimationFrame); @@ -255,8 +253,6 @@ idleAnimationFrame += 1; } - - function frame() { frameCount += 1; const diffX = nekoPosX - mousePosX; diff --git a/public/assets/js/oneko.js b/public/assets/js/oneko.js index 4f5b18d..fd7c008 100644 --- a/public/assets/js/oneko.js +++ b/public/assets/js/oneko.js @@ -96,10 +96,10 @@ nekoEl.style.top = `${nekoPosY - 16}px`; nekoEl.style.zIndex = Number.MAX_VALUE; - let nekoFile = "assets/img/oneko.gif" - const curScript = document.currentScript + let nekoFile = "assets/img/oneko.gif"; + const curScript = document.currentScript; if (curScript && curScript.dataset.cat) { - nekoFile = curScript.dataset.cat + nekoFile = curScript.dataset.cat; } nekoEl.style.backgroundImage = `url(${nekoFile})`; @@ -124,8 +124,8 @@ lastFrameTimestamp = timestamp; } if (timestamp - lastFrameTimestamp > 100) { - lastFrameTimestamp = timestamp - frame() + lastFrameTimestamp = timestamp; + frame(); } window.requestAnimationFrame(onAnimationFrame); } @@ -164,7 +164,7 @@ } idleAnimation = avalibleIdleAnimations[ - Math.floor(Math.random() * avalibleIdleAnimations.length) + Math.floor(Math.random() * avalibleIdleAnimations.length) ]; } @@ -205,14 +205,16 @@ const centerY = rect.top + rect.height / 2 + scrollTop; for (let i = 0; i < 10; i++) { - const heart = document.createElement('div'); - heart.className = 'heart'; - heart.textContent = '❀'; + const heart = document.createElement("div"); + heart.className = "heart"; + heart.textContent = "❀"; const offsetX = (Math.random() - 0.5) * 50; const offsetY = (Math.random() - 0.5) * 50; heart.style.left = `${centerX + offsetX - 16}px`; heart.style.top = `${centerY + offsetY - 16}px`; - heart.style.transform = `translate(-50%, -50%) rotate(${Math.random() * 360}deg)`; + heart.style.transform = `translate(-50%, -50%) rotate(${ + Math.random() * 360 + }deg)`; parent.appendChild(heart); setTimeout(() => { @@ -221,7 +223,7 @@ } } - const style = document.createElement('style'); + const style = document.createElement("style"); style.innerHTML = ` @keyframes heartBurst { 0% { transform: scale(0); opacity: 1; } @@ -237,7 +239,7 @@ `; document.head.appendChild(style); - nekoEl.addEventListener('click', explodeHearts); + nekoEl.addEventListener("click", explodeHearts); function frame() { frameCount += 1; @@ -279,4 +281,4 @@ } init(); -})(); \ No newline at end of file +})(); diff --git a/public/index.html b/public/index.html index 8ce3f94..ac8802d 100644 --- a/public/index.html +++ b/public/index.html @@ -1,299 +1,350 @@ + + + + + + + - - - - - - - + + Lindwen's Website - - Lindwen's Website - - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + + + + - - - - - - - - - + + + + + - + +
+
+ Lindwen +
+

Lindwen

+

+ Hey there, I'm Lindwen, your + friendly neighborhood DevOps student! +
If you want to contact me, + feel free to reach out on + Discordβ€”it'll make my day! +

+ +
+
+ +
+ +
+

+ + + + + + + + + +

+ status + playing + spotify +
-
-
- Lindwen -
-

Lindwen

-

- Hey there, I'm Lindwen, your friendly neighborhood DevOps student! -
If you want to contact me, feel free to reach out on Discordβ€”it'll make my day! -

- -
-
- + + -
- -
-

- - - - - - - - - -

- status - playing - spotify -
- + + + + + + + + +

+ -
-

Technologies

-

- The different technologies I use -

-

- - - - - - - - - - - - - - -

-
+
+

Projects

+

Some of my projects

+ + +
-
-

Projects

-

- Some of my projects -

- - -
- - - - - - - - - + - \ No newline at end of file + + + + + + diff --git a/public/old/assets/css/common.css b/public/old/assets/css/common.css index a1d0399..ffa19e7 100644 --- a/public/old/assets/css/common.css +++ b/public/old/assets/css/common.css @@ -6,107 +6,100 @@ */ @font-face { - font-family: 'CascadiaMono'; + font-family: "CascadiaMono"; font-style: normal; font-weight: 400; - src: url(CascadiaMono.woff2) format('woff2'); + src: url(CascadiaMono.woff2) format("woff2"); font-display: swap; } body { - margin: 0; - padding: 0; - font-family: 'CascadiaMono'; - background-color: #0c162d; + margin: 0; + padding: 0; + font-family: "CascadiaMono"; + background-color: #0c162d; } .main { - padding: 20px; + padding: 20px; } .command { - color: #fff; + color: #fff; } .result { - padding-left: 20px; + padding-left: 20px; } .result p { - margin: 0; - color: #627597; + margin: 0; + color: #627597; } .result a { - color: #00a8ff; + color: #00a8ff; } .yellow { - color: #ea4aaa; - font-weight: 600; - text-shadow: - 0 0 7px #ea4aaa, - 0 0 10px #ea4aaa, - 0 0 21px #ea4aaa, - 0 0 42px #f09, - 0 0 82px #f09, - 0 0 92px #f09, - 0 0 102px #f09, - 0 0 151px #f09; + color: #ea4aaa; + font-weight: 600; + text-shadow: 0 0 7px #ea4aaa, 0 0 10px #ea4aaa, 0 0 21px #ea4aaa, + 0 0 42px #f09, 0 0 82px #f09, 0 0 92px #f09, 0 0 102px #f09, 0 0 151px #f09; } .green { - color: #00cfc8; + color: #00cfc8; } .red { - color: #ee4b5b; + color: #ee4b5b; } -a{ - /* +a { + /* font-weight: 900; background: rgba(0, 0, 0, 0) -webkit-gradient(linear, left top, right top, from(rgb(46, 105, 255)), color-stop(24%, rgb(29, 93, 255)), color-stop(55.73%, rgb(91, 157, 255)), color-stop(75%, rgb(255, 116, 241)), to(rgb(255, 116, 241))) repeat scroll 0% 0% padding-box text; background: rgba(0, 0, 0, 0) -o-linear-gradient(left, rgb(46, 105, 255) 0%, rgb(29, 93, 255) 24%, rgb(91, 157, 255) 55.73%, rgb(255, 116, 241) 75%, rgb(255, 116, 241) 100%) repeat scroll 0% 0% padding-box text; background: rgba(0, 0, 0, 0) linear-gradient(to right, rgb(46, 105, 255) 0%, rgb(29, 93, 255) 24%, rgb(91, 157, 255) 55.73%, rgb(255, 116, 241) 75%, rgb(255, 116, 241) 100%) repeat scroll 0% 0% padding-box text; -webkit-text-fill-color: transparent; */ - color: rgb(46, 105, 255); - text-decoration: underline; + color: rgb(46, 105, 255); + text-decoration: underline; } a:hover { - animation: shake 0.8s ; + animation: shake 0.8s; } .footer { - text-align: center; + text-align: center; } .footer p { - color: #fff; -} - - @keyframes shake{ - 0%{ - transform: translateX(0) - } - 25%{ - transform: translateX(25px); - } - - 50%{ - transform: translateX(-25px); - } - 100%{ - transform: translateX(0px); - } - } - - #playPauseButton { - background-color: #4CAF50; - color: white; - cursor: pointer; - font-size: 16px; - display: inline-block; -} \ No newline at end of file + color: #fff; +} + +@keyframes shake { + 0% { + transform: translateX(0); + } + 25% { + transform: translateX(25px); + } + + 50% { + transform: translateX(-25px); + } + 100% { + transform: translateX(0px); + } +} + +#playPauseButton { + background-color: #4caf50; + color: white; + cursor: pointer; + font-size: 16px; + display: inline-block; +} From f2dd1a9d011fb654b0e66dd2eac89630222c649c Mon Sep 17 00:00:00 2001 From: Lindwen Date: Sat, 13 Jul 2024 09:14:45 +0200 Subject: [PATCH 2/2] add conf files for prettier and pnpm --- .github/dependabot.yml | 3 +-- .gitignore | 1 + .prettierrc | 1 + README.md | 2 +- docker-compose.yml | 2 -- package.json | 15 +++++++++++++++ pnpm-lock.yaml | 24 ++++++++++++++++++++++++ public/assets/js/main.js | 2 +- public/assets/js/oneko-ie6.js | 4 ++-- public/index.html | 2 +- public/old/assets/css/common.css | 11 +++++++++-- public/old/assets/js/main.js | 14 +++++++------- public/old/index.html | 6 +++--- 13 files changed, 66 insertions(+), 21 deletions(-) create mode 100644 .gitignore create mode 100644 .prettierrc create mode 100644 package.json create mode 100644 pnpm-lock.yaml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f888e27..1230149 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,6 @@ version: 2 updates: - - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "daily" \ No newline at end of file + interval: "daily" diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..30bc162 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/node_modules \ No newline at end of file diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/.prettierrc @@ -0,0 +1 @@ +{} diff --git a/README.md b/README.md index ba25061..b7d8517 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -[![deploy](https://github.com/Lindwen/personnal-website/actions/workflows/deploy.yml/badge.svg)](https://github.com/Lindwen/personnal-website/actions/workflows/deploy.yml) \ No newline at end of file +[![deploy](https://github.com/Lindwen/personnal-website/actions/workflows/deploy.yml/badge.svg)](https://github.com/Lindwen/personnal-website/actions/workflows/deploy.yml) diff --git a/docker-compose.yml b/docker-compose.yml index a6e9e62..a650373 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,5 @@ --- services: - lindwen_fr: container_name: lindwen_fr image: ghcr.io/static-web-server/static-web-server:2 @@ -24,4 +23,3 @@ services: networks: proxy-net: external: true -... diff --git a/package.json b/package.json new file mode 100644 index 0000000..e399601 --- /dev/null +++ b/package.json @@ -0,0 +1,15 @@ +{ + "name": "personnal-website", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "keywords": [], + "author": "", + "license": "ISC", + "devDependencies": { + "prettier": "3.3.2" + } +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml new file mode 100644 index 0000000..534c4ae --- /dev/null +++ b/pnpm-lock.yaml @@ -0,0 +1,24 @@ +lockfileVersion: "9.0" + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +importers: + .: + devDependencies: + prettier: + specifier: 3.3.2 + version: 3.3.2 + +packages: + prettier@3.3.2: + resolution: + { + integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==, + } + engines: { node: ">=14" } + hasBin: true + +snapshots: + prettier@3.3.2: {} diff --git a/public/assets/js/main.js b/public/assets/js/main.js index adbb1e2..fa079ba 100644 --- a/public/assets/js/main.js +++ b/public/assets/js/main.js @@ -15,7 +15,7 @@ document.addEventListener("DOMContentLoaded", () => { console.log( "%cSTOP! βœ‹ This area is intended for developers.", - "font-size: 18px; font-weight: 700; color: red;" + "font-size: 18px; font-weight: 700; color: red;", ); const konamiCode = [ "ArrowUp", diff --git a/public/assets/js/oneko-ie6.js b/public/assets/js/oneko-ie6.js index a487d62..74477d6 100644 --- a/public/assets/js/oneko-ie6.js +++ b/public/assets/js/oneko-ie6.js @@ -227,11 +227,11 @@ function neko() { nekoPosX = Math.min( Math.max(16, nekoPosX), - document.getElementsByTagName("body")[0].clientWidth - 16 + document.getElementsByTagName("body")[0].clientWidth - 16, ); nekoPosY = Math.min( Math.max(16, nekoPosY), - document.getElementsByTagName("body")[0].clientHeight - 16 + document.getElementsByTagName("body")[0].clientHeight - 16, ); nekoEl.style.left = nekoPosX - 16 + "px"; diff --git a/public/index.html b/public/index.html index ac8802d..1e08073 100644 --- a/public/index.html +++ b/public/index.html @@ -1,4 +1,4 @@ - + diff --git a/public/old/assets/css/common.css b/public/old/assets/css/common.css index ffa19e7..f5a1175 100644 --- a/public/old/assets/css/common.css +++ b/public/old/assets/css/common.css @@ -44,8 +44,15 @@ body { .yellow { color: #ea4aaa; font-weight: 600; - text-shadow: 0 0 7px #ea4aaa, 0 0 10px #ea4aaa, 0 0 21px #ea4aaa, - 0 0 42px #f09, 0 0 82px #f09, 0 0 92px #f09, 0 0 102px #f09, 0 0 151px #f09; + text-shadow: + 0 0 7px #ea4aaa, + 0 0 10px #ea4aaa, + 0 0 21px #ea4aaa, + 0 0 42px #f09, + 0 0 82px #f09, + 0 0 92px #f09, + 0 0 102px #f09, + 0 0 151px #f09; } .green { diff --git a/public/old/assets/js/main.js b/public/old/assets/js/main.js index d290a46..a1da043 100644 --- a/public/old/assets/js/main.js +++ b/public/old/assets/js/main.js @@ -1,10 +1,10 @@ window.onload = setInterval(cmdPrompt, 500); function cmdPrompt() { - const prompt = document.getElementById("prompt"); - if (prompt.style.display === "none") { - prompt.style.display = "inline"; - } else { - prompt.style.display = "none"; - } -} \ No newline at end of file + const prompt = document.getElementById("prompt"); + if (prompt.style.display === "none") { + prompt.style.display = "inline"; + } else { + prompt.style.display = "none"; + } +} diff --git a/public/old/index.html b/public/old/index.html index 4e1dc5f..485c653 100644 --- a/public/old/index.html +++ b/public/old/index.html @@ -1,4 +1,4 @@ - + @@ -134,7 +134,7 @@