diff --git a/theseus_gui/dist/splashscreen.html b/theseus_gui/dist/splashscreen.html new file mode 100644 index 000000000..c70a3279f --- /dev/null +++ b/theseus_gui/dist/splashscreen.html @@ -0,0 +1,151 @@ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
Loading...
+
+ + + diff --git a/theseus_gui/src-tauri/src/main.rs b/theseus_gui/src-tauri/src/main.rs index 6d7cba8d4..ded8f9aa0 100644 --- a/theseus_gui/src-tauri/src/main.rs +++ b/theseus_gui/src-tauri/src/main.rs @@ -142,7 +142,7 @@ fn main() { .invoke_handler(tauri::generate_handler![ initialize_state, is_dev, - toggle_decorations + toggle_decorations, ]); builder diff --git a/theseus_gui/src/components/ui/AccountsCard.vue b/theseus_gui/src/components/ui/AccountsCard.vue index 0401554d6..337cdecbc 100644 --- a/theseus_gui/src/components/ui/AccountsCard.vue +++ b/theseus_gui/src/components/ui/AccountsCard.vue @@ -11,7 +11,7 @@ :src=" selectedAccount ? `https://mc-heads.net/avatar/${selectedAccount.id}/128` - : 'https://cdn.discordapp.com/attachments/817413688771608587/1129829843425570867/unnamed.png' + : 'https://launcher-files.modrinth.com/assets/steve_head.png' " />
diff --git a/theseus_gui/src/components/ui/ExportModal.vue b/theseus_gui/src/components/ui/ExportModal.vue index f11bc6135..35ac903e2 100644 --- a/theseus_gui/src/components/ui/ExportModal.vue +++ b/theseus_gui/src/components/ui/ExportModal.vue @@ -188,6 +188,8 @@ const exportPack = async () => { } .select-checkbox { + gap: var(--gap-sm); + button.checkbox { border: none; } diff --git a/theseus_gui/src/components/ui/InstanceCreationModal.vue b/theseus_gui/src/components/ui/InstanceCreationModal.vue index 756ead5c8..1c6d9e1a5 100644 --- a/theseus_gui/src/components/ui/InstanceCreationModal.vue +++ b/theseus_gui/src/components/ui/InstanceCreationModal.vue @@ -181,6 +181,10 @@ : 'Select profiles to import' }} +
@@ -224,6 +228,7 @@ import { get_importable_instances, import_instance, } from '@/helpers/import.js' +import ProgressBar from '@/components/ui/ProgressBar.vue' const themeStore = useTheming() @@ -420,6 +425,8 @@ const profiles = ref( ) const loading = ref(false) +const importedProfiles = ref(0) +const totalProfiles = ref(0) const selectedProfileType = ref('MultiMC') const profileOptions = ref([ @@ -480,6 +487,10 @@ const setPath = () => { } const next = async () => { + importedProfiles.value = 0 + totalProfiles.value = Array.from(profiles.value.values()) + .map((profiles) => profiles.filter((profile) => profile.selected).length) + .reduce((a, b) => a + b, 0) loading.value = true for (const launcher of Array.from(profiles.value.entries()).map(([launcher, profiles]) => ({ launcher, @@ -491,6 +502,7 @@ const next = async () => { .catch(handleError) .then(() => console.log(`Successfully Imported ${profile.name} from ${launcher.launcher}`)) profile.selected = false + importedProfiles.value++ } } loading.value = false @@ -628,6 +640,7 @@ const next = async () => { display: flex; flex-direction: row; justify-content: space-between; + align-items: center; gap: var(--gap-md); .transparent { diff --git a/theseus_gui/src/components/ui/ProjectCard.vue b/theseus_gui/src/components/ui/ProjectCard.vue index 6fd7fe6ae..20ee8c034 100644 --- a/theseus_gui/src/components/ui/ProjectCard.vue +++ b/theseus_gui/src/components/ui/ProjectCard.vue @@ -119,7 +119,7 @@ const install = async (e) => { 'background-image': `url(${ project.featured_gallery ?? project.gallery[0] ?? - 'https://cdn.discordapp.com/attachments/817413688771608587/1119143634319724564/image.png' + 'https://launcher-files.modrinth.com/assets/maze-bg.png' })`, 'no-image': !project.featured_gallery && !project.gallery[0], }" diff --git a/theseus_gui/src/components/ui/tutorial/FakeAccountsCard.vue b/theseus_gui/src/components/ui/tutorial/FakeAccountsCard.vue index 139e5ed99..4ad272847 100644 --- a/theseus_gui/src/components/ui/tutorial/FakeAccountsCard.vue +++ b/theseus_gui/src/components/ui/tutorial/FakeAccountsCard.vue @@ -1,17 +1,12 @@