+
+
+
+
+ {{ route.fullPath }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
{{ criticalErrorMessage.header }}
+
-
+
@@ -401,31 +612,61 @@ command_listener(async (e) => {
justify-content: center;
cursor: pointer;
transition: all ease-in-out 0.1s;
- background-color: var(--color-raised-bg);
+ background-color: transparent;
color: var(--color-base);
- border-radius: 0;
- height: 3.25rem;
+ height: 100%;
+ width: 3rem;
+ position: relative;
+ box-shadow: none;
+
+ &:last-child {
+ padding-right: 0.75rem;
+ width: 3.75rem;
+ }
+
+ svg {
+ width: 1.25rem;
+ height: 1.25rem;
+ }
+
+ &::before {
+ content: '';
+ border-radius: 999999px;
+ width: 3rem;
+ height: 3rem;
+ aspect-ratio: 1 / 1;
+ margin-block: auto;
+ position: absolute;
+ background-color: transparent;
+ scale: 0.9;
+ transition: all ease-in-out 0.2s;
+ z-index: -1;
+ }
&.close {
&:hover,
&:active {
- background-color: var(--color-red);
color: var(--color-accent-contrast);
+
+ &::before {
+ background-color: var(--color-red);
+ }
}
}
&:hover,
&:active {
- background-color: var(--color-button-bg);
color: var(--color-contrast);
+
+ &::before {
+ background-color: var(--color-button-bg);
+ scale: 1;
+ }
}
}
}
-.container {
- --appbar-height: 3.25rem;
- --sidebar-width: 4.5rem;
-
+.app-container {
height: 100vh;
display: flex;
flex-direction: row;
@@ -435,6 +676,16 @@ command_listener(async (e) => {
width: calc(100% - var(--sidebar-width));
background-color: var(--color-raised-bg);
+ .critical-error-banner {
+ margin-top: -1.25rem;
+ padding: 1rem;
+ background-color: rgba(203, 34, 69, 0.1);
+ border-left: 2px solid var(--color-red);
+ border-bottom: 2px solid var(--color-red);
+ border-right: 2px solid var(--color-red);
+ border-radius: 1rem;
+ }
+
.appbar {
display: flex;
align-items: center;
@@ -460,53 +711,6 @@ command_listener(async (e) => {
}
}
-.failure {
- height: 100vh;
- display: flex;
- flex-direction: column;
- overflow: hidden;
- background-color: var(--color-bg);
-
- .appbar-failure {
- display: flex; /* Change to flex to align items horizontally */
- justify-content: flex-end; /* Align items to the right */
- height: 3.25rem;
- //no select
- user-select: none;
- -webkit-user-select: none;
- }
-
- .error-view {
- display: flex; /* Change to flex to align items horizontally */
- justify-content: center;
- width: 100%;
- background-color: var(--color-bg);
-
- color: var(--color-base);
-
- .card {
- background-color: var(--color-raised-bg);
- }
-
- .error-text {
- display: flex;
- max-width: 60%;
- gap: 0.25rem;
- flex-direction: column;
-
- .error-div {
- // spaced out
- margin: 0.5rem;
- }
-
- .error-message {
- margin: 0.5rem;
- background-color: var(--color-button-bg);
- }
- }
- }
-}
-
.nav-container {
display: flex;
flex-direction: column;
@@ -590,4 +794,157 @@ command_listener(async (e) => {
padding: var(--gap-sm) 0;
}
}
+
+.app-grid-layout,
+.app-contents {
+ --top-bar-height: 3.75rem;
+ --left-bar-width: 5rem;
+ --right-bar-width: 300px;
+}
+
+.app-grid-layout {
+ display: grid;
+ grid-template: 'status status' 'nav dummy';
+ grid-template-columns: auto 1fr;
+ grid-template-rows: auto 1fr;
+ position: relative;
+ //z-index: 0;
+ background-color: var(--color-raised-bg);
+ height: 100vh;
+}
+
+.app-grid-navbar {
+ grid-area: nav;
+}
+
+.app-grid-statusbar {
+ grid-area: status;
+}
+
+.app-contents {
+ position: absolute;
+ z-index: 1;
+ left: 5rem;
+ top: 3.75rem;
+ right: 0;
+ bottom: 0;
+ height: calc(100vh - 3.75rem);
+ background-color: var(--color-bg);
+ border-top-left-radius: var(--radius-xl);
+
+ display: grid;
+ grid-template-columns: 1fr 300px;
+ //grid-template-columns: 1fr 0px;
+ transition: grid-template-columns 0.4s ease-in-out;
+}
+
+.loading-indicator-container {
+ border-top-left-radius: var(--radius-xl);
+ overflow: hidden;
+}
+
+.app-sidebar {
+ overflow: visible;
+ width: 300px;
+ position: relative;
+ height: calc(100vh - 3.75rem);
+ background: var(--brand-gradient-bg);
+
+ --color-button-bg: var(--brand-gradient-button);
+ --color-button-bg-hover: var(--brand-gradient-border);
+ --color-divider: var(--brand-gradient-border);
+ --color-divider-dark: var(--brand-gradient-border);
+}
+
+.app-sidebar::after {
+ content: '';
+ position: absolute;
+ bottom: 250px;
+ left: 0;
+ right: 0;
+ height: 5rem;
+ background: var(--brand-gradient-fade-out-color);
+ pointer-events: none;
+}
+
+.app-sidebar.has-plus::after {
+ display: none;
+}
+
+.app-sidebar::before {
+ content: '';
+ box-shadow: -15px 0 15px -15px rgba(0, 0, 0, 0.2) inset;
+ top: 0;
+ bottom: 0;
+ left: -2rem;
+ width: 2rem;
+ position: absolute;
+ pointer-events: none;
+}
+
+.app-viewport {
+ flex-grow: 1;
+ height: 100%;
+ overflow: auto;
+ overflow-x: hidden;
+}
+
+//::-webkit-scrollbar-track {
+// background-color: transparent; /* Make it transparent if needed */
+// margin-block: 5px;
+// margin-right: 5px;
+//}
+
+.app-contents::before {
+ z-index: 1;
+ content: '';
+ position: fixed;
+ left: 5rem;
+ top: 3.75rem;
+ right: -5rem;
+ bottom: -5rem;
+ border-radius: var(--radius-xl);
+ //box-shadow: 1px 1px 15px rgba(0, 0, 0, 0.2) inset;
+ box-shadow:
+ 1px 1px 15px rgba(0, 0, 0, 0.2) inset,
+ inset 1px 1px 1px rgba(255, 255, 255, 0.23);
+ pointer-events: none;
+}
+
+.sidebar-teleport-content {
+ display: contents;
+}
+
+.sidebar-default-content {
+ display: none;
+}
+
+.sidebar-teleport-content:empty + .sidebar-default-content {
+ display: contents;
+}
+
+
diff --git a/apps/app-frontend/src/assets/icons/index.js b/apps/app-frontend/src/assets/icons/index.js
index 2c94c4781..cd5561435 100644
--- a/apps/app-frontend/src/assets/icons/index.js
+++ b/apps/app-frontend/src/assets/icons/index.js
@@ -1,15 +1,10 @@
-export { default as ServerIcon } from './server.svg'
-export { default as MinimizeIcon } from './minimize.svg'
-export { default as MaximizeIcon } from './maximize.svg'
export { default as SwapIcon } from './arrow-left-right.svg'
export { default as ToggleIcon } from './toggle.svg'
export { default as PackageIcon } from './package.svg'
export { default as VersionIcon } from './milestone.svg'
-export { default as MoreIcon } from './more.svg'
export { default as TextInputIcon } from './text-cursor-input.svg'
export { default as AddProjectImage } from './add-project.svg'
export { default as NewInstanceImage } from './new-instance.svg'
export { default as MenuIcon } from './menu.svg'
-export { default as BugIcon } from './bug.svg'
export { default as ChatIcon } from './messages-square.svg'
export { default as SkinManagerIcon } from './skin-editor.svg'
diff --git a/apps/app-frontend/src/assets/loading/cube.png b/apps/app-frontend/src/assets/loading/cube.png
new file mode 100644
index 000000000..427dfaa93
Binary files /dev/null and b/apps/app-frontend/src/assets/loading/cube.png differ
diff --git a/apps/app-frontend/src/assets/modrinth_app.svg b/apps/app-frontend/src/assets/modrinth_app.svg
new file mode 100644
index 000000000..8448a98ae
--- /dev/null
+++ b/apps/app-frontend/src/assets/modrinth_app.svg
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/assets/modrinth_servers.svg b/apps/app-frontend/src/assets/modrinth_servers.svg
new file mode 100644
index 000000000..e4d949e8c
--- /dev/null
+++ b/apps/app-frontend/src/assets/modrinth_servers.svg
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/app-frontend/src/assets/profile_icon.png b/apps/app-frontend/src/assets/profile_icon.png
deleted file mode 100644
index 17bb70e1d..000000000
Binary files a/apps/app-frontend/src/assets/profile_icon.png and /dev/null differ
diff --git a/apps/app-frontend/src/assets/sad-modrinth-bot.webp b/apps/app-frontend/src/assets/sad-modrinth-bot.webp
new file mode 100644
index 000000000..b3e00b838
Binary files /dev/null and b/apps/app-frontend/src/assets/sad-modrinth-bot.webp differ
diff --git a/apps/app-frontend/src/assets/stylesheets/global.scss b/apps/app-frontend/src/assets/stylesheets/global.scss
index e907894b6..af5dcbb8e 100644
--- a/apps/app-frontend/src/assets/stylesheets/global.scss
+++ b/apps/app-frontend/src/assets/stylesheets/global.scss
@@ -1,3 +1,7 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
:root {
font-family: var(--font-standard);
color-scheme: dark;
@@ -69,35 +73,6 @@ input {
}
}
-.mac {
- .nav-container {
- padding-top: calc(var(--gap-md) + 1.75rem);
- }
-
- .account-card,
- .card-section {
- top: calc(var(--gap-md) + 1.75rem);
- }
-}
-
-.windows {
- .fake-appbar {
- height: 2.5rem !important;
- }
-
- .window-controls {
- display: flex !important;
- }
-
- .info-card {
- right: 8rem;
- }
-
- .profile-card {
- right: 8rem;
- }
-}
-
* {
scrollbar-width: auto;
scrollbar-color: var(--color-scrollbar) var(--color-bg);
@@ -105,19 +80,25 @@ input {
/* Chrome, Edge, and Safari */
*::-webkit-scrollbar {
- width: var(--gap-md);
- border: 3px solid var(--color-scrollbar);
+ width: 16px;
+ border: 3px solid transparent;
+ opacity: 0.5;
+ transition: opacity 0.2s ease-in-out;
+}
+
+*::-webkit-scrollbar:hover {
+ opacity: 1;
}
*::-webkit-scrollbar-track {
- background: var(--color-bg);
- border: 3px solid var(--color-bg);
+ background: transparent;
}
*::-webkit-scrollbar-thumb {
background-color: var(--color-scrollbar);
border-radius: var(--radius-lg);
- border: 3px solid var(--color-bg);
+ border: 5px solid transparent;
+ background-clip: content-box;
}
.highlighted {
@@ -135,3 +116,5 @@ img {
-moz-user-select: none;
-ms-user-select: none;
}
+
+@import '@modrinth/assets/omorphia.scss';
diff --git a/apps/app-frontend/src/components/GridDisplay.vue b/apps/app-frontend/src/components/GridDisplay.vue
index 3fe50e72a..914668846 100644
--- a/apps/app-frontend/src/components/GridDisplay.vue
+++ b/apps/app-frontend/src/components/GridDisplay.vue
@@ -12,13 +12,13 @@ import {
SearchIcon,
XIcon,
} from '@modrinth/assets'
-import { ConfirmModal, Button, Card, DropdownSelect } from '@modrinth/ui'
+import { Button, DropdownSelect } from '@modrinth/ui'
import { formatCategoryHeader } from '@modrinth/utils'
import ContextMenu from '@/components/ui/ContextMenu.vue'
import dayjs from 'dayjs'
-import { useTheming } from '@/store/theme.js'
import { duplicate, remove } from '@/helpers/profile.js'
import { handleError } from '@/store/notifications.js'
+import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
const props = defineProps({
instances: {
@@ -35,7 +35,6 @@ const props = defineProps({
const instanceOptions = ref(null)
const instanceComponents = ref(null)
-const themeStore = useTheming()
const currentDeleteInstance = ref(null)
const confirmModal = ref(null)
@@ -122,11 +121,10 @@ const handleOptionsClick = async (args) => {
const search = ref('')
const group = ref('Category')
-const filters = ref('All profiles')
const sortBy = ref('Name')
const filteredResults = computed(() => {
- let instances = props.instances.filter((instance) => {
+ const instances = props.instances.filter((instance) => {
return instance.name.toLowerCase().includes(search.value.toLowerCase())
})
@@ -160,16 +158,6 @@ const filteredResults = computed(() => {
})
}
- if (filters.value === 'Custom instances') {
- instances = instances.filter((instance) => {
- return !instance.linked_data
- })
- } else if (filters.value === 'Downloaded modpacks') {
- instances = instances.filter((instance) => {
- return instance.linked_data
- })
- }
-
const instanceMap = new Map()
if (group.value === 'Loader') {
@@ -230,54 +218,37 @@ const filteredResults = computed(() => {
})
-
+
+
+
+
+
+ Sort by:
+ {{ selected }}
+
+
+ Group by:
+ {{ selected }}
+
+
@@ -317,7 +296,6 @@ const filteredResults = computed(() => {
flex-direction: column;
align-items: flex-start;
width: 100%;
- padding: 1rem;
.divider {
display: flex;
diff --git a/apps/app-frontend/src/components/LoadingIndicatorBar.vue b/apps/app-frontend/src/components/LoadingIndicatorBar.vue
new file mode 100644
index 000000000..3c1dd0883
--- /dev/null
+++ b/apps/app-frontend/src/components/LoadingIndicatorBar.vue
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/RowDisplay.vue b/apps/app-frontend/src/components/RowDisplay.vue
index 75a184362..06891b0e1 100644
--- a/apps/app-frontend/src/components/RowDisplay.vue
+++ b/apps/app-frontend/src/components/RowDisplay.vue
@@ -12,7 +12,7 @@ import {
EyeIcon,
ChevronRightIcon,
} from '@modrinth/assets'
-import { ConfirmModal } from '@modrinth/ui'
+import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
import Instance from '@/components/ui/Instance.vue'
import { computed, onMounted, onUnmounted, ref } from 'vue'
import ContextMenu from '@/components/ui/ContextMenu.vue'
@@ -22,8 +22,7 @@ import { handleError } from '@/store/notifications.js'
import { duplicate, kill, remove, run } from '@/helpers/profile.js'
import { useRouter } from 'vue-router'
import { showProfileInFolder } from '@/helpers/utils.js'
-import { useTheming } from '@/store/state.js'
-import { mixpanel_track } from '@/helpers/mixpanel'
+import { trackEvent } from '@/helpers/analytics'
import { handleSevereError } from '@/store/error.js'
import { install as installVersion } from '@/store/install.js'
@@ -53,7 +52,6 @@ const instanceComponents = ref(null)
const rows = ref(null)
const deleteConfirmModal = ref(null)
-const themeStore = useTheming()
const currentDeleteInstance = ref(null)
async function deleteProfile() {
@@ -122,15 +120,17 @@ const handleProjectClick = (event, passedInstance) => {
const handleOptionsClick = async (args) => {
switch (args.option) {
case 'play':
- await run(args.item.path).catch(handleSevereError)
- mixpanel_track('InstanceStart', {
+ await run(args.item.path).catch((err) =>
+ handleSevereError(err, { profilePath: args.item.path }),
+ )
+ trackEvent('InstanceStart', {
loader: args.item.loader,
game_version: args.item.game_version,
})
break
case 'stop':
await kill(args.item.path).catch(handleError)
- mixpanel_track('InstanceStop', {
+ trackEvent('InstanceStop', {
loader: args.item.loader,
game_version: args.item.game_version,
})
@@ -205,13 +205,12 @@ onUnmounted(() => {
-
@@ -261,7 +260,6 @@ onUnmounted(() => {
align-items: center;
justify-content: center;
width: 100%;
- padding: 1rem;
gap: 1rem;
-ms-overflow-style: none;
@@ -295,16 +293,16 @@ onUnmounted(() => {
a {
margin: 0;
- font-size: var(--font-size-lg);
+ font-size: var(--font-size-md);
font-weight: bolder;
white-space: nowrap;
- color: var(--color-contrast);
+ color: var(--color-base);
}
svg {
- height: 1.5rem;
- width: 1.5rem;
- color: var(--color-contrast);
+ height: 1.25rem;
+ width: 1.25rem;
+ color: var(--color-base);
}
}
diff --git a/apps/app-frontend/src/components/modrinth-loading-indicator.js b/apps/app-frontend/src/components/modrinth-loading-indicator.js
deleted file mode 100644
index 2858df36a..000000000
--- a/apps/app-frontend/src/components/modrinth-loading-indicator.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import { computed, defineComponent, h, onBeforeUnmount, ref, watch } from 'vue'
-import { useLoading } from '@/store/state.js'
-
-export default defineComponent({
- props: {
- throttle: {
- type: Number,
- default: 50,
- },
- duration: {
- type: Number,
- default: 500,
- },
- height: {
- type: Number,
- default: 3,
- },
- color: {
- type: [String, Boolean],
- default:
- 'repeating-linear-gradient(to right, var(--color-brand) 0%, var(--color-brand) 100%)',
- },
- offsetWidth: {
- type: String,
- default: '208px',
- },
- offsetHeight: {
- type: String,
- default: '52px',
- },
- },
- setup(props, { slots }) {
- const indicator = useLoadingIndicator({
- duration: props.duration,
- throttle: props.throttle,
- })
-
- onBeforeUnmount(() => indicator.clear)
-
- const loading = useLoading()
-
- watch(loading, (newValue) => {
- if (newValue.loading) {
- indicator.start()
- } else {
- indicator.finish()
- }
- })
-
- return () =>
- h(
- 'div',
- {
- style: {
- position: 'fixed',
- top: props.offsetHeight,
- right: 0,
- left: props.offsetWidth,
- pointerEvents: 'none',
- width: `calc((100vw - ${props.offsetWidth}) * ${indicator.progress.value / 100})`,
- height: `${props.height}px`,
- opacity: indicator.isLoading.value ? 1 : 0,
- background: props.color || undefined,
- backgroundSize: `${(100 / indicator.progress.value) * 100}% auto`,
- transition: 'width 0.1s, height 0.4s, opacity 0.4s',
- zIndex: 6,
- },
- },
- slots,
- )
- },
-})
-
-function useLoadingIndicator(opts) {
- const progress = ref(0)
- const isLoading = ref(false)
- const step = computed(() => 10000 / opts.duration)
-
- let _timer = null
- let _throttle = null
-
- function start() {
- clear()
- progress.value = 0
- if (opts.throttle) {
- _throttle = setTimeout(() => {
- isLoading.value = true
- _startTimer()
- }, opts.throttle)
- } else {
- isLoading.value = true
- _startTimer()
- }
- }
- function finish() {
- progress.value = 100
- _hide()
- }
-
- function clear() {
- clearInterval(_timer)
- clearTimeout(_throttle)
- _timer = null
- _throttle = null
- }
-
- function _increase(num) {
- progress.value = Math.min(100, progress.value + num)
- }
-
- function _hide() {
- clear()
- setTimeout(() => {
- isLoading.value = false
- setTimeout(() => {
- progress.value = 0
- }, 400)
- }, 500)
- }
-
- function _startTimer() {
- _timer = setInterval(() => {
- _increase(step.value)
- }, 100)
- }
-
- return {
- progress,
- isLoading,
- start,
- finish,
- clear,
- }
-}
diff --git a/apps/app-frontend/src/components/ui/AccountsCard.vue b/apps/app-frontend/src/components/ui/AccountsCard.vue
index 7cec122a2..d7fed010c 100644
--- a/apps/app-frontend/src/components/ui/AccountsCard.vue
+++ b/apps/app-frontend/src/components/ui/AccountsCard.vue
@@ -2,15 +2,14 @@
-
-
diff --git a/apps/app-frontend/src/components/ui/ErrorModal.vue b/apps/app-frontend/src/components/ui/ErrorModal.vue
index c248447a9..d9a71608d 100644
--- a/apps/app-frontend/src/components/ui/ErrorModal.vue
+++ b/apps/app-frontend/src/components/ui/ErrorModal.vue
@@ -1,15 +1,18 @@
-
+
@@ -125,30 +176,40 @@ async function loginMinecraft() {
-
-
- If nothing is working and you need help, visit
- our support page
- and start a chat using the widget in the bottom right and we will be more than happy to
- assist! Make sure to provide the following debug information to the agent:
-
-
- Debug information
- {{ error.message ?? error }}
-
-
-
-
- Installed the app before April 23rd, 2024?
-
-
- Modrinth has updated our sign-in workflow to allow for better stability, security, and
- performance. You must sign in again so your credentials can be upgraded to this new
- flow.
-
+
+
+ Change directory permissions
+
+ It looks like the Modrinth App is unable to write to the directory you selected.
+ Please adjust the permissions of the directory and try again or cancel the directory
+ change.
+
+
+
+ Not enough space
+
+ It looks like there is not enough space on the disk containing the dirctory you
+ selected Please free up some space and try again or cancel the directory change.
+
+
+
+
+ The Modrinth App is unable to migrate to the new directory you selected. Please
+ contact support for help or cancel the directory change.
+
+
+
+
+
+
+
+
+
+
To play this instance, you must sign in through Microsoft below. If you don't have a
Minecraft account, you can purchase the game on the
@@ -162,16 +223,56 @@ async function loginMinecraft() {
+
+
+ Modrinth App failed to load correctly. This may be because of a corrupted file, or
+ because the app is missing crucial files.
+
+ You may be able to fix it through one of the following ways:
+
+ Ensuring you are connected to the internet, then try restarting the app.
+ Redownloading the app.
+
+
+
+ The Modrinth App failed to find the loader version for this instance.
+ To resolve this, you need to repair the instance. Click the button below to do so.
+
+
+
+
+
{{ error.message ?? error }}
+
+
+ If nothing is working and you need help, visit
+ our support page
+ and start a chat using the widget in the bottom right and we will be more than happy to
+ assist! Make sure to provide the following debug information to the agent:
+
+
+ Debug information
+ {{ error.message ?? error }}
+
+
-
+
diff --git a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
index ac68c224d..c5a7aca53 100644
--- a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
+++ b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
@@ -1,5 +1,5 @@
-
+
-
+
diff --git a/apps/app-frontend/src/components/ui/NavTabs.vue b/apps/app-frontend/src/components/ui/NavTabs.vue
new file mode 100644
index 000000000..fa739af38
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/NavTabs.vue
@@ -0,0 +1,164 @@
+
+
+
+ {{ link.label }}
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/PromotionWrapper.vue b/apps/app-frontend/src/components/ui/PromotionWrapper.vue
new file mode 100644
index 000000000..a9a6a6fba
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/PromotionWrapper.vue
@@ -0,0 +1,46 @@
+
+
+
+
+
+
75% of ad revenue goes to creators
+
+
+ Support creators and Modrinth ad-free with
+ Modrinth+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/RunningAppBar.vue b/apps/app-frontend/src/components/ui/RunningAppBar.vue
index 6638db801..ad600fc7f 100644
--- a/apps/app-frontend/src/components/ui/RunningAppBar.vue
+++ b/apps/app-frontend/src/components/ui/RunningAppBar.vue
@@ -81,9 +81,9 @@
>
{
const stop = async (process) => {
try {
- console.log(process.pid)
- await killProcess(process.pid).catch(handleError)
+ await killProcess(process.uuid).catch(handleError)
- mixpanel_track('InstanceStop', {
+ trackEvent('InstanceStop', {
loader: process.profile.loader,
game_version: process.profile.game_version,
source: 'AppBar',
diff --git a/apps/app-frontend/src/components/ui/SearchCard.vue b/apps/app-frontend/src/components/ui/SearchCard.vue
index 4c17ca5c2..d291c1751 100644
--- a/apps/app-frontend/src/components/ui/SearchCard.vue
+++ b/apps/app-frontend/src/components/ui/SearchCard.vue
@@ -1,74 +1,110 @@
-
-
-
-
{{ project.title }}
-
by {{ project.author }}
+
+
+
+ by {{ project.author }}
-
+
{{ project.description }}
-
-
-
-
- Featured
+
+
+
+ {{ formatNumber(project.downloads) }}
+ downloads
+
-
-
- {{ formatNumber(project.downloads) }}
+
+
+ {{ formatNumber(project.follows ?? project.followers) }}
+ followers
+
-
-
- {{ formatNumber(project.follows ?? project.followers) }}
+
+
+
+ Updated
+ {{ dayjs(project.date_modified ?? project.updated).fromNow() }}
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
-
+const modpack = computed(() => props.project.project_type === 'modpack')
+
diff --git a/apps/app-frontend/src/components/ui/SplashScreen.vue b/apps/app-frontend/src/components/ui/SplashScreen.vue
index 780aaa78a..fa45ff012 100644
--- a/apps/app-frontend/src/components/ui/SplashScreen.vue
+++ b/apps/app-frontend/src/components/ui/SplashScreen.vue
@@ -1,43 +1,223 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ message }}
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/URLConfirmModal.vue b/apps/app-frontend/src/components/ui/URLConfirmModal.vue
index 7d47d9d1d..91014edc8 100644
--- a/apps/app-frontend/src/components/ui/URLConfirmModal.vue
+++ b/apps/app-frontend/src/components/ui/URLConfirmModal.vue
@@ -1,11 +1,12 @@
-
+
diff --git a/apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue b/apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue
index ca134eb95..70c49e879 100644
--- a/apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue
+++ b/apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue
@@ -7,7 +7,7 @@ import {
RightArrowIcon,
CheckIcon,
} from '@modrinth/assets'
-import { Avatar, Modal, Button, Card } from '@modrinth/ui'
+import { Avatar, Button, Card } from '@modrinth/ui'
import { computed, ref } from 'vue'
import {
add_project_from_version as installMod,
@@ -16,15 +16,14 @@ import {
list,
create,
} from '@/helpers/profile'
-import { open } from '@tauri-apps/api/dialog'
+import { open } from '@tauri-apps/plugin-dialog'
import { installVersionDependencies } from '@/store/install.js'
import { handleError } from '@/store/notifications.js'
-import { mixpanel_track } from '@/helpers/mixpanel'
-import { useTheming } from '@/store/theme.js'
import { useRouter } from 'vue-router'
-import { tauri } from '@tauri-apps/api'
+import { convertFileSrc } from '@tauri-apps/api/core'
+import { trackEvent } from '@/helpers/analytics'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-const themeStore = useTheming()
const router = useRouter()
const versions = ref()
@@ -49,7 +48,7 @@ const shownProfiles = computed(() =>
return profile.name.toLowerCase().includes(searchFilter.value.toLowerCase())
})
.filter((profile) => {
- let loaders = versions.value.flatMap((v) => v.loaders)
+ const loaders = versions.value.flatMap((v) => v.loaders)
return (
versions.value.flatMap((v) => v.game_versions).includes(profile.game_version) &&
@@ -60,7 +59,7 @@ const shownProfiles = computed(() =>
}),
)
-let onInstall = ref(() => {})
+const onInstall = ref(() => {})
defineExpose({
show: async (projectVal, versionsVal, callback) => {
@@ -78,7 +77,7 @@ defineExpose({
onInstall.value = callback
const profilesVal = await list().catch(handleError)
- for (let profile of profilesVal) {
+ for (const profile of profilesVal) {
profile.installing = false
profile.installedMod = await check_installed(profile.path, project.value.id).catch(
handleError,
@@ -88,7 +87,7 @@ defineExpose({
installModal.value.show()
- mixpanel_track('ProjectInstallStart', { source: 'ProjectInstallModal' })
+ trackEvent('ProjectInstallStart', { source: 'ProjectInstallModal' })
},
})
@@ -115,7 +114,7 @@ async function install(instance) {
instance.installedMod = true
instance.installing = false
- mixpanel_track('ProjectInstall', {
+ trackEvent('ProjectInstall', {
loader: instance.loader,
game_version: instance.game_version,
id: project.value.id,
@@ -137,12 +136,12 @@ const toggleCreation = () => {
loader.value = null
if (showCreation.value) {
- mixpanel_track('InstanceCreateStart', { source: 'ProjectInstallModal' })
+ trackEvent('InstanceCreateStart', { source: 'ProjectInstallModal' })
}
}
const upload_icon = async () => {
- icon.value = await open({
+ const res = await open({
multiple: false,
filters: [
{
@@ -151,9 +150,10 @@ const upload_icon = async () => {
},
],
})
+ icon.value = res.path ?? res
if (!icon.value) return
- display_icon.value = tauri.convertFileSrc(icon.value)
+ display_icon.value = convertFileSrc(icon.value)
}
const reset_icon = () => {
@@ -186,7 +186,7 @@ const createInstance = async () => {
const instance = await get(id, true)
await installVersionDependencies(instance, versions.value[0])
- mixpanel_track('InstanceCreate', {
+ trackEvent('InstanceCreate', {
profile_name: name.value,
game_version: versions.value[0].game_versions[0],
loader: loader,
@@ -195,7 +195,7 @@ const createInstance = async () => {
source: 'ProjectInstallModal',
})
- mixpanel_track('ProjectInstall', {
+ trackEvent('ProjectInstall', {
loader: loader,
game_version: versions.value[0].game_versions[0],
id: project.value,
@@ -213,12 +213,7 @@ const createInstance = async () => {
-
+
@@ -304,7 +297,7 @@ const createInstance = async () => {
Cancel
-
+
diff --git a/apps/app-frontend/src/components/ui/tutorial/LoginCard.vue b/apps/app-frontend/src/components/ui/tutorial/LoginCard.vue
deleted file mode 100644
index 11b340d4c..000000000
--- a/apps/app-frontend/src/components/ui/tutorial/LoginCard.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-
-
-
-
-
-
- Sign into Minecraft
-
- Sign in with your Microsoft account to launch Minecraft with your mods and modpacks. If you
- don't have a Minecraft account, you can purchase the game on the
-
- Minecraft website
-
-
-
-
Back
-
-
-
-
-
Finish
-
-
-
-
diff --git a/apps/app-frontend/src/components/ui/tutorial/ModrinthLoginScreen.vue b/apps/app-frontend/src/components/ui/tutorial/ModrinthLoginScreen.vue
deleted file mode 100644
index 1c9d91361..000000000
--- a/apps/app-frontend/src/components/ui/tutorial/ModrinthLoginScreen.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-
-
-
-
-
-
- Enter two-factor code
- Please enter a two-factor code to proceed.
-
-
- Login to Modrinth
- Create an account
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Close
- Login
-
- Login
-
-
- Create account
-
-
-
-
-
-
-
diff --git a/apps/app-frontend/src/components/ui/tutorial/OnboardingScreen.vue b/apps/app-frontend/src/components/ui/tutorial/OnboardingScreen.vue
deleted file mode 100644
index ae694c409..000000000
--- a/apps/app-frontend/src/components/ui/tutorial/OnboardingScreen.vue
+++ /dev/null
@@ -1,284 +0,0 @@
-
-
-
-
-
- Get started
-
-
-
-
-
diff --git a/apps/app-frontend/src/components/ui/tutorial/StickyTitleBar.vue b/apps/app-frontend/src/components/ui/tutorial/StickyTitleBar.vue
deleted file mode 100644
index fd1fc40b2..000000000
--- a/apps/app-frontend/src/components/ui/tutorial/StickyTitleBar.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/apps/app-frontend/src/composables/macCssFix.js b/apps/app-frontend/src/composables/macCssFix.js
new file mode 100644
index 000000000..c4ce417a2
--- /dev/null
+++ b/apps/app-frontend/src/composables/macCssFix.js
@@ -0,0 +1,20 @@
+import { invoke } from '@tauri-apps/api/core'
+import cssContent from '@/assets/stylesheets/macFix.css?inline'
+
+export async function useCheckDisableMouseover() {
+ try {
+ // Fetch the CSS content from the Rust backend
+ let should_disable_mouseover = await invoke('plugin:utils|should_disable_mouseover')
+
+ if (should_disable_mouseover) {
+ // Create a style element and set its content
+ const styleElement = document.createElement('style')
+ styleElement.innerHTML = cssContent
+
+ // Append the style element to the document's head
+ document.head.appendChild(styleElement)
+ }
+ } catch (error) {
+ console.error('Error checking OS version from Rust backend', error)
+ }
+}
diff --git a/apps/app-frontend/src/helpers/ads.js b/apps/app-frontend/src/helpers/ads.js
new file mode 100644
index 000000000..41b231c38
--- /dev/null
+++ b/apps/app-frontend/src/helpers/ads.js
@@ -0,0 +1,21 @@
+import { invoke } from '@tauri-apps/api/core'
+
+export async function init_ads_window(x, y, width, height, overrideShown = false) {
+ return await invoke('plugin:ads|init_ads_window', { x, y, width, height, overrideShown })
+}
+
+export async function show_ads_window() {
+ return await invoke('plugin:ads|show_ads_window')
+}
+
+export async function hide_ads_window(reset) {
+ return await invoke('plugin:ads|hide_ads_window', { reset })
+}
+
+export async function record_ads_click() {
+ return await invoke('plugin:ads|record_ads_click')
+}
+
+export async function open_ads_link(path, origin) {
+ return await invoke('plugin:ads|open_link', { path, origin })
+}
diff --git a/apps/app-frontend/src/helpers/analytics.js b/apps/app-frontend/src/helpers/analytics.js
new file mode 100644
index 000000000..90d2c8aef
--- /dev/null
+++ b/apps/app-frontend/src/helpers/analytics.js
@@ -0,0 +1,23 @@
+import { posthog } from 'posthog-js'
+
+export const initAnalytics = () => {
+ posthog.init('phc_hm2ihMpTAoE86xIm7XzsCB8RPiTRKivViK5biiHedm', {
+ persistence: 'localStorage',
+ })
+}
+
+export const debugAnalytics = () => {
+ posthog.debug()
+}
+
+export const optOutAnalytics = () => {
+ posthog.opt_out_capturing()
+}
+
+export const optInAnalytics = () => {
+ posthog.opt_in_capturing()
+}
+
+export const trackEvent = (eventName, properties) => {
+ posthog.capture(eventName, properties)
+}
diff --git a/apps/app-frontend/src/helpers/auth.js b/apps/app-frontend/src/helpers/auth.js
index 5d5c26fe8..32e1d038a 100644
--- a/apps/app-frontend/src/helpers/auth.js
+++ b/apps/app-frontend/src/helpers/auth.js
@@ -3,7 +3,7 @@
* So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
* and deserialized into a usable JS object.
*/
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
// Example function:
// User goes to auth_url to complete flow, and when completed, authenticate_await_completion() returns the credentials
@@ -13,37 +13,48 @@ import { invoke } from '@tauri-apps/api/tauri'
// await authenticate_await_completion()
// }
-/// Authenticate a user with Hydra - part 1
-/// This begins the authentication flow quasi-synchronously
-/// This returns a DeviceLoginSuccess object, with two relevant fields:
-/// - verification_uri: the URL to go to to complete the flow
-/// - user_code: the code to enter on the verification_uri page
+/**
+ * Authenticate a user with Hydra - part 1.
+ * This begins the authentication flow quasi-synchronously.
+ *
+ * @returns {Promise
} A DeviceLoginSuccess object with two relevant fields:
+ * @property {string} verification_uri - The URL to go to complete the flow.
+ * @property {string} user_code - The code to enter on the verification_uri page.
+ */
export async function login() {
- return await invoke('auth_login')
+ return await invoke('plugin:auth|login')
}
-/// Retrieves the default user
-/// user is UUID
+/**
+ * Retrieves the default user
+ * @return {Promise}
+ */
export async function get_default_user() {
- return await invoke('plugin:auth|auth_get_default_user')
+ return await invoke('plugin:auth|get_default_user')
}
-/// Updates the default user
-/// user is UUID
+/**
+ * Updates the default user
+ * @param {UUID} user
+ */
export async function set_default_user(user) {
- return await invoke('plugin:auth|auth_set_default_user', { user })
+ return await invoke('plugin:auth|set_default_user', { user })
}
-/// Remove a user account from the database
-/// user is UUID
+/**
+ * Remove a user account from the database
+ * @param {UUID} user
+ */
export async function remove_user(user) {
- return await invoke('plugin:auth|auth_remove_user', { user })
+ return await invoke('plugin:auth|remove_user', { user })
}
-/// Returns a list of users
-/// Returns an Array of Credentials
+/**
+ * Returns a list of users
+ * @returns {Promise}
+ */
export async function users() {
- return await invoke('plugin:auth|auth_users')
+ return await invoke('plugin:auth|get_users')
}
// Refreshes a credential by UUID
diff --git a/apps/app-frontend/src/helpers/cache.js b/apps/app-frontend/src/helpers/cache.js
index c64ff4403..45b3b438c 100644
--- a/apps/app-frontend/src/helpers/cache.js
+++ b/apps/app-frontend/src/helpers/cache.js
@@ -1,49 +1,53 @@
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
-export async function get_project(id) {
- return await invoke('plugin:cache|get_project', { id })
+export async function get_project(id, cacheBehaviour) {
+ return await invoke('plugin:cache|get_project', { id, cacheBehaviour })
}
-export async function get_project_many(ids) {
- return await invoke('plugin:cache|get_project_many', { ids })
+export async function get_project_many(ids, cacheBehaviour) {
+ return await invoke('plugin:cache|get_project_many', { ids, cacheBehaviour })
}
-export async function get_version(id) {
- return await invoke('plugin:cache|get_version', { id })
+export async function get_version(id, cacheBehaviour) {
+ return await invoke('plugin:cache|get_version', { id, cacheBehaviour })
}
-export async function get_version_many(ids) {
- return await invoke('plugin:cache|get_version_many', { ids })
+export async function get_version_many(ids, cacheBehaviour) {
+ return await invoke('plugin:cache|get_version_many', { ids, cacheBehaviour })
}
-export async function get_user(id) {
- return await invoke('plugin:cache|get_user', { id })
+export async function get_user(id, cacheBehaviour) {
+ return await invoke('plugin:cache|get_user', { id, cacheBehaviour })
}
-export async function get_user_many(ids) {
- return await invoke('plugin:cache|get_user_many', { ids })
+export async function get_user_many(ids, cacheBehaviour) {
+ return await invoke('plugin:cache|get_user_many', { ids, cacheBehaviour })
}
-export async function get_team(id) {
- return await invoke('plugin:cache|get_team', { id })
+export async function get_team(id, cacheBehaviour) {
+ return await invoke('plugin:cache|get_team', { id, cacheBehaviour })
}
-export async function get_team_many(ids) {
- return await invoke('plugin:cache|get_team_many', { ids })
+export async function get_team_many(ids, cacheBehaviour) {
+ return await invoke('plugin:cache|get_team_many', { ids, cacheBehaviour })
}
-export async function get_organization(id) {
- return await invoke('plugin:cache|get_organization', { id })
+export async function get_organization(id, cacheBehaviour) {
+ return await invoke('plugin:cache|get_organization', { id, cacheBehaviour })
}
-export async function get_organization_many(ids) {
- return await invoke('plugin:cache|get_organization_many', { ids })
+export async function get_organization_many(ids, cacheBehaviour) {
+ return await invoke('plugin:cache|get_organization_many', { ids, cacheBehaviour })
}
-export async function get_search_results(id) {
- return await invoke('plugin:cache|get_search_results', { id })
+export async function get_search_results(id, cacheBehaviour) {
+ return await invoke('plugin:cache|get_search_results', { id, cacheBehaviour })
}
-export async function get_search_results_many(ids) {
- return await invoke('plugin:cache|get_search_results_many', { ids })
+export async function get_search_results_many(ids, cacheBehaviour) {
+ return await invoke('plugin:cache|get_search_results_many', { ids, cacheBehaviour })
+}
+
+export async function purge_cache_types(cacheTypes) {
+ return await invoke('plugin:cache|purge_cache_types', { cacheTypes })
}
diff --git a/apps/app-frontend/src/helpers/events.js b/apps/app-frontend/src/helpers/events.js
index 3bc07bcb9..0ed288365 100644
--- a/apps/app-frontend/src/helpers/events.js
+++ b/apps/app-frontend/src/helpers/events.js
@@ -93,3 +93,7 @@ export async function command_listener(callback) {
export async function warning_listener(callback) {
return await listen('warning', (event) => callback(event.payload))
}
+
+export async function friend_listener(callback) {
+ return await listen('friend', (event) => callback(event.payload))
+}
diff --git a/apps/app-frontend/src/helpers/friends.js b/apps/app-frontend/src/helpers/friends.js
new file mode 100644
index 000000000..168c93837
--- /dev/null
+++ b/apps/app-frontend/src/helpers/friends.js
@@ -0,0 +1,17 @@
+import { invoke } from '@tauri-apps/api/core'
+
+export async function friends() {
+ return await invoke('plugin:friends|friends')
+}
+
+export async function friend_statuses() {
+ return await invoke('plugin:friends|friend_statuses')
+}
+
+export async function add_friend(userId) {
+ return await invoke('plugin:friends|add_friend', { userId })
+}
+
+export async function remove_friend(userId) {
+ return await invoke('plugin:friends|remove_friend', { userId })
+}
diff --git a/apps/app-frontend/src/helpers/import.js b/apps/app-frontend/src/helpers/import.js
index cfaa3ad1e..ba0bc4ffa 100644
--- a/apps/app-frontend/src/helpers/import.js
+++ b/apps/app-frontend/src/helpers/import.js
@@ -3,7 +3,7 @@
* So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
* and deserialized into a usable JS object.
*/
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
import { create } from './profile'
/*
@@ -27,7 +27,7 @@ import { create } from './profile'
/// eg: get_importable_instances("MultiMC", "C:/MultiMC")
/// returns ["Instance 1", "Instance 2"]
export async function get_importable_instances(launcherType, basePath) {
- return await invoke('plugin:import|import_get_importable_instances', { launcherType, basePath })
+ return await invoke('plugin:import|get_importable_instances', { launcherType, basePath })
}
/// Import an instance from a launcher type and base path
@@ -38,7 +38,7 @@ export async function import_instance(launcherType, basePath, instanceFolder) {
// fs watching will be enabled once the instance is imported
const profilePath = await create(instanceFolder, '1.19.4', 'vanilla', 'latest', null, true)
- return await invoke('plugin:import|import_import_instance', {
+ return await invoke('plugin:import|import_instance', {
profilePath,
launcherType,
basePath,
@@ -49,7 +49,7 @@ export async function import_instance(launcherType, basePath, instanceFolder) {
/// Checks if this instance is valid for importing, given a certain launcher type
/// eg: is_valid_importable_instance("C:/MultiMC/Instance 1", "MultiMC")
export async function is_valid_importable_instance(instanceFolder, launcherType) {
- return await invoke('plugin:import|import_is_valid_importable_instance', {
+ return await invoke('plugin:import|is_valid_importable_instance', {
instanceFolder,
launcherType,
})
@@ -59,5 +59,5 @@ export async function is_valid_importable_instance(instanceFolder, launcherType)
/// null if it can't be found or doesn't exist
/// eg: get_default_launcher_path("MultiMC")
export async function get_default_launcher_path(launcherType) {
- return await invoke('plugin:import|import_get_default_launcher_path', { launcherType })
+ return await invoke('plugin:import|get_default_launcher_path', { launcherType })
}
diff --git a/apps/app-frontend/src/helpers/jre.js b/apps/app-frontend/src/helpers/jre.js
index 7ad4a42cd..0814e9b0a 100644
--- a/apps/app-frontend/src/helpers/jre.js
+++ b/apps/app-frontend/src/helpers/jre.js
@@ -3,7 +3,7 @@
* So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
* and deserialized into a usable JS object.
*/
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
/*
diff --git a/apps/app-frontend/src/helpers/logs.js b/apps/app-frontend/src/helpers/logs.js
index 5694d6a0a..963bae88b 100644
--- a/apps/app-frontend/src/helpers/logs.js
+++ b/apps/app-frontend/src/helpers/logs.js
@@ -3,7 +3,7 @@
* So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
* and deserialized into a usable JS object.
*/
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
/*
A log is a struct containing the filename string, stdout, and stderr, as follows:
diff --git a/apps/app-frontend/src/helpers/metadata.js b/apps/app-frontend/src/helpers/metadata.js
index 6f2c15be1..2959834fa 100644
--- a/apps/app-frontend/src/helpers/metadata.js
+++ b/apps/app-frontend/src/helpers/metadata.js
@@ -1,4 +1,4 @@
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
/// Gets the game versions from daedalus
// Returns a VersionManifest
diff --git a/apps/app-frontend/src/helpers/mixpanel.js b/apps/app-frontend/src/helpers/mixpanel.js
deleted file mode 100644
index d527ea2ad..000000000
--- a/apps/app-frontend/src/helpers/mixpanel.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import mixpanel from 'mixpanel-browser'
-
-// mixpanel_track
-function trackWrapper(originalTrack) {
- return function (event_name, properties = {}) {
- try {
- originalTrack(event_name, properties)
- } catch (e) {
- console.error(e)
- }
- }
-}
-export const mixpanel_track = trackWrapper(mixpanel.track.bind(mixpanel))
-
-// mixpanel_opt_out_tracking()
-function optOutTrackingWrapper(originalOptOutTracking) {
- return function () {
- try {
- originalOptOutTracking()
- } catch (e) {
- console.error(e)
- }
- }
-}
-export const mixpanel_opt_out_tracking = optOutTrackingWrapper(
- mixpanel.opt_out_tracking.bind(mixpanel),
-)
-
-// mixpanel_opt_in_tracking()
-function optInTrackingWrapper(originalOptInTracking) {
- return function () {
- try {
- originalOptInTracking()
- } catch (e) {
- console.error(e)
- }
- }
-}
-export const mixpanel_opt_in_tracking = optInTrackingWrapper(
- mixpanel.opt_in_tracking.bind(mixpanel),
-)
-
-// mixpanel_init
-function initWrapper(originalInit) {
- return function (token, config = {}) {
- try {
- originalInit(token, config)
- } catch (e) {
- console.error(e)
- }
- }
-}
-export const mixpanel_init = initWrapper(mixpanel.init.bind(mixpanel))
-
-export const mixpanel_is_loaded = () => {
- return mixpanel.__loaded
-}
diff --git a/apps/app-frontend/src/helpers/mr_auth.js b/apps/app-frontend/src/helpers/mr_auth.js
index ae0e19619..ecd9aee35 100644
--- a/apps/app-frontend/src/helpers/mr_auth.js
+++ b/apps/app-frontend/src/helpers/mr_auth.js
@@ -3,34 +3,16 @@
* So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
* and deserialized into a usable JS object.
*/
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
-export async function login(provider) {
- return await invoke('modrinth_auth_login', { provider })
-}
-
-export async function login_pass(username, password, challenge) {
- return await invoke('plugin:mr_auth|login_pass', { username, password, challenge })
-}
-
-export async function login_2fa(code, flow) {
- return await invoke('plugin:mr_auth|login_2fa', { code, flow })
-}
-
-export async function create_account(username, email, password, challenge, signUpNewsletter) {
- return await invoke('plugin:mr_auth|create_account', {
- username,
- email,
- password,
- challenge,
- signUpNewsletter,
- })
+export async function login() {
+ return await invoke('plugin:mr-auth|modrinth_login')
}
export async function logout() {
- return await invoke('plugin:mr_auth|logout')
+ return await invoke('plugin:mr-auth|logout')
}
export async function get() {
- return await invoke('plugin:mr_auth|get')
+ return await invoke('plugin:mr-auth|get')
}
diff --git a/apps/app-frontend/src/helpers/pack.js b/apps/app-frontend/src/helpers/pack.js
index d1ae241d2..9908e93d1 100644
--- a/apps/app-frontend/src/helpers/pack.js
+++ b/apps/app-frontend/src/helpers/pack.js
@@ -3,7 +3,7 @@
* So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
* and deserialized into a usable JS object.
*/
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
import { create } from './profile'
// Installs pack from a version ID
diff --git a/apps/app-frontend/src/helpers/process.js b/apps/app-frontend/src/helpers/process.js
index 94df7f8f6..140ba6a99 100644
--- a/apps/app-frontend/src/helpers/process.js
+++ b/apps/app-frontend/src/helpers/process.js
@@ -3,7 +3,7 @@
* So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
* and deserialized into a usable JS object.
*/
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
/// Gets all running process IDs with a given profile path
/// Returns [u32]
@@ -18,6 +18,6 @@ export async function get_all() {
}
/// Kills a process by UUID
-export async function kill(pid) {
- return await invoke('plugin:process|process_kill', { pid })
+export async function kill(uuid) {
+ return await invoke('plugin:process|process_kill', { uuid })
}
diff --git a/apps/app-frontend/src/helpers/profile.js b/apps/app-frontend/src/helpers/profile.js
index 2e6ac703c..118a374ae 100644
--- a/apps/app-frontend/src/helpers/profile.js
+++ b/apps/app-frontend/src/helpers/profile.js
@@ -3,7 +3,7 @@
* So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
* and deserialized into a usable JS object.
*/
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
/// Add instance
/*
@@ -19,7 +19,7 @@ import { invoke } from '@tauri-apps/api/tauri'
export async function create(name, gameVersion, modloader, loaderVersion, iconPath, skipInstall) {
//Trim string name to avoid "Unable to find directory"
name = name.trim()
- return await invoke('plugin:profile_create|profile_create', {
+ return await invoke('plugin:profile-create|profile_create', {
name,
gameVersion,
modloader,
@@ -31,7 +31,7 @@ export async function create(name, gameVersion, modloader, loaderVersion, iconPa
// duplicate a profile
export async function duplicate(path) {
- return await invoke('plugin:profile_create|profile_duplicate', { path })
+ return await invoke('plugin:profile-create|profile_duplicate', { path })
}
// Remove a profile
@@ -51,8 +51,8 @@ export async function get_many(paths) {
// Get a profile's projects
// Returns a map of a path to profile file
-export async function get_projects(path) {
- return await invoke('plugin:profile|profile_get_projects', { path })
+export async function get_projects(path, cacheBehaviour) {
+ return await invoke('plugin:profile|profile_get_projects', { path, cacheBehaviour })
}
// Get a profile's full fs path
diff --git a/apps/app-frontend/src/helpers/settings.js b/apps/app-frontend/src/helpers/settings.js
index 701cc325d..b27bfe90b 100644
--- a/apps/app-frontend/src/helpers/settings.js
+++ b/apps/app-frontend/src/helpers/settings.js
@@ -3,7 +3,7 @@
* So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
* and deserialized into a usable JS object.
*/
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
// Settings object
/*
@@ -38,12 +38,6 @@ export async function set(settings) {
return await invoke('plugin:settings|settings_set', { settings })
}
-// Changes the config dir
-// Seizes the entire application state until its done
-export async function change_config_dir(newConfigDir) {
- return await invoke('plugin:settings|settings_change_config_dir', { newConfigDir })
-}
-
-export async function is_dir_writeable(newConfigDir) {
- return await invoke('plugin:settings|settings_is_dir_writeable', { newConfigDir })
+export async function cancel_directory_change() {
+ return await invoke('plugin:settings|cancel_directory_change')
}
diff --git a/apps/app-frontend/src/helpers/state.js b/apps/app-frontend/src/helpers/state.js
index d28671851..99b496e16 100644
--- a/apps/app-frontend/src/helpers/state.js
+++ b/apps/app-frontend/src/helpers/state.js
@@ -3,7 +3,7 @@
* So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
* and deserialized into a usable JS object.
*/
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
// Initialize the theseus API state
// This should be called during the initializion/opening of the launcher
diff --git a/apps/app-frontend/src/helpers/tags.js b/apps/app-frontend/src/helpers/tags.js
index 11f502aa4..07ee7589f 100644
--- a/apps/app-frontend/src/helpers/tags.js
+++ b/apps/app-frontend/src/helpers/tags.js
@@ -3,7 +3,7 @@
* So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
* and deserialized into a usable JS object.
*/
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
// Gets cached category tags
export async function get_categories() {
diff --git a/apps/app-frontend/src/helpers/utils.js b/apps/app-frontend/src/helpers/utils.js
index d63adbe8f..69cd5a8c4 100644
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -1,5 +1,5 @@
import { get_full_path, get_mod_full_path } from '@/helpers/profile'
-import { invoke } from '@tauri-apps/api/tauri'
+import { invoke } from '@tauri-apps/api/core'
export async function isDev() {
return await invoke('is_dev')
@@ -10,8 +10,12 @@ export async function getOS() {
return await invoke('plugin:utils|get_os')
}
-export async function showInFolder(path) {
- return await invoke('plugin:utils|show_in_folder', { path })
+export async function openPath(path) {
+ return await invoke('plugin:utils|open_path', { path })
+}
+
+export async function highlightInFolder(path) {
+ return await invoke('plugin:utils|highlight_in_folder', { path })
}
export async function showLauncherLogsFolder() {
@@ -21,12 +25,16 @@ export async function showLauncherLogsFolder() {
// Opens a profile's folder in the OS file explorer
export async function showProfileInFolder(path) {
const fullPath = await get_full_path(path)
- return await showInFolder(fullPath)
+ return await openPath(fullPath)
}
export async function highlightModInProfile(profilePath, projectPath) {
const fullPath = await get_mod_full_path(profilePath, projectPath)
- return await showInFolder(fullPath)
+ return await highlightInFolder(fullPath)
+}
+
+export async function restartApp() {
+ return await invoke('restart_app')
}
export const releaseColor = (releaseType) => {
@@ -48,7 +56,7 @@ export function debounce(fn, wait) {
if (timer) {
clearTimeout(timer) // clear any pre-existing timer
}
- // eslint-disable-next-line @typescript-eslint/no-this-alias
+
const context = this // get the current context
timer = setTimeout(() => {
fn.apply(context, args) // call the function if time expires
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
new file mode 100644
index 000000000..1b083c11f
--- /dev/null
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -0,0 +1,38 @@
+{
+ "app.settings.developer-mode-enabled": {
+ "message": "Developer mode enabled."
+ },
+ "app.settings.tabs.appearance": {
+ "message": "Appearance"
+ },
+ "app.settings.tabs.default-instance-options": {
+ "message": "Default instance options"
+ },
+ "app.settings.tabs.feature-flags": {
+ "message": "Feature flags"
+ },
+ "app.settings.tabs.java-versions": {
+ "message": "Java versions"
+ },
+ "app.settings.tabs.privacy": {
+ "message": "Privacy"
+ },
+ "app.settings.tabs.resource-management": {
+ "message": "Resource management"
+ },
+ "instance.filter.updates-available": {
+ "message": "Updates available"
+ },
+ "search.filter.locked.instance": {
+ "message": "Provided by the instance"
+ },
+ "search.filter.locked.instance-game-version.title": {
+ "message": "Game version is provided by the instance"
+ },
+ "search.filter.locked.instance-loader.title": {
+ "message": "Loader is provided by the instance"
+ },
+ "search.filter.locked.instance.sync": {
+ "message": "Sync with instance"
+ }
+}
diff --git a/apps/app-frontend/src/main.js b/apps/app-frontend/src/main.js
index 8d3876830..54eecc8d0 100644
--- a/apps/app-frontend/src/main.js
+++ b/apps/app-frontend/src/main.js
@@ -2,16 +2,10 @@ import { createApp } from 'vue'
import router from '@/routes'
import App from '@/App.vue'
import { createPinia } from 'pinia'
-import '@modrinth/assets/omorphia.scss'
-import '@/assets/stylesheets/global.scss'
import FloatingVue from 'floating-vue'
import 'floating-vue/dist/style.css'
-import { get_opening_command, initialize_state } from '@/helpers/state'
-import loadCssMixin from './mixins/macCssFix.js'
-import { get } from '@/helpers/settings'
-import { invoke } from '@tauri-apps/api'
-import { isDev } from './helpers/utils.js'
import { createPlugin } from '@vintl/vintl/plugin'
+import * as Sentry from '@sentry/vue'
const VIntlPlugin = createPlugin({
controllerOpts: {
@@ -33,51 +27,27 @@ const VIntlPlugin = createPlugin({
const pinia = createPinia()
let app = createApp(App)
+
+Sentry.init({
+ app,
+ dsn: 'https://9508775ee5034536bc70433f5f531dd4@o485889.ingest.us.sentry.io/4504579615227904',
+ integrations: [Sentry.browserTracingIntegration({ router })],
+ tracesSampleRate: 0.1,
+})
+
app.use(router)
app.use(pinia)
-app.use(FloatingVue)
-app.mixin(loadCssMixin)
+app.use(FloatingVue, {
+ themes: {
+ 'ribbit-popout': {
+ $extend: 'dropdown',
+ placement: 'bottom-end',
+ instantMove: true,
+ distance: 8,
+ triggers: ['click'],
+ },
+ },
+})
app.use(VIntlPlugin)
-const mountedApp = app.mount('#app')
-
-const raw_invoke = async (plugin, fn, args) => {
- if (plugin === '') {
- await invoke(fn, args)
- } else {
- await invoke('plugin:' + plugin + '|' + fn, args)
- }
-}
-isDev()
- .then((dev) => {
- if (dev) {
- window.raw_invoke = raw_invoke
- }
- })
- .catch((err) => {
- console.error(err)
- })
-
-initialize_state()
- .then(() => {
- // First, redirect to other landing page if we have that setting
- get()
- .then((fetchSettings) => {
- if (fetchSettings?.default_page && fetchSettings?.default_page !== 'Home') {
- router.push({ name: fetchSettings?.default_page })
- }
- })
- .catch((err) => {
- console.error(err)
- })
- .finally(() => {
- mountedApp.initialize()
- get_opening_command().then((command) => {
- console.log(JSON.stringify(command)) // change me to use whatever FE command handler is made
- })
- })
- })
- .catch((err) => {
- console.error('Failed to initialize app', err)
- mountedApp.failure(err)
- })
+app.mount('#app')
diff --git a/apps/app-frontend/src/mixins/macCssFix.js b/apps/app-frontend/src/mixins/macCssFix.js
deleted file mode 100644
index 9d8b6ce45..000000000
--- a/apps/app-frontend/src/mixins/macCssFix.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { invoke } from '@tauri-apps/api/tauri'
-import cssContent from '@/assets/stylesheets/macFix.css?inline'
-
-export default {
- async mounted() {
- await this.checkDisableMouseover()
- },
- methods: {
- async checkDisableMouseover() {
- try {
- // Fetch the CSS content from the Rust backend
- const should_disable_mouseover = await invoke('plugin:utils|should_disable_mouseover')
-
- if (should_disable_mouseover) {
- // Create a style element and set its content
- const styleElement = document.createElement('style')
- styleElement.innerHTML = cssContent
-
- // Append the style element to the document's head
- document.head.appendChild(styleElement)
- }
- } catch (error) {
- console.error('Error checking OS version from Rust backend', error)
- }
- },
- },
-}
diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue
index f1463e032..607d7c1d5 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -1,246 +1,200 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- Sort by
-
-
- Show per page
-
-
-