Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita54d47c

Browse files
Dan docs 2 (#1252)
1 parent48f5b46 commita54d47c

File tree

1 file changed

+53
-23
lines changed

1 file changed

+53
-23
lines changed

‎pgml-dashboard/src/api/cms.rs‎

Lines changed: 53 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@ use std::path::{Path, PathBuf};
33
use comrak::{format_html_with_plugins, parse_document,Arena,ComrakPlugins};
44
use lazy_static::lazy_static;
55
use markdown::mdast::Node;
6-
use rocket::{
7-
fs::NamedFile,
8-
http::{uri::Origin,Status},
9-
route::Route,
10-
State,
11-
};
6+
use rocket::{fs::NamedFile, http::uri::Origin, route::Route,State};
127
use yaml_rust::YamlLoader;
138

149
usecrate::{
@@ -39,11 +34,19 @@ pub struct Document {
3934
}
4035

4136
implDocument{
37+
pubfnnew(content:&str) ->Document{
38+
Document{
39+
path:PathBuf::new(),
40+
description:None,
41+
image:None,
42+
title:"404".to_string(),
43+
toc_links:Vec::new(),
44+
html: content.to_string(),
45+
}
46+
}
47+
4248
pubasyncfnfrom_path(path:&PathBuf) -> anyhow::Result<Document, std::io::Error>{
43-
let contents =match tokio::fs::read_to_string(&path).await{
44-
Ok(contents) => contents,
45-
Err(_) =>String::from("<h3>Failed to find your requested document!</h3>"),
46-
};
49+
let contents = tokio::fs::read_to_string(&path).await?;
4750

4851
let parts = contents.split("---").collect::<Vec<&str>>();
4952

@@ -156,7 +159,7 @@ impl Collection {
156159
mutpath:PathBuf,
157160
cluster:&Cluster,
158161
origin:&Origin<'_>,
159-
) ->Result<ResponseOk,Status>{
162+
) ->Result<ResponseOk,crate::responses::NotFound>{
160163
info!("get_content: {} | {path:?}",self.name);
161164

162165
if origin.path().ends_with("/"){
@@ -273,17 +276,21 @@ impl Collection {
273276
}
274277

275278
// renders document in layout
276-
asyncfnrender<'a>(&self,path:&'aPathBuf,cluster:&Cluster) ->Result<ResponseOk,Status>{
279+
asyncfnrender<'a>(
280+
&self,
281+
path:&'aPathBuf,
282+
cluster:&Cluster,
283+
) ->Result<ResponseOk,crate::responses::NotFound>{
284+
let user =if cluster.context.user.is_anonymous(){
285+
None
286+
}else{
287+
Some(cluster.context.user.clone())
288+
};
289+
277290
matchDocument::from_path(&path).await{
278291
Ok(doc) =>{
279292
let index =self.open_index(doc.path);
280293

281-
let user =if cluster.context.user.is_anonymous(){
282-
None
283-
}else{
284-
Some(cluster.context.user.clone())
285-
};
286-
287294
letmut layout =crate::templates::Layout::new(&doc.title,Some(cluster));
288295
ifletSome(image) = doc.image{
289296
layout.image(&config::asset_url(image.into()));
@@ -306,7 +313,30 @@ impl Collection {
306313
))
307314
}
308315
// Return page not found on bad path
309-
_ =>Err(Status::NotFound),
316+
_ =>{
317+
letmut layout =crate::templates::Layout::new("404",None);
318+
319+
let doc =crate::api::cms::Document::new(
320+
r#"
321+
<div style='height: 80vh'>
322+
<h2>Oops, document not found!</h2>
323+
<p>The document you are searching for may have been moved or replaced with better content.</p>
324+
</div>"#,
325+
);
326+
327+
ifletSome(user) =&user{
328+
layout.user(user);
329+
}
330+
331+
layout
332+
.nav_links(&self.index)
333+
.nav_title(&self.name)
334+
.footer(cluster.context.marketing_footer.to_string());
335+
336+
layout.render(crate::templates::Article{content: doc.html});
337+
338+
Err(crate::responses::NotFound(layout.into()))
339+
}
310340
}
311341
}
312342
}
@@ -344,7 +374,7 @@ async fn get_blog(
344374
path:PathBuf,
345375
cluster:&Cluster,
346376
origin:&Origin<'_>,
347-
) ->Result<ResponseOk,Status>{
377+
) ->Result<ResponseOk,crate::responses::NotFound>{
348378
BLOG.get_content(path, cluster, origin).await
349379
}
350380

@@ -353,7 +383,7 @@ async fn get_careers(
353383
path:PathBuf,
354384
cluster:&Cluster,
355385
origin:&Origin<'_>,
356-
) ->Result<ResponseOk,Status>{
386+
) ->Result<ResponseOk,crate::responses::NotFound>{
357387
CAREERS.get_content(path, cluster, origin).await
358388
}
359389

@@ -362,7 +392,7 @@ async fn get_docs(
362392
path:PathBuf,
363393
cluster:&Cluster,
364394
origin:&Origin<'_>,
365-
) ->Result<ResponseOk,Status>{
395+
) ->Result<ResponseOk,crate::responses::NotFound>{
366396
DOCS.get_content(path, cluster, origin).await
367397
}
368398

@@ -550,7 +580,7 @@ This is the end of the markdown
550580
let rsp = req.dispatch().await;
551581

552582
assert!(
553-
rsp.status() ==Status::Ok,
583+
rsp.status() ==Status::NotFound,
554584
"Returned status {:?}",
555585
rsp.status()
556586
);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp