diff --git a/.gitignore b/.gitignore index 8c3b49d..9991d51 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,8 @@ + /target -# old data directory -/boards - -# new data directory, specified in default config file +# new data directory, specified in config gile +# NOTE: this config file does not yet exist /data Cargo.lock diff --git a/src/html/boards.rs b/src/html/boards.rs index 3ff3940..b9c3f10 100644 --- a/src/html/boards.rs +++ b/src/html/boards.rs @@ -79,7 +79,7 @@ pub async fn get_board( "messages" => to_json(&a.messages), "user" => match uid { Ok(a) => to_json(data.user_manager.lock().unwrap().get_user_by_id(a.id)), - Err(_) => to_json("null") + Err(_) => to_json(None::>) }, "board" => to_json(a) ); diff --git a/src/res/board.hbs b/src/res/board.hbs index f7f99a2..eb9e973 100644 --- a/src/res/board.hbs +++ b/src/res/board.hbs @@ -4,7 +4,7 @@ - {{> board_bar board=board}} + {{> board_bar board=board user=user}}
diff --git a/src/res/board_index.hbs b/src/res/board_index.hbs index 585c722..246cc8d 100644 --- a/src/res/board_index.hbs +++ b/src/res/board_index.hbs @@ -15,14 +15,14 @@
{{#each boards}} - - + + + + {{#if time_meta}} + + {{else}} + + {{/if}} {{/each}}
NameDescriptionLast Active
{{title}}{{desc}} - {{#if time_meta}} - {{time_meta.0}} {{time_meta.1}} - {{else}} - Never - {{/if}} -
{{title}}{{desc}}{{time_meta.0}} {{time_meta.1}}Never
diff --git a/src/res/snippets/board_bar.hbs b/src/res/snippets/board_bar.hbs index 5c35688..b16ecb3 100644 --- a/src/res/snippets/board_bar.hbs +++ b/src/res/snippets/board_bar.hbs @@ -7,5 +7,5 @@
{{board.desc}}
- {{> login_status}} + {{> login_status user=user}}