Skip to content

Commit 2981fea

Browse files
committed
fix(homepage): use hyData
1 parent fae9ba2 commit 2981fea

File tree

2 files changed

+33
-27
lines changed

2 files changed

+33
-27
lines changed

Diff for: crates/rari-doc/src/pages/json.rs

+9-4
Original file line numberDiff line numberDiff line change
@@ -346,17 +346,22 @@ where
346346
}
347347
#[derive(Debug, Clone, Serialize)]
348348
#[serde(rename_all = "camelCase")]
349-
pub struct JsonHomePageSPA {
350-
pub slug: &'static str,
351-
pub url: String,
352-
pub page_title: &'static str,
349+
pub struct JsonHomePageSPAHyData {
353350
pub page_description: Option<&'static str>,
354351
pub featured_articles: Vec<HomePageFeaturedArticle>,
355352
pub featured_contributor: Option<HomePageFeaturedContributor>,
356353
pub latest_news: ItemContainer<HomePageLatestNewsItem>,
357354
pub recent_contributions: ItemContainer<HomePageRecentContribution>,
358355
}
359356

357+
#[derive(Debug, Clone, Serialize)]
358+
#[serde(rename_all = "camelCase")]
359+
pub struct JsonHomePageSPA {
360+
pub hy_data: JsonHomePageSPAHyData,
361+
pub page_title: &'static str,
362+
pub url: String,
363+
}
364+
360365
#[derive(Debug, Clone, Serialize)]
361366
#[serde(rename_all = "camelCase")]
362367
pub struct JsonGenericHyData {

Diff for: crates/rari-doc/src/pages/types/spa.rs

+24-23
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::cached_readers::blog_files;
1717
use crate::error::DocError;
1818
use crate::pages::json::{
1919
BlogIndex, BuiltDocy, HyData, ItemContainer, JsonBasicSPA, JsonBlogPost, JsonBlogPostDoc,
20-
JsonHomePageSPA,
20+
JsonHomePageSPA, JsonHomePageSPAHyData,
2121
};
2222
use crate::pages::page::{Page, PageLike, PageReader};
2323
use crate::pages::title::page_title;
@@ -129,30 +129,31 @@ impl SPA {
129129
url: strcat!(self.base_slug.as_ref() self.slug),
130130
}))),
131131
SPAData::HomePage => Ok(BuiltDocy::HomePageSPA(Box::new(JsonHomePageSPA {
132-
slug: self.slug,
133132
url: strcat!("/" self.locale().as_url_str() "/" self.slug),
134133
page_title: self.page_title,
135-
page_description: self.page_description,
136-
featured_articles: featured_articles(
137-
&[
138-
"/en-US/blog/mdn-scrimba-partnership/",
139-
"/en-US/blog/learn-javascript-console-methods/",
140-
"/en-US/blog/introduction-to-web-sustainability/",
141-
"/en-US/docs/Web/API/CSS_Custom_Highlight_API",
142-
],
143-
self.locale,
144-
)?,
145-
featured_contributor: featured_contributor(self.locale)?,
146-
latest_news: ItemContainer {
147-
items: lastet_news(&[
148-
"/en-US/blog/mdn-scrimba-partnership/",
149-
"/en-US/blog/mdn-http-observatory-launch/",
150-
"/en-US/blog/mdn-curriculum-launch/",
151-
"/en-US/blog/baseline-evolution-on-mdn/",
152-
])?,
153-
},
154-
recent_contributions: ItemContainer {
155-
items: recent_contributions()?,
134+
hy_data: JsonHomePageSPAHyData {
135+
page_description: self.page_description,
136+
featured_articles: featured_articles(
137+
&[
138+
"/en-US/blog/mdn-scrimba-partnership/",
139+
"/en-US/blog/learn-javascript-console-methods/",
140+
"/en-US/blog/introduction-to-web-sustainability/",
141+
"/en-US/docs/Web/API/CSS_Custom_Highlight_API",
142+
],
143+
self.locale,
144+
)?,
145+
featured_contributor: featured_contributor(self.locale)?,
146+
latest_news: ItemContainer {
147+
items: lastet_news(&[
148+
"/en-US/blog/mdn-scrimba-partnership/",
149+
"/en-US/blog/mdn-http-observatory-launch/",
150+
"/en-US/blog/mdn-curriculum-launch/",
151+
"/en-US/blog/baseline-evolution-on-mdn/",
152+
])?,
153+
},
154+
recent_contributions: ItemContainer {
155+
items: recent_contributions()?,
156+
},
156157
},
157158
}))),
158159
}

0 commit comments

Comments
 (0)