diff --git a/src/main.rs b/src/main.rs index 5afa2b6..fabac6c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,15 +6,6 @@ mod io; mod tests; fn construct_main_page() { - // Specify info to go onto the base page - let base_page = build_html::HtmlPage::new() - .with_head_link("favicon.ico", "icon") // Favicon - .with_stylesheet("style.css") // Link stylesheet - .with_meta(vec![("charset", "UTF-8")]) - .with_meta(vec![("name", "viewport"), ("content", "width=device-width, initial-scale=1")]) // Display stuff - .with_meta(vec![("name", "description"), ("content", structures::DESCRIPTION)]) // Add the description - .with_title(structures::TITLE); - // Create the footer let footer = Container::new(ContainerType::Footer) .with_raw(r#"
Tags: "#); // Begin paragraph element for x in tags { // Go through the list of tags tags_html.push_str(format!("{},", x, x).as_str()); // Append the tags as a link } tags_html.push_str(r#"
"#); // End the paragraph - home_page.add_raw(tags_html); // Add the string as html to the page - home_page.add_raw(r#""#); // End the italics - // Append recipes - home_page.add_header(2, "Recipes:"); + // Recipes let mut recipes_container = Container::new(ContainerType::UnorderedList); for i in recipes { let mut link = String::new(); @@ -55,8 +36,24 @@ fn construct_main_page() { recipes_container.add_link(link, &i.name); } - home_page.add_container(recipes_container); - home_page.add_container(footer); + // Create home page + let home_page = build_html::HtmlPage::new() + .with_head_link("favicon.ico", "icon") // Favicon + .with_stylesheet("style.css") // Link stylesheet + .with_meta(vec![("charset", "UTF-8")]) + .with_meta(vec![("name", "viewport"), ("content", "width=device-width, initial-scale=1")]) // Display stuff + .with_meta(vec![("name", "description"), ("content", structures::DESCRIPTION)]) // Add the description + .with_title(structures::TITLE) + .with_header(1, structures::HEADER) + .with_raw(r#"