From f10c6200406101b89366e60d988a8c960072e453 Mon Sep 17 00:00:00 2001 From: realaravinth Date: Tue, 12 Oct 2021 14:54:51 +0530 Subject: [PATCH] load mcaptcha-glue --- package.json | 7 ++++--- src/api/v1/admin/campaigns.rs | 4 +--- src/main.rs | 3 +++ src/pages/routes.rs | 10 +++++----- src/static_assets/static_files.rs | 13 ++++++++++++- src/tests.rs | 2 +- static/cache/img/headsets.jpg | Bin 0 -> 4292 bytes webpack.config.js | 1 + yarn.lock | 5 +++++ 9 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 static/cache/img/headsets.jpg diff --git a/package.json b/package.json index feaa6d8..baedc8c 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "@types/node": "^15.0.2", "@types/sinon": "^10.0.0", "@wasm-tool/wasm-pack-plugin": "^1.4.0", + "dart-sass": "^1.25.0", "jest": "^26.6.3", "jest-fetch-mock": "^3.0.3", "jsdom": "^16.5.3", @@ -24,10 +25,10 @@ "typescript": "^4.1.0", "webpack": "^5.0.0", "webpack-cli": "^4.6.0", - "webpack-dev-server": "^3.1.14", - "dart-sass": "^1.25.0" + "webpack-dev-server": "^3.1.14" }, "dependencies": { - "mcaptcha-browser": "./vendor/pow/" + "mcaptcha-browser": "./vendor/pow/", + "mcaptcha-glue": "^0.1.0-alpha-3" } } diff --git a/src/api/v1/admin/campaigns.rs b/src/api/v1/admin/campaigns.rs index 02b4328..8d9c9c3 100644 --- a/src/api/v1/admin/campaigns.rs +++ b/src/api/v1/admin/campaigns.rs @@ -121,9 +121,7 @@ async fn add( #[cfg(test)] mod tests { - use std::str::FromStr; - - use crate::api::v1::bench::{Bench, BenchConfig, Submission, SubmissionProof}; + use crate::api::v1::bench::{Bench, Submission}; use crate::data::Data; use crate::tests::*; use crate::*; diff --git a/src/main.rs b/src/main.rs index 8d95e8b..50d8cd0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -54,6 +54,9 @@ lazy_static! { pub static ref JS: &'static str = FILES.get("./static/cache/bundle/bundle.js").unwrap(); + pub static ref GLUE: &'static str = + FILES.get("./static/cache/bundle/glue.js").unwrap(); + /// points to source files matching build commit pub static ref SOURCE_FILES_OF_INSTANCE: String = { let mut url = SETTINGS.source_code.clone(); diff --git a/src/pages/routes.rs b/src/pages/routes.rs index 7547947..551932c 100644 --- a/src/pages/routes.rs +++ b/src/pages/routes.rs @@ -41,12 +41,12 @@ impl Routes { panel, home, errors: Errors::new(), - about: "/about", + about: "https://mcaptcha.org/about/", sitemap: "/sitemap.xml", - thanks: "/thanks", - donate: "/donate", - security: "/security", - privacy: "/privacy-policy", + thanks: "https://mcaptcha.org/thanks", + donate: "https://mcaptcha.org/donate", + security: "https://mcaptcha.org/security", + privacy: "https://mcaptcha.org/privacy-policy/", } } diff --git a/src/static_assets/static_files.rs b/src/static_assets/static_files.rs index 9503e3c..e0da09b 100644 --- a/src/static_assets/static_files.rs +++ b/src/static_assets/static_files.rs @@ -43,6 +43,10 @@ pub mod assets { path: FILES.get("./static/cache/img/trash.svg").unwrap(), name: "Trash logo" }; + pub static ref HEADSETS: Img = Img { + path: FILES.get("./static/cache/img/headsets.jpg").unwrap(), + name: "Headsets image" + }; } } @@ -119,7 +123,14 @@ mod tests { async fn static_assets_work() { let app = get_app!().await; - for file in [assets::LOGO.path, &*crate::JS].iter() { + for file in [ + assets::LOGO.path, + assets::HEADSETS.path, + &*crate::JS, + &*crate::GLUE, + ] + .iter() + { let resp = test::call_service( &app, test::TestRequest::get().uri(file).to_request(), diff --git a/src/tests.rs b/src/tests.rs index c013030..467c683 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -28,7 +28,7 @@ use crate::api::v1::admin::{ auth::runners::{Login, Register}, campaigns::{AddCapmaign, AddCapmaignResp}, }; -use crate::api::v1::bench::{Bench, BenchConfig, Submission, SubmissionProof}; +use crate::api::v1::bench::{BenchConfig, Submission, SubmissionProof}; use crate::data::Data; use crate::errors::*; use crate::V1_API_ROUTES; diff --git a/static/cache/img/headsets.jpg b/static/cache/img/headsets.jpg new file mode 100644 index 0000000000000000000000000000000000000000..11e560967293da5728d04829bd4bedae4499be8a GIT binary patch literal 4292 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