diff --git a/app/javascript/retrospring/initializers/bootstrap.ts b/app/javascript/retrospring/initializers/_bootstrap.ts similarity index 100% rename from app/javascript/retrospring/initializers/bootstrap.ts rename to app/javascript/retrospring/initializers/_bootstrap.ts diff --git a/app/javascript/retrospring/initializers/index.ts b/app/javascript/retrospring/initializers/index.ts index ba1abad8..3e7768c0 100644 --- a/app/javascript/retrospring/initializers/index.ts +++ b/app/javascript/retrospring/initializers/index.ts @@ -14,6 +14,7 @@ export default function initialize(): void { files.keys().forEach((key) => { if (key === './index.ts') return; + if (key.startsWith('./_')) return; files(key).default(); }); } \ No newline at end of file diff --git a/app/views/layouts/base.haml b/app/views/layouts/base.haml index cacc0a04..c209fc19 100644 --- a/app/views/layouts/base.haml +++ b/app/views/layouts/base.haml @@ -10,12 +10,12 @@ %link{ rel: 'icon', href: '/icon-152.png', sizes: '152x152' } %link{ rel: 'icon', href: '/images/favicon/favicon-32.png', sizes: '32x32' } %title= yield(:title) - = stylesheet_link_tag 'application', media: 'all', data: { 'turbolinks-track': true } - = javascript_pack_tag 'application', data: { 'turbolinks-track': true } - = javascript_pack_tag 'legacy', data: { 'turbolinks-track': true } - = stylesheet_pack_tag 'legacy', data: { 'turbolinks-track': true } + = stylesheet_link_tag 'application', media: 'all', data: { 'turbolinks-track': 'reload' } + = javascript_pack_tag 'application', data: { 'turbolinks-track': 'reload' } + = javascript_pack_tag 'legacy', data: { 'turbolinks-track': 'reload' } + = stylesheet_pack_tag 'legacy', data: { 'turbolinks-track': 'reload' } - if user_signed_in? && current_user.mod? - = javascript_pack_tag 'legacy-moderation', data: { 'turbolinks-track': true } + = javascript_pack_tag 'legacy-moderation', data: { 'turbolinks-track': 'reload' } = csrf_meta_tags %body - if user_signed_in?