From 35ff3670ad4fb7bec419f2d18f272f89fb83de79 Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Sun, 23 Jun 2024 16:08:41 -0400 Subject: [PATCH] Remove iced client going to Godot --- client/Cargo.toml | 33 -------- client/assets/icons.ttf | Bin 5732 -> 0 bytes client/iced-todos.desktop | 4 - client/index.html | 12 --- client/src/app.rs | 161 -------------------------------------- client/src/components.rs | 0 client/src/lib.rs | 3 - client/src/main.rs | 11 --- 8 files changed, 224 deletions(-) delete mode 100644 client/Cargo.toml delete mode 100644 client/assets/icons.ttf delete mode 100644 client/iced-todos.desktop delete mode 100644 client/index.html delete mode 100644 client/src/app.rs delete mode 100644 client/src/components.rs delete mode 100644 client/src/lib.rs delete mode 100644 client/src/main.rs diff --git a/client/Cargo.toml b/client/Cargo.toml deleted file mode 100644 index ad90271..0000000 --- a/client/Cargo.toml +++ /dev/null @@ -1,33 +0,0 @@ -[package] -name = "realm_client" -version = "0.1.0" -edition = "2021" - -[package.metadata.docs.rs] -all-features = true -targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"] - -[dependencies] -realm_server = { version = "0.1", path = "../server" } - -log = "0.4" -tarpc = { version = "0.34.0", features = ["full"] } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -uuid = { version = "1.8", features = ["v4", "fast-rng", "serde"] } -directories-next = "2.0" -tracing-subscriber = "0.3" -async-std = "1.12.0" -once_cell = "1.19.0" -env_logger = "0.11.3" - -[dependencies.iced] -git = "https://github.com/iced-rs/iced.git" -rev = "e6d0b3bda5042a1017a5944a5227c97e0ed6caf9" - -[profile.release] -opt-level = 2 # fast and small wasm - -# Optimize all dependencies even in debug builds: -[profile.dev.package."*"] -opt-level = 2 diff --git a/client/assets/icons.ttf b/client/assets/icons.ttf deleted file mode 100644 index 7b65fd3634a48b1afc3bebe7b3bb83a6c4f508d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5732 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 O`omk-n03oH(|-dX8~8W? diff --git a/client/iced-todos.desktop b/client/iced-todos.desktop deleted file mode 100644 index dd7ce53..0000000 --- a/client/iced-todos.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Desktop Entry] -Name=Todos - Iced -Exec=iced-todos -Type=Application diff --git a/client/index.html b/client/index.html deleted file mode 100644 index ee5570f..0000000 --- a/client/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - Todos - Iced - - - - - - diff --git a/client/src/app.rs b/client/src/app.rs deleted file mode 100644 index 0fa1b83..0000000 --- a/client/src/app.rs +++ /dev/null @@ -1,161 +0,0 @@ -use iced::alignment::{self, Alignment}; -use iced::{keyboard, Renderer, Theme}; -use iced::widget::{ - self, button, center, checkbox, column, container, keyed_column, row, - scrollable, text, text_input, Text, -}; -use iced::window; -use iced::{Command, Element, Font, Length, Subscription}; -use iced::futures::StreamExt; - -use once_cell::sync::Lazy; -use serde::{Deserialize, Serialize}; -use uuid::Uuid; -use realm_server::types::Message; - -static INPUT_ID: Lazy = Lazy::new(text_input::Id::unique); - -#[derive(Default, Debug)] -pub struct RealmApp { - input_value: String, - messages: Vec, -} - -#[derive(Debug, Clone)] -pub enum Events { - // Loaded(Result), - // Saved(Result<(), SaveError>), - InputChanged(String), - SendMessage, -} - -impl RealmApp { - pub fn load() -> Command { - //Command::perform(SavedState::load(), Events::Loaded) - Command::none() - } - - pub fn title(&self) -> String { - "Realm Chat".to_string() - } - - pub fn update(&mut self, event: Events) -> Command { - let command = match event { - Events::InputChanged(value) => { - self.input_value = value; - - Command::none() - } - Events::SendMessage => { - self.messages.push(Message { - guid: "".to_string(), - text: Some(self.input_value.clone()), - attachments: None, - reply_to_guid: None, - reaction_emoji: None, - redact: false, - }); - - //TODO - self.input_value.clear(); - Command::none() - } - }; - - Command::batch(vec![command]) - } - - pub fn view(&self) -> Element { - let input = text_input("New Message", &*self.input_value) - .id(INPUT_ID.clone()) - .on_input(Events::InputChanged) - .on_submit(Events::SendMessage) - //.padding(15) - .size(12); - - let mut all_messages: String = String::new(); - for message in self.messages.iter() { - match message.clone().text { - None => {} - Some(text) => { - all_messages = format!("{}{}\n", all_messages, text) - } - } - } - - let messages = text(all_messages) - .size(12) - .width(Length::Fill) - .height(600) - .horizontal_alignment(alignment::Horizontal::Left); - - // let content = column![title, input] - // .spacing(20); - //.max_width(800); - - column!(scrollable( - container(messages).center_x(Length::Fill).padding(40)), input).into() - } - - pub fn subscription(&self) -> Subscription { - use keyboard::key; - - keyboard::on_key_press(|key, modifiers| { - let keyboard::Key::Named(key) = key else { - return None; - }; - - match (key, modifiers) { - // (key::Named::Tab, _) => Some(Events::TabPressed { - // shift: modifiers.shift(), - // }), - // (key::Named::ArrowUp, keyboard::Modifiers::SHIFT) => { - // Some(Events::ToggleFullscreen(window::Mode::Fullscreen)) - // } - // (key::Named::ArrowDown, keyboard::Modifiers::SHIFT) => { - // Some(Events::ToggleFullscreen(window::Mode::Windowed)) - // } - _ => None, - } - }) - } -} - -fn loading_message<'a>() -> Element<'a, Events> { - center( - text("Loading...") - .horizontal_alignment(alignment::Horizontal::Center) - .size(50), - ) - .into() -} - -fn empty_message(message: &str) -> Element<'_, Events> { - center( - text(message) - .width(Length::Fill) - .size(25) - .horizontal_alignment(alignment::Horizontal::Center) - .color([0.7, 0.7, 0.7]), - ) - .height(200) - .into() -} - -// Fonts -const ICONS: Font = Font::with_name("Iced-Todos-Icons"); - -fn icon(unicode: char) -> Text<'static> { - text(unicode.to_string()) - .font(ICONS) - .width(20) - .horizontal_alignment(alignment::Horizontal::Center) -} - -fn edit_icon() -> Text<'static> { - icon('\u{F303}') -} - -fn delete_icon() -> Text<'static> { - icon('\u{F1F8}') -} \ No newline at end of file diff --git a/client/src/components.rs b/client/src/components.rs deleted file mode 100644 index e69de29..0000000 diff --git a/client/src/lib.rs b/client/src/lib.rs deleted file mode 100644 index 62cc189..0000000 --- a/client/src/lib.rs +++ /dev/null @@ -1,3 +0,0 @@ -mod app; -mod components; -pub use app::RealmApp; \ No newline at end of file diff --git a/client/src/main.rs b/client/src/main.rs deleted file mode 100644 index b2b3beb..0000000 --- a/client/src/main.rs +++ /dev/null @@ -1,11 +0,0 @@ -use realm_client::RealmApp; - -pub fn main() -> iced::Result { - tracing_subscriber::fmt::init(); - iced::program(RealmApp::title, RealmApp::update, RealmApp::view) - .load(RealmApp::load) - .subscription(RealmApp::subscription) - .font(include_bytes!("../assets/icons.ttf").as_slice()) - .window_size((1280.0, 720.0)) - .run() -} \ No newline at end of file