Skip to content

Commit

Permalink
Merge pull request #780 from rubyforgood/fix-landing-page-custom-text
Browse files Browse the repository at this point in the history
Fix bug on landing page where custom text was being ignored
  • Loading branch information
solebared authored Oct 13, 2020
2 parents 168dd9c + b6bb617 commit 8000e1c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ This changelog also serves to acknowledge the incredible people who've contribut

## [Unreleased]
* Unordered lists in user provided custom text (eg /about) now display with discs ('bullets') #777, #779
* Allow custom text on landing page to override default text #769, #780

## [0.3.0] - 2020-10-05
### Breaking changes
Expand Down
6 changes: 2 additions & 4 deletions app/javascript/entry_points/orientation.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import Vue from 'vue_config'
import Orientation from 'pages/Orientation'

export default function(el, props = {organization: 'Mutual Aid'}) {
export default function(el, props) {
new Vue({
el,
render(h) {
return h(Orientation, {
props: props,
})
return h(Orientation, {props})
}
})
}
6 changes: 3 additions & 3 deletions app/views/public/landing_page.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
document.addEventListener('DOMContentLoaded', () => {
EntryPoints.orientation('#orientation', {
organization: "<%= @organization_name %>",
landingPageTextWhat: "<%= @landing_page_text_what %>",
landingPageTextWho: "<%= @landing_page_text_who %>",
landingPageTextHow: "<%= @landing_page_text_how %>"
landing_page_text_what: "<%= @landing_page_text_what %>",
landing_page_text_who: "<%= @landing_page_text_who %>",
landing_page_text_how: "<%= @landing_page_text_how %>"
})
})
</script>

0 comments on commit 8000e1c

Please sign in to comment.