Beta14 compatability (#10)

* beta 14 * Apply fixes from StyleCI * Update default templates, mark $baseUrl deprecated * Reword deprecation comment * Update resources * typo * re-work user mention template * re-work postmention template * Rework dafult template, new post template * Update base mailer, use $url * Check for deprecated content, lint * Forgot to change search values * Build dist Co-authored-by: Charlie <[email protected]>
FriendsOfFlarum · Nov 14, 2020 · d27ff82 · d27ff82
1 parent e6e7b74
commit d27ff82
Show file tree

Hide file tree

Showing 15 changed files with 369 additions and 352 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "source": "https://github.com/FriendsOfFlarum/pretty-mail"
     },
     "require": {
-        "flarum/core": "^0.1.0-beta.10"
+        "flarum/core": "^0.1.0-beta.14"
     },
     "replace": {
         "reflar/pretty-mail": "*"

diff --git a/extend.php b/extend.php
@@ -13,13 +13,13 @@
 
 namespace FoF\PrettyMail;
 
-use Flarum\Extend as Native;
+use Flarum\Extend;
 use Flarum\Foundation\Application;
 
 return [
-    (new Native\Frontend('admin'))
+    (new Extend\Frontend('admin'))
         ->js(__DIR__.'/js/dist/admin.js'),
-    new Native\Locales(__DIR__.'/resources/locale'),
+    new Extend\Locales(__DIR__.'/resources/locale'),
     function (Application $app) {
         $app->register(Providers\MailerProvider::class);
     },

diff --git a/js/dist/admin.js b/js/dist/admin.js
diff --git a/js/dist/admin.js.map b/js/dist/admin.js.map
diff --git a/js/src/admin/addSettingsPage.js b/js/src/admin/addSettingsPage.js
@@ -4,19 +4,21 @@ import AdminLinkButton from 'flarum/components/AdminLinkButton';
 import SettingsPage from './components/SettingsPage';
 
 export default function() {
-    app.routes['fof-pretty-mail'] = { path: '/fof/pretty-mail', component: SettingsPage.component() };
+    app.routes['fof-pretty-mail'] = { path: '/fof/pretty-mail', component: SettingsPage };
 
-    app.extensionSettings['fof-pretty-mail'] = () => m.route(app.route('fof-pretty-mail'));
+    app.extensionSettings['fof-pretty-mail'] = () => m.route.get(app.route('fof-pretty-mail'));
 
     extend(AdminNav.prototype, 'items', items => {
         items.add(
             'fof-pretty-mail',
-            AdminLinkButton.component({
-                href: app.route('fof-pretty-mail'),
-                icon: 'fas fa-envelope-open',
-                children: 'Pretty Mail',
-                description: app.translator.trans('fof-pretty-mail.admin.nav.desc'),
-            })
+            AdminLinkButton.component(
+                {
+                    href: app.route('fof-pretty-mail'),
+                    icon: 'fas fa-envelope-open',
+                    description: app.translator.trans('fof-pretty-mail.admin.nav.desc'),
+                },
+                'Pretty Mail'
+            )
         );
     });
 }
diff --git a/js/src/admin/components/SettingsPage.js b/js/src/admin/components/SettingsPage.js
@@ -1,13 +1,15 @@
-import Alert from 'flarum/components/Alert';
 import Button from 'flarum/components/Button';
 import Page from 'flarum/components/Page';
 import saveSettings from 'flarum/utils/saveSettings';
 import Switch from 'flarum/components/Switch';
+import withAttr from 'flarum/utils/withAttr';
+import Stream from 'flarum/utils/Stream';
 
 import * as defaults from '../defaults';
 
 export default class SettingsPage extends Page {
-    init() {
+    oninit(vnode) {
+        super.oninit(vnode);
         this.fields = ['mailhtml', 'newPost', 'postMentioned', 'userMentioned', 'includeCSS'];
 
         this.values = {};
@@ -16,7 +18,7 @@ export default class SettingsPage extends Page {
 
         const settings = app.data.settings;
 
-        this.fields.forEach(key => (this.values[key] = m.prop(settings[this.addPrefix(key)])));
+        this.fields.forEach(key => (this.values[key] = Stream(settings[this.addPrefix(key)])));
     }
 
     view() {
@@ -36,22 +38,24 @@ export default class SettingsPage extends Page {
                             ),
                             m('label', app.translator.trans('fof-pretty-mail.admin.settings.default')),
                             m('br'),
-                            Button.component({
-                                type: 'button',
-                                style: 'margin-bottom: 10px',
-                                className: 'Button Button--primary',
-                                children: app.translator.trans('fof-pretty-mail.admin.settings.reset'),
-                                onclick: () => {
-                                    if (confirm(app.translator.trans('fof-pretty-mail.admin.settings.confirm') + ' default?')) {
-                                        this.values.mailhtml(defaults.mailto);
-                                    }
+                            Button.component(
+                                {
+                                    type: 'button',
+                                    style: 'margin-bottom: 10px',
+                                    className: 'Button Button--primary',
+                                    onclick: () => {
+                                        if (confirm(app.translator.trans('fof-pretty-mail.admin.settings.confirm') + ' default?')) {
+                                            this.values.mailhtml(defaults.mailto);
+                                        }
+                                    },
                                 },
-                            }),
+                                app.translator.trans('fof-pretty-mail.admin.settings.reset')
+                            ),
                             m('textarea.FormControl', {
                                 rows: '15',
                                 value: this.values.mailhtml(),
                                 style: 'margin: 10px 0 10px',
-                                oninput: m.withAttr('value', this.values.mailhtml),
+                                oninput: withAttr('value', this.values.mailhtml),
                             }),
                             m('h3', app.translator.trans('fof-pretty-mail.admin.settings.notifications')),
                             m(
@@ -64,60 +68,66 @@ export default class SettingsPage extends Page {
                             ),
                             m('label', app.translator.trans('fof-pretty-mail.admin.settings.newPost')),
                             m('br'),
-                            Button.component({
-                                type: 'button',
-                                style: 'margin: 10px 0 10px',
-                                className: 'Button Button--primary',
-                                children: app.translator.trans('fof-pretty-mail.admin.settings.reset'),
-                                onclick: () => {
-                                    if (confirm(app.translator.trans('fof-pretty-mail.admin.settings.confirm') + ' newPost?')) {
-                                        this.values.newPost(defaults.newPost);
-                                    }
+                            Button.component(
+                                {
+                                    type: 'button',
+                                    style: 'margin: 10px 0 10px',
+                                    className: 'Button Button--primary',
+                                    onclick: () => {
+                                        if (confirm(app.translator.trans('fof-pretty-mail.admin.settings.confirm') + ' newPost?')) {
+                                            this.values.newPost(defaults.newPost);
+                                        }
+                                    },
                                 },
-                            }),
+                                app.translator.trans('fof-pretty-mail.admin.settings.reset')
+                            ),
                             m('textarea.FormControl', {
                                 rows: '15',
                                 value: this.values.newPost(),
                                 style: 'margin-bottom: 10px',
-                                oninput: m.withAttr('value', this.values.newPost),
+                                oninput: withAttr('value', this.values.newPost),
                             }),
                             m('label', app.translator.trans('fof-pretty-mail.admin.settings.userMentioned')),
                             m('br'),
-                            Button.component({
-                                type: 'button',
-                                style: 'margin: 10px 0 10px',
-                                className: 'Button Button--primary',
-                                children: app.translator.trans('fof-pretty-mail.admin.settings.reset'),
-                                onclick: () => {
-                                    if (confirm(app.translator.trans('fof-pretty-mail.admin.settings.confirm') + ' userMentioned?')) {
-                                        this.values.userMentioned(defaults.userMentioned);
-                                    }
+                            Button.component(
+                                {
+                                    type: 'button',
+                                    style: 'margin: 10px 0 10px',
+                                    className: 'Button Button--primary',
+                                    onclick: () => {
+                                        if (confirm(app.translator.trans('fof-pretty-mail.admin.settings.confirm') + ' userMentioned?')) {
+                                            this.values.userMentioned(defaults.userMentioned);
+                                        }
+                                    },
                                 },
-                            }),
+                                app.translator.trans('fof-pretty-mail.admin.settings.reset')
+                            ),
                             m('textarea.FormControl', {
                                 rows: '15',
                                 value: this.values.userMentioned(),
                                 style: 'margin-bottom: 10px',
-                                oninput: m.withAttr('value', this.values.userMentioned),
+                                oninput: withAttr('value', this.values.userMentioned),
                             }),
                             m('label', app.translator.trans('fof-pretty-mail.admin.settings.postMentioned')),
                             m('br'),
-                            Button.component({
-                                type: 'button',
-                                style: 'margin: 10px 0 10px',
-                                className: 'Button Button--primary',
-                                children: app.translator.trans('fof-pretty-mail.admin.settings.reset'),
-                                onclick: () => {
-                                    if (confirm(app.translator.trans('fof-pretty-mail.admin.settings.confirm') + ' postMentioned?')) {
-                                        this.values.postMentioned(defaults.postMentioned);
-                                    }
+                            Button.component(
+                                {
+                                    type: 'button',
+                                    style: 'margin: 10px 0 10px',
+                                    className: 'Button Button--primary',
+                                    onclick: () => {
+                                        if (confirm(app.translator.trans('fof-pretty-mail.admin.settings.confirm') + ' postMentioned?')) {
+                                            this.values.postMentioned(defaults.postMentioned);
+                                        }
+                                    },
                                 },
-                            }),
+                                app.translator.trans('fof-pretty-mail.admin.settings.reset')
+                            ),
                             m('textarea.FormControl', {
                                 rows: '15',
                                 value: this.values.postMentioned(),
                                 style: 'margin-bottom: 10px',
-                                oninput: m.withAttr('value', this.values.postMentioned),
+                                oninput: withAttr('value', this.values.postMentioned),
                             }),
                             m('h1', app.translator.trans('fof-pretty-mail.admin.css_settings.label')),
                             m(
@@ -128,19 +138,23 @@ export default class SettingsPage extends Page {
                                 },
                                 app.translator.trans('fof-pretty-mail.admin.css_settings.help', { strong: <strong /> })
                             ),
-                            Switch.component({
-                                className: 'Form-group',
-                                state: this.values.includeCSS() === '1',
-                                onchange: enabled => this.values.includeCSS(enabled ? '1' : '0'),
-                                children: app.translator.trans('fof-pretty-mail.admin.css_settings.switch_label'),
-                            }),
-                            Button.component({
-                                type: 'submit',
-                                className: 'Button Button--primary',
-                                children: app.translator.trans('core.admin.settings.submit_button'),
-                                loading: this.loading,
-                                disabled: !this.changed(),
-                            }),
+                            Switch.component(
+                                {
+                                    className: 'Form-group',
+                                    state: this.values.includeCSS() === '1',
+                                    onchange: enabled => this.values.includeCSS(enabled ? '1' : '0'),
+                                },
+                                app.translator.trans('fof-pretty-mail.admin.css_settings.switch_label')
+                            ),
+                            Button.component(
+                                {
+                                    type: 'submit',
+                                    className: 'Button Button--primary',
+                                    loading: this.loading,
+                                    disabled: !this.changed(),
+                                },
+                                app.translator.trans('core.admin.settings.submit_button')
+                            ),
                         ]),
                     ]),
                 ]),
@@ -161,25 +175,19 @@ export default class SettingsPage extends Page {
      */
     onsubmit(e) {
         e.preventDefault();
+        this.fields.forEach(key => this.checkContent(key));
 
         if (this.loading) return;
 
         this.loading = true;
 
-        app.alerts.dismiss(this.successAlert);
-
         const settings = {};
 
         this.fields.forEach(key => (settings[this.addPrefix(key)] = this.values[key]()));
 
         saveSettings(settings).then(() => {
             this.loading = false;
-            app.alerts.show(
-                (this.successAlert = new Alert({
-                    type: 'success',
-                    children: app.translator.trans('core.admin.basics.saved_message'),
-                }))
-            );
+            app.alerts.show({ type: 'success' }, app.translator.trans('core.admin.basics.saved_message'));
         });
     }
 
@@ -189,4 +197,13 @@ export default class SettingsPage extends Page {
     addPrefix(key) {
         return this.settingsPrefix + '.' + key;
     }
+
+    checkContent(key) {
+        if (this.values[key]().includes('$baseUrl')) {
+            app.alerts.show({ type: 'warning' }, key + ": The use of $baseUrl is deprecated. Use $url->to('forum')->base() instead.");
+        }
+        if (this.values[key]().includes('app()->url()')) {
+            app.alerts.show({ type: 'error' }, key + ": app()->url() has been replaced. Use $url->to('forum')->base() instead.");
+        }
+    }
 }