add index page with a cards list

src/main.rs

@@ -3,7 +3,7 @@
 #[macro_use] extern crate rocket;
 #[macro_use] extern crate serde;
 
-use serde_json::json;
+use serde_json::{json, Value};
 
 //use rocket::request::FromSegments;
 //use rocket::http::uri::Segments;
@@ -21,37 +21,72 @@ use std::collections::HashMap;
 use std::env;
 use crate::store::form::RenderedField;
 
-#[derive(Serialize)]
+fn render_empty_fields<'a>(store : &'a Store) -> Vec<RenderedField<'a>> {
-struct FormContext<'a> {
+    let indexes = &store.index;
+
+    store.model.fields.iter().map(|(key, field)| {
+        RenderedField::from_template_field(key, field, None, indexes)
+    }).collect()
+}
+
+#[derive(Serialize,Debug)]
+struct RenderedCard<'a> {
     pub fields : Vec<RenderedField<'a>>,
+    pub id : usize,
+}
+
+fn render_card_fields<'a>(store : &'a Store, values : &'a serde_json::Map<String, Value>) -> Vec<RenderedField<'a>> {
+    let indexes = &store.index;
+
+    store.model.fields.iter().map(|(key, field)| {
+        RenderedField::from_template_field(key, field, values.get(key), indexes)
+    }).collect()
+}
+
+#[derive(Serialize,Debug)]
+struct ListContext<'a> {
+    pub fields : Vec<RenderedField<'a>>,
+    pub cards : Vec<RenderedCard<'a>>,
 }
 
 #[get("/")]
 fn index(store : State<RwLock<Store>>) -> Template {
-    let rg = store.read();
 
-    let tags = json!(["foo", "bar"]);
+    let rg = store.read();
 
-    let indexes = &rg.index;
+    let context = ListContext {
-    let context = FormContext {
+        fields: render_empty_fields(&rg),
-        fields: rg.model.fields.iter().map(|(key, field)| {
+        cards: rg.items.iter().filter_map(|(id, card)| {
-            let value = if key == "tags" {
+            if let Value::Object(map) = card {
-                Some(&tags)
+                Some(RenderedCard {
+                    fields: render_card_fields(&rg, map),
+                    id: *id,
+                })
             } else {
                 None
-            };
+            }
-            RenderedField::from_template_field(key, field, value, indexes)
+        }).collect(),
-        }).collect()
     };
 
     Template::render("index", context)
 }
 
-//#[post("/add", data="<record>")]
+#[derive(Serialize)]
-//fn add_part(store : State<RwLock<Store>>, record : Form<store::Part>) -> Redirect {
+struct AddCardContext<'a> {
-//    store.write().add(record.into_inner());
+    pub fields : Vec<RenderedField<'a>>,
-//    Redirect::to(uri!(index))
+}
-//}
+
+#[get("/add")]
+fn add(store : State<RwLock<Store>>) -> Template {
+
+    let rg = store.read();
+
+    let context = AddCardContext {
+        fields: render_empty_fields(&rg)
+    };
+
+    Template::render("add", context)
+}
 
 fn main() {
     let cwd = env::current_dir().unwrap();
@@ -62,5 +97,8 @@ fn main() {
         .attach(Template::fairing())
         .manage(RwLock::new(store))
         .mount("/", StaticFiles::from(cwd.join("templates/static/")))
-        .mount("/", routes![index]).launch();
+        .mount("/", routes![
+            index,
+            add,
+        ]).launch();
 }

src/store/form.rs

@@ -102,6 +102,8 @@ impl<'a> RenderedField<'a> {
 
                 if let Some(Value::String(s)) = value {
                     rendered.value = Cow::Borrowed(&s.as_str());
+                } else if let Some(def) = default {
+                    rendered.value = def.to_owned().into();
                 }
             }
             FieldKind::FreeEnum { enum_group } => {

templates/_fields.html.tera

@@ -0,0 +1,33 @@
+{%- for field in fields %}
+<!-- {{ field.key }} -->
+<div class="Row">
+	{%- if field.kind == "string" -%}
+	{{ form::text(field=field) }}
+
+	{%- elif field.kind == "text" -%}
+	{{ form::longtext(field=field) }}
+
+	{%- elif field.kind == "number" -%}
+	{{ form::number(field=field) }}
+
+	{%- elif field.kind == "bool" -%}
+	{{ form::checkbox(field=field) }}
+
+	{%- elif field.kind == "select" -%}
+	{{ form::select(field=field) }}
+
+	{%- elif field.kind == "free_select" -%}
+	{{ form::free_select(field=field) }}
+
+	{%- elif field.kind == "tags" -%}
+	{{ form::tags(field=field) }}
+
+	{%- elif field.kind == "free_tags" -%}
+	{{ form::free_tags(field=field) }}
+
+	{%- else -%}
+	TODO {{ field.key }}
+
+	{%- endif -%}
+</div>
+{%- endfor %}

templates/_layout.html.tera

@@ -2,12 +2,15 @@
 <html lang="en">
 <head>
 	<meta charset="UTF-8">
-	<title>{% block title %}{% endblock title %}</title>
+	<title>{% block title %}{% endblock title %} &bull; Inventory</title>
 	<link rel="stylesheet" href="style.css">
 	<link rel="stylesheet" href="taggle.css">
 	<script src="taggle.min.js"></script>
 </head>
 <body>
-{% block content %}{% endblock content %}
+<nav class="top-nav">
+	{% block nav %}{% endblock %}
+</nav>
+{% block content %}{% endblock %}
 </body>
 </html>

templates/add.html.tera

@@ -0,0 +1,22 @@
+{% extends "_layout" %}
+{% import "_form_macros" as form %}
+
+{% block title -%}
+	Add Record
+{%- endblock %}
+
+{% block nav -%}
+	<a href="/">Index</a>
+{%- endblock %}
+
+{% block content -%}
+	<form action="/add" method="POST" class="Form">
+		<div class="Row indented">
+			<h1>New Record</h1>
+		</div>
+		{% include "_fields" %}
+		<div class="Row indented">
+			<button type="submit">Add</button>
+		</div>
+	</form>
+{%- endblock %}

templates/index.html.tera

@@ -1,50 +1,41 @@
-{% extends "layout" %}
+{% extends "_layout" %}
-{% import "form_macros" as form %}
+{% import "_form_macros" as form %}
 
 {% block title -%}
-	Form
+	Inventory
-{%- endblock title %}
+{%- endblock %}
 
-{% block content -%}
+{% block nav -%}
-<form action="/add" method="POST" class="Form">
+	<a href="/add">Add</a>
-	<div class="Row indented">
+{%- endblock %}
-		<h1>New Record</h1>
-	</div>
-{%- for field in fields %}
-<!-- {{ field.key }} -->
-<div class="Row">
-	{%- if field.kind == "string" -%}
-		{{ form::text(field=field) }}
-
-	{%- elif field.kind == "text" -%}
-		{{ form::longtext(field=field) }}
-
-	{%- elif field.kind == "number" -%}
-		{{ form::number(field=field) }}
-
-	{%- elif field.kind == "bool" -%}
-		{{ form::checkbox(field=field) }}
-
-	{%- elif field.kind == "select" -%}
-		{{ form::select(field=field) }}
 
-	{%- elif field.kind == "free_select" -%}
+{% block content -%}
-		{{ form::free_select(field=field) }}
+	<table class="cards-table">
-
+		<thead>
-	{%- elif field.kind == "tags" -%}
+		<tr>
-		{{ form::tags(field=field) }}
+			{%- for field in fields %}
-
+			<th>{{ field.label }}</th>
-	{%- elif field.kind == "free_tags" -%}
+			{%- endfor %}
-		{{ form::free_tags(field=field) }}
+		</tr>
-
+		</thead>
-	{%- else -%}
+		<tbody>
-		{{ field.key }}
+		{%- for card in cards %}
-
+			<tr>
-	{%- endif -%}
+			{%- for field in card.fields %}
-</div>
+				<td>
-{%- endfor %}
+				{%- if field.kind == "bool" -%}
-<div class="Row indented">
+					{% if field.checked %}
-	<button type="submit">Add</button>
+						✔
-</div>
+					{% else %}
-</form>
+						✘
-{%- endblock content %}
+					{% endif %}
+				{%- else -%}
+					{{ field.value }}
+				{%- endif -%}
+				</td>
+			{%- endfor %}
+			</tr>
+		{% endfor %}
+		</tbody>
+	</table>
+{%- endblock %}

templates/static/style.css

@@ -12,6 +12,26 @@ html, textarea, select {
 	margin: 0 auto;
 }
 
+nav.top-nav {
+	margin: 0 auto;
+	margin-bottom: .5rem;
+	width: 900px;
+	border-bottom: 1px solid silver;
+}
+
+nav.top-nav a {
+	display: inline-block;
+	padding: .75rem;
+
+	color: gray;
+	text-decoration: none;
+}
+
+nav.top-nav a:hover {
+	color: black;
+	text-decoration: underline;
+}
+
 .Form .Row {
 	display: flex;
 	padding: .25rem;
@@ -85,3 +105,26 @@ textarea:focus,
 	box-shadow: none;
 	outline: 0 none !important;
 }
+
+.cards-table {
+	border-collapse: collapse;
+	margin: 0 auto;
+	margin-top: 1rem;
+}
+
+.cards-table td,
+.cards-table th {
+	padding: .5rem;
+}
+
+.cards-table thead th {
+	border-bottom: 2px solid silver;
+}
+
+.cards-table tbody td {
+	border-bottom: 1px solid silver;
+}
+
+.cards-table tbody tr:last-child td {
+	border-bottom: 2px solid silver;
+}