From 9d264cf3b5c5af09fd7882f6fa8193d7f38f9935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= <victorcoder2@gmail.com>
Date: Tue, 9 Mar 2021 00:34:21 +0100
Subject: [PATCH] server.rs removed

---
 src/main.rs      | 8 ++++----
 src/routes/ws.rs | 3 ++-
 src/server.rs    | 6 ------
 3 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 src/server.rs

diff --git a/src/main.rs b/src/main.rs
index e3d5d1d..5db9b47 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,13 +1,13 @@
 mod actors;
+mod constants;
 mod messages;
 mod models;
 mod routes;
-mod server;
-mod constants;
 
-use crate::{actors::chat_server::ChatServer, models::AppState, server::init};
+use crate::{actors::chat_server::ChatServer, models::AppState};
 use actix::Actor;
 use actix_web::{App, HttpServer};
+use routes::ws::connect;
 
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
@@ -15,7 +15,7 @@ async fn main() -> std::io::Result<()> {
     HttpServer::new(move || {
         App::new()
             .data(AppState { chat: chat.clone() })
-            .configure(init)
+            .service(connect)
     })
     .bind("127.0.0.1:8080")?
     .run()
diff --git a/src/routes/ws.rs b/src/routes/ws.rs
index 887cbea..a2aa223 100644
--- a/src/routes/ws.rs
+++ b/src/routes/ws.rs
@@ -1,7 +1,8 @@
 use crate::{actors::chat_session::WsChatSession, models::AppState};
-use actix_web::{web, HttpRequest, Responder};
+use actix_web::{get, web, HttpRequest, Responder};
 use actix_web_actors::ws;
 
+#[get("/ws")]
 pub async fn connect(
     req: HttpRequest,
     stream: web::Payload,
diff --git a/src/server.rs b/src/server.rs
deleted file mode 100644
index 2a7ed1d..0000000
--- a/src/server.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use crate::routes::ws::connect;
-use actix_web::web;
-
-pub fn init(app: &mut web::ServiceConfig) {
-    app.service(web::resource("/ws").to(connect));
-}