fix: cleanup views (#382)

ladjs · Apr 18, 2020 · 8b0a60d · 8b0a60d
1 parent 6f0793f
commit 8b0a60d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/template/app/views/layout.pug b/template/app/views/layout.pug
@@ -126,19 +126,10 @@ html(lang=locale).h-100
       script(src=`https://polyfill.io/v3/polyfill${config.env === 'production' ? '.min' : ''}.js?features=${polyfills.join(',')}`)
 
       //- factor bundle (common shared assets across all files)
-      if config.env === 'production'
-        script(src=manifest('factor-bundle.js') integrity=manifest('factor-bundle.js', 'integrity'))
-      else
-        script(src=manifest('factor-bundle.js'))
+      script(src=manifest('factor-bundle.js') integrity=manifest('factor-bundle.js', 'integrity'))
 
       //- uncaught (handles errors, similar to TraceKit but with CabinJS + StackTrace.JS)
-      if config.env === 'production'
-        script(src=manifest('uncaught.js') integrity=manifest('uncaught.js', 'integrity'))
-      else
-        script(src=manifest('uncaught.js'))
+      script(src=manifest('uncaught.js') integrity=manifest('uncaught.js', 'integrity'))
 
       //- scripts
-      if config.env === 'production'
-        script(src=manifest('core.js') integrity=manifest('core.js', 'integrity'))
-      else
-        script(src=manifest('core.js'))
+      script(src=manifest('core.js') integrity=manifest('core.js', 'integrity'))
diff --git a/template/app/views/my-account/security.pug b/template/app/views/my-account/security.pug
@@ -35,8 +35,8 @@ block body
                       = t('Copy')
           .modal-footer
             .form-check
-              input#recovery-keys-stored(type='checkbox', name="recovery-keys-stored", value='true' data-toggle='collapse' data-target='#recovery-key-submit')
-              label(for='recovery-keys-stored')= t('I have stored these recovery keys in a safe place')
+              input#recovery-keys-stored(type='checkbox', name="recovery-keys-stored", value='true' data-toggle='collapse' data-target='#recovery-key-submit').form-check-input
+              label(for='recovery-keys-stored').form-check-label= t('I have stored these recovery keys in a safe place')
             #recovery-key-submit.collapse
               button(data-toggle='modal', data-target='#modal-enable-2fa-verify', data-dismiss='modal', type='button').btn.btn-primary.btn-lg.float-right= t('Continue')
     #modal-enable-2fa-verify(tabindex='-1', role='dialog').modal.fade

diff --git a/template/package.json b/template/package.json
@@ -83,7 +83,7 @@
     "koa-views-render": "^0.0.1",
     "lodash": "^4.17.15",
     "mandarin": "^2.0.3",
-    "manifest-rev": "^1.0.0",
+    "manifest-rev": "^1.0.2",
     "markdown-it": "^10.0.0",
     "markdown-it-emoji": "^1.4.0",
     "markdown-it-github-headings": "^2.0.0",

diff --git a/template/yarn.lock b/template/yarn.lock
@@ -10564,10 +10564,10 @@ mandarin@^2.0.3:
     remark-textr "^3.0.4"
     rev-hash "^3.0.0"
 
-manifest-rev@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/manifest-rev/-/manifest-rev-1.0.0.tgz#8556b527db0c663f308c04fbb6a46d35ef35148e"
-  integrity sha512-yQVITfe4FIaOVpVvdOlrAojeNygJrxEOb8yEAOsAY5JASsmLfvwQMFKdF9kBVLWgD05sUViB9gAlPTBTO30Z9A==
+manifest-rev@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/manifest-rev/-/manifest-rev-1.0.2.tgz#b0bfa8c6f3d4ff881d9a19f7e08cd17c090d2abf"
+  integrity sha512-bZIXwhhK59+u9gXtfYzxQpyte14bWf3YIhC1PDY5N+bM0Tfh0XkTx3cFR/9d2BsYHi/aRPSmVTOoytHOYBKEvQ==
 
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"