From b6ae1062e34f06645e2d93a2ab7fc959359db637 Mon Sep 17 00:00:00 2001
From: Jonni Liljamo <jonni@liljamo.com>
Date: Thu, 9 Mar 2023 12:08:26 +0200
Subject: [PATCH] feat(client): move connect menu structs to mod from ui

---
 client/src/plugins/menu/ui/connect/mod.rs | 22 ++++++++++++++++++++
 client/src/plugins/menu/ui/connect/ui.rs  | 25 ++---------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/client/src/plugins/menu/ui/connect/mod.rs b/client/src/plugins/menu/ui/connect/mod.rs
index 93722d3..11fd2d3 100644
--- a/client/src/plugins/menu/ui/connect/mod.rs
+++ b/client/src/plugins/menu/ui/connect/mod.rs
@@ -6,5 +6,27 @@
  * See LICENSE for licensing information.
  */
 
+use bevy::ecs::system::Resource;
+
 mod ui;
 pub use ui::*;
+
+#[derive(Default, Resource)]
+pub struct ConnectScreenData {
+    pub state: ConnectState,
+    pub connecting: bool,
+    pub username: String,
+    pub email: String,
+    pub password: String,
+    pub password_confirm: String,
+    pub error: String,
+}
+
+#[derive(Default, PartialEq)]
+pub enum ConnectState {
+    #[default]
+    Login,
+    LoggingIn,
+    Register,
+    Registering,
+}
diff --git a/client/src/plugins/menu/ui/connect/ui.rs b/client/src/plugins/menu/ui/connect/ui.rs
index 3869cce..0cd5fc2 100644
--- a/client/src/plugins/menu/ui/connect/ui.rs
+++ b/client/src/plugins/menu/ui/connect/ui.rs
@@ -6,10 +6,7 @@
  * See LICENSE for licensing information.
  */
 
-use bevy::ecs::{
-    system::Resource,
-    system::{Res, ResMut},
-};
+use bevy::ecs::system::{Res, ResMut};
 use bevy_inspector_egui::bevy_egui::{egui, EguiContext};
 use laurelin_shared::server::messages::Auth;
 use naia_bevy_client::Client;
@@ -19,25 +16,7 @@ use crate::{
     util::egui::{menuwindow, password},
 };
 
-#[derive(Default, Resource)]
-pub struct ConnectScreenData {
-    pub state: ConnectState,
-    pub connecting: bool,
-    pub username: String,
-    pub email: String,
-    pub password: String,
-    pub password_confirm: String,
-    pub error: String,
-}
-
-#[derive(Default, PartialEq)]
-pub enum ConnectState {
-    #[default]
-    Login,
-    LoggingIn,
-    Register,
-    Registering,
-}
+use super::{ConnectScreenData, ConnectState};
 
 pub fn ui(
     mut egui_context: ResMut<EguiContext>,
-- 
2.44.1