From 297e7f70c45498087f0f4a0923269ee306de8168 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Sat, 13 May 2023 14:02:24 -0400 Subject: [PATCH] Rearrange the entire kifu directory tree --- Makefile | 12 +++++++----- kifu/core-types/Makefile | 4 ++-- kifu/{kifu-core => core}/Cargo.lock | 0 kifu/{kifu-core => core}/Cargo.toml | 0 kifu/{kifu-core => core}/Makefile | 0 kifu/{kifu-core => core}/src/api.rs | 0 kifu/{kifu-core => core}/src/board.rs | 0 kifu/{kifu-core => core}/src/lib.rs | 0 kifu/{kifu-core => core}/src/types.rs | 0 kifu/{kifu-core => core}/src/ui/mod.rs | 0 kifu/{kifu-core => core}/src/ui/playing_field.rs | 0 kifu/{kifu-core => core}/src/ui/types.rs | 0 kifu/{kifu-core => core}/typeshare/core.d.ts | 0 kifu/ffi/wasm/Cargo.toml | 2 +- kifu/{kifu-gtk => gtk}/Cargo.lock | 0 kifu/{kifu-gtk => gtk}/Cargo.nix | 0 kifu/{kifu-gtk => gtk}/Cargo.toml | 2 +- kifu/{kifu-gtk => gtk}/Makefile | 0 kifu/{kifu-gtk => gtk}/build.rs | 0 .../resources/resources.gresources.xml | 0 kifu/{kifu-gtk => gtk}/resources/wood_texture.jpg | Bin kifu/{kifu-gtk => gtk}/src/bin/screenplay.rs | 0 kifu/{kifu-gtk => gtk}/src/lib.rs | 6 +++--- kifu/{kifu-gtk => gtk}/src/main.rs | 8 ++++---- kifu/{kifu-gtk => gtk}/src/ui/board.rs | 0 kifu/{kifu-gtk => gtk}/src/ui/chat.rs | 0 kifu/{kifu-gtk => gtk}/src/ui/mod.rs | 0 kifu/{kifu-gtk => gtk}/src/ui/player_card.rs | 0 kifu/{kifu-gtk => gtk}/src/ui/playing_field.rs | 0 kifu/{kifu-pwa => pwa}/Makefile | 0 kifu/{kifu-pwa => pwa}/package-lock.json | 0 kifu/{kifu-pwa => pwa}/package.json | 0 kifu/{kifu-pwa => pwa}/src/components/Board.ts | 0 kifu/{kifu-pwa => pwa}/src/coreApi.ts | 0 kifu/{kifu-pwa => pwa}/src/icon512.png | Bin kifu/{kifu-pwa => pwa}/src/index.html | 0 kifu/{kifu-pwa => pwa}/src/kifu.css | 0 kifu/{kifu-pwa => pwa}/src/main.ts | 0 kifu/{kifu-pwa => pwa}/src/manifest.json | 0 kifu/{kifu-pwa => pwa}/src/sw.js | 0 kifu/{kifu-pwa => pwa}/webpack.config.js | 0 41 files changed, 18 insertions(+), 16 deletions(-) rename kifu/{kifu-core => core}/Cargo.lock (100%) rename kifu/{kifu-core => core}/Cargo.toml (100%) rename kifu/{kifu-core => core}/Makefile (100%) rename kifu/{kifu-core => core}/src/api.rs (100%) rename kifu/{kifu-core => core}/src/board.rs (100%) rename kifu/{kifu-core => core}/src/lib.rs (100%) rename kifu/{kifu-core => core}/src/types.rs (100%) rename kifu/{kifu-core => core}/src/ui/mod.rs (100%) rename kifu/{kifu-core => core}/src/ui/playing_field.rs (100%) rename kifu/{kifu-core => core}/src/ui/types.rs (100%) rename kifu/{kifu-core => core}/typeshare/core.d.ts (100%) rename kifu/{kifu-gtk => gtk}/Cargo.lock (100%) rename kifu/{kifu-gtk => gtk}/Cargo.nix (100%) rename kifu/{kifu-gtk => gtk}/Cargo.toml (94%) rename kifu/{kifu-gtk => gtk}/Makefile (100%) rename kifu/{kifu-gtk => gtk}/build.rs (100%) rename kifu/{kifu-gtk => gtk}/resources/resources.gresources.xml (100%) rename kifu/{kifu-gtk => gtk}/resources/wood_texture.jpg (100%) rename kifu/{kifu-gtk => gtk}/src/bin/screenplay.rs (100%) rename kifu/{kifu-gtk => gtk}/src/lib.rs (70%) rename kifu/{kifu-gtk => gtk}/src/main.rs (89%) rename kifu/{kifu-gtk => gtk}/src/ui/board.rs (100%) rename kifu/{kifu-gtk => gtk}/src/ui/chat.rs (100%) rename kifu/{kifu-gtk => gtk}/src/ui/mod.rs (100%) rename kifu/{kifu-gtk => gtk}/src/ui/player_card.rs (100%) rename kifu/{kifu-gtk => gtk}/src/ui/playing_field.rs (100%) rename kifu/{kifu-pwa => pwa}/Makefile (100%) rename kifu/{kifu-pwa => pwa}/package-lock.json (100%) rename kifu/{kifu-pwa => pwa}/package.json (100%) rename kifu/{kifu-pwa => pwa}/src/components/Board.ts (100%) rename kifu/{kifu-pwa => pwa}/src/coreApi.ts (100%) rename kifu/{kifu-pwa => pwa}/src/icon512.png (100%) rename kifu/{kifu-pwa => pwa}/src/index.html (100%) rename kifu/{kifu-pwa => pwa}/src/kifu.css (100%) rename kifu/{kifu-pwa => pwa}/src/main.ts (100%) rename kifu/{kifu-pwa => pwa}/src/manifest.json (100%) rename kifu/{kifu-pwa => pwa}/src/sw.js (100%) rename kifu/{kifu-pwa => pwa}/webpack.config.js (100%) diff --git a/Makefile b/Makefile index 1269985..92a0aeb 100644 --- a/Makefile +++ b/Makefile @@ -45,18 +45,20 @@ kifu-core/test-oneshot: cd kifu/kifu-core && make test-oneshot kifu-gtk: - cd kifu/kifu-gtk && make release + cd kifu/gtk && make release kifu-gtk/dev: - cd kifu/kifu-gtk && make dev + cd kifu/gtk && make dev kifu-pwa: - cd kifu/kifu-pwa && make release + pushd kifu/ffi/wasm && make && popd + pushd kifu/core-types && make && popd + cd kifu/pwa && make release kifu-pwa/dev: pushd kifu/ffi/wasm && make && popd pushd kifu/core-types && make && popd - pushd kifu/kifu-pwa && make dev + pushd kifu/pwa && make dev kifu-pwa/test-server: - pushd kifu/kifu-pwa && make test-server + pushd kifu/pwa && make test-server diff --git a/kifu/core-types/Makefile b/kifu/core-types/Makefile index d3b1f09..d42b5a0 100644 --- a/kifu/core-types/Makefile +++ b/kifu/core-types/Makefile @@ -1,6 +1,6 @@ -SOURCES = $(shell find ../kifu-core -name "*.rs") +SOURCES = $(shell find ../core -name "*.rs") dist/core.d.ts: $(SOURCES) mkdir -p dist - typeshare ../kifu-core --lang=typescript --output-file=dist/core.d.ts + typeshare ../core --lang=typescript --output-file=dist/core.d.ts diff --git a/kifu/kifu-core/Cargo.lock b/kifu/core/Cargo.lock similarity index 100% rename from kifu/kifu-core/Cargo.lock rename to kifu/core/Cargo.lock diff --git a/kifu/kifu-core/Cargo.toml b/kifu/core/Cargo.toml similarity index 100% rename from kifu/kifu-core/Cargo.toml rename to kifu/core/Cargo.toml diff --git a/kifu/kifu-core/Makefile b/kifu/core/Makefile similarity index 100% rename from kifu/kifu-core/Makefile rename to kifu/core/Makefile diff --git a/kifu/kifu-core/src/api.rs b/kifu/core/src/api.rs similarity index 100% rename from kifu/kifu-core/src/api.rs rename to kifu/core/src/api.rs diff --git a/kifu/kifu-core/src/board.rs b/kifu/core/src/board.rs similarity index 100% rename from kifu/kifu-core/src/board.rs rename to kifu/core/src/board.rs diff --git a/kifu/kifu-core/src/lib.rs b/kifu/core/src/lib.rs similarity index 100% rename from kifu/kifu-core/src/lib.rs rename to kifu/core/src/lib.rs diff --git a/kifu/kifu-core/src/types.rs b/kifu/core/src/types.rs similarity index 100% rename from kifu/kifu-core/src/types.rs rename to kifu/core/src/types.rs diff --git a/kifu/kifu-core/src/ui/mod.rs b/kifu/core/src/ui/mod.rs similarity index 100% rename from kifu/kifu-core/src/ui/mod.rs rename to kifu/core/src/ui/mod.rs diff --git a/kifu/kifu-core/src/ui/playing_field.rs b/kifu/core/src/ui/playing_field.rs similarity index 100% rename from kifu/kifu-core/src/ui/playing_field.rs rename to kifu/core/src/ui/playing_field.rs diff --git a/kifu/kifu-core/src/ui/types.rs b/kifu/core/src/ui/types.rs similarity index 100% rename from kifu/kifu-core/src/ui/types.rs rename to kifu/core/src/ui/types.rs diff --git a/kifu/kifu-core/typeshare/core.d.ts b/kifu/core/typeshare/core.d.ts similarity index 100% rename from kifu/kifu-core/typeshare/core.d.ts rename to kifu/core/typeshare/core.d.ts diff --git a/kifu/ffi/wasm/Cargo.toml b/kifu/ffi/wasm/Cargo.toml index 03475b2..45f5216 100644 --- a/kifu/ffi/wasm/Cargo.toml +++ b/kifu/ffi/wasm/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -kifu-core = { path = "../../kifu-core" } +kifu-core = { path = "../../core" } serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.5.0" wasm-bindgen = "0.2" diff --git a/kifu/kifu-gtk/Cargo.lock b/kifu/gtk/Cargo.lock similarity index 100% rename from kifu/kifu-gtk/Cargo.lock rename to kifu/gtk/Cargo.lock diff --git a/kifu/kifu-gtk/Cargo.nix b/kifu/gtk/Cargo.nix similarity index 100% rename from kifu/kifu-gtk/Cargo.nix rename to kifu/gtk/Cargo.nix diff --git a/kifu/kifu-gtk/Cargo.toml b/kifu/gtk/Cargo.toml similarity index 94% rename from kifu/kifu-gtk/Cargo.toml rename to kifu/gtk/Cargo.toml index fa13690..c66cf17 100644 --- a/kifu/kifu-gtk/Cargo.toml +++ b/kifu/gtk/Cargo.toml @@ -14,7 +14,7 @@ gio = { version = "0.17" } glib = { version = "0.17" } gtk = { version = "0.6", package = "gtk4" } image = { version = "0.24" } -kifu-core = { path = "../kifu-core" } +kifu-core = { path = "../core" } tokio = { version = "1.26", features = [ "full" ] } screenplay = { path = "../../screenplay" } diff --git a/kifu/kifu-gtk/Makefile b/kifu/gtk/Makefile similarity index 100% rename from kifu/kifu-gtk/Makefile rename to kifu/gtk/Makefile diff --git a/kifu/kifu-gtk/build.rs b/kifu/gtk/build.rs similarity index 100% rename from kifu/kifu-gtk/build.rs rename to kifu/gtk/build.rs diff --git a/kifu/kifu-gtk/resources/resources.gresources.xml b/kifu/gtk/resources/resources.gresources.xml similarity index 100% rename from kifu/kifu-gtk/resources/resources.gresources.xml rename to kifu/gtk/resources/resources.gresources.xml diff --git a/kifu/kifu-gtk/resources/wood_texture.jpg b/kifu/gtk/resources/wood_texture.jpg similarity index 100% rename from kifu/kifu-gtk/resources/wood_texture.jpg rename to kifu/gtk/resources/wood_texture.jpg diff --git a/kifu/kifu-gtk/src/bin/screenplay.rs b/kifu/gtk/src/bin/screenplay.rs similarity index 100% rename from kifu/kifu-gtk/src/bin/screenplay.rs rename to kifu/gtk/src/bin/screenplay.rs diff --git a/kifu/kifu-gtk/src/lib.rs b/kifu/gtk/src/lib.rs similarity index 70% rename from kifu/kifu-gtk/src/lib.rs rename to kifu/gtk/src/lib.rs index bc9d45c..b0ef459 100644 --- a/kifu/kifu-gtk/src/lib.rs +++ b/kifu/gtk/src/lib.rs @@ -1,17 +1,17 @@ pub mod ui; -use kifu_core::{CoreApp, Request, Response}; +use kifu_core::{CoreApp, CoreRequest, CoreResponse}; use std::sync::Arc; use tokio::runtime::Runtime; #[derive(Clone)] pub struct CoreApi { - pub gtk_tx: gtk::glib::Sender, + pub gtk_tx: gtk::glib::Sender, pub rt: Arc, pub core: CoreApp, } impl CoreApi { - pub fn dispatch(&self, request: Request) { + pub fn dispatch(&self, request: CoreRequest) { self.rt.spawn({ let gtk_tx = self.gtk_tx.clone(); let core = self.core.clone(); diff --git a/kifu/kifu-gtk/src/main.rs b/kifu/gtk/src/main.rs similarity index 89% rename from kifu/kifu-gtk/src/main.rs rename to kifu/gtk/src/main.rs index 2ede4f3..931aae5 100644 --- a/kifu/kifu-gtk/src/main.rs +++ b/kifu/gtk/src/main.rs @@ -1,5 +1,5 @@ use gtk::prelude::*; -use kifu_core::{CoreApp, Request, Response}; +use kifu_core::{CoreApp, CoreRequest, CoreResponse}; use kifu_gtk::{ui::PlayingField, CoreApi}; use std::sync::{Arc, RwLock}; @@ -31,7 +31,7 @@ fn main() { let runtime = runtime.clone(); move |app| { let (gtk_tx, gtk_rx) = - gtk::glib::MainContext::channel::(gtk::glib::PRIORITY_DEFAULT); + gtk::glib::MainContext::channel::(gtk::glib::PRIORITY_DEFAULT); let api = CoreApi { gtk_tx, @@ -47,7 +47,7 @@ fn main() { let playing_field = Arc::new(RwLock::new(None)); move |message| { match message { - Response::PlayingFieldView(view) => { + CoreResponse::PlayingFieldView(view) => { let api = api.clone(); let start = std::time::Instant::now(); @@ -67,7 +67,7 @@ fn main() { } }); - api.dispatch(Request::PlayingField); + api.dispatch(CoreRequest::PlayingField); } }); diff --git a/kifu/kifu-gtk/src/ui/board.rs b/kifu/gtk/src/ui/board.rs similarity index 100% rename from kifu/kifu-gtk/src/ui/board.rs rename to kifu/gtk/src/ui/board.rs diff --git a/kifu/kifu-gtk/src/ui/chat.rs b/kifu/gtk/src/ui/chat.rs similarity index 100% rename from kifu/kifu-gtk/src/ui/chat.rs rename to kifu/gtk/src/ui/chat.rs diff --git a/kifu/kifu-gtk/src/ui/mod.rs b/kifu/gtk/src/ui/mod.rs similarity index 100% rename from kifu/kifu-gtk/src/ui/mod.rs rename to kifu/gtk/src/ui/mod.rs diff --git a/kifu/kifu-gtk/src/ui/player_card.rs b/kifu/gtk/src/ui/player_card.rs similarity index 100% rename from kifu/kifu-gtk/src/ui/player_card.rs rename to kifu/gtk/src/ui/player_card.rs diff --git a/kifu/kifu-gtk/src/ui/playing_field.rs b/kifu/gtk/src/ui/playing_field.rs similarity index 100% rename from kifu/kifu-gtk/src/ui/playing_field.rs rename to kifu/gtk/src/ui/playing_field.rs diff --git a/kifu/kifu-pwa/Makefile b/kifu/pwa/Makefile similarity index 100% rename from kifu/kifu-pwa/Makefile rename to kifu/pwa/Makefile diff --git a/kifu/kifu-pwa/package-lock.json b/kifu/pwa/package-lock.json similarity index 100% rename from kifu/kifu-pwa/package-lock.json rename to kifu/pwa/package-lock.json diff --git a/kifu/kifu-pwa/package.json b/kifu/pwa/package.json similarity index 100% rename from kifu/kifu-pwa/package.json rename to kifu/pwa/package.json diff --git a/kifu/kifu-pwa/src/components/Board.ts b/kifu/pwa/src/components/Board.ts similarity index 100% rename from kifu/kifu-pwa/src/components/Board.ts rename to kifu/pwa/src/components/Board.ts diff --git a/kifu/kifu-pwa/src/coreApi.ts b/kifu/pwa/src/coreApi.ts similarity index 100% rename from kifu/kifu-pwa/src/coreApi.ts rename to kifu/pwa/src/coreApi.ts diff --git a/kifu/kifu-pwa/src/icon512.png b/kifu/pwa/src/icon512.png similarity index 100% rename from kifu/kifu-pwa/src/icon512.png rename to kifu/pwa/src/icon512.png diff --git a/kifu/kifu-pwa/src/index.html b/kifu/pwa/src/index.html similarity index 100% rename from kifu/kifu-pwa/src/index.html rename to kifu/pwa/src/index.html diff --git a/kifu/kifu-pwa/src/kifu.css b/kifu/pwa/src/kifu.css similarity index 100% rename from kifu/kifu-pwa/src/kifu.css rename to kifu/pwa/src/kifu.css diff --git a/kifu/kifu-pwa/src/main.ts b/kifu/pwa/src/main.ts similarity index 100% rename from kifu/kifu-pwa/src/main.ts rename to kifu/pwa/src/main.ts diff --git a/kifu/kifu-pwa/src/manifest.json b/kifu/pwa/src/manifest.json similarity index 100% rename from kifu/kifu-pwa/src/manifest.json rename to kifu/pwa/src/manifest.json diff --git a/kifu/kifu-pwa/src/sw.js b/kifu/pwa/src/sw.js similarity index 100% rename from kifu/kifu-pwa/src/sw.js rename to kifu/pwa/src/sw.js diff --git a/kifu/kifu-pwa/webpack.config.js b/kifu/pwa/webpack.config.js similarity index 100% rename from kifu/kifu-pwa/webpack.config.js rename to kifu/pwa/webpack.config.js