Start an actual design

src/routes/blogs.rs

@@ -14,10 +14,11 @@ use models::users::User;
 use utils;
 
 #[get("/~/<name>", rank = 2)]
-fn details(name: String, conn: DbConn) -> Template {
+fn details(name: String, conn: DbConn, user: Option<User>) -> Template {
     let blog = Blog::find_by_actor_id(&*conn, name).unwrap();    
     Template::render("blogs/details", json!({
-        "blog": blog
+        "blog": blog,
+        "account": user
     }))
 }
 
@@ -28,8 +29,10 @@ fn activity_details(name: String, conn: DbConn) -> ActivityPub {
 }
 
 #[get("/blogs/new")]
-fn new(_user: User) -> Template {
-    Template::render("blogs/new", HashMap::<String, i32>::new())
+fn new(user: User) -> Template {
+    Template::render("blogs/new", json!({
+        "account": user
+    }))
 }
 
 #[derive(FromForm)]

src/routes/comments.rs

@@ -10,10 +10,11 @@ use models::posts::Post;
 use models::users::User;
 
 #[get("/~/<_blog>/<slug>/comment")]
-fn new(_blog: String, slug: String, _user: User, conn: DbConn) -> Template {
+fn new(_blog: String, slug: String, user: User, conn: DbConn) -> Template {
     let post = Post::find_by_slug(&*conn, slug).unwrap();
     Template::render("comments/new", json!({
         "post": post,
+        "account": user
     }))
 }
 

src/routes/instance.rs

@@ -5,14 +5,16 @@ use std::collections::HashMap;
 
 use BASE_URL;
 use db_conn::DbConn;
+use models::users::User;
 use models::instance::*;
 
 #[get("/")]
-fn index(conn: DbConn) -> Template {
+fn index(conn: DbConn, user: Option<User>) -> Template {
     match Instance::get_local(&*conn) {
         Some(inst) => {
             Template::render("instance/index", json!({
-                "instance": inst
+                "instance": inst,
+                "account": user
             }))
         }
         None => {
@@ -25,7 +27,7 @@ fn index(conn: DbConn) -> Template {
 
 #[get("/configure")]
 fn configure() -> Template {
-    Template::render("instance/configure", HashMap::<String, i32>::new())
+    Template::render("instance/configure", json!({}))
 }
 
 #[derive(FromForm)]

src/routes/posts.rs

@@ -18,7 +18,7 @@ use models::users::User;
 use utils;
 
 #[get("/~/<blog>/<slug>", rank = 4)]
-fn details(blog: String, slug: String, conn: DbConn) -> Template {
+fn details(blog: String, slug: String, conn: DbConn, user: Option<User>) -> Template {
     let blog = Blog::find_by_actor_id(&*conn, blog).unwrap();
     let post = Post::find_by_slug(&*conn, slug).unwrap();
     let comments = Comment::for_post(&*conn, post.id);    
@@ -32,7 +32,8 @@ fn details(blog: String, slug: String, conn: DbConn) -> Template {
                 "author": c.get_author(&*conn)
             })
         }).collect::<Vec<serde_json::Value>>(),
-        "n_likes": post.get_likes(&*conn).len()
+        "n_likes": post.get_likes(&*conn).len(),
+        "account": user
     }))
 }
 
@@ -52,8 +53,10 @@ fn new_auth(_blog: String) -> Redirect {
 }
 
 #[get("/~/<_blog>/new", rank = 1)]
-fn new(_blog: String, _user: User) -> Template {
-    Template::render("posts/new", HashMap::<String, String>::new())
+fn new(_blog: String, user: User) -> Template {
+    Template::render("posts/new", json!({
+        "account": user
+    }))
 }
 
 #[derive(FromForm)]

src/routes/session.rs

@@ -9,8 +9,10 @@ use db_conn::DbConn;
 use models::users::{User, AUTH_COOKIE};
 
 #[get("/login")]
-fn new() -> Template {
-    Template::render("session/login", HashMap::<String, String>::new())
+fn new(user: Option<User>) -> Template {
+    Template::render("session/login", json!({
+        "account": user
+    }))
 }
 
 #[derive(FromForm)]

src/routes/user.rs

@@ -19,10 +19,11 @@ fn me(user: User) -> Redirect {
 }
 
 #[get("/@/<name>", rank = 2)]
-fn details(name: String, conn: DbConn) -> Template {
+fn details(name: String, conn: DbConn, account: Option<User>) -> Template {
     let user = User::find_by_fqn(&*conn, name).unwrap();
     Template::render("users/details", json!({
-        "user": serde_json::to_value(user).unwrap()
+        "user": serde_json::to_value(user).unwrap(),
+        "account": account
     }))
 }
 
@@ -44,8 +45,10 @@ fn activity_details(name: String, conn: DbConn) -> ActivityPub {
 }
 
 #[get("/users/new")]
-fn new() -> Template {
-    Template::render("users/new", HashMap::<String, i32>::new())
+fn new(user: Option<User>) -> Template {
+    Template::render("users/new", json!({
+        "account": user
+    }))
 }
 
 #[derive(FromForm)]