Merge pull request #26 from sertschgi/dev

Dev

Author: sertschgi

Cargo.toml

@@ -1,42 +1,22 @@
-[package]
-name = "SimpleAIEditor"
-version = "0.1.0"
-edition = "2021"
-
-[[bin]]
-name = "SimpleAIEditor"
-path = "src/main.rs"
-
-[build-dependencies]
-copy_dir = { version = "0.1.3" }
-
-[dependencies]
-sai_macros = { path = "extern/macros" }
-async-recursion = { version = "1.1.1" }
-chrono = { version = "0.4.38", features = ["serde"] }
-sai_backend = { path = "extern/backend" }
-dioxus = { git = "https://github.com/DioxusLabs/dioxus.git" }
-futures = "0.3.31"
-reqwest = { version = "0.12.9", features = ["json"] }
-serde = { version = "1.0.215", features = ["derive"] }
-serde_json = { version = "1.0.133" }
-dirs = { version = "6.0.0" }
-toml = { version = "0.8.19" }
-include_dir = { version = "0.7.3" }
-anyhow = { version = "1.0.95" }
-colored = { version = "3.0.0" }
-regex = { version = "1.11.1" }
-derive-new = { version = "0.7.0" }
-derive_builder = { version = "0.20.2" }
-thiserror = { version = "2.0.11"}
-tokio = { version = "1.43.0", features = ["sync"]}
-
-[features]
-default = []
-desktop = ["dioxus/desktop"]
-web = ["dioxus/web", "dioxus/router"]
-mobile = ["dioxus/mobile"]
-dev = ["dioxus/devtools", "dioxus/liveview"]
+[workspace]
+resolver = "2"
+members = [
+  "packages/backend",
+  "packages/frontend",
+  "packages/macros",
+  "packages/platforms/desktop",
+  "packages/platforms/web"
+]
+
+[workspace.package]
+version = "0.6.3"
+
+[workspace.dependencies]
+simple-ai-backend = { path = "packages/backend" }
+simple-ai-frontend = { path = "packages/frontend" }
+simple-ai-macros = { path = "packages/macros" }
+
+dioxus = { version = "0.6.3" }
 
 [profile]
 

Makefile

@@ -1,35 +1,24 @@
-CARGO := cargo
 DIOXUS := dx
 
-APP_NAME = SimpleAIEditor
-TAURI_TARGET = target/release/bundle
-WEB_TARGET = target/wasm32-unknown-unknown/release
-DESKTOP_TARGET = target/release
-
-APP_PATH = $(DESKTOP_TARGET)/$(APP_NAME)
-
-
 all: build-web build-desktop
 
 build-web:
 	@echo "Building for WebAssembly..."
-	$(CARGO) build --release --target wasm32-unknown-unknown --features "web"
-
+	$(DIOXUS) build --release --package simple-ai-web --platform web
 build-desktop:
 	@echo "Building for Desktop..."
-	$(CARGO) build --release --features "desktop"
+	$(DIOXUS) build --release --package simple-ai-desktop --platform desktop
 
 run-web:
 	@echo "Running Web version..."
-	$(DIOXUS) serve --platform web --features "web"
+	$(DIOXUS) serve --package simple-ai-web --platform web
 
-run-desktop: build-desktop
+run-desktop: 
 	@echo "Running Desktop version..."
-	exec $(APP_PATH)
+	$(DIOXUS) serve --package simple-ai-desktop --platform desktop
 
 clean:
 	@echo "Cleaning the project..."
-	$(CARGO) clean
-	rm -rf $(WEB_TARGET)
+	$(DIOXUS) clean
 
 .PHONY: all build-web build-desktop run-web run-desktop clean

assets/themes/styles/cybr1/pages/editor/index.css

@@ -1,11 +1,12 @@
 [package]
-name = "sai_backend"
+name = "simple-ai-backend"
+version = { workspace = true }
 edition = "2021"
 
 [features]
 default = []
 desktop = []
-web = []
+web = ["uuid/js"]
 mobile = []
 
 [dependencies]
@@ -18,6 +19,6 @@ derive-new = { version = "0.7.0" }
 derive_builder = { version = "0.20.2" }
 anyhow = { version = "1.0.95" }
 sha2 = { version = "0.10.8" }
-uuid = { version = "1.15.1", features = ["v4"] }
+uuid = { version = "1.15.1", features = ["v4"]}
 bincode = { version = "1.1.3" }
 tokio = { version = "1.43.0", features = ["sync"] }