Auto merge of #2103 - Turbo87:flash-message, r=locks

Simplify and reuse `FlashMessage` component

r? @locks

Author: bors

app/components/flash-message.js

@@ -1,9 +1,5 @@
 import Component from '@ember/component';
-import { readOnly } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
 
 export default Component.extend({
-  flashMessages: service(),
-  message: readOnly('flashMessages.message'),
   tagName: '',
 });

app/controllers/application.js

@@ -5,6 +5,7 @@ import { EKMixin, keyDown, keyPress } from 'ember-keyboard';
 import { on } from '@ember/object/evented';
 
 export default Controller.extend(EKMixin, {
+  flashMessages: service(),
   search: service(),
   searchQuery: oneWay('search.q'),
   session: service(),

app/templates/application.hbs

@@ -127,7 +127,7 @@
   </form>
 
   <main id="main" class='inner-content'>
-    <FlashMessage />
+    <FlashMessage @message={{this.flashMessages.message}} />
 
     {{outlet}}
   </main>

app/templates/catch-all.hbs

@@ -1,4 +1,4 @@
-<p id='flash' class='shown'>Oops, that route doesn't exist!</p>
+<FlashMessage @message="Oops, that route doesn't exist!" />
 
 <p id='p404'>
   Perhaps a search of the site may help?