From 1fdcbaef30bf4c21ad0d35c16dc7826d83d9f330 Mon Sep 17 00:00:00 2001 From: Jonni Liljamo Date: Thu, 5 Jan 2023 12:22:16 +0200 Subject: [PATCH] Change CfgHidden to CfgDev --- sdbclient/src/cfg/mod.rs | 4 ++-- sdbclient/src/main.rs | 2 +- sdbclient/src/plugins/connection_check/mod.rs | 6 +++--- sdbclient/src/plugins/menu/accountlogin/mod.rs | 6 +++--- sdbclient/src/plugins/menu/accountregister/mod.rs | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sdbclient/src/cfg/mod.rs b/sdbclient/src/cfg/mod.rs index a4b2e8b..41e23db 100644 --- a/sdbclient/src/cfg/mod.rs +++ b/sdbclient/src/cfg/mod.rs @@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize}; // Constants for file names pub const FILE_CFG_SETTINGS: &str = "cfgsettings.json"; pub const FILE_CFG_USER: &str = "cfguser.json"; -pub const FILE_CFG_HIDDEN: &str = ".cfghidden.json"; +pub const FILE_CFG_DEV: &str = ".cfgdev.json"; /// Stores a directories::ProjectDirs for easy access #[derive(Resource, Debug, Component, Clone)] @@ -47,7 +47,7 @@ pub struct CfgUser { /// Settings that the user has no access to, or can only access through developer settings #[derive(Serialize, Deserialize, Resource, Debug, Component, PartialEq, Clone)] -pub struct CfgHidden { +pub struct CfgDev { /// API Server pub api_server: String, } diff --git a/sdbclient/src/main.rs b/sdbclient/src/main.rs index 5d8971d..271d623 100644 --- a/sdbclient/src/main.rs +++ b/sdbclient/src/main.rs @@ -87,7 +87,7 @@ fn main() { username: "".to_string(), email: "".to_string(), }) - .insert_resource(cfg::CfgHidden { + .insert_resource(cfg::CfgDev { api_server: "http://localhost:8080/api".to_string(), }); diff --git a/sdbclient/src/plugins/connection_check/mod.rs b/sdbclient/src/plugins/connection_check/mod.rs index 12d20b1..5fc262f 100644 --- a/sdbclient/src/plugins/connection_check/mod.rs +++ b/sdbclient/src/plugins/connection_check/mod.rs @@ -14,7 +14,7 @@ use bevy_console::PrintConsoleLine; use futures_lite::future; -use crate::{api, cfg::CfgHidden}; +use crate::{api, cfg::CfgDev}; /// This plugin will check if we can connect to the API pub struct ConnectionCheckPlugin; @@ -31,8 +31,8 @@ impl Plugin for ConnectionCheckPlugin { #[derive(Component)] struct ConnectionCheck(Task); -fn start_connection_check(mut commands: Commands, cfg_hidden: Res) { - let api_address = cfg_hidden.api_server.clone(); +fn start_connection_check(mut commands: Commands, cfg_dev: Res) { + let api_address = cfg_dev.api_server.clone(); let thread_pool = AsyncComputeTaskPool::get(); let task = thread_pool.spawn(async move { let api_info = api::info(api_address); diff --git a/sdbclient/src/plugins/menu/accountlogin/mod.rs b/sdbclient/src/plugins/menu/accountlogin/mod.rs index 0e2f147..bcea312 100644 --- a/sdbclient/src/plugins/menu/accountlogin/mod.rs +++ b/sdbclient/src/plugins/menu/accountlogin/mod.rs @@ -16,7 +16,7 @@ use futures_lite::future; use crate::{ api::{self, user::ResponseToken}, - cfg::{self, CfgDirs, CfgHidden, CfgUser}, + cfg::{self, CfgDev, CfgDirs, CfgUser}, util, }; @@ -57,10 +57,10 @@ struct LoginCall(Task); fn start_login_call( mut commands: Commands, - cfg_hidden: Res, + cfg_dev: Res, inputs: Res, ) { - let api_address = cfg_hidden.api_server.clone(); + let api_address = cfg_dev.api_server.clone(); let i = inputs.clone(); let thread_pool = AsyncComputeTaskPool::get(); diff --git a/sdbclient/src/plugins/menu/accountregister/mod.rs b/sdbclient/src/plugins/menu/accountregister/mod.rs index dd3e5ff..550887d 100644 --- a/sdbclient/src/plugins/menu/accountregister/mod.rs +++ b/sdbclient/src/plugins/menu/accountregister/mod.rs @@ -19,7 +19,7 @@ use crate::{ self, user::{ResponseRegister, ResponseToken}, }, - cfg::{self, CfgDirs, CfgHidden, CfgUser}, + cfg::{self, CfgDev, CfgDirs, CfgUser}, util, }; @@ -65,10 +65,10 @@ struct RegisterCall(Task); fn start_register_call( mut commands: Commands, - cfg_hidden: Res, + cfg_dev: Res, inputs: Res, ) { - let api_address = cfg_hidden.api_server.clone(); + let api_address = cfg_dev.api_server.clone(); let i = inputs.clone(); let thread_pool = AsyncComputeTaskPool::get(); -- 2.44.1