From f4e8abef3fedd87f3a521a6a7488cea23d53517a Mon Sep 17 00:00:00 2001 From: limes Date: Mon, 17 Aug 2026 05:13:25 +0200 Subject: [PATCH] fix: navbar, env switch, style, etc. 1/2 --- README.md | 23 +- nuxt.config.ts | 4 + server/routes/blog/feed.xml.ts | 4 +- src/assets/css/main.css | 2 +- src/components/Navbar/Navbar.vue | 1608 +++++++++++++++++----- src/layouts/docs.vue | 10 +- src/pages/account/index.vue | 26 +- src/pages/account/upgrade.vue | 22 +- src/pages/docs/index.vue | 23 - src/pages/docs/welcome.vue | 93 +- src/public/assets/images/arrow-right.svg | 2 +- 11 files changed, 1378 insertions(+), 439 deletions(-) delete mode 100644 src/pages/docs/index.vue diff --git a/README.md b/README.md index a48bd4e..271a0cc 100644 --- a/README.md +++ b/README.md @@ -125,27 +125,28 @@ Testing findings: - [X] faq open first by default - [X] fix github icon size on team - [X] click out of bandwidth doesn't close bandwidth (use vueuse onclickoutside) -- [ ] fix hover and clickaway on navbar -- [ ] fix locale list not having the same layout, no clickaway +- [X] fix hover and clickaway on navbar +- [X] fix locale list not having the same layout, no clickaway - [X] progress is a wrench? -- [ ] rss feed wrong content type +- [X] rss feed wrong content type - [ ] progress page has no mobile layout (jvs you suck) - [ ] docs errors page, ironically, gives an error -- [ ] docs headings are very purple -- [ ] docs codeblocks *not* very purple +- [X] docs headings are very purple +- [X] docs codeblocks *not* very purple +- [X] docs index page redirect should be in config, not as a page -- [ ] upgrade: progress numbers not bold -- [ ] upgrade: align perk text with icon +- [X] upgrade: progress numbers not bold +- [X] upgrade: align perk text with icon - [ ] miieditor logs serverside - [ ] just move as much stuff as possible to renderside really -- [ ] account shows beta switch even if it's disabled -- [ ] if user has beta access they should be able to change back to prod -- [ ] add dev server env button +- [X] account shows beta switch even if it's disabled +- [X] if user has beta access they should be able to change back to prod +- [X] add dev server env button - [ ] discord link/remove success toast - [ ] forgot password shows success toast even w no captcha (doesn't actually submit) @@ -154,6 +155,4 @@ Testing findings: - [ ] need error page - [ ] need 404 page -- [ ] docs index page redirect should be in config, not as a page - - ? progress seems to sometimes not load for jvs? diff --git a/nuxt.config.ts b/nuxt.config.ts index 0d1871a..15186bf 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -32,6 +32,10 @@ export default defineNuxtConfig({ } }, + routeRules: { + '/docs': { redirect: '/docs/welcome' } + }, + runtimeConfig: { nitro: { envPrefix: 'PN_WEBSITE_' diff --git a/server/routes/blog/feed.xml.ts b/server/routes/blog/feed.xml.ts index aa8216d..0228321 100644 --- a/server/routes/blog/feed.xml.ts +++ b/server/routes/blog/feed.xml.ts @@ -17,7 +17,7 @@ export default defineEventHandler(async (event) => { favicon: 'http://pretendo.network/favicon.ico', copyright: 'Pretendo Network', feedLinks: { - atom: 'https://pretendo.network/blog/rss.xml' + atom: 'https://pretendo.network/blog/feed.xml' } }); @@ -39,7 +39,7 @@ export default defineEventHandler(async (event) => { feed.addCategory('Technology'); - event.res.setHeader('content-type', 'text/xml'); + setHeader(event, 'content-type', 'text/xml'); return feed.rss2(); }); diff --git a/src/assets/css/main.css b/src/assets/css/main.css index bd1cdf1..3e421d6 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -52,7 +52,7 @@ body, code { display: inline-block; - background-color: #191919; + background-color: var(--bg-shade-0); padding: 4px; border-radius: 4px; font-family: Consolas, Monaco, "Andale Mono", monospace; diff --git a/src/components/Navbar/Navbar.vue b/src/components/Navbar/Navbar.vue index a55655e..6eab40c 100644 --- a/src/components/Navbar/Navbar.vue +++ b/src/components/Navbar/Navbar.vue @@ -1,21 +1,42 @@ + + + + + diff --git a/src/layouts/docs.vue b/src/layouts/docs.vue index 8baf24e..b2391e0 100644 --- a/src/layouts/docs.vue +++ b/src/layouts/docs.vue @@ -198,6 +198,14 @@ button#openSidebar { font-weight: bold; color: var(--accent-shade-1); } +.docs-wrapper :deep(.content-inner:not(.search)) h1 a, +.docs-wrapper :deep(.content-inner:not(.search)) h2 a, +.docs-wrapper :deep(.content-inner:not(.search)) h3 a, +.docs-wrapper :deep(.content-inner:not(.search)) h4 a, +.docs-wrapper :deep(.content-inner:not(.search)) h5 a, +.docs-wrapper :deep(.content-inner:not(.search)) h6 a { + color: var(--text-shade-3); +} .docs-wrapper :deep(header) { position: relative; @@ -206,7 +214,7 @@ button#openSidebar { left: 0 !important; } -.docs-wrapper :deep(header) #mobile-button, +.docs-wrapper :deep(header) .nav-menu-trigger.mobile, .docs-wrapper :deep(header) .logo-link { display: none !important; } diff --git a/src/pages/account/index.vue b/src/pages/account/index.vue index d6dccac..d40d97c 100644 --- a/src/pages/account/index.vue +++ b/src/pages/account/index.vue @@ -298,7 +298,7 @@ useHead({

{{ $t("account.settings.settingCards.serverEnv") }}

-
+
{{ $t("account.settings.settingCards.production") }} -
diff --git a/src/pages/account/upgrade.vue b/src/pages/account/upgrade.vue index 445e538..0c1a415 100644 --- a/src/pages/account/upgrade.vue +++ b/src/pages/account/upgrade.vue @@ -247,22 +247,22 @@ useHead({

{{ tier.name }}

-

+

- Beta server access -

-

+

Beta server access

+
+
- Read-only access to select dev channels on Discord -

+

Read-only access to select dev channels on Discord

+

@@ -436,7 +436,7 @@ p.caption { text-align: left; margin-bottom: 0; } -.account-form-wrapper .progress-bar-wrapper p span { +.account-form-wrapper .progress-bar-wrapper span span { color: var(--text-shade-3); font-weight: 600; } @@ -539,7 +539,7 @@ label.tier .tier-name { label.tier .tier-perks { text-align: left; - width: 70%; + max-width: 70%; margin: 24px auto 48px; } @@ -551,7 +551,11 @@ label.tier .tier-perks p span { label.tier .tier-perks div { display: grid; grid-template-columns: 16px auto; - gap: 8px; + gap: 10px; +} + +label.tier .tier-perks div span { + margin-top: 2px; } label.tier p.price { diff --git a/src/pages/docs/index.vue b/src/pages/docs/index.vue deleted file mode 100644 index 4a4316d..0000000 --- a/src/pages/docs/index.vue +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/src/pages/docs/welcome.vue b/src/pages/docs/welcome.vue index 7e8c3cc..9b3545c 100644 --- a/src/pages/docs/welcome.vue +++ b/src/pages/docs/welcome.vue @@ -31,90 +31,37 @@ definePageMeta({

{{ $t('docs.quickLinks.header') }}

diff --git a/src/public/assets/images/arrow-right.svg b/src/public/assets/images/arrow-right.svg index 88abada..9e43d48 100644 --- a/src/public/assets/images/arrow-right.svg +++ b/src/public/assets/images/arrow-right.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file