frontend v0.4.1

- fixed most of the bugs with the rewrite. should be ready to deploy now

backend/src/api/space.rs

@@ -1,17 +1,15 @@
-use crate::error::ApiResult;
-use crate::model::space::{Space, SpaceDto};
-use crate::model::space::Channel;
-use crate::repo::{SpaceRepo, ChannelRepo};
-use rocket::serde::json::Json;
-use rocket::State;
-use std::sync::Arc;
 use crate::api::auth::Session;
+use crate::error::ApiResult;
+use crate::model::space::Channel;
+use crate::model::space::{Space, SpaceDto};
+use crate::repo::{ChannelRepo, SpaceRepo};
 use crate::svc::chat_svc::ChatService;
+use rocket::State;
+use rocket::serde::json::Json;
+use std::sync::Arc;
 
 #[get("/spaces")]
-pub async fn list_spaces(
-    space_repo: &State<Arc<dyn SpaceRepo>>
-) -> ApiResult<Json<Vec<Space>>> {
+pub async fn list_spaces(space_repo: &State<Arc<dyn SpaceRepo>>) -> ApiResult<Json<Vec<Space>>> {
     let spaces = space_repo.get_all().await?;
     Ok(Json(spaces))
 }
@@ -19,7 +17,7 @@ pub async fn list_spaces(
 #[get("/spaces/<space_id>/channels")]
 pub async fn list_channels(
     space_id: i64,
-    channel_repo: &State<Arc<dyn ChannelRepo>>
+    channel_repo: &State<Arc<dyn ChannelRepo>>,
 ) -> ApiResult<Json<Vec<Channel>>> {
     let channels = channel_repo.get_by_space_id(space_id).await?;
     Ok(Json(channels))
@@ -28,9 +26,8 @@ pub async fn list_channels(
 #[get("/accessible_channels")]
 pub async fn get_accessible_channels(
     session: Session,
-    svc: &State<ChatService>
+    svc: &State<ChatService>,
 ) -> ApiResult<Json<Vec<SpaceDto>>> {
     let space = svc.get_accessible_channels(session.uid).await?;
-    println!("{:?}", space);
     Ok(Json(space))
-}
+}