Skip to content

Commit

Permalink
tryna understand this shitstrom of a project
Browse files Browse the repository at this point in the history
  • Loading branch information
marci1175 committed Feb 18, 2024
1 parent 1ab43f0 commit afd1ab4
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust-version = "1.71"
egui = "0.24.1"
egui_extras = { version = "0.24.2", features = ["all_loaders"] }
image = { version = "0.24", features = ["jpeg", "png", "gif", "bmp", "tiff", "webp"] } # Add the types you want support for
tonic = {version = "0.7", features = ["tls"]} #, "compression"
tonic = {version = "0.7", features = ["tls", "transport", "channel"]} #, "compression"

prost = "0.10"
tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion build_info.matthias_build
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024.01.18. 21:43
2024.02.18. 21:16
3 changes: 1 addition & 2 deletions src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ impl eframe::App for backend::TemplateApp {

fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
let input_keys = keymap(self.main.keymap.clone());

//dbg!(generate_uuid());

/* NOTES:
Expand Down Expand Up @@ -79,6 +78,7 @@ impl eframe::App for backend::TemplateApp {
if self.main.client_mode {
self.state_client(_frame, ctx, input_keys);
}

//character picker
if self.main.emoji_mode && self.main.client_mode {
self.window_emoji(ctx);
Expand Down Expand Up @@ -357,7 +357,6 @@ impl eframe::App for backend::TemplateApp {
self.client_connection = connection
}
else {
println!("err");
self.client_connection.state = ConnectionState::Error;
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/app/client.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use messages::MessageRequest;
use tonic::{client::Grpc, codec::Codec, transport::Channel, Request};

use super::backend::{ClientMessage, TemplateApp};
pub mod messages {
Expand All @@ -13,6 +14,8 @@ pub async fn send_msg(
connection: ClientConnection,
message: ClientMessage,
) -> anyhow::Result<String> {
// let chan = Channel::builder("http://[::1]".parse().unwrap()).connect().await?;

if let Some(mut client) = connection.client.clone() {
let request = tonic::Request::new(MessageRequest {
message: message.struct_into_string(),
Expand All @@ -26,4 +29,5 @@ pub async fn send_msg(
} else {
Err(anyhow::Error::msg("Request failed, see logs"))
}

}
25 changes: 4 additions & 21 deletions src/app/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,7 @@ use super::backend::{
};
use rand::Rng;
use std::sync::Mutex;
use tonic::{transport::Server, IntoRequest, Request, Response, Status};
/*
use std::{io, time::Duration};
use clap::Parser;
use rcgen::{Certificate, CertificateParams, DistinguishedName};
use tokio::time::sleep;
use log::{info, error};
use clap_derive::Parser;
use instant_acme::{
Account, AuthorizationStatus, ChallengeType, Identifier, LetsEncrypt, NewAccount, NewOrder,
OrderStatus,
};
*/

use tonic::{transport::Server, IntoRequest, Request, Response, Status, client::GrpcService};
use messages::{
message_server::{Message as ServerMessage, MessageServer},
MessageRequest, MessageResponse,
Expand Down Expand Up @@ -258,17 +244,14 @@ pub async fn server_main(
..Default::default()
};

let messages = &msg_service.messages.lock().unwrap().to_vec();

Server::builder()
.add_service(MessageServer::new(msg_service))
.add_service(
MessageServer::new(msg_service)
)
.serve(addr)
.await?;

unimplemented!();
let reply: String = messages.iter().map(|f| f.struct_into_string()).collect();

Ok(reply)
}

impl MessageService {
Expand Down
6 changes: 5 additions & 1 deletion src/app/ui/login.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ impl TemplateApp {
ctx.send_viewport_cmd(egui::ViewportCommand::InnerSize(vec2(500., 200.)));
ctx.send_viewport_cmd(ViewportCommand::Resizable(false));

let is_focused = ctx.input(|input| {
input.focused
});

egui::CentralPanel::default().show(ctx, |ui| {
ui.with_layout(Layout::top_down(Align::Center), |ui| {
ui.label(RichText::from("Matthias").strong().size(25.))
Expand All @@ -33,7 +37,7 @@ impl TemplateApp {

ui.add(egui::TextEdit::singleline(&mut self.login_password).password(true));

if ui.button("Login").clicked()
if ui.button("Login").clicked() && is_focused
|| input_keys.contains(&Keycode::Enter)
&& !(self.login_password.is_empty() && self.login_username.is_empty())
{
Expand Down

0 comments on commit afd1ab4

Please sign in to comment.