raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace ng-app with explicit Angular bootstrapping and move scripts to head

Browse Source
This commit is contained in:
Matt-Yorkley
2021-08-14 19:25:53 +01:00
parent b29d88be25
commit 658f0eccbb
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/views/layouts/darkswarm.html.haml
View File

@@ -15,17 +15,26 @@
%link{href: "https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700", rel: "stylesheet", type: "text/css"}
%link{href: font_path("OFN-v2.woff"), rel: "preload", as: "font", crossorigin: "anonymous"}
= stylesheet_link_tag "darkswarm/all"
= javascript_pack_tag "application"
= stylesheet_link_tag "darkswarm/all", "data-turbo-track": "reload"
= javascript_pack_tag "application", "data-turbo-track": "reload"
= render "layouts/shopfront_script" if @shopfront_layout
= render "layouts/bugsnag_js"
- if Spree::Config.stripe_connect_enabled
= render "shared/stripe_js"
= javascript_include_tag "darkswarm/all", "data-turbo-track": "reload"
= javascript_include_tag "web/all", "data-turbo-track": "reload"
= render "layouts/i18n_script"
= csrf_meta_tags
%body{ class: body_classes, "body-scroll" => true , ng: { app: 'Darkswarm' }}
%body{ class: body_classes, "body-scroll": "true" }
/ [if lte IE 8]
= render partial: "shared/ie_warning"
= javascript_include_tag "iehack"
= render "layouts/shopfront_script" if @shopfront_layout
.off-canvas-wrap{ offcanvas: true }
.fixed.off-canvas-fixed
= render "shared/menu/menu" unless @hide_menu
@@ -38,16 +47,7 @@
#footer
%loading
= render "layouts/bugsnag_js"
- if Spree::Config.stripe_connect_enabled
= render "shared/stripe_js"
= javascript_include_tag "darkswarm/all"
= javascript_include_tag "web/all"
= render "layouts/i18n_script"
= yield :scripts
= inject_current_hub
= inject_current_user
= inject_rails_flash

8
app/views/layouts/registration.html.haml
View File

@@ -11,9 +11,12 @@
%link{href: "https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700", rel: "stylesheet", type: "text/css"}
= stylesheet_link_tag "darkswarm/all"
= javascript_include_tag "darkswarm/all"
= javascript_pack_tag "application"
= csrf_meta_tags
%body.off-canvas{"ng-app" => "Darkswarm", style: "background-image: url(#{image_path('tile-wide.png')})" }
%body.off-canvas{ style: "background-image: url(#{image_path('tile-wide.png')})" }
/ [if lte IE 8]
= render partial: "shared/ie_warning"
= javascript_include_tag "iehack"
@@ -27,10 +30,7 @@
#footer
%loading
%script{src: "//maps.googleapis.com/maps/api/js?libraries=places#{ ENV['GOOGLE_MAPS_API_KEY'] ? '&key=' + ENV['GOOGLE_MAPS_API_KEY'] : ''}"}
= javascript_include_tag "darkswarm/all"
= yield :scripts
= inject_current_user
= yield :injection_data