-
-
+
+
-
+
@@ -21,37 +21,38 @@ import { Hero } from '../components/all';
import { computed, getCurrentInstance, onMounted, ref } from 'vue';
import { getStore } from '../providers/generic/store/StoreProvider';
import { State } from '../store';
-import VueRouter from 'vue-router';
+import VueRouter, {useRouter} from 'vue-router';
+import path from '../providers/node/path/path';
+import InteractionProviderImpl from "../r2mm/system/InteractionProviderImpl";
import {getWrapperLaunchArgs} from "../utils/LaunchUtils";
const store = getStore();
-let router!: VueRouter;
-
-onMounted(() => {
- router = getCurrentInstance()!.proxy.$router;
-})
-
-const copyableArgs = ref();
-const copyAction = ref();
+let router = useRouter();
const launchArgs = ref("");
-getWrapperLaunchArgs().then(value => launchArgs.value = value);
+getWrapperLaunchArgs().then(value => {
+ console.log("Wrapper launch args", value)
+ launchArgs.value = value
+});
const activeGame = computed(() => store.state.activeGame.displayName);
const platformName = computed(() => process.platform === 'darwin' ? 'macOS' : process.platform);
function copy(){
let range = document.createRange();
- range.selectNode(copyableArgs.value as Node);
+ range.selectNode(document.getElementById('copyableArgs') as Node);
const selection = window.getSelection();
if(selection !== null) {
selection.removeAllRanges();
selection.addRange(range);
}
- document.execCommand("copy");
- (copyAction.value as Element).innerHTML = "Copied!";
+ InteractionProviderImpl.instance.copyToClipboard(launchArgs.value);
+ document.getElementById('copy-action')!.innerHTML = 'Copied!';
setTimeout(() => {
- (copyAction.value as Element).innerHTML = "Copy to clipboard";
+ const element = document.getElementById('copy-action');
+ if (element) {
+ element.innerHTML = 'Copy to clipboard';
+ }
}, 2000);
}
diff --git a/src/pages/Manager.vue b/src/pages/Manager.vue
index e5c05c266..1a312557c 100644
--- a/src/pages/Manager.vue
+++ b/src/pages/Manager.vue
@@ -139,7 +139,6 @@
diff --git a/src/pages/Splash.vue b/src/pages/Splash.vue
index 27633c5cb..c8ae261ec 100644
--- a/src/pages/Splash.vue
+++ b/src/pages/Splash.vue
@@ -118,31 +118,25 @@
@@ -151,7 +150,7 @@
- ![Mod Logo]()
+ ![Mod Logo]()
();
-let router!: VueRouter;
+const router = useRouter();
const runningMigration = ref(false);
const selectedGame = ref(null);
@@ -203,6 +203,7 @@ const settings = ref(undefined);
const isSettingDefaultPlatform = ref(false);
const viewMode = ref(GameSelectionViewMode.LIST);
const activeTab = ref(GameInstanceType.GAME);
+const gameImages = reactive({});
const filteredGameList = computed(() => {
const displayNameInAdditionalSearch = (game: Game, filterText: string): boolean => {
@@ -232,10 +233,18 @@ const gameList = computed(() => {
});
});
+function getImageHref(image: string) {
+ return ProtocolProvider.getPublicAssetUrl(image);
+}
+
function changeTab(tab: GameInstanceType) {
activeTab.value = tab;
}
+function markAsSelectedGame(game: Game) {
+ selectedGame.value = game;
+}
+
function selectGame(game: Game) {
selectedGame.value = game;
isSettingDefaultPlatform.value = false;
@@ -251,7 +260,7 @@ function selectGame(game: Game) {
});
showPlatformModal.value = true;
} else {
- selectedPlatform.value = game.storePlatformMetadata[0].storePlatform;
+ selectedPlatform.value = game.storePlatformMetadata[0]!.storePlatform;
showPlatformModal.value = false;
proceed();
}
@@ -263,7 +272,7 @@ function selectDefaultGame(game: Game) {
if (game.storePlatformMetadata.length > 1) {
showPlatformModal.value = true;
} else {
- selectedPlatform.value = game.storePlatformMetadata[0].storePlatform;
+ selectedPlatform.value = game.storePlatformMetadata[0]!.storePlatform;
showPlatformModal.value = false;
proceedDefault();
}
@@ -341,9 +350,15 @@ function isFavourited(game: Game) {
}
}
-onMounted(async () => {
- router = getCurrentInstance()!.proxy.$router;
+function isGameSelected(game: Game) {
+ return selectedGame.value !== null && selectedGame.value.internalFolderName === game.internalFolderName;
+}
+
+function isAnyGameSelected() {
+ return selectedGame.value !== null;
+}
+onMounted(async () => {
runningMigration.value = true;
await store.dispatch('checkMigrations');
runningMigration.value = false;
@@ -385,10 +400,6 @@ function toggleViewMode() {
}
}
-function getImage(image: string) {
- return require("../assets/images/game_selection/" + image);
-}
-
function capitalize(str: string) {
return str.slice(0, 1).toUpperCase() + str.slice(1);
}
diff --git a/src/pages/Help.vue b/src/pages/Help.vue
index 3cc0ca290..7b1881ad5 100644
--- a/src/pages/Help.vue
+++ b/src/pages/Help.vue
@@ -71,7 +71,7 @@
{{ game.displayName }}
@@ -185,13 +184,14 @@ import R2Error from '../model/errors/R2Error'; import { GameInstanceType, GameSelectionDisplayMode, Platform } from '../model/schema/ThunderstoreSchema'; import ProviderUtils from '../providers/generic/ProviderUtils'; import ModalCard from '../components/ModalCard.vue'; -import { computed, getCurrentInstance, onMounted, ref } from 'vue'; +import { computed, onMounted, reactive, ref } from 'vue'; import { getStore } from '../providers/generic/store/StoreProvider'; import { State } from '../store'; -import VueRouter from 'vue-router'; +import { useRouter } from 'vue-router'; +import ProtocolProvider from '../providers/generic/protocol/ProtocolProvider'; const store = getStoreThat's because you don't legally own the game. The manager only supports legal copies.
A text window appears and closes immediately.
-Try running "Reset {{$store.state.activeGame.displayName}} installation" on the Settings screen.
+Try running "Reset {{store.state.activeGame.displayName}} installation" on the Settings screen.
If it persists, force exit Steam and start modded with Steam closed.
diff --git a/src/pages/LinuxNativeGameSetup.vue b/src/pages/LinuxNativeGameSetup.vue
index 322a1be77..bca435716 100644
--- a/src/pages/LinuxNativeGameSetup.vue
+++ b/src/pages/LinuxNativeGameSetup.vue
@@ -7,10 +7,10 @@
This needs to be done because of how the BepInEx injection works on Unix systems.
Please copy and paste the following to your {{ activeGame }} launch options:
-
- Copy to clipboard + Copy to clipboard Continue
Please copy and paste the following to your {{ activeGame }} launch options:
-
{{ launchArgs }}
+ {{ launchArgs }}
- Copy to clipboard + Copy to clipboard Continue