diff options
| -rw-r--r-- | src-tauri/src/lib.rs | 2 | ||||
| -rw-r--r-- | src-tauri/src/main.rs | 4 | ||||
| -rw-r--r-- | src-vue/src/plugins/store.ts | 6 | ||||
| -rw-r--r-- | src-vue/src/views/ChangelogView.vue | 5 | ||||
| -rw-r--r-- | src-vue/src/views/DeveloperView.vue | 2 | ||||
| -rw-r--r-- | src-vue/src/views/PlayView.vue | 6 |
6 files changed, 13 insertions, 12 deletions
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index b249d519..8a97a108 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -231,7 +231,7 @@ async fn do_install(nmod: &thermite::model::Mod, game_path: &std::path::Path) -> pub async fn install_northstar( game_path: &str, northstar_package_name: Option<String>, -) -> Result<String> { +) -> Result<String, String> { let northstar_package_name = match northstar_package_name { Some(northstar_package_name) => { if northstar_package_name.len() <= 1 { diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 411e75c9..4826ef52 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -73,7 +73,7 @@ fn main() { .invoke_handler(tauri::generate_handler![ force_panic, find_game_install_location_caller, - get_version_number, + get_flightcore_version_number, get_northstar_version_number_caller, check_is_northstar_outdated, verify_install_location, @@ -131,7 +131,7 @@ fn linux_checks() -> Result<(), String> { #[tauri::command] /// Returns the current version number as a string -fn get_version_number() -> String { +fn get_flightcore_version_number() -> String { let version = env!("CARGO_PKG_VERSION"); if cfg!(debug_assertions) { // Debugging enabled diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts index 4fdf50a3..c731b98d 100644 --- a/src-vue/src/plugins/store.ts +++ b/src-vue/src/plugins/store.ts @@ -33,7 +33,7 @@ export interface FlightCoreStore { let notification_handle: NotificationHandle; export const store = createStore<FlightCoreStore>({ - state (): FlightCoreStore { + state(): FlightCoreStore { return { developer_mode: false, game_path: undefined as unknown as string, @@ -197,7 +197,7 @@ async function _initializeApp(state: any) { // Grab Northstar release canal value from store if exists var persistent_northstar_release_canal = (await persistentStore.get('northstar-release-canal')) as any; - if(persistent_northstar_release_canal) { // For some reason, the plugin-store doesn't throw an eror but simply returns `null` when key not found + if (persistent_northstar_release_canal) { // For some reason, the plugin-store doesn't throw an eror but simply returns `null` when key not found // Put value from peristent store into current store state.northstar_release_canal = persistent_northstar_release_canal.value as string; } @@ -206,7 +206,7 @@ async function _initializeApp(state: any) { } // Get FlightCore version number - state.flightcore_version = await invoke("get_version_number"); + state.flightcore_version = await invoke("get_flightcore_version_number"); const result = await invoke("find_game_install_location_caller") .catch((err) => { diff --git a/src-vue/src/views/ChangelogView.vue b/src-vue/src/views/ChangelogView.vue index 9fca5e5b..ff4f2659 100644 --- a/src-vue/src/views/ChangelogView.vue +++ b/src-vue/src/views/ChangelogView.vue @@ -1,6 +1,7 @@ <template> <div class="fc__changelog__container"> - <el-link :underline="false" icon="DocumentCopy" target="_blank" href="https://github.com/R2Northstar/Northstar/releases"> + <el-link :underline="false" icon="DocumentCopy" target="_blank" + href="https://github.com/R2Northstar/Northstar/releases"> Open release notes </el-link> </div> @@ -18,6 +19,6 @@ export default { } .el-link { - color: white; + color: white; } </style> diff --git a/src-vue/src/views/DeveloperView.vue b/src-vue/src/views/DeveloperView.vue index dcc0c477..3a7ec8f5 100644 --- a/src-vue/src/views/DeveloperView.vue +++ b/src-vue/src/views/DeveloperView.vue @@ -26,7 +26,7 @@ </template> <script lang="ts"> -import {defineComponent} from "vue"; +import { defineComponent } from "vue"; import { invoke } from "@tauri-apps/api"; import { ElNotification } from "element-plus"; import { ReleaseCanal } from "../utils/ReleaseCanal"; diff --git a/src-vue/src/views/PlayView.vue b/src-vue/src/views/PlayView.vue index b02acc59..7b034004 100644 --- a/src-vue/src/views/PlayView.vue +++ b/src-vue/src/views/PlayView.vue @@ -1,6 +1,6 @@ <script lang="ts"> import { ElNotification } from 'element-plus'; -import {Tabs} from "../utils/Tabs"; +import { Tabs } from "../utils/Tabs"; import PlayButton from '../components/PlayButton.vue'; import { defineComponent } from "vue"; @@ -55,10 +55,10 @@ export default defineComponent({ </div> </div> <div> - <PlayButton/> + <PlayButton /> <div v-if="$store.state.developer_mode" id="fc_services__status"> <div> - <div class="fc_version__line">Northstar is running: </div> + <div class="fc_version__line">Northstar is running: </div> <div class="fc_version__line fc_version__line__boolean"> {{ northstarIsRunning }}</div> </div> <div> |