rearranged static files

.gitignore

@@ -6,8 +6,10 @@ cobertura.xml
 prod/
 node_modules/
 /static-assets/bundle
-/static
+static/cache/bundle
 ./templates/**/*.js
 /static-assets/bundle/*
 src/cache_buster_data.json
 coverage
+dist
+assets

build.rs

@@ -47,8 +47,8 @@ fn cache_bust() {
     ];
 
     let config = BusterBuilder::default()
-        .source("./static-assets")
+        .source("./static/cache")
-        .result("./static")
+        .result("./assets")
         .mime_types(types)
         .copy(true)
         .follow_links(true)

src/docs.rs

@@ -51,7 +51,7 @@ pub fn services(cfg: &mut web::ServiceConfig) {
 }
 
 #[derive(RustEmbed)]
-#[folder = "docs/"]
+#[folder = "static/openapi/"]
 struct Asset;
 
 pub fn handle_embedded_file(path: &str) -> HttpResponse {

src/main.rs

@@ -55,11 +55,11 @@ lazy_static! {
 //    pub static ref S: String = env::var("S").unwrap();
     pub static ref FILES: FileMap = FileMap::new();
     pub static ref JS: &'static str =
-        FILES.get("./static-assets/bundle/bundle.js").unwrap();
+        FILES.get("./static/cache/bundle/bundle.js").unwrap();
     pub static ref CSS: &'static str =
-        FILES.get("./static-assets/bundle/bundle.css").unwrap();
+        FILES.get("./static/cache/bundle/bundle.css").unwrap();
     pub static ref MOBILE_CSS: &'static str =
-        FILES.get("./static-assets/bundle/mobile.css").unwrap();
+        FILES.get("./static/cache/bundle/mobile.css").unwrap();
 
     /// points to source files matching build commit
     pub static ref SOURCE_FILES_OF_INSTANCE: String = {

src/static_assets/filemap.rs

@@ -45,8 +45,8 @@ mod tests {
     #[test]
     fn filemap_works() {
         let files = super::FileMap::new();
-        let css = files.get("./static-assets/bundle/bundle.css").unwrap();
+        let css = files.get("./static/cache/bundle/bundle.css").unwrap();
         println!("{}", css);
-        assert!(css.contains("/static/bundle/bundle"));
+        assert!(css.contains("/assets/bundle/bundle"));
     }
 }

src/static_assets/static_files.rs

@@ -25,7 +25,7 @@ use rust_embed::RustEmbed;
 use crate::CACHE_AGE;
 
 #[derive(RustEmbed)]
-#[folder = "static/"]
+#[folder = "assets/"]
 struct Asset;
 
 fn handle_assets(path: &str) -> HttpResponse {
@@ -47,7 +47,7 @@ fn handle_assets(path: &str) -> HttpResponse {
     }
 }
 
-#[get("/static/{_:.*}")]
+#[get("/assets/{_:.*}")]
 pub async fn static_files(path: web::Path<String>) -> impl Responder {
     handle_assets(&path.0)
 }
@@ -55,7 +55,7 @@ pub async fn static_files(path: web::Path<String>) -> impl Responder {
 
 
 #[derive(RustEmbed)]
-#[folder = "static-assets/favicons/"]
+#[folder = "static/favicons/"]
 struct Favicons;
 
 fn handle_favicons(path: &str) -> HttpResponse {
@@ -90,7 +90,6 @@ mod tests {
 
     use super::*;
     use crate::*;
-    use crate::tests::*;
 
     #[actix_rt::test]
     async fn static_assets_work() {
@@ -102,6 +101,18 @@ mod tests {
         )
         .await;
         assert_eq!(resp.status(), StatusCode::OK);
+
+        let resp = test::call_service(
+            &mut app,
+            test::TestRequest::get().uri(
+                crate::FILES
+                .get("./static/cache/img/icon-trans.png")
+                .unwrap()
+            ).to_request(),
+        )
+        .await;
+        assert_eq!(resp.status(), StatusCode::OK);
+
     }
 
     #[actix_rt::test]

src/widget/mod.rs

@@ -72,20 +72,12 @@ pub fn services(cfg: &mut web::ServiceConfig) {
 mod test {
     use actix_web::http::StatusCode;
     use actix_web::test;
-    use actix_web::web::Bytes;
 
     use crate::*;
 
     #[actix_rt::test]
     async fn captcha_widget_route_works() {
-        let mut app  = test::init_service(
+        let mut app  = get_app!().await;
-            actix_web::App::new()
-                .wrap(get_identity_service())
-                .wrap(actix_middleware::NormalizePath::new(
-                    actix_middleware::normalize::TrailingSlash::Trim,
-                ))
-                .configure(crate::widget::services)
-        ).await;
 
 
         let list_sitekey_resp = test::call_service(

static/favicons/manifest.json

@@ -1,5 +1,5 @@
 {
- "name": "App",
+ "name": "mCaptcha",
  "icons": [
   {
    "src": "\/android-icon-36x36.png",
@@ -38,4 +38,4 @@
    "density": "4.0"
   }
  ]
-}
+}

templates/auth/login/index.html

@@ -4,7 +4,7 @@
   <div class="auth-inner-container">
 
     <img src="<.=
-    crate::FILES.get("./static-assets/img/icon-trans.png").unwrap().>"
+    crate::FILES.get("./static/cache/img/icon-trans.png").unwrap().>"
     class="auth__logo" alt="mcaptcha logo" />
 
   <form

templates/auth/register/index.html

@@ -4,7 +4,7 @@
   <div class="auth-inner-container">
 
     <img src="<.=
-    crate::FILES.get("./static-assets/img/icon-trans.png").unwrap().>"
+    crate::FILES.get("./static/cache/img/icon-trans.png").unwrap().>"
     class="auth__logo" alt="mcaptcha logo" />
 
 

templates/components/headers/raw-headers.html

@@ -24,7 +24,7 @@
     />
     <meta name="twitter:creator" content="@realaravinth" />
     <meta name="twitter:image" 
-          content="<.= crate::FILES.get("./static-assets/img/icon-trans.png").unwrap().>" 
+          content="<.= crate::FILES.get("./static/cache/img/icon-trans.png").unwrap().>" 
     />
 
     <meta
@@ -34,7 +34,7 @@
     <meta property="og:type" content="article" />
     <meta property="og:url" content="https://mcaptcaha.org" />
     <meta property="og:image" 
-          content="<.= crate::FILES.get("./static-assets/img/icon-trans.png").unwrap().>"
+          content="<.= crate::FILES.get("./static/cache/img/icon-trans.png").unwrap().>"
       />
 
     <meta

templates/components/showPassword/index.html

@@ -1,6 +1,6 @@
 <span class="show-password-container">
   <img class="show-password--show" src="<.=
-  crate::FILES.get("./static-assets/img/svg/eye.svg").unwrap() .>" alt="" />
+  crate::FILES.get("./static/cache/img/svg/eye.svg").unwrap() .>" alt="" />
   <img class="show-password--hide" src="<.=
-  crate::FILES.get("./static-assets/img/svg/eye-off.svg").unwrap() .>" alt="" />
+  crate::FILES.get("./static/cache/img/svg/eye-off.svg").unwrap() .>" alt="" />
 </span>

templates/panel/header/taskbar/index.html

@@ -12,19 +12,19 @@
   </li>
   <li class="taskbar__action">
     <img class="taskbar__icon" src="<.=
-    crate::FILES.get("./static-assets/img/svg/moon.svg").unwrap() .>" alt="Profile" />
+    crate::FILES.get("./static/cache/img/svg/moon.svg").unwrap() .>" alt="Profile" />
   </li>
 
   <li class="taskbar__action">
     <img class="taskbar__icon" src="<.=
-    crate::FILES.get("./static-assets/img/svg/bell.svg").unwrap() .>"
+    crate::FILES.get("./static/cache/img/svg/bell.svg").unwrap() .>"
     alt="Notifications" />
   </li>
 
   <li class="taskbar__action">
       <a href="<.= crate::V1_API_ROUTES.auth.logout .>">
     <img class="taskbar__icon" src="<.=
-    crate::FILES.get("./static-assets/img/svg/log-out.svg").unwrap() .>" alt="Profile"
+    crate::FILES.get("./static/cache/img/svg/log-out.svg").unwrap() .>" alt="Profile"
     /></a>
   </li>
 </ul>

templates/panel/navbar/index.html

@@ -1,7 +1,7 @@
 <nav class="secondary-menu">
   <ul class="secondary-menu__lsit">
     <li class="secondary-menu__heading">
-      <img class="secondary-menu__logo" src="<.= crate::FILES.get("./static-assets/img/icon-trans.png").unwrap() .>" alt="Logo" />
+      <img class="secondary-menu__logo" src="<.= crate::FILES.get("./static/cache/img/icon-trans.png").unwrap() .>" alt="Logo" />
       <div class="secondary-menu__brand-name">
         mCaptcha
       </div>
@@ -12,7 +12,7 @@
           -->
     <li class="secondary-menu__item">
         <a class="secondary-menu__item-link" href="<.= crate::PAGES.home .>">
-        <img class="secondary-menu__icon" src="<.= crate::FILES.get("./static-assets/img/svg/home.svg").unwrap() .>" alt="" />
+        <img class="secondary-menu__icon" src="<.= crate::FILES.get("./static/cache/img/svg/home.svg").unwrap() .>" alt="" />
         <div class="secondary-menu__item-name">
           Overview
         </div>
@@ -20,7 +20,7 @@
     </li>
     <li class="secondary-menu__item">
         <a class="secondary-menu__item-link" href="<.= crate::PAGES.panel.sitekey.list .>">
-        <img class="secondary-menu__icon" src="<.= crate::FILES.get("./static-assets/img/svg/key.svg").unwrap() .>" alt="" />
+        <img class="secondary-menu__icon" src="<.= crate::FILES.get("./static/cache/img/svg/key.svg").unwrap() .>" alt="" />
         <div class="secondary-menu__item-name">
           Site Keys
         </div>
@@ -29,7 +29,7 @@
 
     <li class="secondary-menu__item">
       <a class="secondary-menu__item-link" href="">
-        <img class="secondary-menu__icon" src="<.= crate::FILES.get("./static-assets/img/svg/settings.svg").unwrap() .>" alt="" />
+        <img class="secondary-menu__icon" src="<.= crate::FILES.get("./static/cache/img/svg/settings.svg").unwrap() .>" alt="" />
         <div class="secondary-menu__item-name">
           Settings
         </div>
@@ -37,7 +37,7 @@
     </li>
     <li class="secondary-menu__item">
       <a class="secondary-menu__item-link" href="">
-        <img class="secondary-menu__icon" src="<.= crate::FILES.get("./static-assets/img/svg/credit-card.svg").unwrap() .>" alt="" />
+        <img class="secondary-menu__icon" src="<.= crate::FILES.get("./static/cache/img/svg/credit-card.svg").unwrap() .>" alt="" />
         <div class="secondary-menu__item-name">
           Billing
         </div>
@@ -45,7 +45,7 @@
     </li>
     <li class="secondary-menu__item">
       <a class="secondary-menu__item-link" href="">
-        <img class="secondary-menu__icon" src="<.= crate::FILES.get("./static-assets/img/svg/help-circle.svg").unwrap() .>" alt="" />
+        <img class="secondary-menu__icon" src="<.= crate::FILES.get("./static/cache/img/svg/help-circle.svg").unwrap() .>" alt="" />
         <div class="secondary-menu__item-name">
           Help
         </div>
@@ -55,7 +55,7 @@
       <a class="secondary-menu__item-link" href="">
         <img
           class="secondary-menu__icon"
-		  src="<.= crate::FILES.get("./static-assets/img/svg/message-square.svg").unwrap() .>"
+		  src="<.= crate::FILES.get("./static/cache/img/svg/message-square.svg").unwrap() .>"
           alt=""
         />
 
@@ -66,7 +66,7 @@
     </li>
     <li class="secondary-menu__item">
         <a class="secondary-menu__item-link" href="<.= crate::DOCS.home .>">
-        <img class="secondary-menu__icon" src="<.= crate::FILES.get("./static-assets/img/svg/file-text.svg").unwrap() .>" alt="" />
+        <img class="secondary-menu__icon" src="<.= crate::FILES.get("./static/cache/img/svg/file-text.svg").unwrap() .>" alt="" />
         <div class="secondary-menu__item-name">
           API Docs
         </div>
@@ -75,7 +75,7 @@
     <li class="secondary-menu__item">
         <a class="secondary-menu__item-link" href="<.= crate::SETTINGS.source_code .>">
         <img class="secondary-menu__icon" 
-		src="<.= crate::FILES.get("./static-assets/img/svg/github.svg").unwrap() .>" alt="GitHub Icon" />
+		src="<.= crate::FILES.get("./static/cache/img/svg/github.svg").unwrap() .>" alt="GitHub Icon" />
         <div class="secondary-menu__item-name">
           Source Code
         </div>

templates/widget/index.html

@@ -9,7 +9,7 @@
         <a href="<.= crate::PKG_HOMEPAGE .>" class="logo-container">
           <img
             class="logo"
-			src="<.= crate::FILES.get("./static-assets/img/icon-trans.png").unwrap().>"
+			src="<.= crate::FILES.get("./static/cache/img/icon-trans.png").unwrap().>"
             alt="mCaptcha logo"
           />
           <p class="brand-name">mCaptcha</p>

webpack.config.js

@@ -16,7 +16,7 @@ module.exports = {
   },
   output: {
     filename: '[name].js',
-    path: path.resolve(__dirname, './static-assets/bundle/'),
+    path: path.resolve(__dirname, './static/cache/bundle/'),
   },
   module: {
     rules: [