Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
003249e
start new server settings tabs
tdgao Mar 21, 2026
ef452a2
update properties tab to match design
tdgao Mar 21, 2026
debbe66
Merge branch 'main' into truman/new-server-settings
tdgao Mar 24, 2026
05995c3
better stying in general tab
tdgao Mar 24, 2026
e83df0b
feat: add suffix input for hostname field
tdgao Mar 24, 2026
4d38ac4
implement tables for allocations and DNS records
tdgao Mar 24, 2026
88f1ec6
add tags for dns record type
tdgao Mar 24, 2026
92e5be7
small gap adjustment
tdgao Mar 24, 2026
e8347a9
polish advanced page
tdgao Mar 24, 2026
d55df3b
adjust properties page hierarchy
tdgao Mar 24, 2026
affe960
fix searching properties, empty state and projection radius appearing
tdgao Mar 24, 2026
7589703
pnpm prepr
tdgao Mar 24, 2026
45b090e
update copy to match designs
tdgao Mar 25, 2026
e2a4730
fix suffix input component
tdgao Mar 25, 2026
003df72
style fixes and match heading size
tdgao Mar 25, 2026
b226a23
small fix
tdgao Mar 25, 2026
6491d8a
fix search allocations placeholder
tdgao Mar 25, 2026
9a1b43a
adjust table styles
tdgao Mar 25, 2026
2d4ed90
move all installation settings helper text to below input
tdgao Mar 25, 2026
2a6e83b
update icon to use overflow menu buttons
tdgao Mar 25, 2026
9905533
fix modal to be consistent
tdgao Mar 25, 2026
292c555
open advanced properties when search
tdgao Mar 25, 2026
5428bfc
remove other and custom properties, and update styles
tdgao Mar 25, 2026
9cacac8
remove hide/show all java versions
tdgao Mar 26, 2026
3aad5dd
Merge branch 'main' into truman/new-server-settings
tdgao Mar 27, 2026
314bc1a
handle mc 26
tdgao Mar 27, 2026
a618a34
refactor: move server settings pages into /ui and add app ServerSetti…
tdgao Mar 27, 2026
df75595
hook up server pages for app
tdgao Mar 27, 2026
530b481
add server page header to app
tdgao Mar 27, 2026
86d7f5d
hook up server settings modal
tdgao Mar 27, 2026
aaa69f1
use large size
tdgao Mar 27, 2026
39959c4
Merge branch 'main' into truman/new-server-settings
tdgao Mar 27, 2026
5fd0e84
Merge branch 'main' into truman/new-server-settings
IMB11 Mar 27, 2026
9510fd3
Merge branches 'truman/new-server-settings' and 'truman/new-server-se…
tdgao Mar 27, 2026
65a0288
fix card box shadow style
tdgao Mar 30, 2026
90db390
fix hostname input for app
tdgao Mar 30, 2026
e49a094
fix app/website card containers
tdgao Mar 30, 2026
3331be7
implement external tabs for billing and admin billing
tdgao Mar 30, 2026
5570724
fix save banner fixed to parent instead of page body
tdgao Mar 30, 2026
d7f7853
remove unused prop to FriendsList causing warning in app
tdgao Mar 30, 2026
6e2c6e2
fix client-only not available for app
tdgao Mar 30, 2026
c17f83f
fix bottom cut off
tdgao Mar 30, 2026
2b6c070
wire node auth
tdgao Mar 30, 2026
aea424c
implement full copy buttons
tdgao Mar 30, 2026
b231db6
dedup copy button tailwind styles
tdgao Mar 30, 2026
fa08436
fix hover class not working in @apply
tdgao Mar 30, 2026
1be8f8e
fix spacing
tdgao Mar 30, 2026
6983233
fix error validation styles
tdgao Mar 30, 2026
6202759
apply consistent styles and spacing
tdgao Mar 30, 2026
14f43fb
Merge branch 'main' into truman/new-server-settings
tdgao Mar 31, 2026
2b6fb96
Merge branch 'main' into truman/new-server-settings
tdgao Apr 1, 2026
6c31c0c
feat: update hosting server card (#5609)
tdgao Apr 2, 2026
2325ae3
pnpm prepr
tdgao Apr 2, 2026
b47020d
Merge branch 'truman/new-server-settings' of github.com:modrinth/code…
tdgao Apr 2, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@
},
"[rust]": {
"editor.defaultFormatter": "rust-lang.rust-analyzer"
}
},
"css.lint.unknownAtRules": "ignore",
"scss.lint.unknownAtRules": "ignore"
}
38 changes: 24 additions & 14 deletions apps/app-frontend/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<script setup>
import { AuthFeature, PanelVersionFeature, TauriModrinthClient } from '@modrinth/api-client'
import {
AuthFeature,
NodeAuthFeature,
nodeAuthState,
PanelVersionFeature,
TauriModrinthClient,
} from '@modrinth/api-client'
import {
ArrowBigUpDashIcon,
ChangeSkinIcon,
Expand Down Expand Up @@ -128,8 +134,16 @@ const { addPopupNotification } = popupNotificationManager
const tauriApiClient = new TauriModrinthClient({
userAgent: `modrinth/theseus/${getVersion()} (support@modrinth.com)`,
features: [
new NodeAuthFeature({
getAuth: () => nodeAuthState.getAuth?.() ?? null,
refreshAuth: async () => {
if (nodeAuthState.refreshAuth) {
await nodeAuthState.refreshAuth()
}
},
}),
new AuthFeature({
token: async () => (await getCreds()).session,
token: async () => (await getCreds())?.session,
}),
new PanelVersionFeature(),
],
Expand Down Expand Up @@ -982,13 +996,6 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
<NavButton v-if="themeStore.featureFlags.worlds_tab" v-tooltip.right="'Worlds'" to="/worlds">
<WorldIcon />
</NavButton>
<NavButton
v-if="themeStore.featureFlags.servers_in_app"
v-tooltip.right="'Servers'"
to="/hosting/manage"
>
<ServerIcon />
</NavButton>
<NavButton
v-tooltip.right="'Discover content'"
to="/browse/modpack"
Expand All @@ -1012,6 +1019,13 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
>
<LibraryIcon />
</NavButton>
<NavButton
v-if="themeStore.featureFlags.servers_in_app"
v-tooltip.right="'Servers'"
to="/hosting/manage"
>
<ServerIcon />
</NavButton>
<div class="h-px w-6 mx-auto my-2 bg-surface-5"></div>
<suspense>
<QuickInstanceSwitcher />
Expand Down Expand Up @@ -1250,11 +1264,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
</div>
<div class="py-4 border-0 border-b-[1px] border-[--brand-gradient-border] border-solid">
<suspense>
<FriendsList
:credentials="credentials"
:sign-in="() => signIn()"
:refresh-credentials="fetchCredentials"
/>
<FriendsList :credentials="credentials" :sign-in="() => signIn()" />
</suspense>
</div>
<div v-if="news && news.length > 0" class="p-4 pr-1 flex flex-col items-center">
Expand Down
65 changes: 60 additions & 5 deletions apps/app-frontend/src/assets/stylesheets/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,8 @@ body {
}

a {
color: var(--color-link);
color: inherit;
text-decoration: none;

&:hover {
text-decoration: none;
}
}

.badge {
Expand Down Expand Up @@ -174,4 +170,63 @@ img {
}
}

button,
input[type='button'] {
cursor: pointer;
border: none;
outline: 2px solid transparent;
}

@import '@modrinth/assets/omorphia.scss';

input {
border-radius: var(--size-rounded-sm);
box-sizing: border-box;
border: 2px solid transparent;
// safari iOS rounds inputs by default
// set the appearance to none to prevent this
appearance: none !important;
}

pre {
font-weight: var(--font-weight-regular);
}

input,
textarea {
background: var(--color-button-bg);
color: var(--color-text);
padding: 0.5rem 1rem;
font-weight: var(--font-weight-medium);
border: none;
outline: 2px solid transparent;
box-shadow:
var(--shadow-inset-sm),
0 0 0 0 transparent;
transition: box-shadow 0.1s ease-in-out;
min-height: 36px;

&:focus,
&:focus-visible {
box-shadow:
inset 0 0 0 transparent,
0 0 0 0.25rem var(--color-brand-shadow);
color: var(--color-button-text-active);
}

&:disabled,
&[disabled='true'] {
opacity: 0.6;
pointer-events: none;
cursor: not-allowed;
}

&:focus::placeholder {
opacity: 0.8;
}

&::placeholder {
color: var(--color-button-text);
opacity: 0.6;
}
}
Loading
Loading