Un-appify raft, since it's just included as an on-demand block in wag…

…tail (#6824)
cfpb · Jan 11, 2022 · 8660b3a · 8660b3a
1 parent 956104f
commit 8660b3a
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 119 deletions.
diff --git a/cfgov/jinja2/v1/_includes/blocks/raf_tool.html b/cfgov/jinja2/v1/_includes/blocks/raf_tool.html
@@ -1,4 +1,17 @@
-<link rel="stylesheet" href="{{ static('apps/erap/css/main.css') }}">
+<style>
+#rental-assistance-finder {
+  max-width: 41.875rem;
+}
+#rental-assistance-finder dl a {
+  word-break: break-all;
+}
+#rental-assistance-finder .m-form-field + .m-form-field {
+  margin-top: 15px;
+}
+.no-js .js-is-hidden {
+  display: block !important;
+}
+</style>
 
 <div id="rental-assistance-finder"
      data-language="{{ page.language if page and page.language else 'en' }}"

diff --git a/cfgov/jinja2/v1/_layouts/base.html b/cfgov/jinja2/v1/_layouts/base.html
@@ -319,12 +319,7 @@
           #}
           {% if page and page.media %}
             {% for js in page.media %}
-              // Check whether this JS is coming from our apps or from an on-demand script.
-              if ( '{{ js }}'.substring(0,6) === '/apps/' ) {
-                s.push( '{{ static(js) }}' );
-              } else {
-                s.push( '{{ static('js/routes/on-demand/' + js) }}' );
-              }
+              s.push( '{{ static('js/routes/on-demand/' + js) }}' );
             {% endfor %}
           {% endif %}
           {#

diff --git a/cfgov/unprocessed/apps/erap/.yarnrc b/cfgov/unprocessed/apps/erap/.yarnrc
diff --git a/cfgov/unprocessed/apps/erap/css/main.less b/cfgov/unprocessed/apps/erap/css/main.less
diff --git a/cfgov/unprocessed/apps/erap/package.json b/cfgov/unprocessed/apps/erap/package.json
diff --git a/cfgov/unprocessed/apps/erap/webpack-config.js b/cfgov/unprocessed/apps/erap/webpack-config.js
diff --git a/cfgov/unprocessed/apps/erap/yarn.lock b/cfgov/unprocessed/apps/erap/yarn.lock
diff --git a/cfgov/unprocessed/apps/erap/js/main.js → ...v/unprocessed/js/routes/on-demand/erap.js b/cfgov/unprocessed/apps/erap/js/main.js → ...v/unprocessed/js/routes/on-demand/erap.js
diff --git a/cfgov/v1/blocks.py b/cfgov/v1/blocks.py
@@ -231,7 +231,7 @@ class Meta:
         template = '_includes/blocks/raf_tool.html'
 
     class Media:
-        js = ['/apps/erap/js/main.js']
+        js = ['erap.js']
 
 
 class RAFTBlock(blocks.StructBlock):
@@ -248,4 +248,4 @@ class Meta:
         template = '_includes/blocks/raf_tool.html'
 
     class Media:
-        js = ['/apps/erap/js/main.js']
+        js = ['erap.js']
diff --git a/.../@cfpb-rental-assistance-finder-0.4.0.tgz → .../@cfpb-rental-assistance-finder-0.4.0.tgz b/.../@cfpb-rental-assistance-finder-0.4.0.tgz → .../@cfpb-rental-assistance-finder-0.4.0.tgz
diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
     "@cfpb/cfpb-pagination": "0.13.0",
     "@cfpb/cfpb-tables": "0.13.0",
     "@cfpb/cfpb-typography": "0.13.0",
+    "@cfpb/rental-assistance-finder": "0.4.0",
     "autoprefixer": "10.4.0",
     "babel-loader": "8.2.3",
     "cfpb-chart-builder": "6.4.2",

diff --git a/yarn.lock b/yarn.lock
@@ -1084,6 +1084,11 @@
     "@cfpb/cfpb-core" "^0.3.1"
     "@cfpb/cfpb-icons" "^0.3.2"
 
+"@cfpb/[email protected]":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@cfpb/rental-assistance-finder/-/rental-assistance-finder-0.4.0.tgz#fd06695d2798f734a1f972125f593419943bbed9"
+  integrity sha512-XHQHh/g5SQ3SWY2F4gWGcx+y8UeGEH+qb5D9Q9Q0//5osOPiwtm8qc0F/85Rp4r61eRukaMamPDqNdM1qEdYMQ==
+
 "@cypress/request@^2.88.10":
   version "2.88.10"
   resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"