From a07e4cc686e8def9bd0363395d8bf0b973c81ba6 Mon Sep 17 00:00:00 2001 From: Kevin Boos Date: Wed, 5 Jun 2024 12:51:34 -0700 Subject: [PATCH] Refactor repo into a non-virtual cargo workspace with a root package. The old way of using a virtual workspace is incorrect for an application like this. It also prevents existing bundle tools (cargo-bundle) from working with Moxin because they all expect a root package to be defined. Technically we don't even need a workspace at all for this repo, but I left it in just for the sake of posterity. --- Cargo.lock | 36 +++++++++--------- Cargo.toml | 34 +++++++++++++---- README.md | 9 ++++- .../Cargo.toml | 2 +- .../src/fake_data.rs | 0 .../src/lib.rs | 0 moxin-frontend/Cargo.toml | 24 ------------ moxin-frontend/src/main.rs | 3 -- .../resources => resources}/icons/add.svg | 0 .../icons/cancel_download.svg | 0 .../resources => resources}/icons/chat.svg | 0 .../resources => resources}/icons/close.svg | 0 .../icons/collapse.svg | 0 .../resources => resources}/icons/copy.svg | 0 .../resources => resources}/icons/delete.svg | 0 .../icons/discover.svg | 0 .../icons/download.svg | 0 .../icons/download_done.svg | 0 .../icons/downloads.svg | 0 .../resources => resources}/icons/edit.svg | 0 .../icons/edit_folder.svg | 0 .../icons/external_link.svg | 0 .../icons/favorite.svg | 0 .../resources => resources}/icons/folder.svg | 0 .../resources => resources}/icons/info.svg | 0 .../icons/jump_to_bottom.svg | 0 .../icons/my_models.svg | 0 .../icons/pause_download.svg | 0 .../icons/play_arrow.svg | 0 .../icons/play_download.svg | 0 .../resources => resources}/icons/prompt.svg | 0 .../resources => resources}/icons/remove.svg | 0 .../icons/retry_download.svg | 0 .../resources => resources}/icons/search.svg | 0 .../icons/start_chat.svg | 0 .../resources => resources}/icons/stop.svg | 0 .../icons/visibility.svg | 0 .../images/chat_user_icon.png | Bin .../images/failure_icon.png | Bin .../images/my_models_bg_image.png | Bin .../images/success_icon.png | Bin {moxin-frontend/src => src}/app.rs | 0 .../src => src}/chat/chat_history.rs | 0 {moxin-frontend/src => src}/chat/chat_line.rs | 0 .../src => src}/chat/chat_line_loading.rs | 0 .../src => src}/chat/chat_panel.rs | 0 .../src => src}/chat/chat_screen.rs | 0 {moxin-frontend/src => src}/chat/mod.rs | 0 .../src => src}/chat/model_info.rs | 0 .../src => src}/chat/model_selector.rs | 0 .../src => src}/chat/model_selector_list.rs | 0 {moxin-frontend/src => src}/data/chat.rs | 0 {moxin-frontend/src => src}/data/download.rs | 0 .../src => src}/data/filesystem.rs | 0 {moxin-frontend/src => src}/data/mod.rs | 0 .../src => src}/data/preferences.rs | 0 {moxin-frontend/src => src}/data/search.rs | 0 {moxin-frontend/src => src}/data/store.rs | 0 .../src => src}/landing/download_item.rs | 0 .../src => src}/landing/downloads.rs | 0 .../src => src}/landing/landing_screen.rs | 0 {moxin-frontend/src => src}/landing/mod.rs | 0 .../src => src}/landing/model_card.rs | 0 .../src => src}/landing/model_files.rs | 0 .../src => src}/landing/model_files_item.rs | 0 .../src => src}/landing/model_files_list.rs | 0 .../src => src}/landing/model_files_tags.rs | 0 .../src => src}/landing/model_list.rs | 0 .../src => src}/landing/search_bar.rs | 0 .../src => src}/landing/search_loading.rs | 0 {moxin-frontend/src => src}/landing/shared.rs | 0 .../src => src}/landing/sorting.rs | 0 {moxin-frontend/src => src}/lib.rs | 0 src/main.rs | 3 ++ .../my_models/delete_model_modal.rs | 0 .../my_models/downloaded_files_row.rs | 0 .../my_models/downloaded_files_table.rs | 0 {moxin-frontend/src => src}/my_models/mod.rs | 0 .../src => src}/my_models/model_info_modal.rs | 0 .../src => src}/my_models/my_models_screen.rs | 0 {moxin-frontend/src => src}/shared/actions.rs | 0 .../shared/download_notification_popup.rs | 0 .../src => src}/shared/external_link.rs | 0 {moxin-frontend/src => src}/shared/icon.rs | 0 {moxin-frontend/src => src}/shared/mod.rs | 0 {moxin-frontend/src => src}/shared/modal.rs | 0 .../src => src}/shared/resource_imports.rs | 0 {moxin-frontend/src => src}/shared/styles.rs | 0 {moxin-frontend/src => src}/shared/utils.rs | 0 {moxin-frontend/src => src}/shared/widgets.rs | 0 90 files changed, 56 insertions(+), 55 deletions(-) rename {moxin-frontend/moxin-fake-backend => moxin-fake-backend}/Cargo.toml (74%) rename {moxin-frontend/moxin-fake-backend => moxin-fake-backend}/src/fake_data.rs (100%) rename {moxin-frontend/moxin-fake-backend => moxin-fake-backend}/src/lib.rs (100%) delete mode 100644 moxin-frontend/Cargo.toml delete mode 100644 moxin-frontend/src/main.rs rename {moxin-frontend/resources => resources}/icons/add.svg (100%) rename {moxin-frontend/resources => resources}/icons/cancel_download.svg (100%) rename {moxin-frontend/resources => resources}/icons/chat.svg (100%) rename {moxin-frontend/resources => resources}/icons/close.svg (100%) rename {moxin-frontend/resources => resources}/icons/collapse.svg (100%) rename {moxin-frontend/resources => resources}/icons/copy.svg (100%) rename {moxin-frontend/resources => resources}/icons/delete.svg (100%) rename {moxin-frontend/resources => resources}/icons/discover.svg (100%) rename {moxin-frontend/resources => resources}/icons/download.svg (100%) rename {moxin-frontend/resources => resources}/icons/download_done.svg (100%) rename {moxin-frontend/resources => resources}/icons/downloads.svg (100%) rename {moxin-frontend/resources => resources}/icons/edit.svg (100%) rename {moxin-frontend/resources => resources}/icons/edit_folder.svg (100%) rename {moxin-frontend/resources => resources}/icons/external_link.svg (100%) rename {moxin-frontend/resources => resources}/icons/favorite.svg (100%) rename {moxin-frontend/resources => resources}/icons/folder.svg (100%) rename {moxin-frontend/resources => resources}/icons/info.svg (100%) rename {moxin-frontend/resources => resources}/icons/jump_to_bottom.svg (100%) rename {moxin-frontend/resources => resources}/icons/my_models.svg (100%) rename {moxin-frontend/resources => resources}/icons/pause_download.svg (100%) rename {moxin-frontend/resources => resources}/icons/play_arrow.svg (100%) rename {moxin-frontend/resources => resources}/icons/play_download.svg (100%) rename {moxin-frontend/resources => resources}/icons/prompt.svg (100%) rename {moxin-frontend/resources => resources}/icons/remove.svg (100%) rename {moxin-frontend/resources => resources}/icons/retry_download.svg (100%) rename {moxin-frontend/resources => resources}/icons/search.svg (100%) rename {moxin-frontend/resources => resources}/icons/start_chat.svg (100%) rename {moxin-frontend/resources => resources}/icons/stop.svg (100%) rename {moxin-frontend/resources => resources}/icons/visibility.svg (100%) rename {moxin-frontend/resources => resources}/images/chat_user_icon.png (100%) rename {moxin-frontend/resources => resources}/images/failure_icon.png (100%) rename {moxin-frontend/resources => resources}/images/my_models_bg_image.png (100%) rename {moxin-frontend/resources => resources}/images/success_icon.png (100%) rename {moxin-frontend/src => src}/app.rs (100%) rename {moxin-frontend/src => src}/chat/chat_history.rs (100%) rename {moxin-frontend/src => src}/chat/chat_line.rs (100%) rename {moxin-frontend/src => src}/chat/chat_line_loading.rs (100%) rename {moxin-frontend/src => src}/chat/chat_panel.rs (100%) rename {moxin-frontend/src => src}/chat/chat_screen.rs (100%) rename {moxin-frontend/src => src}/chat/mod.rs (100%) rename {moxin-frontend/src => src}/chat/model_info.rs (100%) rename {moxin-frontend/src => src}/chat/model_selector.rs (100%) rename {moxin-frontend/src => src}/chat/model_selector_list.rs (100%) rename {moxin-frontend/src => src}/data/chat.rs (100%) rename {moxin-frontend/src => src}/data/download.rs (100%) rename {moxin-frontend/src => src}/data/filesystem.rs (100%) rename {moxin-frontend/src => src}/data/mod.rs (100%) rename {moxin-frontend/src => src}/data/preferences.rs (100%) rename {moxin-frontend/src => src}/data/search.rs (100%) rename {moxin-frontend/src => src}/data/store.rs (100%) rename {moxin-frontend/src => src}/landing/download_item.rs (100%) rename {moxin-frontend/src => src}/landing/downloads.rs (100%) rename {moxin-frontend/src => src}/landing/landing_screen.rs (100%) rename {moxin-frontend/src => src}/landing/mod.rs (100%) rename {moxin-frontend/src => src}/landing/model_card.rs (100%) rename {moxin-frontend/src => src}/landing/model_files.rs (100%) rename {moxin-frontend/src => src}/landing/model_files_item.rs (100%) rename {moxin-frontend/src => src}/landing/model_files_list.rs (100%) rename {moxin-frontend/src => src}/landing/model_files_tags.rs (100%) rename {moxin-frontend/src => src}/landing/model_list.rs (100%) rename {moxin-frontend/src => src}/landing/search_bar.rs (100%) rename {moxin-frontend/src => src}/landing/search_loading.rs (100%) rename {moxin-frontend/src => src}/landing/shared.rs (100%) rename {moxin-frontend/src => src}/landing/sorting.rs (100%) rename {moxin-frontend/src => src}/lib.rs (100%) create mode 100644 src/main.rs rename {moxin-frontend/src => src}/my_models/delete_model_modal.rs (100%) rename {moxin-frontend/src => src}/my_models/downloaded_files_row.rs (100%) rename {moxin-frontend/src => src}/my_models/downloaded_files_table.rs (100%) rename {moxin-frontend/src => src}/my_models/mod.rs (100%) rename {moxin-frontend/src => src}/my_models/model_info_modal.rs (100%) rename {moxin-frontend/src => src}/my_models/my_models_screen.rs (100%) rename {moxin-frontend/src => src}/shared/actions.rs (100%) rename {moxin-frontend/src => src}/shared/download_notification_popup.rs (100%) rename {moxin-frontend/src => src}/shared/external_link.rs (100%) rename {moxin-frontend/src => src}/shared/icon.rs (100%) rename {moxin-frontend/src => src}/shared/mod.rs (100%) rename {moxin-frontend/src => src}/shared/modal.rs (100%) rename {moxin-frontend/src => src}/shared/resource_imports.rs (100%) rename {moxin-frontend/src => src}/shared/styles.rs (100%) rename {moxin-frontend/src => src}/shared/utils.rs (100%) rename {moxin-frontend/src => src}/shared/widgets.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index ac6377c..6b35ab9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1185,6 +1185,24 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "moxin" +version = "0.1.0" +dependencies = [ + "anyhow", + "chrono", + "lipsum", + "makepad-widgets", + "moxin-backend", + "moxin-fake-backend", + "moxin-protocol", + "rand", + "robius-open", + "serde", + "serde_json", + "unicode-segmentation", +] + [[package]] name = "moxin-backend" version = "0.1.0" @@ -1212,24 +1230,6 @@ dependencies = [ "moxin-protocol", ] -[[package]] -name = "moxin-frontend" -version = "0.1.0" -dependencies = [ - "anyhow", - "chrono", - "lipsum", - "makepad-widgets", - "moxin-backend", - "moxin-fake-backend", - "moxin-protocol", - "rand", - "robius-open", - "serde", - "serde_json", - "unicode-segmentation", -] - [[package]] name = "moxin-protocol" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index f837b5f..a2a17f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,30 @@ [workspace] - -members = [ - "moxin-backend", - "moxin-frontend", - "moxin-protocol" -] - resolver = "2" +members = [ + "moxin-protocol", + "moxin-backend", + "moxin-fake-backend", +] + +[package] +name = "moxin" +version = "0.1.0" +edition = "2021" + +[dependencies] +moxin-protocol = { path = "moxin-protocol" } +moxin-backend = { path = "moxin-backend" } +moxin-fake-backend = { path = "moxin-fake-backend" } + +makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "rik" } + +robius-open = { git = "https://github.com/project-robius/robius-open", rev = "b901523667d4a8bbb0bba3cd1ebcc0b94d33534e" } + +chrono = "0.4" +unicode-segmentation = "1.10.1" +anyhow = "1.0" +serde_json = "1.0" +serde = { version = "1.0.197", features = ["derive"] } +lipsum = "0.9" +rand = "0.8.5" \ No newline at end of file diff --git a/README.md b/README.md index 418573a..2f2c464 100644 --- a/README.md +++ b/README.md @@ -22,12 +22,17 @@ curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/insta source $HOME/.wasmedge/env ``` +Obtain the source code from this repository: +```sh +git clone https://github.com/moxin-org/moxin.git +``` + ### macOS Then, on a standard desktop platform (macOS), simply run: ```sh -cd ~/moxin +cd moxin cargo run ``` @@ -50,6 +55,6 @@ sudo apt-get install libxcursor-dev libx11-dev libasound2-dev libpulse-dev Then, run: ```sh -cd ~/moxin +cd moxin cargo run ``` diff --git a/moxin-frontend/moxin-fake-backend/Cargo.toml b/moxin-fake-backend/Cargo.toml similarity index 74% rename from moxin-frontend/moxin-fake-backend/Cargo.toml rename to moxin-fake-backend/Cargo.toml index 7a6a1c7..36de8c8 100644 --- a/moxin-frontend/moxin-fake-backend/Cargo.toml +++ b/moxin-fake-backend/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -moxin-protocol = { path = "../../moxin-protocol" } +moxin-protocol = { path = "../moxin-protocol" } chrono = "0.4" \ No newline at end of file diff --git a/moxin-frontend/moxin-fake-backend/src/fake_data.rs b/moxin-fake-backend/src/fake_data.rs similarity index 100% rename from moxin-frontend/moxin-fake-backend/src/fake_data.rs rename to moxin-fake-backend/src/fake_data.rs diff --git a/moxin-frontend/moxin-fake-backend/src/lib.rs b/moxin-fake-backend/src/lib.rs similarity index 100% rename from moxin-frontend/moxin-fake-backend/src/lib.rs rename to moxin-fake-backend/src/lib.rs diff --git a/moxin-frontend/Cargo.toml b/moxin-frontend/Cargo.toml deleted file mode 100644 index 575c1d1..0000000 --- a/moxin-frontend/Cargo.toml +++ /dev/null @@ -1,24 +0,0 @@ -[package] -name = "moxin-frontend" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -moxin-protocol = { path = "../moxin-protocol" } - -moxin-backend = { path = "../moxin-backend" } -moxin-fake-backend = { path = "./moxin-fake-backend", package="moxin-fake-backend" } - -makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "rik" } - -robius-open = { git = "https://github.com/project-robius/robius-open", rev = "b901523667d4a8bbb0bba3cd1ebcc0b94d33534e" } - -chrono = "0.4" -unicode-segmentation = "1.10.1" -anyhow = "1.0" -serde_json = "1.0" -serde = { version = "1.0.197", features = ["derive"] } -lipsum = "0.9" -rand = "0.8.5" diff --git a/moxin-frontend/src/main.rs b/moxin-frontend/src/main.rs deleted file mode 100644 index 575eee8..0000000 --- a/moxin-frontend/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - moxin_frontend::app::app_main() -} diff --git a/moxin-frontend/resources/icons/add.svg b/resources/icons/add.svg similarity index 100% rename from moxin-frontend/resources/icons/add.svg rename to resources/icons/add.svg diff --git a/moxin-frontend/resources/icons/cancel_download.svg b/resources/icons/cancel_download.svg similarity index 100% rename from moxin-frontend/resources/icons/cancel_download.svg rename to resources/icons/cancel_download.svg diff --git a/moxin-frontend/resources/icons/chat.svg b/resources/icons/chat.svg similarity index 100% rename from moxin-frontend/resources/icons/chat.svg rename to resources/icons/chat.svg diff --git a/moxin-frontend/resources/icons/close.svg b/resources/icons/close.svg similarity index 100% rename from moxin-frontend/resources/icons/close.svg rename to resources/icons/close.svg diff --git a/moxin-frontend/resources/icons/collapse.svg b/resources/icons/collapse.svg similarity index 100% rename from moxin-frontend/resources/icons/collapse.svg rename to resources/icons/collapse.svg diff --git a/moxin-frontend/resources/icons/copy.svg b/resources/icons/copy.svg similarity index 100% rename from moxin-frontend/resources/icons/copy.svg rename to resources/icons/copy.svg diff --git a/moxin-frontend/resources/icons/delete.svg b/resources/icons/delete.svg similarity index 100% rename from moxin-frontend/resources/icons/delete.svg rename to resources/icons/delete.svg diff --git a/moxin-frontend/resources/icons/discover.svg b/resources/icons/discover.svg similarity index 100% rename from moxin-frontend/resources/icons/discover.svg rename to resources/icons/discover.svg diff --git a/moxin-frontend/resources/icons/download.svg b/resources/icons/download.svg similarity index 100% rename from moxin-frontend/resources/icons/download.svg rename to resources/icons/download.svg diff --git a/moxin-frontend/resources/icons/download_done.svg b/resources/icons/download_done.svg similarity index 100% rename from moxin-frontend/resources/icons/download_done.svg rename to resources/icons/download_done.svg diff --git a/moxin-frontend/resources/icons/downloads.svg b/resources/icons/downloads.svg similarity index 100% rename from moxin-frontend/resources/icons/downloads.svg rename to resources/icons/downloads.svg diff --git a/moxin-frontend/resources/icons/edit.svg b/resources/icons/edit.svg similarity index 100% rename from moxin-frontend/resources/icons/edit.svg rename to resources/icons/edit.svg diff --git a/moxin-frontend/resources/icons/edit_folder.svg b/resources/icons/edit_folder.svg similarity index 100% rename from moxin-frontend/resources/icons/edit_folder.svg rename to resources/icons/edit_folder.svg diff --git a/moxin-frontend/resources/icons/external_link.svg b/resources/icons/external_link.svg similarity index 100% rename from moxin-frontend/resources/icons/external_link.svg rename to resources/icons/external_link.svg diff --git a/moxin-frontend/resources/icons/favorite.svg b/resources/icons/favorite.svg similarity index 100% rename from moxin-frontend/resources/icons/favorite.svg rename to resources/icons/favorite.svg diff --git a/moxin-frontend/resources/icons/folder.svg b/resources/icons/folder.svg similarity index 100% rename from moxin-frontend/resources/icons/folder.svg rename to resources/icons/folder.svg diff --git a/moxin-frontend/resources/icons/info.svg b/resources/icons/info.svg similarity index 100% rename from moxin-frontend/resources/icons/info.svg rename to resources/icons/info.svg diff --git a/moxin-frontend/resources/icons/jump_to_bottom.svg b/resources/icons/jump_to_bottom.svg similarity index 100% rename from moxin-frontend/resources/icons/jump_to_bottom.svg rename to resources/icons/jump_to_bottom.svg diff --git a/moxin-frontend/resources/icons/my_models.svg b/resources/icons/my_models.svg similarity index 100% rename from moxin-frontend/resources/icons/my_models.svg rename to resources/icons/my_models.svg diff --git a/moxin-frontend/resources/icons/pause_download.svg b/resources/icons/pause_download.svg similarity index 100% rename from moxin-frontend/resources/icons/pause_download.svg rename to resources/icons/pause_download.svg diff --git a/moxin-frontend/resources/icons/play_arrow.svg b/resources/icons/play_arrow.svg similarity index 100% rename from moxin-frontend/resources/icons/play_arrow.svg rename to resources/icons/play_arrow.svg diff --git a/moxin-frontend/resources/icons/play_download.svg b/resources/icons/play_download.svg similarity index 100% rename from moxin-frontend/resources/icons/play_download.svg rename to resources/icons/play_download.svg diff --git a/moxin-frontend/resources/icons/prompt.svg b/resources/icons/prompt.svg similarity index 100% rename from moxin-frontend/resources/icons/prompt.svg rename to resources/icons/prompt.svg diff --git a/moxin-frontend/resources/icons/remove.svg b/resources/icons/remove.svg similarity index 100% rename from moxin-frontend/resources/icons/remove.svg rename to resources/icons/remove.svg diff --git a/moxin-frontend/resources/icons/retry_download.svg b/resources/icons/retry_download.svg similarity index 100% rename from moxin-frontend/resources/icons/retry_download.svg rename to resources/icons/retry_download.svg diff --git a/moxin-frontend/resources/icons/search.svg b/resources/icons/search.svg similarity index 100% rename from moxin-frontend/resources/icons/search.svg rename to resources/icons/search.svg diff --git a/moxin-frontend/resources/icons/start_chat.svg b/resources/icons/start_chat.svg similarity index 100% rename from moxin-frontend/resources/icons/start_chat.svg rename to resources/icons/start_chat.svg diff --git a/moxin-frontend/resources/icons/stop.svg b/resources/icons/stop.svg similarity index 100% rename from moxin-frontend/resources/icons/stop.svg rename to resources/icons/stop.svg diff --git a/moxin-frontend/resources/icons/visibility.svg b/resources/icons/visibility.svg similarity index 100% rename from moxin-frontend/resources/icons/visibility.svg rename to resources/icons/visibility.svg diff --git a/moxin-frontend/resources/images/chat_user_icon.png b/resources/images/chat_user_icon.png similarity index 100% rename from moxin-frontend/resources/images/chat_user_icon.png rename to resources/images/chat_user_icon.png diff --git a/moxin-frontend/resources/images/failure_icon.png b/resources/images/failure_icon.png similarity index 100% rename from moxin-frontend/resources/images/failure_icon.png rename to resources/images/failure_icon.png diff --git a/moxin-frontend/resources/images/my_models_bg_image.png b/resources/images/my_models_bg_image.png similarity index 100% rename from moxin-frontend/resources/images/my_models_bg_image.png rename to resources/images/my_models_bg_image.png diff --git a/moxin-frontend/resources/images/success_icon.png b/resources/images/success_icon.png similarity index 100% rename from moxin-frontend/resources/images/success_icon.png rename to resources/images/success_icon.png diff --git a/moxin-frontend/src/app.rs b/src/app.rs similarity index 100% rename from moxin-frontend/src/app.rs rename to src/app.rs diff --git a/moxin-frontend/src/chat/chat_history.rs b/src/chat/chat_history.rs similarity index 100% rename from moxin-frontend/src/chat/chat_history.rs rename to src/chat/chat_history.rs diff --git a/moxin-frontend/src/chat/chat_line.rs b/src/chat/chat_line.rs similarity index 100% rename from moxin-frontend/src/chat/chat_line.rs rename to src/chat/chat_line.rs diff --git a/moxin-frontend/src/chat/chat_line_loading.rs b/src/chat/chat_line_loading.rs similarity index 100% rename from moxin-frontend/src/chat/chat_line_loading.rs rename to src/chat/chat_line_loading.rs diff --git a/moxin-frontend/src/chat/chat_panel.rs b/src/chat/chat_panel.rs similarity index 100% rename from moxin-frontend/src/chat/chat_panel.rs rename to src/chat/chat_panel.rs diff --git a/moxin-frontend/src/chat/chat_screen.rs b/src/chat/chat_screen.rs similarity index 100% rename from moxin-frontend/src/chat/chat_screen.rs rename to src/chat/chat_screen.rs diff --git a/moxin-frontend/src/chat/mod.rs b/src/chat/mod.rs similarity index 100% rename from moxin-frontend/src/chat/mod.rs rename to src/chat/mod.rs diff --git a/moxin-frontend/src/chat/model_info.rs b/src/chat/model_info.rs similarity index 100% rename from moxin-frontend/src/chat/model_info.rs rename to src/chat/model_info.rs diff --git a/moxin-frontend/src/chat/model_selector.rs b/src/chat/model_selector.rs similarity index 100% rename from moxin-frontend/src/chat/model_selector.rs rename to src/chat/model_selector.rs diff --git a/moxin-frontend/src/chat/model_selector_list.rs b/src/chat/model_selector_list.rs similarity index 100% rename from moxin-frontend/src/chat/model_selector_list.rs rename to src/chat/model_selector_list.rs diff --git a/moxin-frontend/src/data/chat.rs b/src/data/chat.rs similarity index 100% rename from moxin-frontend/src/data/chat.rs rename to src/data/chat.rs diff --git a/moxin-frontend/src/data/download.rs b/src/data/download.rs similarity index 100% rename from moxin-frontend/src/data/download.rs rename to src/data/download.rs diff --git a/moxin-frontend/src/data/filesystem.rs b/src/data/filesystem.rs similarity index 100% rename from moxin-frontend/src/data/filesystem.rs rename to src/data/filesystem.rs diff --git a/moxin-frontend/src/data/mod.rs b/src/data/mod.rs similarity index 100% rename from moxin-frontend/src/data/mod.rs rename to src/data/mod.rs diff --git a/moxin-frontend/src/data/preferences.rs b/src/data/preferences.rs similarity index 100% rename from moxin-frontend/src/data/preferences.rs rename to src/data/preferences.rs diff --git a/moxin-frontend/src/data/search.rs b/src/data/search.rs similarity index 100% rename from moxin-frontend/src/data/search.rs rename to src/data/search.rs diff --git a/moxin-frontend/src/data/store.rs b/src/data/store.rs similarity index 100% rename from moxin-frontend/src/data/store.rs rename to src/data/store.rs diff --git a/moxin-frontend/src/landing/download_item.rs b/src/landing/download_item.rs similarity index 100% rename from moxin-frontend/src/landing/download_item.rs rename to src/landing/download_item.rs diff --git a/moxin-frontend/src/landing/downloads.rs b/src/landing/downloads.rs similarity index 100% rename from moxin-frontend/src/landing/downloads.rs rename to src/landing/downloads.rs diff --git a/moxin-frontend/src/landing/landing_screen.rs b/src/landing/landing_screen.rs similarity index 100% rename from moxin-frontend/src/landing/landing_screen.rs rename to src/landing/landing_screen.rs diff --git a/moxin-frontend/src/landing/mod.rs b/src/landing/mod.rs similarity index 100% rename from moxin-frontend/src/landing/mod.rs rename to src/landing/mod.rs diff --git a/moxin-frontend/src/landing/model_card.rs b/src/landing/model_card.rs similarity index 100% rename from moxin-frontend/src/landing/model_card.rs rename to src/landing/model_card.rs diff --git a/moxin-frontend/src/landing/model_files.rs b/src/landing/model_files.rs similarity index 100% rename from moxin-frontend/src/landing/model_files.rs rename to src/landing/model_files.rs diff --git a/moxin-frontend/src/landing/model_files_item.rs b/src/landing/model_files_item.rs similarity index 100% rename from moxin-frontend/src/landing/model_files_item.rs rename to src/landing/model_files_item.rs diff --git a/moxin-frontend/src/landing/model_files_list.rs b/src/landing/model_files_list.rs similarity index 100% rename from moxin-frontend/src/landing/model_files_list.rs rename to src/landing/model_files_list.rs diff --git a/moxin-frontend/src/landing/model_files_tags.rs b/src/landing/model_files_tags.rs similarity index 100% rename from moxin-frontend/src/landing/model_files_tags.rs rename to src/landing/model_files_tags.rs diff --git a/moxin-frontend/src/landing/model_list.rs b/src/landing/model_list.rs similarity index 100% rename from moxin-frontend/src/landing/model_list.rs rename to src/landing/model_list.rs diff --git a/moxin-frontend/src/landing/search_bar.rs b/src/landing/search_bar.rs similarity index 100% rename from moxin-frontend/src/landing/search_bar.rs rename to src/landing/search_bar.rs diff --git a/moxin-frontend/src/landing/search_loading.rs b/src/landing/search_loading.rs similarity index 100% rename from moxin-frontend/src/landing/search_loading.rs rename to src/landing/search_loading.rs diff --git a/moxin-frontend/src/landing/shared.rs b/src/landing/shared.rs similarity index 100% rename from moxin-frontend/src/landing/shared.rs rename to src/landing/shared.rs diff --git a/moxin-frontend/src/landing/sorting.rs b/src/landing/sorting.rs similarity index 100% rename from moxin-frontend/src/landing/sorting.rs rename to src/landing/sorting.rs diff --git a/moxin-frontend/src/lib.rs b/src/lib.rs similarity index 100% rename from moxin-frontend/src/lib.rs rename to src/lib.rs diff --git a/src/main.rs b/src/main.rs new file mode 100644 index 0000000..d6900f6 --- /dev/null +++ b/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + moxin::app::app_main() +} diff --git a/moxin-frontend/src/my_models/delete_model_modal.rs b/src/my_models/delete_model_modal.rs similarity index 100% rename from moxin-frontend/src/my_models/delete_model_modal.rs rename to src/my_models/delete_model_modal.rs diff --git a/moxin-frontend/src/my_models/downloaded_files_row.rs b/src/my_models/downloaded_files_row.rs similarity index 100% rename from moxin-frontend/src/my_models/downloaded_files_row.rs rename to src/my_models/downloaded_files_row.rs diff --git a/moxin-frontend/src/my_models/downloaded_files_table.rs b/src/my_models/downloaded_files_table.rs similarity index 100% rename from moxin-frontend/src/my_models/downloaded_files_table.rs rename to src/my_models/downloaded_files_table.rs diff --git a/moxin-frontend/src/my_models/mod.rs b/src/my_models/mod.rs similarity index 100% rename from moxin-frontend/src/my_models/mod.rs rename to src/my_models/mod.rs diff --git a/moxin-frontend/src/my_models/model_info_modal.rs b/src/my_models/model_info_modal.rs similarity index 100% rename from moxin-frontend/src/my_models/model_info_modal.rs rename to src/my_models/model_info_modal.rs diff --git a/moxin-frontend/src/my_models/my_models_screen.rs b/src/my_models/my_models_screen.rs similarity index 100% rename from moxin-frontend/src/my_models/my_models_screen.rs rename to src/my_models/my_models_screen.rs diff --git a/moxin-frontend/src/shared/actions.rs b/src/shared/actions.rs similarity index 100% rename from moxin-frontend/src/shared/actions.rs rename to src/shared/actions.rs diff --git a/moxin-frontend/src/shared/download_notification_popup.rs b/src/shared/download_notification_popup.rs similarity index 100% rename from moxin-frontend/src/shared/download_notification_popup.rs rename to src/shared/download_notification_popup.rs diff --git a/moxin-frontend/src/shared/external_link.rs b/src/shared/external_link.rs similarity index 100% rename from moxin-frontend/src/shared/external_link.rs rename to src/shared/external_link.rs diff --git a/moxin-frontend/src/shared/icon.rs b/src/shared/icon.rs similarity index 100% rename from moxin-frontend/src/shared/icon.rs rename to src/shared/icon.rs diff --git a/moxin-frontend/src/shared/mod.rs b/src/shared/mod.rs similarity index 100% rename from moxin-frontend/src/shared/mod.rs rename to src/shared/mod.rs diff --git a/moxin-frontend/src/shared/modal.rs b/src/shared/modal.rs similarity index 100% rename from moxin-frontend/src/shared/modal.rs rename to src/shared/modal.rs diff --git a/moxin-frontend/src/shared/resource_imports.rs b/src/shared/resource_imports.rs similarity index 100% rename from moxin-frontend/src/shared/resource_imports.rs rename to src/shared/resource_imports.rs diff --git a/moxin-frontend/src/shared/styles.rs b/src/shared/styles.rs similarity index 100% rename from moxin-frontend/src/shared/styles.rs rename to src/shared/styles.rs diff --git a/moxin-frontend/src/shared/utils.rs b/src/shared/utils.rs similarity index 100% rename from moxin-frontend/src/shared/utils.rs rename to src/shared/utils.rs diff --git a/moxin-frontend/src/shared/widgets.rs b/src/shared/widgets.rs similarity index 100% rename from moxin-frontend/src/shared/widgets.rs rename to src/shared/widgets.rs