From 613c6b92dd2c8d5b735583f412f707ced4246066 Mon Sep 17 00:00:00 2001 From: trinkey Date: Sat, 15 Feb 2025 10:57:30 -0500 Subject: [PATCH] refactor some stuff --- css/base.css | 32 +++++++------- index.html | 37 ++++------------ js/index.js | 13 +++++- js/shell.js | 26 +++++++----- no-cmd.html | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++ no-js.html | 19 +++++---- ts/index.ts | 15 ++++++- ts/shell.ts | 26 +++++++----- 8 files changed, 207 insertions(+), 78 deletions(-) create mode 100644 no-cmd.html diff --git a/css/base.css b/css/base.css index fb4cd77..8fb2401 100644 --- a/css/base.css +++ b/css/base.css @@ -58,10 +58,8 @@ body { max-width: 100vw; overflow-x: hidden; position: relative; -} - -body:has(footer) { - min-height: calc(100vh + 40px); + height: 100vh; + min-height: 150px; } noscript { @@ -76,7 +74,7 @@ header { background-color: var(--crust); } -header > nav { +nav { display: flex; flex-wrap: nowrap; flex-direction: row; @@ -333,10 +331,12 @@ pre { gap: 5px; } -.buttons-88x31 img { +.buttons-88x31 img, +img.button-88x31 { width: 88px; height: 31px; display: inline-block; + image-rendering: pixelated; } footer { @@ -348,29 +348,31 @@ footer { padding: 10px 50px; } -@media (max-width: 890px) { - header div.hyphen { +@media (max-width: 926px) { + header div.hyphen, + footer div.hyphen { display: none; } } @media (max-width: 775px) { + header, footer { width: calc(100vw - 20px); padding: 10px; } - header { - width: calc(100vw - 20px); - padding: 10px; - } - - header > nav { + nav { display: block; } - header div:not(.header-title, .hyphen) { + header div:not(.header-title, .hyphen), + footer div:not(.hyphen) { display: inline-block; + padding-bottom: 1px; + } + + header div:not(.header-title) { text-wrap: nowrap; } } diff --git a/index.html b/index.html index a186446..c05e1c7 100644 --- a/index.html +++ b/index.html @@ -46,17 +46,9 @@
@@ -70,28 +62,14 @@ My cat `, - projects: `
projects - the things i made
-
- smiggins (website) - a social media platform i made
-
- this website - check out the code
-
- dotindex (pypi) - a python library that lets you access dicts using the dot notation (dict.key) instead of whatever python does (dict["key"])
-
- infopage (website) - my very own pronouns.page clone
-
- tSuite (website) - a collection of services that are all interconnected

-
i'll likely add more in the future, these are just the ones i'm most proud of at the moment.
`, directory: `
there's a lot that goes into this website. here are some links for your usage to help you navigate this hellhole

trinkey.com:
this is where you are right now

@@ -285,6 +287,8 @@ const _internal_defaultFiles = {
holds some of my git projects (older ones on github or git.gay)

*is.trinkey.com:
hosts iceshrimp.net, which is the fedi backend i use

+
jayflame.trinkey.com:
+
the website of my friend Jayflame

message.trinkey.com:
tMessage, from tSuite

music.trinkey.com:
diff --git a/no-cmd.html b/no-cmd.html new file mode 100644 index 0000000..5123d92 --- /dev/null +++ b/no-cmd.html @@ -0,0 +1,117 @@ + + + + + trinkey's website!!! + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + My cat + + + + + + + + + diff --git a/no-js.html b/no-js.html index 1530b4d..cc701a2 100644 --- a/no-js.html +++ b/no-js.html @@ -22,17 +22,17 @@

trinkey's website!!!

-
(no-js version - regular version here)
+
(no-js version - regular version here)
--------------------

about me

hi there! i'm trinkey!
--------------------
-
i'm a silly little kitty cat who lives in the usa.
-
i'm trans (she/her, they/them and it/its are also fine) and a bit gay sometimes.
+
i'm a silly little kitty cat who lives in the usa (sadly).
+
i'm trans (she/her, they/them and it/its are also fine).
i'm not actively in a relationship, however i'm also not looking to get into one either.
--------------------
-
i like to code stuff (mostly websites)! some of my programs can be found on the projects section. i know a few languages, those being python, javascript/typescript, html/css (if you count those), and a little bit of java.
+
i like to code stuff (mostly websites)! some of my programs can be found on the projects page. i know a few languages, those being python, javascript/typescript, html/css (if you count those), and a little bit of java.
--------------------
well, that's about it! i hope you like my website!
@@ -44,7 +44,7 @@
- smiggins - trinkey
- signal - @trinkey.01
- email - trinkey [at] proton [dot] me
-
- youtube - @trinkey (inactive)
+
- youtube - @trinkey (inactive)
`,

projects

- smiggins (website) - a social media platform i made
@@ -52,11 +52,11 @@
- dotindex (pypi) - a python library that lets you access dicts using the dot notation (dict.key) instead of whatever python does (dict["key"])
- infopage (website) - my very own pronouns.page clone
- tSuite (website) - a collection of services that are all interconnected

-
i'll likely add more in the future, these are just the ones i'm most proud of at the moment.
+
i'll likely add more in the future, these are just the ones i'm most proud of at the moment.
`,

people

my button:

-
trinkey's 88x31. image of her cat on the right with the word 'trinkey' taking up the rest of the button.
+
trinkey's 88x31. image of her cat on the right with the word 'trinkey' taking up the rest of the button.
html:
<a href="https://trinkey.com/" target="_blank"><img src="https://trinkey.com/img/88x31.png" alt="trinkey's 88x31. image of her cat on the right with the word trinkey name taking up the rest of the button." title="trinkey's 88x31. image of her cat on the right with the word trinkey name taking up the rest of the button."></a>
--------------------
@@ -67,6 +67,8 @@ kopper's button Sneexy unnick + Autumn Town Café + the text 'red is purple' on a purple background

testimonials:

"warning: this user is trinkey"
@@ -103,13 +105,14 @@
holds some of my git projects (older ones on github or git.gay)

*is.trinkey.com:
hosts iceshrimp.net, which is the fedi backend i use

+
jayflame.trinkey.com:
+
the website of my friend Jayflame

message.trinkey.com:
tMessage, from tSuite

music.trinkey.com:
has some music. i haven't actually updated the site in a while but i've been meaning to do rewrite it at some point. 100% legal i pinky promise

smiggins.trinkey.com:
official jerimiah smiggins instance, that being my own social media platform

-
(asterisk (*) means i haven't written the code for it)

diff --git a/ts/index.ts b/ts/index.ts index fa13aa1..cd9bb60 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -54,7 +54,6 @@ function edgeMoveEvent(x: number, y: number, pos: "top" | "bottom" | "left" | "r w.posX = 0; } } else if (pos == "right" || pos.endsWith("-right")) { - console.log(x - w.vars.mouseOffsetX - w.vars.startingPosX + w.vars.startingWidth, w.minWidth); w.width = Math.max(x - w.vars.mouseOffsetX - w.vars.startingPosX + w.vars.startingWidth, w.minWidth); } @@ -292,7 +291,7 @@ function createWindow(config: _winInitConf): void { globalIncrement++; } -function windowPreset(template: string): void { +function windowPreset(template: string, dontDisableTyping: boolean=false): void { let el: HTMLElement = document.querySelector(`#window-templates > [data-template-id="${template}"]`); if (!el) { return; } @@ -318,6 +317,18 @@ function windowPreset(template: string): void { WINDOWS[template].element.querySelector("[data-type-area]").innerHTML = command.innerHTML; commandManager(template, command.innerHTML); } + + if (!dontDisableTyping) { + WINDOWS[template].element.querySelector("input").remove(); + } +} + +function emptyWindow(): void { + createWindow({ + id: `terminal-${Math.random()}`, + title: "~ - tSh", + content: "
trinkey@website:~$  
" + }); } function copyButton(): void { diff --git a/ts/shell.ts b/ts/shell.ts index 4785be9..47d395c 100644 --- a/ts/shell.ts +++ b/ts/shell.ts @@ -266,7 +266,7 @@ const _internal_commands: { [key: string]: (args: string, windowID: string) => s const _internal_defaultFiles: StringDict = { about: `
hi there! i'm trinkey!
--------------------
-
i'm a silly little kitty cat who lives in the usa.
+
i'm a silly little kitty cat who lives in the usa (sadly).
i'm trans (she/her, they/them and it/its are also fine).
i'm not actively in a relationship, however i'm also not looking to get into one either.
--------------------
@@ -281,16 +281,25 @@ const _internal_defaultFiles: StringDict = {
- signal - @trinkey.01
- email - trinkey [at] proton [dot] me
- youtube - @trinkey (inactive)
`, + projects: `
projects - the things i made
+
- smiggins (website) - a social media platform i made
+
- this website - check out the code
+
- dotindex (pypi) - a python library that lets you access dicts using the dot notation (dict.key) instead of whatever python does (dict["key"])
+
- infopage (website) - my very own pronouns.page clone
+
- tSuite (website) - a collection of services that are all interconnected

+
i'll likely add more in the future, these are just the ones i'm most proud of at the moment.
`, buttons: `
my button: (click to copy html)
trinkey's 88x31. image of her cat on the right with the word 'trinkey' taking up the rest of the button.
--------------------
cool people:
- notfire.cc + notfire.cc a non-spinning demigirl blobcat angled slightly with a black border to the left of "Micro" - kopper's button - Sneexy + kopper's button + Sneexy unnick + Autumn Town Café + the text 'red is purple' on a purple background
`, testimonials: `
"warning: this user is trinkey"
- bread

@@ -308,13 +317,6 @@ const _internal_defaultFiles: StringDict = { fediring → `, - projects: `
projects - the things i made
-
- smiggins (website) - a social media platform i made
-
- this website - check out the code
-
- dotindex (pypi) - a python library that lets you access dicts using the dot notation (dict.key) instead of whatever python does (dict["key"])
-
- infopage (website) - my very own pronouns.page clone
-
- tSuite (website) - a collection of services that are all interconnected

-
i'll likely add more in the future, these are just the ones i'm most proud of at the moment.
`, directory: `
there's a lot that goes into this website. here are some links for your usage to help you navigate this hellhole

trinkey.com:
this is where you are right now

@@ -330,6 +332,8 @@ const _internal_defaultFiles: StringDict = {
holds some of my git projects (older ones on github or git.gay)

*is.trinkey.com:
hosts iceshrimp.net, which is the fedi backend i use

+
jayflame.trinkey.com:
+
the website of my friend Jayflame

message.trinkey.com:
tMessage, from tSuite

music.trinkey.com: