From 82c3cc2c1952020ef13c330047cbc8ba1dc7cc75 Mon Sep 17 00:00:00 2001
From: Kevin J Hoerr <kjhoerr@submelon.tech>
Date: Wed, 30 Oct 2019 13:14:09 -0400
Subject: Refactor routes and scope into routes module

---
 src/main.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index 1b5ac70..b5bab39 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,11 +14,10 @@ pub mod messages;
 pub mod routes;
 pub mod schema;
 
-use actix_web::{middleware, web::route, web::scope, App, HttpServer};
+use actix_web::{middleware, App, HttpServer};
 use diesel::pg::PgConnection;
 use diesel::prelude::*;
 use dotenv::dotenv;
-use routes::*;
 use std::{env, io::Error};
 
 fn main() {
@@ -29,6 +28,7 @@ fn main() {
     }
 }
 
+// Run start-up for the server and dependencies
 fn run() -> Result<(), Error> {
     dotenv().ok();
     let db_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
@@ -40,11 +40,9 @@ fn run() -> Result<(), Error> {
     PgConnection::establish(&db_url).expect(&format!("Error connecting to {}", db_url));
 
     HttpServer::new(|| {
-        App::new().wrap(middleware::Logger::default()).service(
-            scope("/api")
-                .service(scope("/callback").default_service(route().to(callback)))
-                .default_service(route().to(not_understood)),
-        )
+        App::new()
+            .wrap(middleware::Logger::default())
+            .service(routes::get_scope())
     })
     .bind(&bind_address)?
     .start();
-- 
cgit