Add back button to login and signup pages for 2d navigation

.github/workflows/tauri-publish-2d.yml

@@ -48,13 +48,13 @@ jobs:
         # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
 
       - name: install frontend dependencies
-        run: cd ./crates/desktop/artcraft && yarn install # change this to npm, pnpm or bun depending on which one you use.
+        run: cd ./crates/desktop/tauri-artcraft && yarn install # change this to npm, pnpm or bun depending on which one you use.
 
       - uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          projectPath: ./crates/desktop/artcraft
+          projectPath: ./crates/desktop/tauri-artcraft
           tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
           releaseName: 'App v__VERSION__'
           releaseBody: 'See the assets to download this version and install.'

Cargo.lock

@@ -802,54 +802,6 @@ dependencies = [
  "num",
 ]
 
-[[package]]
-name = "artcraft"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "assertor",
- "base64 0.22.1",
- "bytes 1.10.0",
- "chrono",
- "const_format",
- "crockford",
- "directories 6.0.0",
- "dirs 6.0.0",
- "discord-rich-presence",
- "errors",
- "filesys",
- "futures 0.3.29",
- "image",
- "indexmap 2.9.0",
- "libloading 0.8.6",
- "log",
- "memory_caching",
- "memory_store",
- "once_cell",
- "openai_sora_client",
- "primitives",
- "rand 0.9.0",
- "reqwest 0.12.15",
- "serde",
- "serde_derive",
- "serde_json",
- "serde_yaml",
- "serial_test",
- "storyteller_client",
- "subprocess_common",
- "tauri",
- "tauri-build",
- "tauri-plugin-http",
- "tauri-plugin-log",
- "tauri-plugin-upload",
- "tempdir",
- "tempfile",
- "tokens",
- "tokio",
- "tokio-util",
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "ascii"
 version = "0.9.3"
