From a75538c0939ec56dd4bcf4c2d743c659136bb911 Mon Sep 17 00:00:00 2001 From: Evan Song <52982404+ferothefox@users.noreply.github.com> Date: Mon, 10 Feb 2025 08:39:13 -0700 Subject: [PATCH] Modrinth Servers Mega Features & Bug Fix-a-thon (#3222) * fix(content): changing mod versions works again * chore(assets): update pyro logo * fix(properties): deprecate fetchconfigfile * Revert "fix(content): changing mod versions works again" This reverts commit d7c0d1196f8c1850fd7ccbc1644941c6db4dc306. * feat(files): ability to sort via column click * chore(startup): update clunky wording * feat(serverListing): server icons SSR friendly * fix(servers): if archon fails, display err in listing * chore(serverlisting): use pyroserver hook to init icon * chore(servers): much more graceful reinstall * fix(servers): tw warn * fix(platform): correctly react when pack reinstalled * fix(serversroot): explicitly import navigateTo Signed-off-by: Evan Song * chore(serverlabels): show skeleton instead of hiding Signed-off-by: Evan Song * feat(platform): install-aware controls Signed-off-by: Evan Song * refactor!(platform): rewrite platform page * fix(platform): regression in autoselecting loader * chore(platform): prefer version over project modification date * fix(platform): permanent hang after initial mount * chore(platform): do not silently fail and hang if modpack fails loading * oops: remove hardcoded error causer * fix(platform): switch modpack btn while installing doesnt need class Signed-off-by: Evan Song * chore(platform): adjust styling in version modal Signed-off-by: Evan Song * chore(platform): prevent changing project card style Signed-off-by: Evan Song * refactor(pyrodropdown): rewrite Signed-off-by: Evan Song * fix(pyrodropdown): do nopt use deprecated substr Signed-off-by: Evan Song * chore: clean Signed-off-by: Evan Song * fix(network): sentence case Signed-off-by: Evan Song * refactor(terminal): initial batch Signed-off-by: Evan Song * fix(terminal): fulllog over fullscreen Signed-off-by: Evan Song * fix(terminal): fullscreen conflict with body scroll Signed-off-by: Evan Song * feat(terminal): init drag select * feat(terminal): shift click support Signed-off-by: Evan Song * chore(terminal): double lines limit Signed-off-by: Evan Song * feat(terminal): copy button Signed-off-by: Evan Song * chore(terminal): protip style Signed-off-by: Evan Song * chore(terminal): improve styles Signed-off-by: Evan Song * feat(terminal): regex search Signed-off-by: Evan Song * chore(terminal): move icons to icons dir Signed-off-by: Evan Song * chore(terminal): improve drag select autoscroll inertia Signed-off-by: Evan Song * fix(terminal): cancel selection on right click Signed-off-by: Evan Song * fix(terminal): progblur and stb btn disappearing Signed-off-by: Evan Song * refactor(serverstats): power efficiency * fix(subdomainlabel): correct tooltip terminology Signed-off-by: Evan Song * feat(preferences): users hide subdomain label Signed-off-by: Evan Song * chore(servers): clean Signed-off-by: Evan Song * chore(terminal): deselect lines on escape Signed-off-by: Evan Song * fix(serversidebar): type err Signed-off-by: Evan Song * fix(fileitem): vue server render type Signed-off-by: Evan Song * fix(terminal): disable pointer events on lines if scrolling Signed-off-by: Evan Song * fix(terminal): search result counts style Signed-off-by: Evan Song * fix(terminal): plural Signed-off-by: Evan Song * chore(terminal): clean Signed-off-by: Evan Song * feat(terminal): view selection Signed-off-by: Evan Song * feat(terminal): show actively selected lines in scrollbar Signed-off-by: Evan Song * fix(terminallog): btn color Signed-off-by: Evan Song * chore: clean Signed-off-by: Evan Song * fix(gamelabel): align to text Signed-off-by: Evan Song * fix(gamelabel): align to text Signed-off-by: Evan Song * fix(listing): remove deadcode Signed-off-by: Evan Song * fix(serverlisting): deprecated process.server Signed-off-by: Evan Song * fix(platform): correctly disable button Signed-off-by: Evan Song * fix(backups): do not allow backup creation during server installation Signed-off-by: Evan Song * fix(platform): flush stale currentversion data on successful install Signed-off-by: Evan Song * fix(gamelabel): fix gap Signed-off-by: Evan Song * chore(network): vaporize uppercase Signed-off-by: Evan Song * chore(info): vaporize uppercase Signed-off-by: Evan Song * chore(backups): style unification Signed-off-by: Evan Song * chore(backups): finalize style change Signed-off-by: Evan Song * fix(servers): catch pyro servers fetch errors during ssr Signed-off-by: Evan Song * fix(serverstats): ram as bytes graph now works Signed-off-by: Evan Song * fix(platform): unify attempts and refresh interval Signed-off-by: Evan Song * fix(terminal): input Signed-off-by: Evan Song * feat(servers): installing ticket + update available notice back in platform Signed-off-by: Evan Song * chore(terminal): dont add bg to scroll track Signed-off-by: Evan Song * fix(terminal): preserve whitespace Signed-off-by: Evan Song * chore(serversroot): unnest blurred icon query Signed-off-by: Evan Song * fix(serverstats): clamp memory usage to 100% no matter what Signed-off-by: Evan Song * feat(terminal): allow copy of single lines, show btn Signed-off-by: Evan Song * chore(terminal): animate copy>view transition Signed-off-by: Evan Song * init: search improvements Signed-off-by: Evan Song * fix: lint Signed-off-by: Evan Song * chore: change log modal title Signed-off-by: Evan Song * fix: hide fullscreen when selecting and cancel selection on clickout Signed-off-by: Evan Song * refactor(terminal): more reliable jumpToLine Signed-off-by: Evan Song * feat: search results separator Signed-off-by: Evan Song * chore: remove buggy isScrollable check Signed-off-by: Evan Song * fix: style Signed-off-by: Evan Song * refactor: correctly store pos to make jump reliable Signed-off-by: Evan Song * fix: disparity between search/log dragselect Signed-off-by: Evan Song * fix: prevent propagation of click events when clicking on jump btn Signed-off-by: Evan Song * fix: switch selection strategies depending on terminal mode Signed-off-by: Evan Song * chore: smarter esc handling Signed-off-by: Evan Song * finalize Signed-off-by: Evan Song * run fix * fix: ensure lines between cannot be selected Signed-off-by: Evan Song * fix: increase initial log batch to 256 Signed-off-by: Evan Song * fix(terminal): click on scroll track should take user to new scroll position Signed-off-by: Evan Song * fix(terminal): update aria label for view selected logs btn Signed-off-by: Evan Song * chore: clean Signed-off-by: Evan Song --------- Signed-off-by: Evan Song --- .../src/components/ui/servers/FileItem.vue | 2 +- .../ui/servers/FilesBrowseNavbar.vue | 46 +- .../ui/servers/FilesImageViewer.vue | 2 +- .../components/ui/servers/FilesLabelBar.vue | 61 +- .../ui/servers/InstallingTicker.vue | 76 ++ .../components/ui/servers/LoaderSelector.vue | 4 + .../ui/servers/LoaderSelectorCard.vue | 3 +- .../src/components/ui/servers/LogLine.vue | 91 ++ .../src/components/ui/servers/LogParser.vue | 107 -- .../src/components/ui/servers/PanelCopyIP.vue | 31 - .../ui/servers/PanelOverviewLoading.vue | 77 -- .../components/ui/servers/PanelTerminal.vue | 1212 +++++++++++++---- .../PlatformChangeModpackVersionModal.vue | 164 +++ .../ui/servers/PlatformMrpackModal.vue | 281 ++++ .../ui/servers/PlatformVersionSelectModal.vue | 551 ++++++++ .../components/ui/servers/ProjectSelect.vue | 167 --- .../src/components/ui/servers/PyroLoading.vue | 94 -- .../src/components/ui/servers/PyroModal.vue | 60 - .../src/components/ui/servers/SaveBanner.vue | 2 +- .../components/ui/servers/ServerGameLabel.vue | 14 +- .../ui/servers/ServerInfoLabels.vue | 7 +- .../components/ui/servers/ServerListing.vue | 42 +- .../ui/servers/ServerLoaderLabel.vue | 33 +- .../components/ui/servers/ServerSidebar.vue | 2 +- .../components/ui/servers/ServerSkeleton.vue | 18 - .../src/components/ui/servers/ServerStats.vue | 382 ++---- .../ui/servers/ServerSubdomainLabel.vue | 14 +- .../ui/servers/ServerUptimeLabel.vue | 2 +- .../ui/servers/TeleportDropdownMenu.vue | 321 ++--- .../ui/servers/icons/ChevronDownIcon.vue | 16 + .../ui/servers/icons/ChevronUpIcon.vue | 16 + .../FullscreenIcon.vue} | 0 .../MinimizeIcon.vue.vue} | 0 .../ui/servers/{ => icons}/Timer.vue | 0 apps/frontend/src/composables/pyroServers.ts | 78 +- .../src/pages/servers/manage/[id].vue | 113 +- .../src/pages/servers/manage/[id]/backups.vue | 207 +-- .../src/pages/servers/manage/[id]/files.vue | 93 +- .../src/pages/servers/manage/[id]/index.vue | 9 +- .../servers/manage/[id]/options/index.vue | 2 +- .../servers/manage/[id]/options/info.vue | 12 +- .../servers/manage/[id]/options/loader.vue | 1069 +++------------ .../servers/manage/[id]/options/network.vue | 16 +- .../manage/[id]/options/preferences.vue | 6 + .../manage/[id]/options/properties.vue | 29 +- .../servers/manage/[id]/options/startup.vue | 7 +- .../src/pages/servers/manage/index.vue | 135 +- apps/frontend/src/store/console.ts | 116 +- packages/assets/external/pyro.svg | 2 +- packages/assets/index.ts | 2 +- 50 files changed, 3276 insertions(+), 2518 deletions(-) create mode 100644 apps/frontend/src/components/ui/servers/InstallingTicker.vue create mode 100644 apps/frontend/src/components/ui/servers/LogLine.vue delete mode 100644 apps/frontend/src/components/ui/servers/LogParser.vue delete mode 100644 apps/frontend/src/components/ui/servers/PanelCopyIP.vue delete mode 100644 apps/frontend/src/components/ui/servers/PanelOverviewLoading.vue create mode 100644 apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue create mode 100644 apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue create mode 100644 apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue delete mode 100644 apps/frontend/src/components/ui/servers/ProjectSelect.vue delete mode 100644 apps/frontend/src/components/ui/servers/PyroLoading.vue delete mode 100644 apps/frontend/src/components/ui/servers/PyroModal.vue delete mode 100644 apps/frontend/src/components/ui/servers/ServerSkeleton.vue create mode 100644 apps/frontend/src/components/ui/servers/icons/ChevronDownIcon.vue create mode 100644 apps/frontend/src/components/ui/servers/icons/ChevronUpIcon.vue rename apps/frontend/src/components/ui/servers/{PanelTerminalFullscreen.vue => icons/FullscreenIcon.vue} (100%) rename apps/frontend/src/components/ui/servers/{PanelTerminalMinimize.vue => icons/MinimizeIcon.vue.vue} (100%) rename apps/frontend/src/components/ui/servers/{ => icons}/Timer.vue (100%) diff --git a/apps/frontend/src/components/ui/servers/FileItem.vue b/apps/frontend/src/components/ui/servers/FileItem.vue index 06db4103e..6d269d8f7 100644 --- a/apps/frontend/src/components/ui/servers/FileItem.vue +++ b/apps/frontend/src/components/ui/servers/FileItem.vue @@ -75,7 +75,7 @@ import { RightArrowIcon, } from "@modrinth/assets"; import { computed, shallowRef, ref } from "vue"; -import { renderToString } from "@vue/server-renderer"; +import { renderToString } from "vue/server-renderer"; import { useRouter, useRoute } from "vue-router"; import { UiServersIconsCogFolderIcon, diff --git a/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue b/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue index 5cf62b213..c2e5e70a4 100644 --- a/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue +++ b/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue @@ -2,7 +2,7 @@
- -
- @@ -52,6 +52,7 @@ interface Props { loader: LoaderInfo; currentLoader: string | null; loaderVersion: string | null; + isInstalling?: boolean; } const props = defineProps(); diff --git a/apps/frontend/src/components/ui/servers/LogLine.vue b/apps/frontend/src/components/ui/servers/LogLine.vue new file mode 100644 index 000000000..1e8f4e02b --- /dev/null +++ b/apps/frontend/src/components/ui/servers/LogLine.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/apps/frontend/src/components/ui/servers/LogParser.vue b/apps/frontend/src/components/ui/servers/LogParser.vue deleted file mode 100644 index efea31712..000000000 --- a/apps/frontend/src/components/ui/servers/LogParser.vue +++ /dev/null @@ -1,107 +0,0 @@ - - - - - diff --git a/apps/frontend/src/components/ui/servers/PanelCopyIP.vue b/apps/frontend/src/components/ui/servers/PanelCopyIP.vue deleted file mode 100644 index 6bc45920d..000000000 --- a/apps/frontend/src/components/ui/servers/PanelCopyIP.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - diff --git a/apps/frontend/src/components/ui/servers/PanelOverviewLoading.vue b/apps/frontend/src/components/ui/servers/PanelOverviewLoading.vue deleted file mode 100644 index 7fbe45a37..000000000 --- a/apps/frontend/src/components/ui/servers/PanelOverviewLoading.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - - diff --git a/apps/frontend/src/components/ui/servers/PanelTerminal.vue b/apps/frontend/src/components/ui/servers/PanelTerminal.vue index 29dfb8c0c..138baa507 100644 --- a/apps/frontend/src/components/ui/servers/PanelTerminal.vue +++ b/apps/frontend/src/components/ui/servers/PanelTerminal.vue @@ -1,141 +1,277 @@ diff --git a/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue b/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue new file mode 100644 index 000000000..ed15a3b5c --- /dev/null +++ b/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue @@ -0,0 +1,164 @@ + + + + + diff --git a/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue b/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue new file mode 100644 index 000000000..df5bdb964 --- /dev/null +++ b/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue @@ -0,0 +1,281 @@ + + + + + diff --git a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue new file mode 100644 index 000000000..6bcaef3e1 --- /dev/null +++ b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue @@ -0,0 +1,551 @@ + + + + + diff --git a/apps/frontend/src/components/ui/servers/ProjectSelect.vue b/apps/frontend/src/components/ui/servers/ProjectSelect.vue deleted file mode 100644 index bdc2e2ebd..000000000 --- a/apps/frontend/src/components/ui/servers/ProjectSelect.vue +++ /dev/null @@ -1,167 +0,0 @@ - - - diff --git a/apps/frontend/src/components/ui/servers/PyroLoading.vue b/apps/frontend/src/components/ui/servers/PyroLoading.vue deleted file mode 100644 index 3c72d239b..000000000 --- a/apps/frontend/src/components/ui/servers/PyroLoading.vue +++ /dev/null @@ -1,94 +0,0 @@ - - - - - diff --git a/apps/frontend/src/components/ui/servers/PyroModal.vue b/apps/frontend/src/components/ui/servers/PyroModal.vue deleted file mode 100644 index 67ea4f17d..000000000 --- a/apps/frontend/src/components/ui/servers/PyroModal.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - diff --git a/apps/frontend/src/components/ui/servers/SaveBanner.vue b/apps/frontend/src/components/ui/servers/SaveBanner.vue index be754f733..65508267e 100644 --- a/apps/frontend/src/components/ui/servers/SaveBanner.vue +++ b/apps/frontend/src/components/ui/servers/SaveBanner.vue @@ -39,7 +39,7 @@ const props = defineProps<{ save: () => void; reset: () => void; isVisible: boolean; - server: Server<["general", "mods", "backups", "network", "startup", "ws", "fs"]>; + server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>; }>(); const saveAndRestart = async () => { diff --git a/apps/frontend/src/components/ui/servers/ServerGameLabel.vue b/apps/frontend/src/components/ui/servers/ServerGameLabel.vue index bef037812..6c7fd043d 100644 --- a/apps/frontend/src/components/ui/servers/ServerGameLabel.vue +++ b/apps/frontend/src/components/ui/servers/ServerGameLabel.vue @@ -8,13 +8,19 @@ - {{ game[0].toUpperCase() + game.slice(1) }} {{ mcVersion }} +
+ {{ game[0].toUpperCase() + game.slice(1) }} + {{ mcVersion }} + +
-
- {{ game[0].toUpperCase() + game.slice(1) }} {{ mcVersion }} +
+ {{ game[0].toUpperCase() + game.slice(1) }} + {{ mcVersion }} +
diff --git a/apps/frontend/src/components/ui/servers/ServerInfoLabels.vue b/apps/frontend/src/components/ui/servers/ServerInfoLabels.vue index a23430e78..56f257d32 100644 --- a/apps/frontend/src/components/ui/servers/ServerInfoLabels.vue +++ b/apps/frontend/src/components/ui/servers/ServerInfoLabels.vue @@ -2,19 +2,18 @@
@@ -85,9 +84,12 @@ import type { Project, Server } from "~/types/servers"; const props = defineProps>(); +if (props.server_id) { + await usePyroServer(props.server_id, ["general"]); +} + const showGameLabel = computed(() => !!props.game); const showLoaderLabel = computed(() => !!props.loader); -const showSubdomainLabel = computed(() => !!props.net?.domain); let projectData: Ref; if (props.upstream) { @@ -103,39 +105,11 @@ if (props.upstream) { projectData = ref(null); } -const image = ref(); +const image = useState(`server-icon-${props.server_id}`, () => undefined); -onMounted(async () => { - const auth = (await usePyroFetch(`servers/${props.server_id}/fs`)) as any; - try { - const fileData = await usePyroFetch(`/download?path=/server-icon-original.png`, { - override: auth, - }); - - if (fileData instanceof Blob) { - const canvas = document.createElement("canvas"); - const ctx = canvas.getContext("2d"); - const img = new Image(); - img.src = URL.createObjectURL(fileData); - await new Promise((resolve) => { - img.onload = () => { - canvas.width = 512; - canvas.height = 512; - ctx?.drawImage(img, 0, 0, 512, 512); - const dataURL = canvas.toDataURL("image/png"); - image.value = dataURL; - resolve(); - }; - }); - } - } catch (error) { - if (error instanceof PyroFetchError && error.statusCode === 404) { - image.value = undefined; - } else { - console.error(error); - } - } -}); +if (import.meta.server && projectData.value?.icon_url) { + await usePyroServer(props.server_id!, ["general"]); +} const iconUrl = computed(() => projectData.value?.icon_url || undefined); diff --git a/apps/frontend/src/components/ui/servers/ServerLoaderLabel.vue b/apps/frontend/src/components/ui/servers/ServerLoaderLabel.vue index 13e8694f8..c9920099e 100644 --- a/apps/frontend/src/components/ui/servers/ServerLoaderLabel.vue +++ b/apps/frontend/src/components/ui/servers/ServerLoaderLabel.vue @@ -1,22 +1,33 @@ diff --git a/apps/frontend/src/components/ui/servers/ServerSubdomainLabel.vue b/apps/frontend/src/components/ui/servers/ServerSubdomainLabel.vue index 8f88d1938..d27d44b9f 100644 --- a/apps/frontend/src/components/ui/servers/ServerSubdomainLabel.vue +++ b/apps/frontend/src/components/ui/servers/ServerSubdomainLabel.vue @@ -1,6 +1,6 @@