diff --git a/README.md b/README.md index f5fccb633e723b1d6385ee093309fb5a9cc93e5b..e20955d774207a1ddcf0f1289955b9d3dfde78c3 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,7 @@ _Env vars may be defined in a .env file at the root of the project_ ## Tests Create a public/standard/test_sitemap.xml file with a sitemap structure in order to pass the tests. +Create a public/testing empty directory ## Admin panel - create a Play Button **Syntax** diff --git a/admin-frontend/src/xhr.js b/admin-frontend/src/xhr.js index 5fc0148ff0d28e8c48bc08947afaaa348731a9db..a650a6d56620d976e02130ec6aebe703ebf7f9ec 100644 --- a/admin-frontend/src/xhr.js +++ b/admin-frontend/src/xhr.js @@ -1,4 +1,4 @@ -async function fetch_article(article_id) { +function fetch_article(article_id) { return new Promise((resolve, reject) => { fetch(`/article/${article_id}`).then(async res => { if (res.status >= 400 && res.status < 600) { @@ -11,7 +11,7 @@ async function fetch_article(article_id) { }) } -async function fetch_articles_by_category(category) { +function fetch_articles_by_category(category) { return new Promise((resolve, reject) => { fetch(`/articles/${category}`).then(async res => { if (res.status >= 400 && res.status < 600) { @@ -24,7 +24,7 @@ async function fetch_articles_by_category(category) { }) } -async function fetch_post_article(article_data) { +function fetch_post_article(article_data) { return new Promise((resolve, reject) => { fetch("/post-article", { credentials: 'include', @@ -47,7 +47,7 @@ async function fetch_post_article(article_data) { }) } -async function fetch_update_article(article_data) { +function fetch_update_article(article_data) { return new Promise((resolve, reject) => { fetch(`/update-article/${article_data._id.$oid}`, { credentials: 'include', @@ -70,7 +70,7 @@ async function fetch_update_article(article_data) { }) } -async function fetch_delete_article(article_id) { +function fetch_delete_article(article_id) { return new Promise((resolve, reject) => { fetch(`/delete-article/${article_id}`, { credentials: 'include', @@ -88,7 +88,7 @@ async function fetch_delete_article(article_id) { }); } -async function fetch_all_articles() { +function fetch_all_articles() { return new Promise((resolve, reject) => { fetch(`/articles`) .then(async res => { diff --git a/src/tls.rs b/src/tls.rs index f92d23a7cd7a8e5cdc56690ca20516f862d29a7b..6106c5a414bc51c67c5e9785c698bce0b86969bf 100644 --- a/src/tls.rs +++ b/src/tls.rs @@ -21,12 +21,11 @@ pub fn get_tls_config() -> ServerConfig { let host = env_var("SERVER_HOST").expect("SERVER_HOST is not defined."); let mut config = ServerConfig::new(NoClientAuth::new()); - let certs_dir = std::path::PathBuf::from( - env_var("RESOURCES_DIR").expect("RESOURCES_DIR is not defined"), - ) - .join("certs") - .join("live") - .join(&host); + let certs_dir = + std::path::PathBuf::from(env_var("RESOURCES_DIR").expect("RESOURCES_DIR is not defined")) + .join("certs") + .join("live") + .join(&host); let cert_file = File::open(certs_dir.join("fullchain.pem")).unwrap(); let key_file = File::open(certs_dir.join("privkey.pem")).unwrap();