@@ -1402,11 +1354,11 @@ dependencies = [
 
 [[package]]
 name = "block2"
-version = "0.6.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "340d2f0bdb2a43c1d3cd40513185b2bd7def0aa1052f956455114bc98f82dcf2"
+checksum = "1d59b4c170e16f0405a2e95aff44432a0d41aa97675f3d52623effe95792a037"
 dependencies = [
- "objc2 0.6.1",
+ "objc2 0.6.0",
 ]
 
 [[package]]
@@ -3335,16 +3287,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
-[[package]]
-name = "dispatch2"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
-dependencies = [
- "bitflags 2.5.0",
- "objc2 0.6.1",
-]
-
 [[package]]
 name = "displaydoc"
 version = "0.2.4"
@@ -7193,10 +7135,10 @@ dependencies = [
  "dpi",
  "gtk",
  "keyboard-types",
- "objc2 0.6.1",
+ "objc2 0.6.0",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.0",
  "once_cell",
  "png",
  "serde",
@@ -7615,9 +7557,9 @@ dependencies = [
 
 [[package]]
 name = "objc2"
-version = "0.6.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88c6597e14493ab2e44ce58f2fdecf095a51f12ca57bec060a11c57332520551"
+checksum = "3531f65190d9cff863b77a99857e74c314dd16bf56c538c4b57c7cbc3f3a6e59"
 dependencies = [
  "objc2-encode",
  "objc2-exception-helper",
@@ -7625,77 +7567,75 @@ dependencies = [
 
 [[package]]
 name = "objc2-app-kit"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
+checksum = "5906f93257178e2f7ae069efb89fbd6ee94f0592740b5f8a1512ca498814d0fb"
 dependencies = [
  "bitflags 2.5.0",
- "block2 0.6.1",
+ "block2 0.6.0",
  "libc",
- "objc2 0.6.1",
+ "objc2 0.6.0",
  "objc2-cloud-kit",
  "objc2-core-data",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-core-image",
- "objc2-foundation 0.3.1",
- "objc2-quartz-core 0.3.1",
+ "objc2-foundation 0.3.0",
+ "objc2-quartz-core 0.3.0",
 ]
 
 [[package]]
 name = "objc2-cloud-kit"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17614fdcd9b411e6ff1117dfb1d0150f908ba83a7df81b1f118005fe0a8ea15d"
+checksum = "6c1948a9be5f469deadbd6bcb86ad7ff9e47b4f632380139722f7d9840c0d42c"
 dependencies = [
  "bitflags 2.5.0",
- "objc2 0.6.1",
- "objc2-foundation 0.3.1",
+ "objc2 0.6.0",
+ "objc2-foundation 0.3.0",
 ]
 
 [[package]]
 name = "objc2-core-data"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291fbbf7d29287518e8686417cf7239c74700fd4b607623140a7d4a3c834329d"
+checksum = "1f860f8e841f6d32f754836f51e6bc7777cd7e7053cf18528233f6811d3eceb4"
 dependencies = [
  "bitflags 2.5.0",
- "objc2 0.6.1",
- "objc2-foundation 0.3.1",
+ "objc2 0.6.0",
+ "objc2-foundation 0.3.0",
 ]
 
 [[package]]
 name = "objc2-core-foundation"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
+checksum = "daeaf60f25471d26948a1c2f840e3f7d86f4109e3af4e8e4b5cd70c39690d925"
 dependencies = [
  "bitflags 2.5.0",
- "dispatch2",
- "objc2 0.6.1",
+ "objc2 0.6.0",
 ]
 
 [[package]]
 name = "objc2-core-graphics"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989c6c68c13021b5c2d6b71456ebb0f9dc78d752e86a98da7c716f4f9470f5a4"
+checksum = "f8dca602628b65356b6513290a21a6405b4d4027b8b250f0b98dddbb28b7de02"
 dependencies = [
  "bitflags 2.5.0",
- "dispatch2",
- "objc2 0.6.1",
+ "objc2 0.6.0",
  "objc2-core-foundation",
  "objc2-io-surface",
 ]
 
 [[package]]
 name = "objc2-core-image"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79b3dc0cc4386b6ccf21c157591b34a7f44c8e75b064f85502901ab2188c007e"
+checksum = "6ffa6bea72bf42c78b0b34e89c0bafac877d5f80bf91e159a5d96ea7f693ca56"
 dependencies = [
- "objc2 0.6.1",
- "objc2-foundation 0.3.1",
+ "objc2 0.6.0",
+ "objc2-foundation 0.3.0",
 ]
 
 [[package]]
@@ -7727,25 +7667,25 @@ dependencies = [
 
 [[package]]
 name = "objc2-foundation"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
+checksum = "3a21c6c9014b82c39515db5b396f91645182611c97d24637cf56ac01e5f8d998"
 dependencies = [
  "bitflags 2.5.0",
- "block2 0.6.1",
+ "block2 0.6.0",
  "libc",
- "objc2 0.6.1",
+ "objc2 0.6.0",
  "objc2-core-foundation",
 ]
 
 [[package]]
 name = "objc2-io-surface"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7282e9ac92529fa3457ce90ebb15f4ecbc383e8338060960760fa2cf75420c3c"
+checksum = "161a8b87e32610086e1a7a9e9ec39f84459db7b3a0881c1f16ca5a2605581c19"
 dependencies = [
  "bitflags 2.5.0",
- "objc2 0.6.1",
+ "objc2 0.6.0",
  "objc2-core-foundation",
 ]
 
@@ -7776,13 +7716,13 @@ dependencies = [
 
 [[package]]
 name = "objc2-quartz-core"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ffb6a0cd5f182dc964334388560b12a57f7b74b3e2dec5e2722aa2dfb2ccd5"
+checksum = "6fb3794501bb1bee12f08dcad8c61f2a5875791ad1c6f47faa71a0f033f20071"
 dependencies = [
  "bitflags 2.5.0",
- "objc2 0.6.1",
- "objc2-foundation 0.3.1",
+ "objc2 0.6.0",
+ "objc2-foundation 0.3.0",
 ]
 
 [[package]]
@@ -7792,23 +7732,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "777a571be14a42a3990d4ebedaeb8b54cd17377ec21b92e8200ac03797b3bee1"
 dependencies = [
  "bitflags 2.5.0",
- "objc2 0.6.1",
+ "objc2 0.6.0",
  "objc2-core-foundation",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.0",
 ]
 
 [[package]]
 name = "objc2-web-kit"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91672909de8b1ce1c2252e95bbee8c1649c9ad9d14b9248b3d7b4c47903c47ad"
+checksum = "b717127e4014b0f9f3e8bba3d3f2acec81f1bde01f656823036e823ed2c94dce"
 dependencies = [
  "bitflags 2.5.0",
- "block2 0.6.1",
- "objc2 0.6.1",
+ "block2 0.6.0",
+ "objc2 0.6.0",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.0",
 ]
 
 [[package]]
@@ -9449,17 +9389,6 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
-[[package]]
-name = "read-progress-stream"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6435842fc2fea44b528719eb8c32203bbc1bb2f5b619fbe0c0a3d8350fd8d2a8"
-dependencies = [
- "bytes 1.10.0",
- "futures 0.3.29",
- "pin-project-lite",
-]
-
 [[package]]
 name = "realfft"
 version = "3.4.0"
@@ -12056,9 +11985,9 @@ dependencies = [
  "ndk 0.9.0",
  "ndk-context",
  "ndk-sys 0.6.0+11769913",
- "objc2 0.6.1",
+ "objc2 0.6.0",
  "objc2-app-kit",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.0",
  "once_cell",
  "parking_lot 0.12.2",
  "raw-window-handle",
@@ -12128,9 +12057,9 @@ dependencies = [
  "log",
  "mime",
  "muda",
- "objc2 0.6.1",
+ "objc2 0.6.0",
  "objc2-app-kit",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.0",
  "percent-encoding",
  "plist",
  "raw-window-handle",
@@ -12156,6 +12085,53 @@ dependencies = [
  "windows 0.60.0",
 ]
 
+[[package]]
+name = "tauri-artcraft"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "assertor",
+ "base64 0.22.1",
+ "bytes 1.10.0",
+ "chrono",
+ "const_format",
+ "crockford",
+ "directories 6.0.0",
+ "dirs 6.0.0",
+ "discord-rich-presence",
+ "errors",
+ "filesys",
+ "futures 0.3.29",
+ "image",
+ "indexmap 2.9.0",
+ "libloading 0.8.6",
+ "log",
+ "memory_caching",
+ "memory_store",
+ "once_cell",
+ "openai_sora_client",
+ "primitives",
+ "rand 0.9.0",
+ "reqwest 0.12.15",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_yaml",
+ "serial_test",
+ "storyteller_client",
+ "subprocess_common",
+ "tauri",
+ "tauri-build",
+ "tauri-plugin-http",
+ "tauri-plugin-log",
+ "tempdir",
+ "tempfile",
+ "tokens",
+ "tokio",
+ "tokio-util",
+ "workspace-build-acceleration",
+]
+
 [[package]]
 name = "tauri-build"
 version = "2.1.1"
@@ -12292,8 +12268,8 @@ dependencies = [
  "byte-unit",
  "fern",
  "log",
- "objc2 0.6.1",
- "objc2-foundation 0.3.1",
+ "objc2 0.6.0",
+ "objc2-foundation 0.3.0",
  "serde",
  "serde_json",
  "serde_repr",
@@ -12304,25 +12280,6 @@ dependencies = [
  "time",
 ]
 
-[[package]]
-name = "tauri-plugin-upload"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e90ac6d3a783d4406caeae8c75aa05e96346474765517fddfd1dc313ff91aa89"
-dependencies = [
- "futures-util",
- "log",
- "read-progress-stream",
- "reqwest 0.12.15",
- "serde",
- "serde_json",
- "tauri",
- "tauri-plugin",
- "thiserror 2.0.12",
- "tokio",
- "tokio-util",
-]
-
 [[package]]
 name = "tauri-realtime"
 version = "0.1.0"
@@ -12394,9 +12351,9 @@ dependencies = [
  "http 1.1.0",
  "jni",
  "log",
- "objc2 0.6.1",
+ "objc2 0.6.0",
  "objc2-app-kit",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.0",
  "once_cell",
  "percent-encoding",
  "raw-window-handle",
@@ -13229,11 +13186,11 @@ dependencies = [
  "dirs 6.0.0",
  "libappindicator",
  "muda",
- "objc2 0.6.1",
+ "objc2 0.6.0",
  "objc2-app-kit",
  "objc2-core-foundation",
  "objc2-core-graphics",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.0",
  "once_cell",
  "png",
  "serde",
@@ -14229,10 +14186,10 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
 dependencies = [
- "objc2 0.6.1",
+ "objc2 0.6.0",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.0",
  "raw-window-handle",
  "windows-sys 0.59.0",
  "windows-version",
@@ -14904,7 +14861,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b19b78efae8b853c6c817e8752fc1dbf9cab8a8ffe9c30f399bd750ccf0f0730"
 dependencies = [
  "base64 0.22.1",
- "block2 0.6.1",
+ "block2 0.6.0",
  "cookie 0.18.1",
  "crossbeam-channel",
  "dpi",
@@ -14918,10 +14875,10 @@ dependencies = [
  "kuchikiki",
  "libc",
  "ndk 0.9.0",
- "objc2 0.6.1",
+ "objc2 0.6.0",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.0",
  "objc2-ui-kit",
  "objc2-web-kit",
  "once_cell",

Cargo.toml

@@ -24,7 +24,7 @@ members = [
   "crates/cli/production/migration-tool",
 
   # Desktop apps
-  "crates/desktop/artcraft",
+  "crates/desktop/tauri-artcraft",
   "crates/desktop/tauri-realtime",
 
   # Shared libraries
@@ -174,7 +174,7 @@ serde_derive = "1.0.219"
 serde_json = "1.0.140"
 serde_yaml = "0.9.1"
 sha3 = "0.10.8"
-tauri = { version = "2.4.1", features = ["unstable", "devtools"] } # NB: "devtools" prevents App Store distribution
+tauri = { version = "2.4.1", features = ["unstable"] }
 thiserror = "2.0.12"
 toml = "0.8.20"
 url = { version = "2.5.4", features = ["serde"] }

crates/desktop/artcraft/src/commands/app_preferences/get_app_preferences_command.rs

@@ -1,46 +0,0 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use errors::AnyhowResult;
-use log::{error, info};
-use serde_derive::Serialize;
-use tauri::{AppHandle, State};
-
-#[derive(Serialize)]
-pub struct GetAppPreferencesResponse {
-  pub preferences: AppPreferencesPayload,
-}
-
-#[derive(Serialize)]
-pub struct AppPreferencesPayload {
-  /// The downloads directory to use when a user downloads a file.
-  pub preferred_download_directory: PreferredDownloadDirectory,
-  /// Play sounds on events.
-  pub play_sounds: bool,
-}
-
-
-#[tauri::command]
-pub async fn get_app_preferences_command(
-  app_prefs: State<'_, AppPreferencesManager>,
-) -> Result<GetAppPreferencesResponse, String> {
-  info!("get_app_preferences_command called");
-
-  let result = get_prefs(&app_prefs)
-      .await
-      .map_err(|err| {
-        error!("Error getting app preferences: {:?}", err);
-        format!("Error getting app preferences: {:?}", err)
-      })?;
-
-  Ok(GetAppPreferencesResponse {
-    preferences: result,
-  })
-}
-
-async fn get_prefs(app_prefs: &AppPreferencesManager) -> AnyhowResult<AppPreferencesPayload> {
-  let prefs = app_prefs.get_clone()?;
-  Ok(AppPreferencesPayload {
-    preferred_download_directory: prefs.preferred_download_directory,
-    play_sounds: prefs.play_sounds,
-  })
-}

crates/desktop/artcraft/src/commands/app_preferences/mod.rs

@@ -1,2 +0,0 @@
-pub mod get_app_preferences_command;
-pub mod update_app_preference_command;

crates/desktop/artcraft/src/commands/app_preferences/update_app_preference_command.rs

@@ -1,70 +0,0 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use errors::AnyhowResult;
-use log::{error, info};
-use serde_derive::{Deserialize, Serialize};
-use tauri::{AppHandle, State};
-
-/// For now, we'll only update a single preference at a time.
-#[derive(Deserialize)]
-pub struct UpdateAppPreferencesRequest {
-  pub preference: PreferenceName,
-  /// We'll decode this with respect to the preference value.
-  pub value: String,
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum PreferenceName {
-  PreferredDownloadDirectory,
-  PlaySounds,
-}
-
-#[derive(Serialize)]
-pub struct UpdateAppPreferencesResponse {
-  pub success: bool,
-}
-
-
-#[tauri::command]
-pub async fn update_app_preferences_command(
-  request: UpdateAppPreferencesRequest,
-  app_prefs: State<'_, AppPreferencesManager>,
-  app_data_root: State<'_, AppDataRoot>,
-) -> Result<UpdateAppPreferencesResponse, String> {
-  info!("update_app_preferences_command called");
-
-  update_prefs(request, &app_prefs, &app_data_root)
-      .await
-      .map_err(|err| {
-        error!("Error getting app preferences: {:?}", err);
-        format!("Error getting app preferences: {:?}", err)
-      })?;
-
-  Ok(UpdateAppPreferencesResponse {
-    success: true,
-  })
-}
-
-async fn update_prefs(
-  request: UpdateAppPreferencesRequest, 
-  app_prefs: &AppPreferencesManager,
-  app_data_root: &AppDataRoot,
-) -> AnyhowResult<()> {
-  let mut prefs = app_prefs.get_clone()?;
-  
-  match request.preference {
-    PreferenceName::PreferredDownloadDirectory => {
-      prefs.preferred_download_directory = request.value.parse::<PreferredDownloadDirectory>()?;
-    }
-    PreferenceName::PlaySounds => {
-      prefs.play_sounds = request.value.parse::<bool>()?;
-    }
-  }
-  
-  app_prefs.set_clone(&prefs)?;
-  app_data_root.settings_dir().write_app_preferences(&prefs)?;
-  
-  Ok(())
-}

crates/desktop/artcraft/src/state/app_preferences/app_preferences.rs

@@ -1,50 +0,0 @@
-use crate::state::app_preferences::app_preferences_serializable::AppPreferencesSerializable;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-
-#[derive(Clone)]
-pub struct AppPreferences {
-  /// The downloads directory to use when a user downloads a file.
-  pub preferred_download_directory: PreferredDownloadDirectory,
-
-  /// Play sounds on events.
-  pub play_sounds: bool,
-}
-
-impl Default for AppPreferences {
-  fn default() -> Self {
-    Self {
-      preferred_download_directory: PreferredDownloadDirectory::SystemDefault,
-      play_sounds: true,
-    }
-  }
-}
-
-impl AppPreferences {
-  pub fn load_from_file_or_default(data_root: &AppDataRoot) -> Self {
-    let filename = data_root.settings_dir().get_app_preferences_path();
-    if !filename.exists() {
-      return Self::default();
-    }
-
-    match AppPreferencesSerializable::load_from_file(data_root) {
-      Ok(Some(serializable)) => {
-        serializable.to_preferences()
-      }
-      Ok(None) => {
-        Self::default()
-      }
-      Err(err) => {
-        println!("Error loading app preferences: {}", err);
-        Self::default()
-      }
-    }
-  }
-  
-  pub fn to_serializable(&self) -> AppPreferencesSerializable {
-    AppPreferencesSerializable {
-      preferred_download_directory: Some(self.preferred_download_directory.clone()),
-      play_sounds: Some(self.play_sounds),
-    }
-  }
-}

crates/desktop/artcraft/src/state/app_preferences/app_preferences_manager.rs

@@ -1,10 +0,0 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use memory_store::clone_cell::CloneCell;
-
-pub type AppPreferencesManager = CloneCell<AppPreferences>;
-
-pub fn load_app_preferences_or_default(data_root: &AppDataRoot) -> AppPreferencesManager {
-  let prefs = AppPreferences::load_from_file_or_default(data_root);
-  AppPreferencesManager::with_owned(prefs)
-}

crates/desktop/artcraft/src/state/app_preferences/app_preferences_serializable.rs

@@ -1,48 +0,0 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use errors::AnyhowResult;
-use serde_derive::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AppPreferencesSerializable {
-  /// The downloads directory to use when a user downloads a file.
-  pub preferred_download_directory: Option<PreferredDownloadDirectory>,
-
-  /// Play sounds on events.
-  pub play_sounds: Option<bool>,
-}
-
-impl AppPreferencesSerializable {
-  pub fn load_from_file(app_data_root: &AppDataRoot) -> AnyhowResult<Option<Self>> {
-    let filename = app_data_root.settings_dir().get_app_preferences_path();
-    if !filename.exists() {
-      return Ok(None);
-    }
-
-    let contents = std::fs::read_to_string(filename)?;
-    let data: Self = serde_json::from_str(&contents)?;
-    Ok(Some(data))
-  }
-
-  pub fn save_to_file(&self, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-    let filename = app_data_root.settings_dir().get_app_preferences_path();
-    let json = serde_json::to_string(self)?;
-    std::fs::write(filename, json)?;
-    Ok(())
-  }
-
-  pub fn to_preferences(&self) -> AppPreferences {
-    let mut preferences = AppPreferences::default();
-
-    if let Some(preferred_download_directory) = &self.preferred_download_directory {
-      preferences.preferred_download_directory = preferred_download_directory.clone();
-    }
-
-    if let Some(play_sounds) = self.play_sounds {
-      preferences.play_sounds = play_sounds;
-    }
-    
-    preferences
-  }
-}

crates/desktop/artcraft/src/state/app_preferences/mod.rs

@@ -1,4 +0,0 @@
-pub mod app_preferences;
-pub mod app_preferences_manager;
-pub mod app_preferences_serializable;
-pub mod preferred_download_directory;

crates/desktop/artcraft/src/state/app_preferences/preferred_download_directory.rs

@@ -1,100 +0,0 @@
-use errors::AnyhowError;
-use serde_derive::{Deserialize, Serialize};
-use std::fmt::{Display, Formatter};
-use std::path::PathBuf;
-use std::str::FromStr;
-
-const SYSTEM_DEFAULT_SENTINEL_VALUE: &str = "system_default";
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub enum PreferredDownloadDirectory {
-  /// The system-default downloads directory, which varies by OS.
-  /// NB: Serializes as `"system_default"` in JSON.
-  SystemDefault,
-  
-  /// A user-defined path
-  /// NB: Serializes as `{"custom": "/path/to/dir"}` in JSON.
-  Custom(PathBuf),
-}
-
-impl FromStr for PreferredDownloadDirectory {
-  type Err = AnyhowError;
-
-  fn from_str(s: &str) -> Result<Self, Self::Err> {
-    if s == SYSTEM_DEFAULT_SENTINEL_VALUE || s == "\"system_default\"" {
-      Ok(PreferredDownloadDirectory::SystemDefault)
-    } else {
-      // TODO: If it gets serialized as JSON, we may need to remove the `{"custom": ...` wrapping layer.
-      let path = PathBuf::from(s);
-      Ok(PreferredDownloadDirectory::Custom(path))
-    }
-  }
-}
-
-impl Display for PreferredDownloadDirectory {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      PreferredDownloadDirectory::SystemDefault => write!(f, "{}", SYSTEM_DEFAULT_SENTINEL_VALUE),
-      PreferredDownloadDirectory::Custom(path) => write!(f, "{}", path.to_string_lossy()),
-    }
-  }
-}
-
-
-#[cfg(test)]
-mod tests {
-  use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-  use std::path::PathBuf;
-  use std::str::FromStr;
-
-  mod json {
-    use super::*;
-
-    #[test]
-    fn to_json_system_default() {
-      let val = PreferredDownloadDirectory::SystemDefault;
-      let val = serde_json::to_string(&val).unwrap();
-      assert_eq!(&val, "\"system_default\"");
-    }
-    
-    #[test]
-    fn to_json_custom() {
-      let val = PreferredDownloadDirectory::Custom("/tmp".into());
-      let val = serde_json::to_string(&val).unwrap();
-      assert_eq!(&val, "{\"custom\":\"/tmp\"}");
-    }
-  }
-
-  mod string {
-    use super::*;
-
-    #[test]
-    fn to_string_system_default() {
-      let val = PreferredDownloadDirectory::SystemDefault;
-      let val = val.to_string();
-      assert_eq!(&val, "system_default");
-    }
-
-    #[test]
-    fn to_string_custom() {
-      let val = PreferredDownloadDirectory::Custom("/tmp/foo".into());
-      let val = val.to_string();
-      assert_eq!(&val, "/tmp/foo");
-    }
-  }
-
-  #[test]
-  fn from_string_system_default() {
-    let val = "system_default";
-    let val = PreferredDownloadDirectory::from_str(val).unwrap();
-    assert_eq!(val, PreferredDownloadDirectory::SystemDefault);
-  }
-
-  #[test]
-  fn from_string_custom() {
-    let val = "/tmp/foo";
-    let val = PreferredDownloadDirectory::from_str(val).unwrap();
-    assert_eq!(val, PreferredDownloadDirectory::Custom(PathBuf::from("/tmp/foo")));
-  }
-}

crates/desktop/artcraft/src/state/data_dir/app_settings_dir.rs

@@ -1,51 +0,0 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use errors::AnyhowResult;
-use std::fs::OpenOptions;
-use std::io::Write;
-use std::path::{Path, PathBuf};
-
-/// For now, let's just keep a collection of loose json files in a settings dir.
-/// Once we know the structure and schema, we can standardize on a single json file.
-#[derive(Clone)]
-pub struct AppSettingsDir {
-  path: PathBuf,
-}
-
-impl DataSubdir for AppSettingsDir {
-  const DIRECTORY_NAME: &'static str = "settings";
-
-  fn new_from<P: AsRef<Path>> (dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-impl AppSettingsDir {
-  pub fn get_app_preferences_path(&self) -> PathBuf {
-    self.path.join("app_preferences.json")
-  }
-  
-  pub fn write_app_preferences(&self, prefs: &AppPreferences) -> AnyhowResult<()> {
-    let serializable = prefs.to_serializable();
-    let serializable = serde_json::to_string(&serializable)?;
-    
-    let filename = self.get_app_preferences_path();
-
-    let mut file = OpenOptions::new()
-        .create(true)
-        .write(true)
-        .truncate(true)
-        .open(filename)?;
-
-    file.write_all(serializable.as_bytes())?;
-    file.flush()?;
-    
-    Ok(())
-  }
-}

crates/desktop/artcraft/src/utils/webview_unsafe.rs

@@ -1,38 +0,0 @@
-use errors::AnyhowResult;
-use tauri::{AppHandle, Manager};
-
-const MAIN_WINDOW_NAME: &str = "main";
-
-pub fn webview_unsafe_for_app(app: &AppHandle) -> AnyhowResult<()> {
-  let windows = app.windows();
-  let maybe_window = windows.get(MAIN_WINDOW_NAME);
-  
-  /*if let Some(window) = maybe_window {
-    let webview = window.get_webview(MAIN_WINDOW_NAME);
-    if let Some(webview) = webview {
-      webview_unsafe(&webview);
-    }
-  } else {
-    return Err(anyhow::anyhow!("Main window not found"));
-  }*/
-
-  Ok(())
-}
-
-/*pub fn webview_unsafe(webview: &Webview) {
-  let r = webview.with_webview(|webview| {
-    webview.controller();
-    #[cfg(target_os = "macos")]
-    unsafe {
-      let view: &objc2_web_kit::WKWebView = &*webview.inner().cast();
-      let controller: &objc2_web_kit::WKUserContentController = &*webview.controller().cast();
-      let window: &objc2_app_kit::NSWindow = &*webview.ns_window().cast();
-
-      //view.setPageZoom(40.);
-      //controller.removeAllUserScripts();
-      let bg_color = objc2_app_kit::NSColor::colorWithDeviceRed_green_blue_alpha(1.0, 0.2, 0.4, 1.);
-      window.setBackgroundColor(Some(&bg_color));
-    }
-
-  });
-}*/

crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.json

@@ -1,8 +0,0 @@
-{
-  "build": {
-    "frontendDist": "../../../frontend/apps/editor3d/dist",
-    "beforeDevCommand": "echo 'no dev'",
-    "devUrl": "http://localhost:5173",
-    "beforeBuildCommand": "nx run editor3d:build"
-  }
-}

crates/desktop/tauri-artcraft/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "artcraft"
+name = "tauri-artcraft"
 version = "0.1.0"
 description = "Artcraft"
 authors = ["you"]
@@ -12,7 +12,7 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
-name = "artcraft_app_lib"
+name = "tauri_artcraft_app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
@@ -55,7 +55,6 @@ serde_json = { workspace = true }
 serde_yaml = { workspace = true }
 tauri = { workspace = true }
 tauri-plugin-log = "2.3.1"
-tauri-plugin-upload = "2.2.1"
 tempdir = "0.3.7"
 tempfile = "3.18.0"
 tokio = { version = "1.42", features = ["rt", "rt-multi-thread", "fs"] }

crates/desktop/tauri-artcraft/capabilities/default.json

@@ -8,23 +8,13 @@
   "permissions": [
     "core:default",
     "log:default",
-    "upload:allow-download",
-    "upload:default",
     {
       "identifier": "http:default",
       "allow": [
-        {
-          "url": "https://*.storyteller.ai"
-        },
-        {
-          "url": "https://*.fakeyou.com"
-        }
+        { "url": "https://*.storyteller.ai" },
+        { "url": "https://*.fakeyou.com" }
       ],
-      "deny": [
-        {
-          "url": "https://private.tauri.app"
-        }
-      ]
+      "deny": [{ "url": "https://private.tauri.app" }]
     }
   ]
 }

crates/desktop/tauri-artcraft/src/commands/mod.rs

@@ -1,4 +1,3 @@
-pub mod app_preferences;
 pub mod flip_image;
 pub mod platform_info_command;
 pub mod sora;

crates/desktop/tauri-artcraft/src/commands/sora/sora_image_remix_command.rs

@@ -54,9 +54,7 @@ pub async fn sora_image_remix_command(
   sora_creds_manager: State<'_, SoraCredentialManager>,
   sora_task_queue: State<'_, SoraTaskQueue>,
 ) -> Result<String, String> {
-  
-  info!("image_generation_command called; scene media token: {:?}, additional images: {:?}", 
-    request.snapshot_media_token, request.maybe_additional_images);
+  info!("image_generation_command called; processing image...");
 
   // TODO(bt,2025-04-24): Better error messages to caller
 

crates/desktop/tauri-artcraft/src/lib.rs

@@ -11,8 +11,7 @@ use crate::commands::platform_info_command::platform_info_command;
 use crate::commands::sora::open_sora_login_command::open_sora_login_command;
 use crate::commands::sora::sora_image_generation_command::sora_image_generation_command;
 use crate::commands::sora::sora_image_remix_command::sora_image_remix_command;
-use crate::commands::app_preferences::get_app_preferences_command::get_app_preferences_command;
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::state::app_config::AppConfig;
 use crate::state::main_window_size::MainWindowSize;
 use crate::state::sora::sora_credential_manager::SoraCredentialManager;
 use crate::state::sora::sora_task_queue::SoraTaskQueue;
@@ -21,9 +20,7 @@ use crate::threads::discord_presence_thread::discord_presence_thread;
 use crate::threads::main_window_thread::main_window_thread::main_window_thread;
 use crate::threads::sora_session_login_thread::sora_session_login_thread;
 use crate::threads::sora_task_polling_thread::sora_task_polling_thread;
-use crate::utils::webview_unsafe::webview_unsafe_for_app;
 
-use crate::state::app_preferences::app_preferences_manager::load_app_preferences_or_default;
 use tauri_plugin_http;
 use tauri_plugin_log::Target;
 use tauri_plugin_log::TargetKind;
@@ -32,13 +29,14 @@ use tauri_plugin_log::TargetKind;
 pub fn run() {
   // NB: Tauri wants to install the logger itself, so we can't rely on the logger crate
   // until the tauri runtime begins.
-  println!("Loading config...");
-  let app_data_root = AppDataRoot::create_default().expect("data directory should be created");
-  let app_data_root_2 = app_data_root.clone();
+  println!("Loading model config...");
+
+  let config = AppConfig::init()
+    .expect("config should load");
+
+  let app_data_root = config.app_data_root.clone();
+  let app_data_root_2 = config.app_data_root.clone();
 
-  println!("Loading app preferences...");
-  let app_preferences = load_app_preferences_or_default(&app_data_root);
-  
   println!("Attempting to read existing artcraft credentials...");
   let storyteller_creds_manager = StorytellerCredentialManager::initialize_from_disk_infallible(&app_data_root);
   let storyteller_creds_manager_2 = storyteller_creds_manager.clone();
@@ -55,7 +53,6 @@ pub fn run() {
 
   tauri::Builder::default()
     .plugin(tauri_plugin_http::init())
-    .plugin(tauri_plugin_upload::init())
     .plugin(tauri_plugin_log::Builder::new()
       .level(log::LevelFilter::Info)
       .targets(vec![
@@ -77,15 +74,9 @@ pub fn run() {
       //  )?;
       //}
       let app = app.handle().clone();
-      
-      let result = webview_unsafe_for_app(&app);
-      if let Err(err) = result {
-        eprintln!("Error setting webview unsafe: {:?}", err);
-      }
 
       let app_2 = app.clone();
       let app_3 = app.clone();
-      let app_4 = app.clone();
       let app_data_root_3 = app_data_root_2.clone();
       let app_data_root_4 = app_data_root_2.clone();
       let sora_creds_manager_3 = sora_creds_manager_2.clone();
@@ -107,18 +98,17 @@ pub fn run() {
 
       tauri::async_runtime::spawn(sora_session_login_thread(app_2, app_data_root_2, sora_creds_manager_2));
       tauri::async_runtime::spawn(main_window_thread(app_3, app_data_root_3, storyteller_creds_manager_2));
-      tauri::async_runtime::spawn(sora_task_polling_thread(app_4, app_data_root_4, sora_creds_manager_3, storyteller_creds_manager_3, sora_task_queue_2));
+      tauri::async_runtime::spawn(sora_task_polling_thread(app_data_root_4, sora_creds_manager_3, storyteller_creds_manager_3, sora_task_queue_2));
       tauri::async_runtime::spawn(discord_presence_thread());
 
       Ok(())
     })
     .manage(app_data_root)
-    .manage(app_preferences)
+    .manage(config)
     .manage(sora_creds_manager)
     .manage(sora_task_queue)
     .invoke_handler(tauri::generate_handler![
       flip_image,
-      get_app_preferences_command,
       open_sora_login_command,
       platform_info_command,
       sora_image_generation_command,

crates/desktop/tauri-artcraft/src/main.rs

@@ -2,5 +2,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 fn main() {
-  artcraft_app_lib::run();
+  tauri_artcraft_app_lib::run();
 }

crates/desktop/tauri-artcraft/src/state/app_config.rs

@@ -0,0 +1,58 @@
+use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::state::os_platform::OsPlatform;
+use crate::state::yaml_config::YamlConfig;
+
+const DEFAULT_SD_IMAGE_WIDTH: usize = 1024;
+const DEFAULT_SD_IMAGE_HEIGHT: usize = 1024;
+
+
+/// A central place to configure app-wide details.
+pub struct AppConfig {
+  pub image_height: usize,
+  pub image_width: usize,
+  pub scheduler_steps: usize,
+  pub scheduler_samples: usize,
+  
+  pub seed: Option<u64>,
+
+  pub cfg_scale: Option<f64>,
+  
+  /// Root location for application data.
+  pub app_data_root: AppDataRoot,
+}
+
+impl AppConfig {
+  
+  pub fn init() -> anyhow::Result<Self> {
+    let yaml_configs = YamlConfig::load_from_config_file_recursive();
+    
+    println!("Configs: {:?}", yaml_configs);
+    
+    let os_platform = OsPlatform::get();
+
+    let default_data_root = match os_platform {
+      OsPlatform::Linux => yaml_configs.linux_default_data_path.as_deref(),
+      OsPlatform::MacOs => yaml_configs.mac_default_data_path.as_deref(),
+      OsPlatform::Windows => yaml_configs.windows_default_data_path.as_deref(),
+    };
+    
+    println!("Possible user-defined data root: {:?}", default_data_root);
+
+    let app_data_root = match default_data_root {
+      None => AppDataRoot::create_default()?,
+      Some(path) => AppDataRoot::create_existing(path)?,
+    };
+
+    println!("App data root: {:?}", app_data_root.path());
+
+    Ok(Self {
+      image_height: yaml_configs.image_height.unwrap_or(DEFAULT_SD_IMAGE_HEIGHT),
+      image_width: yaml_configs.image_width.unwrap_or(DEFAULT_SD_IMAGE_WIDTH),
+      scheduler_steps: yaml_configs.scheduler_steps.unwrap_or(4),
+      scheduler_samples: yaml_configs.scheduler_samples.unwrap_or(15),
+      seed: yaml_configs.seed,
+      cfg_scale: yaml_configs.cfg_scale,
+      app_data_root,
+    })
+  }
+}