diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-03 02:04:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-03 02:04:16 +0200 |
commit | f5bf5ebb82e3af420dcd23d602b1be6cc86838e1 (patch) | |
tree | 92eef08642a038cf44ccbc6d16a884293e7a0814 /app/views/layouts | |
parent | 26bc5915727e0a0173c03cb49f5193dd612fb888 (diff) |
Replace sprockets/browserify with Webpack (#2617)
* Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/admin.html.haml | 4 | ||||
-rwxr-xr-x | app/views/layouts/application.html.haml | 4 | ||||
-rw-r--r-- | app/views/layouts/auth.html.haml | 4 | ||||
-rw-r--r-- | app/views/layouts/embedded.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/public.html.haml | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index d3d97e3a0..f7cea41e2 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -1,12 +1,12 @@ - content_for :header_tags do - = javascript_include_tag 'application_public', integrity: true, crossorigin: 'anonymous' + = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous' - content_for :content do .admin-wrapper .sidebar-wrapper .sidebar = link_to root_path do - = image_tag 'logo.png', class: 'logo' + = image_tag asset_pack_path('logo.png'), class: 'logo' = render_navigation .content-wrapper diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 602d502a9..683d0272f 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -19,7 +19,9 @@ = ' - ' = title - = stylesheet_link_tag stylesheet_for_layout, media: 'all' + = stylesheet_pack_tag 'vendor', media: 'all' + = stylesheet_pack_tag 'application', media: 'all' + = javascript_pack_tag 'vendor', integrity: true, crossorigin: 'anonymous' = csrf_meta_tags = yield :header_tags diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml index b2ceed12a..2478776ab 100644 --- a/app/views/layouts/auth.html.haml +++ b/app/views/layouts/auth.html.haml @@ -1,12 +1,12 @@ - content_for :header_tags do - = javascript_include_tag 'application_public', integrity: true, crossorigin: 'anonymous' + = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous' - content_for :content do .container .logo-container %h1 = link_to root_path do - = image_tag 'logo.png' + = image_tag asset_pack_path('logo.png') .form-container = render 'flashes' diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml index 596f3c36e..fcc474ff6 100644 --- a/app/views/layouts/embedded.html.haml +++ b/app/views/layouts/embedded.html.haml @@ -3,6 +3,6 @@ %head %meta{:charset => 'utf-8'}/ = stylesheet_link_tag 'application', media: 'all' - = javascript_include_tag 'application_public', integrity: true, crossorigin: 'anonymous' + = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous' %body.embed = yield diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 7bb0f71ff..9b94ad9a4 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -1,5 +1,5 @@ - content_for :header_tags do - = javascript_include_tag 'application_public', integrity: true, crossorigin: 'anonymous' + = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous' - content_for :content do .container= yield |