Pour tout problème contactez-nous par mail : support@froggit.fr | La FAQ :grey_question: | Rejoignez-nous sur le Chat :speech_balloon:

Skip to content
Snippets Groups Projects
Commit 515b638a authored by peterrabbit's avatar peterrabbit
Browse files

wip page body

parent 5d479ca1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
example.json
+ 15
− 23
View file @ 515b638a
...@@ -11,29 +11,21 @@ ...@@ -11,29 +11,21 @@
}, },
"body": [ "body": [
{ {
"layout": { "tag": "h1",
"display": "flex", "text": "Pijar Story"
"padding": "20px" },
}, {
"contents": [ "tag": "p",
{ "text": "Hello Pijar<br />Oui oui oui.",
"tag": "h1", "attrs": {
"text": "Pijar Story" "class": "pijar_p_class"
}, }
{ },
"tag": "p", {
"text": "Hello Pijar<br />Oui oui oui.", "tag": "img",
"attrs": { "attrs": {
"class": "pijar_p_class" "src": "/img/url.png"
} }
},
{
"tag": "img",
"attrs": {
"src": "/img/url.png"
}
}
]
} }
], ],
"sub_pages": [] "sub_pages": []
......
src/testing.rs
+ 14
− 34
View file @ 515b638a
...@@ -14,16 +14,8 @@ pub const TEST_JSON_WEBSITE: &'static str = " ...@@ -14,16 +14,8 @@ pub const TEST_JSON_WEBSITE: &'static str = "
}, },
\"body\": [ \"body\": [
{ {
\"layout\": { \"tag\": \"h1\",
\"display\": \"flex\", \"text\": \"testing\"
\"padding\": \"20px\"
},
\"contents\": [
{
\"tag\": \"h1\",
\"text\": \"testing\"
}
]
} }
], ],
\"sub_pages\": [ \"sub_pages\": [
...@@ -40,16 +32,8 @@ pub const TEST_JSON_WEBSITE: &'static str = " ...@@ -40,16 +32,8 @@ pub const TEST_JSON_WEBSITE: &'static str = "
}, },
\"body\": [ \"body\": [
{ {
\"layout\": { \"tag\": \"h1\",
\"display\": \"flex\", \"text\": \"testing subpage\"
\"padding\": \"20px\"
},
\"contents\": [
{
\"tag\": \"h1\",
\"text\": \"testing subpage\"
}
]
} }
], ],
\"sub_pages\": [ \"sub_pages\": [
...@@ -65,17 +49,9 @@ pub const TEST_JSON_WEBSITE: &'static str = " ...@@ -65,17 +49,9 @@ pub const TEST_JSON_WEBSITE: &'static str = "
\"lang\":\"en\" \"lang\":\"en\"
}, },
\"body\": [ \"body\": [
{ {
\"layout\": { \"tag\": \"h1\",
\"display\": \"flex\", \"text\": \"testing nested\"
\"padding\": \"20px\"
},
\"contents\": [
{
\"tag\": \"h1\",
\"text\": \"testing nested\"
}
]
} }
] ]
} }
...@@ -97,13 +73,17 @@ pub const TEST_JSON_WEBSITE: &'static str = " ...@@ -97,13 +73,17 @@ pub const TEST_JSON_WEBSITE: &'static str = "
\"display\": \"grid\" \"display\": \"grid\"
}, },
\"contents\": [ \"contents\": [
{
\"tag\": \"nav\"
},
{ {
\"tag\": \"nav\", \"tag\": \"nav\",
\"contents\": [] \"attrs\": {
\"id\": \"page-body\"
}
}, },
{ {
\"tag\": \"footer\", \"tag\": \"footer\"
\"contents\": []
} }
] ]
} }
......
src/website/item.rs
+ 7
− 56
View file @ 515b638a
use super::css::StyleSheet;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::HashMap; use std::collections::HashMap;
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct Item {
pub contents: Vec<HtmlElement>,
pub layout: StyleSheet,
}
impl std::fmt::Display for Item {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(
f,
"{}",
self.contents
.iter()
.map(|item_content| item_content.to_string())
.collect::<Vec<String>>()
.join("")
)
}
}
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
pub struct HtmlAttributes(pub HashMap<String, String>); pub struct HtmlAttributes(pub HashMap<String, String>);
...@@ -58,6 +37,12 @@ pub struct HtmlElement { ...@@ -58,6 +37,12 @@ pub struct HtmlElement {
pub attrs: HtmlAttributes, pub attrs: HtmlAttributes,
} }
impl HtmlElement {
pub fn set_contents(&mut self, contents: Vec<HtmlElement>) {
self.contents = Some(contents);
}
}
impl std::fmt::Display for HtmlElement { impl std::fmt::Display for HtmlElement {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
let body = match &self.contents { let body = match &self.contents {
...@@ -79,7 +64,6 @@ impl std::fmt::Display for HtmlElement { ...@@ -79,7 +64,6 @@ impl std::fmt::Display for HtmlElement {
#[cfg(test)] #[cfg(test)]
mod test_items { mod test_items {
use super::*; use super::*;
use std::collections::HashMap;
#[test] #[test]
fn text_item_content_to_string() { fn text_item_content_to_string() {
...@@ -98,7 +82,7 @@ mod test_items { ...@@ -98,7 +82,7 @@ mod test_items {
let mut attrs = HtmlAttributes::new(); let mut attrs = HtmlAttributes::new();
attrs.0.insert(String::from("id"), String::from("some-id")); attrs.0.insert(String::from("id"), String::from("some-id"));
let mut item_content = HtmlElement { let item_content = HtmlElement {
tag: String::from("p"), tag: String::from("p"),
text: Some(String::from("Hello")), text: Some(String::from("Hello")),
contents: None, contents: None,
...@@ -106,16 +90,6 @@ mod test_items { ...@@ -106,16 +90,6 @@ mod test_items {
}; };
assert_eq!(item_content.to_string(), "<p id=\"some-id\">Hello</p>"); assert_eq!(item_content.to_string(), "<p id=\"some-id\">Hello</p>");
item_content
.attrs
.0
.insert(String::from("class"), String::from("some-class"));
assert_eq!(
item_content.to_string(),
"<p id=\"some-id\" class=\"some-class\">Hello</p>"
);
} }
#[test] #[test]
...@@ -145,27 +119,4 @@ mod test_items { ...@@ -145,27 +119,4 @@ mod test_items {
"<p><span>Hello </span><b>World</b></p>" "<p><span>Hello </span><b>World</b></p>"
) )
} }
#[test]
fn item_to_string() {
let item = Item {
layout: StyleSheet(HashMap::new()),
contents: vec![
HtmlElement {
tag: String::from("span"),
text: Some(String::from("Hello ")),
contents: None,
attrs: HtmlAttributes::new(),
},
HtmlElement {
tag: String::from("b"),
text: Some(String::from("World")),
contents: None,
attrs: HtmlAttributes::new(),
},
],
};
assert_eq!(item.to_string(), "<span>Hello </span><b>World</b>")
}
} }
src/website/page.rs
+ 8
− 8
View file @ 515b638a
...@@ -23,7 +23,7 @@ pub struct PageTemplate { ...@@ -23,7 +23,7 @@ pub struct PageTemplate {
} }
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
pub struct PageBody(Vec<Item>); pub struct PageBody(Vec<HtmlElement>);
impl std::fmt::Display for PageBody { impl std::fmt::Display for PageBody {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
...@@ -59,13 +59,13 @@ impl Page { ...@@ -59,13 +59,13 @@ impl Page {
let mut body = template.clone(); let mut body = template.clone();
self.template = Some(template); self.template = Some(template);
let err = "Couldn't find page-body placeholder"; let err = "Couldn't find page-body placeholder";
let body_container = body body.contents
.contents .iter_mut()
.iter() .find(|el| el.attrs.get("id").unwrap_or(&String::new()).eq("page-body"))
.find(|el| el.attrs.get("id").expect(err).eq("page-body")) .expect(err)
.expect(err); .set_contents(self.body.0.clone());
// HINT use HashMap::extend() to insert many values
// TODO concat template with page body (template should have a page body placeholder) self.body.0 = body.contents;
} }
pub fn text_from_key(&self, key: String) -> String { pub fn text_from_key(&self, key: String) -> String {
......
templates/new_website.json
+ 2
− 7
View file @ 515b638a
...@@ -11,13 +11,8 @@ ...@@ -11,13 +11,8 @@
}, },
"body": [ "body": [
{ {
"layout": {}, "tag": "h1",
"contents": [ "text": "New website"
{
"tag": "h1",
"text": "New website"
}
]
} }
] ]
}, },
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Froggit est fièrement fabriqué avec amour par Lydra avec des Logiciels Libres et hébergé en France chez Scaleway | Status du service