Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pyro Integration #2503

Open
wants to merge 1,036 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1036 commits
Select commit Hold shift + click to select a range
303f71a
chore: cleanup
ferothefox Oct 19, 2024
e8bf4f8
feat: file sorting, filtering, and search
ferothefox Oct 20, 2024
d0c9fe8
feat: add uptime label
ferothefox Oct 20, 2024
19b8487
chore: make uptime label a11y friendly
ferothefox Oct 20, 2024
5efd649
chore: improve label
ferothefox Oct 20, 2024
9f07987
fix: rename/create file validation logic
ferothefox Oct 20, 2024
e5d94ba
fix: color
ferothefox Oct 20, 2024
e985b9c
chore: improve loading state
ferothefox Oct 20, 2024
724480a
fix: display message when inspector cannot determine a crash cause
ferothefox Oct 20, 2024
5a9fdaf
fix: faulty default state for files sorter
ferothefox Oct 20, 2024
eded34f
fix: reset kill timer on hide
ferothefox Oct 20, 2024
06de314
chore: hide copy ip button
ferothefox Oct 20, 2024
7dce87d
fix: lint
ferothefox Oct 20, 2024
93a26a5
feat: TELEPOPOVER
ferothefox Oct 20, 2024
857c092
chore: use telepopover
ferothefox Oct 20, 2024
5456aac
fix(telepopover): shift focus on hover
ferothefox Oct 20, 2024
ca273c5
fix(pyroserver): only process img on client
ferothefox Oct 20, 2024
9ab408e
refactor(telepopover): fix edge cases, literally
ferothefox Oct 20, 2024
50db09c
feat: sticky files header
ferothefox Oct 20, 2024
dd0f277
chore: clean
ferothefox Oct 20, 2024
8c870d4
chore: clean
ferothefox Oct 20, 2024
663b741
fix: file modal bugs, rename bugs, enter-to-submit
ferothefox Oct 20, 2024
7f0b85c
fix: hide uptime label when server is stopped
ferothefox Oct 20, 2024
83952fc
fix: faded non-blur when advanced rendering is disabled
ferothefox Oct 20, 2024
843758d
fix: edge case where terminal wouldnt scroll to bottom
ferothefox Oct 20, 2024
03dc173
fix: mitigate transition override between dev/prod
ferothefox Oct 20, 2024
c349f29
fix: center server stat icons with title
ferothefox Oct 20, 2024
d7a5f10
fix: isolate server stat z-indeces
ferothefox Oct 20, 2024
d0f4b4e
fix: disparity
ferothefox Oct 20, 2024
c3042ba
fix: savebanner again
ferothefox Oct 20, 2024
b6bb227
rinth tuah mod on that thang
ferothefox Oct 20, 2024
4347996
fix: i concede
ferothefox Oct 20, 2024
5543ad4
fix: case where files with no extension could not be edited
ferothefox Oct 20, 2024
31d192a
fix: tentative fix to file listing
ferothefox Oct 20, 2024
ccc1b5c
fix: so nice we did it thrice, but no longer
ferothefox Oct 20, 2024
7ec01e3
fix: navtabs opacity weirdness
not-nullptr Oct 20, 2024
d1a40d0
Merge branch 'pyro' of github.com:/modrinth/code into pyro
not-nullptr Oct 20, 2024
b991f47
fix: back to nonreactive file header
ferothefox Oct 20, 2024
d92b415
feat: add server button on manage root
ferothefox Oct 20, 2024
ff4edb9
chore: update installation error button copy
ferothefox Oct 20, 2024
4d43aa4
feat: RETURN OF THE (KING) BILLING
ferothefox Oct 20, 2024
2124446
fix: add Since date to server subscription
ferothefox Oct 20, 2024
2e84b77
feat: allow specifying version in `/loader-versions`
not-nullptr Oct 20, 2024
2bd19a0
Merge branch 'pyro' of github.com:/modrinth/code into pyro
not-nullptr Oct 20, 2024
8dff938
chore: shorten uptime label
ferothefox Oct 20, 2024
588b8fe
feat: prevent more broken states for servers, fix: closing modal on r…
not-nullptr Oct 20, 2024
bc4ca4d
fix: files context menu position
not-nullptr Oct 20, 2024
33ea0a0
chore: use $fetch instead of fetch
not-nullptr Oct 21, 2024
f0c1a58
feat: marketing page overhaul pt 1
ferothefox Oct 21, 2024
0fb3189
fix: add servers to navbar + swap position
ferothefox Oct 21, 2024
d89fcce
chore: remove billing from server panel (redirect to Settings)
ferothefox Oct 21, 2024
ab420ed
chore: rounding on server sidebar
ferothefox Oct 21, 2024
2de226a
chore: clean
ferothefox Oct 21, 2024
f16b314
chore: use type-safe addNotification
ferothefox Oct 21, 2024
8430b0e
feat: fixed file manager hero img
ferothefox Oct 21, 2024
ac82ef3
chore: bg color
ferothefox Oct 21, 2024
4025307
fix: font
ferothefox Oct 21, 2024
2a8889a
feat: showModal in servers marketing
ferothefox Oct 21, 2024
99282ef
fix(purchasemodal): if pyro, 2nd step is Billing interval
ferothefox Oct 21, 2024
085b031
fix: improve new server button style
ferothefox Oct 21, 2024
f4b52d1
fix: bad merge
ferothefox Oct 21, 2024
25ac662
fix: cleanup stripe on unmount
ferothefox Oct 21, 2024
1991305
fix: erroneous purchase modal showing logic
ferothefox Oct 21, 2024
7c6a9fc
Merge branch 'main' into pyro
ferothefox Oct 21, 2024
c9e7431
bump
ferothefox Oct 21, 2024
140548a
chore: clean
ferothefox Oct 21, 2024
c3f81c3
fix: submitting allocation modal
ferothefox Oct 21, 2024
efb0dd3
chore: clean
ferothefox Oct 21, 2024
edfd3d8
oops
ferothefox Oct 21, 2024
7d81247
fix: clashing z-indeces again
ferothefox Oct 21, 2024
33ae8d2
Merge branch 'main' into pyro
ferothefox Oct 21, 2024
ee17d43
chore: clean deadcode
ferothefox Oct 22, 2024
ad05e05
chore: clean styles
ferothefox Oct 22, 2024
1defb9c
chore: clean styles
ferothefox Oct 22, 2024
66a851d
chore clean
ferothefox Oct 22, 2024
f44ee1c
chore clean
ferothefox Oct 22, 2024
37c112c
chore: improve ws auth failed copy
ferothefox Oct 22, 2024
9f2c7c4
feat(terminal): bug fixes and performance improvements
ferothefox Oct 22, 2024
1b1ddbf
feat: blur for all "primary" graph card elements
not-nullptr Oct 22, 2024
4107a92
feat: autofocus input on modal open
not-nullptr Oct 22, 2024
2509956
fix: CLS
ferothefox Oct 22, 2024
66d359b
fix: actually fix shifting
ferothefox Oct 22, 2024
ccaeea6
Merge branch 'main' into pyro
ferothefox Oct 22, 2024
353193f
fix: compiler macro warning
ferothefox Oct 22, 2024
1b0b1fc
fix: layout shift while server list icon hydrates
ferothefox Oct 22, 2024
820b24e
fix: server reinstall
fangmarks Oct 22, 2024
eb6c9ae
fix: typo
fangmarks Oct 22, 2024
936960c
feat(terminal): scrollbar improvements
ferothefox Oct 22, 2024
393df0e
fix
ferothefox Oct 22, 2024
9d0c19c
fix: remove page param, frog
thewander02 Oct 22, 2024
8206d70
fix(frontend): file page fixed height for inf scroll
thewander02 Oct 23, 2024
b17c4f4
fix: refresh data after reinstall, hide copy button for the empty lines
thewander02 Oct 23, 2024
4305254
feat: teledropdown
ferothefox Oct 23, 2024
7eddac2
feat: fixup content page
ferothefox Oct 23, 2024
6f010c3
feat: use teledropdown
ferothefox Oct 23, 2024
30c1a45
fix: use teledropdown in loader modals
ferothefox Oct 23, 2024
dd95822
fix: edge case where placeholder didnt get shown
ferothefox Oct 23, 2024
803471f
fix: only show frog on first reconnect
thewander02 Oct 23, 2024
2e6c1fe
fix: uptime counter
thewander02 Oct 23, 2024
c262072
fix: z index
thewander02 Oct 23, 2024
fdc18a3
fix: dns record
thewander02 Oct 23, 2024
e0ff0e5
feat: files image viewer, pyroServer fixes
thewander02 Oct 23, 2024
040df7f
fix: refreshing, img list
thewander02 Oct 23, 2024
864e275
fix: editing
thewander02 Oct 23, 2024
b9f1d5d
fix: no props
thewander02 Oct 23, 2024
d623f2a
feat: always show kill
ferothefox Oct 23, 2024
6ea0c29
feat: more actionable installation error
ferothefox Oct 23, 2024
6a6e554
chore: adjust stop button color
ferothefox Oct 23, 2024
93646a0
fix(modal): visible shift on pages with scrollbars
he3als Oct 23, 2024
a9c82b2
fix(files): make sort dropdown not shift page
he3als Oct 23, 2024
e65f367
fix(TeleportOverflowMenu): clarify page scroll prop
he3als Oct 23, 2024
2923299
fix(dropdowns): disable scroll, fix offset
he3als Oct 23, 2024
1296c9e
Merge branch 'main' into pyro
ferothefox Oct 23, 2024
3bbd190
chore: no lazy here
ferothefox Oct 23, 2024
1168bad
feat(terminal): multiselect, bug fixes, performance improvements
ferothefox Oct 24, 2024
155546e
fix(terminal): missing animation for globalcopy button
ferothefox Oct 24, 2024
7c46edf
fix(terminal): deselect if already selected
ferothefox Oct 24, 2024
c9c5473
fix(terminal): weird spacing for bottom actions
ferothefox Oct 24, 2024
c11a3ed
fix(logparser): remove useless tabindex
ferothefox Oct 24, 2024
265e5d9
chore: clean
ferothefox Oct 24, 2024
5e2057d
chore: clean
ferothefox Oct 24, 2024
3d42055
fix: definitively fix clean reinstall (MOD-151)
ferothefox Oct 24, 2024
f94d2ae
chore: improve display of server errors
ferothefox Oct 24, 2024
7ba0d7f
wtf lol
ferothefox Oct 24, 2024
0b02fbc
fix: MOD-150
ferothefox Oct 24, 2024
97e9fe6
fix(marketing): plan card widths
ferothefox Oct 24, 2024
160eefe
feat: MOD-142 progress
ferothefox Oct 24, 2024
ab013ea
fix: add feedback to copy debug info button
fangmarks Oct 24, 2024
dbe15ad
fix: oh so that's why evan did that
fangmarks Oct 24, 2024
5478fc7
bitches love when i pnpm web:fix
ferothefox Oct 24, 2024
a651ed9
chore: correct stupid fullscreen button madness
ferothefox Oct 24, 2024
0157094
Merge branch 'main' into pyro
ferothefox Oct 24, 2024
6672e63
fix(mobile): put console first
he3als Oct 24, 2024
0395f7f
fix: use md instead of sm
he3als Oct 24, 2024
410f206
fix(console): reducing padding on md
he3als Oct 24, 2024
d534d7e
feat(files); virtual scroll
ferothefox Oct 24, 2024
9f25285
fix(files): faulty validation logic
ferothefox Oct 24, 2024
8394503
feat: content
ferothefox Oct 25, 2024
4fdaf75
fix: clear error when new installation result
ferothefox Oct 25, 2024
3c72936
refactor(loader): use styled
ferothefox Oct 25, 2024
1fe1086
chore: correctly emit reinstall event
ferothefox Oct 25, 2024
b418f37
chore(properties): correct toggle switch color
ferothefox Oct 25, 2024
2c04215
chore: add notice to modloader section if server has upstream
ferothefox Oct 25, 2024
9ff8004
refactor(loader): consolidate markup
ferothefox Oct 25, 2024
25cf1c7
chore: grammar
ferothefox Oct 25, 2024
60541f1
chore(startup): adjust warning banner
ferothefox Oct 25, 2024
0279478
chore(startup): sentence case
ferothefox Oct 25, 2024
7b25498
oops
ferothefox Oct 25, 2024
60db0b5
fix(savebanner): faulty border color
ferothefox Oct 25, 2024
25ddc91
chore(savebanner): adjust animation timings
ferothefox Oct 25, 2024
e542ff1
refactor: servers root cleanup
ferothefox Oct 25, 2024
ea6e95c
refactor: loader selector
ferothefox Oct 25, 2024
1a32f59
chore: call addNotification on profile picture upload fail and succes…
SticksDev Oct 25, 2024
cfd22b7
feat: improve filter names in file manager
prplwtf Oct 25, 2024
1a340ec
fix(usePyroServer): prototype reinstallFromMrpack
thewander02 Oct 25, 2024
0ef63aa
fix: remove un needed import
thewander02 Oct 25, 2024
24ac07a
feat: Install Logs, files rework
thewander02 Oct 25, 2024
e70aeb6
chore(telepoverflow): correct rounding
ferothefox Oct 25, 2024
f0d4eb2
chore: disable mod loader section when server is installing
ferothefox Oct 25, 2024
5985e4d
fix(teledropdown): correct closing logic
ferothefox Oct 25, 2024
681ba08
chore(startup): use teledropdown
ferothefox Oct 25, 2024
1b68c87
chore: clean
ferothefox Oct 25, 2024
9ec69a7
fix(teledropdown): focus dropdown item while open
ferothefox Oct 25, 2024
d79ab39
feat: add better empty to state to content when a server has no mods
SticksDev Oct 25, 2024
18d8012
chore: add loading state to content row
ferothefox Oct 25, 2024
73f1d79
refactor: loadingicon component
ferothefox Oct 25, 2024
6d5e144
chore(perf): noncomputed kill label
ferothefox Oct 25, 2024
6267bba
refactor(content): redo virtualization
ferothefox Oct 25, 2024
cd89248
chore(content): fixed height
ferothefox Oct 25, 2024
3da7085
feat(content): managing external mods
ferothefox Oct 25, 2024
1e7195c
chore(content): mod icon style
ferothefox Oct 25, 2024
d8d5274
chore(content): tooltips
ferothefox Oct 25, 2024
b472608
refactor(content): wrap mod rows in universalcard
ferothefox Oct 25, 2024
754b70d
fix(content): keep toggle disabled while awaiting reply
ferothefox Oct 25, 2024
76ee506
refactor(content): yeah
ferothefox Oct 25, 2024
26500ee
chore(content): clean
ferothefox Oct 25, 2024
8d521f0
chore(content): adjust modal
ferothefox Oct 25, 2024
5156b6a
feat(content): finish
ferothefox Oct 25, 2024
c7f98db
fix(content): erroneous itemheigh
ferothefox Oct 25, 2024
7899387
fix(content): lazyload refresh instead
ferothefox Oct 25, 2024
97a8e62
feat(content): status banner
ferothefox Oct 25, 2024
0283a7e
chore: clean
ferothefox Oct 25, 2024
1edd0b8
chore: clean
ferothefox Oct 25, 2024
5859000
fix(files): image viewer dimensions
ferothefox Oct 25, 2024
0e0a027
refactor(backups): use newmodal
ferothefox Oct 25, 2024
b56bd5f
chore: clean schema generation
ferothefox Oct 25, 2024
ecf6bfa
revert
ferothefox Oct 25, 2024
1662163
fix(backups): missing modal headers
ferothefox Oct 25, 2024
f6514a4
refactor(backups): use styled
ferothefox Oct 25, 2024
d503744
refactor(preferences): fixup
ferothefox Oct 25, 2024
39dd552
fix: padding
ferothefox Oct 25, 2024
f5180e5
fix(root): why did we do dat
ferothefox Oct 25, 2024
fdb336f
fix(frontend): responsive fixes
thewander02 Oct 25, 2024
7b64edb
fix(serverlisting): link a11y
ferothefox Oct 25, 2024
5f7991f
refactor(files): rewrite files
ferothefox Oct 26, 2024
ba60816
refactor(files): rewrite fetching logic
ferothefox Oct 26, 2024
860f74a
chore: blank instead of self
ferothefox Oct 26, 2024
d03e680
fix: disable retry for list dir
ferothefox Oct 26, 2024
dd51d4a
chore(files): focus create input by default
ferothefox Oct 26, 2024
fd46189
chore: more robust restore default disable logic
ferothefox Oct 26, 2024
bbb7236
chore: keep reinstall option available when iserror and installing
ferothefox Oct 26, 2024
3b55fab
feat: power actions confirm (wip)
SticksDev Oct 26, 2024
c544f1a
fix: power action confirm styling and extraneous node warning
ferothefox Oct 26, 2024
3a5d01d
chore: use styled
ferothefox Oct 26, 2024
ac83536
chore(allocations): correct modal style
ferothefox Oct 26, 2024
ce76fd0
chore(allocations): autofocus
ferothefox Oct 26, 2024
f40f821
chore(allocations): other style fixes
ferothefox Oct 26, 2024
a233e1a
feat(allocations): confirmmodal for delete
ferothefox Oct 26, 2024
5c2212b
chore: align styles
ferothefox Oct 26, 2024
b425f69
fix(files): yes, yes, it's that amazing
ferothefox Oct 26, 2024
773fdd5
chore: increase home button touch target
ferothefox Oct 26, 2024
14566f6
chore: migrate fileitem click handler upwards
ferothefox Oct 26, 2024
fd681ea
fix(preferences): switch clr
ferothefox Oct 26, 2024
259b717
one thousand
ferothefox Oct 26, 2024
a4a0bf1
fix: root node
ferothefox Oct 26, 2024
4e661ab
fix: we already have the path, dummy
ferothefox Oct 26, 2024
41f893f
chore: simplify editing dom
ferothefox Oct 26, 2024
320054f
fix: logic issue preventing share to mclogs btn
ferothefox Oct 26, 2024
3652a7e
chore: sentence case
ferothefox Oct 26, 2024
264edc2
chore: adjust icon
ferothefox Oct 26, 2024
0534303
chore: adjust labels
ferothefox Oct 26, 2024
ff4a233
fix: lint
ferothefox Oct 26, 2024
40f476c
feat: icons
ferothefox Oct 26, 2024
6c5aab1
fix
ferothefox Oct 26, 2024
b38ba42
fix
ferothefox Oct 26, 2024
7b358fe
refactor(fileitem): optimize
ferothefox Oct 26, 2024
9c1632b
chore(fileitem): fixed width timestamp
ferothefox Oct 26, 2024
9e34ae3
fix(fileitem): allow editing json5/jsonc
ferothefox Oct 26, 2024
ac047d2
feat: motd pt 1, auto backups scaffolding, editing navbar changes
thewander02 Oct 26, 2024
5b905a9
feat: fancy sidebar animations
thewander02 Oct 26, 2024
047d8ee
fix: files
thewander02 Oct 26, 2024
be555ce
fix: files pt2
thewander02 Oct 26, 2024
abd1363
fix: faulty name validation disallowing spaces in file names
ferothefox Oct 26, 2024
7330344
refactor: fileitem props
ferothefox Oct 26, 2024
d23884f
fix: upload files not refreshing files list
ferothefox Oct 26, 2024
eb5d1d0
fix(imgviewer): handle invalid/empty images
ferothefox Oct 26, 2024
d846595
fix: return of the sticky files header
ferothefox Oct 26, 2024
4e9fff1
chore: prevent servericon from shrinking
ferothefox Oct 26, 2024
127e884
fix: wtf were we thinking with this anyway
ferothefox Oct 26, 2024
6966dd2
fix: further mobile optimization
ferothefox Oct 26, 2024
934628a
chore: propagate margin
ferothefox Oct 26, 2024
f3bc425
chore: truncation fixes
ferothefox Oct 26, 2024
3d34b99
fix: track navbar with sentinel
ferothefox Oct 26, 2024
c2ed40d
chore: clean
ferothefox Oct 26, 2024
59398fb
fix(files): a11y
ferothefox Oct 26, 2024
5ddb654
chore: improve inspector styles
ferothefox Oct 26, 2024
afd850d
chore: clean
ferothefox Oct 27, 2024
4aa18b2
feat: console preformance improvements, decrease blur
thewander02 Oct 27, 2024
a23991b
feat(mobile): new server header
he3als Oct 27, 2024
6ba1dcf
fix: linting
he3als Oct 27, 2024
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: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,8 @@ generated
# app testing dir
app-playground-data/*

# soley because i need the PORT to be 3002 due to WSL stuff
.env
apps/frontend/.env

.astro
4 changes: 1 addition & 3 deletions apps/app/capabilities/plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"identifier": "plugins",
"description": "",
"local": true,
"windows": [
"main"
],
"windows": ["main"],
"permissions": [
"dialog:allow-open",
"dialog:allow-confirm",
Expand Down
3,314 changes: 3,314 additions & 0 deletions apps/app/gen/schemas/windows-schema.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions apps/frontend/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
module.exports = {
root: true,
extends: ["../../packages/eslint-config-custom/nuxt.js"],
rules: {
"import/no-unresolved": "off",
},
};
46 changes: 27 additions & 19 deletions apps/frontend/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ export default defineNuxtConfig({
$fetch(`${API_URL}search?limit=3&query=leave&index=relevance`, headers),
$fetch(`${API_URL}search?limit=3&query=&index=updated`, headers),
// TODO: dehardcode
$fetch(`${API_URL.replace("/v2/", "/_internal/")}billing/products`, headers),
$fetch(`${STAGING_API_URL.replace("/v2/", "/_internal/")}billing/products`, headers),
// SET TO API_URL WHEN MERGING WITH UPSTREAM
]);

state.categories = categories;
Expand Down Expand Up @@ -321,8 +322,12 @@ export default defineNuxtConfig({
apiBaseUrl: process.env.BASE_URL ?? globalThis.BASE_URL ?? getApiUrl(),
// @ts-ignore
rateLimitKey: process.env.RATE_LIMIT_IGNORE_KEY ?? globalThis.RATE_LIMIT_IGNORE_KEY,
pyroBaseUrl: process.env.PYRO_BASE_URL,
prodOverride: process.env.PROD_OVERRIDE,
public: {
apiBaseUrl: getApiUrl(),
pyroBaseUrl: process.env.PYRO_BASE_URL,
prodOverride: process.env.PROD_OVERRIDE,
siteUrl: getDomain(),
production: isProduction(),
featureFlagOverrides: getFeatureFlagOverrides(),
Expand Down Expand Up @@ -361,7 +366,7 @@ export default defineNuxtConfig({
},
},
},
modules: ["@vintl/nuxt", "@nuxtjs/turnstile"],
modules: ["@vintl/nuxt", "@nuxtjs/turnstile", "@pinia/nuxt"],
vintl: {
defaultLocale: "en-US",
locales: [
Expand Down Expand Up @@ -445,23 +450,26 @@ function getFeatureFlagOverrides() {

function getDomain() {
if (process.env.NODE_ENV === "production") {
if (process.env.SITE_URL) {
return process.env.SITE_URL;
}
// @ts-ignore
else if (process.env.CF_PAGES_URL || globalThis.CF_PAGES_URL) {
// @ts-ignore
return process.env.CF_PAGES_URL ?? globalThis.CF_PAGES_URL;
} else if (process.env.HEROKU_APP_NAME) {
return `https://${process.env.HEROKU_APP_NAME}.herokuapp.com`;
} else if (process.env.VERCEL_URL) {
return `https://${process.env.VERCEL_URL}`;
} else if (getApiUrl() === STAGING_API_URL) {
return "https://staging.modrinth.com";
} else {
return "https://modrinth.com";
}
// if (process.env.SITE_URL) {
// return process.env.SITE_URL;
// }
// // @ts-ignore
// else if (process.env.CF_PAGES_URL || globalThis.CF_PAGES_URL) {
// // @ts-ignore
// return process.env.CF_PAGES_URL ?? globalThis.CF_PAGES_URL;
// } else if (process.env.HEROKU_APP_NAME) {
// return `https://${process.env.HEROKU_APP_NAME}.herokuapp.com`;
// } else if (process.env.VERCEL_URL) {
// return `https://${process.env.VERCEL_URL}`;
// } else if (getApiUrl() === STAGING_API_URL) {
// return "https://staging.modrinth.com";
// } else {
// return "https://modrinth.com";
// }
// TODO: remove on merge
return "https://redacted.modrinth.com";
} else {
return "http://localhost:3000";
const port = process.env.PORT || 3000;
return `http://localhost:${port}`;
}
}
11 changes: 10 additions & 1 deletion apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"@formatjs/cli": "^6.2.12",
"@nuxt/devtools": "^1.3.3",
"@nuxtjs/turnstile": "^0.8.0",
"@types/dompurify": "^3.0.5",
"@types/node": "^20.1.0",
"@vintl/compact-number": "^2.0.5",
"@vintl/how-ago": "^3.0.1",
Expand All @@ -38,8 +39,13 @@
"@modrinth/assets": "workspace:*",
"@modrinth/ui": "workspace:*",
"@modrinth/utils": "workspace:*",
"@pinia/nuxt": "^0.5.1",
"@vintl/vintl": "^4.4.1",
"@vueuse/core": "^11.1.0",
"ace-builds": "^1.36.2",
"ansi-to-html": "^0.7.2",
"dayjs": "^1.11.7",
"dompurify": "^3.1.7",
"floating-vue": "2.0.0-beta.20",
"fuse.js": "^6.6.2",
"highlight.js": "^11.7.0",
Expand All @@ -48,9 +54,12 @@
"jszip": "^3.10.1",
"markdown-it": "14.1.0",
"pathe": "^1.1.2",
"pinia": "^2.1.7",
"qrcode.vue": "^3.4.0",
"semver": "^7.5.4",
"vue-multiselect": "3.0.0",
"vue-multiselect": "3.0.0-alpha.2",
"vue-typed-virtual-list": "^1.0.10",
"vue3-ace-editor": "^2.2.4",
"vue3-apexcharts": "^1.5.2",
"xss": "^1.0.14"
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/frontend/src/assets/images/games/bg-mock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/frontend/src/assets/images/games/maze.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/frontend/src/assets/images/games/rinth.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/frontend/src/assets/images/games/waving.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions apps/frontend/src/components/ui/CopyCode.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default {
margin: 0;
padding: 0.25rem 0.5rem;
background-color: var(--color-code-bg);
width: min-content;
width: fit-content;
border-radius: 10px;
user-select: text;
transition:
Expand All @@ -55,7 +55,6 @@ export default {
outline 0.2s ease-in-out;

span {
max-width: 10rem;
overflow: hidden;
text-overflow: ellipsis;
}
Expand Down
5 changes: 3 additions & 2 deletions apps/frontend/src/components/ui/NavTabs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
top: sliderTopPx,
right: sliderRightPx,
bottom: sliderBottomPx,
opacity: sliderLeft === 4 && sliderLeft === sliderRight ? 0 : activeIndex === -1 ? 0 : 1,
// opacity: sliderLeft === 4 && sliderLeft === sliderRight ? 0 : activeIndex === -1 ? 0 : 1,
}"
aria-hidden="true"
></div>
Expand All @@ -38,7 +38,7 @@ interface Tab {
label: string;
href: string;
shown?: boolean;
icon?: string;
icon?: unknown;
subpages?: string[];
}

Expand All @@ -64,6 +64,7 @@ const sliderRightPx = computed(() => `${sliderRight.value}px`);
const sliderBottomPx = computed(() => `${sliderBottom.value}px`);

function pickLink() {
if (route.path.split("/").length < 4) return;
let index = -1;
subpageSelected.value = false;
for (let i = filteredLinks.value.length - 1; i >= 0; i--) {
Expand Down
Loading
Loading