common: use AlertState for Alert component data - pass this to AlertManager

app.alerts.show() now can take plain object OR AlertState instance - will return AlertState.prototype.key
app.alerts.dismiss() takes AlertState or state key (returned by show())

.editorconfig

@@ -15,5 +15,5 @@ indent_size = 2
 [*.{diff,md}]
 trim_trailing_whitespace = false
 
-[*.{php,xml}]
+[*.{php,xml,ts,tsx}]
 indent_size = 4

.github/workflows/lint.yml

@@ -0,0 +1,31 @@
+name: Lint code
+
+on:
+  push:
+    paths:
+      - 'js/src/**'
+  pull_request:
+    paths:
+      - 'js/src/**'
+
+jobs:
+  prettier:
+    runs-on: ubuntu-latest
+
+    name: Lint JS code with Prettier
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: "12"
+
+      - name: Install JS dependencies
+        run: npm ci
+        working-directory: ./js
+
+      - name: Check JS code for formatting
+        run: node_modules/.bin/prettier --check src
+        working-directory: ./js

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.1, 7.2, 7.3, 7.4]
+        php: [7.2, 7.3, 7.4]
         service: ['mysql:5.7', mariadb]
         prefix: ['', flarum_]
 
@@ -21,12 +21,6 @@ jobs:
             prefixStr: (prefix)
 
         exclude:
-          - php: 7.1
-            service: 'mysql:5.7'
-            prefix: flarum_
-          - php: 7.1
-            service: mariadb
-            prefix: flarum_
           - php: 7.2
             service: 'mysql:5.7'
             prefix: flarum_
@@ -55,7 +49,9 @@ jobs:
         run: sudo update-alternatives --set php $(which php${{ matrix.php }})
 
       - name: Create MySQL Database
-        run: mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 13306
+        run: |
+          sudo systemctl start mysql
+          mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 13306
 
       - name: Install Composer dependencies
         run: composer install

FRONTEND FRAMEWORK REWRITE CHANGES.md

@@ -0,0 +1,26 @@
+### Changes
+
+* Mithril
+    - See changes from v0.2.x @ https://mithril.js.org/migration-v02x.html
+    - Kept `m.prop` and `m.withAttr`
+    - Actual Promises are used now instead of `m.deferred`
+* Component
+    - Use new Mithril lifecycle hooks (`component.config` is gone)
+        - When implementing your own, you *must* call `super.<hook>(vnode)` to update `this.attrs`
+    - `component.render` now doesn't use the current state instance
+        - this is because of how Mithril v2 works
+        - now calls mithril on the component class (not instance) and its props
+* Translator
+    - Added `app.translator.transText`, automatically extracts text from `translator.trans` output
+* Utils
+    - Changed `computed` util to require multiple keys to be passed as an array
+    - `SubtreeRetainer` now has an `update` method instead of `retain`, and its output is used in `onbeforeupdate` lifecycle hook
+    - `Evented` util is now a class instead of an object
+    - `formatNumber` now uses `Number.prototype.toLocaleString` with the current application locale, and supports passing an options object (eg. for currency formatting - https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/NumberFormat/resolvedOptions#Description)
+* Modals
+    - `app.modal.show` now takes the Modal _class_ (not instance) and optional props (`app.modal.show(ForgotPasswordModal, props)`)
+
+#### Forum
+* Forum Application
+    - Renamed to `Forum`
+    - `app.search` is no longer global, extend using `extend`

composer.json

@@ -10,23 +10,23 @@
             "email": "franz@develophp.org"
         },
         {
-          "name": "Daniel Klabbers",
-          "email": "daniel@klabbers.email",
-          "homepage": "https://luceos.com"
+            "name": "Daniel Klabbers",
+            "email": "daniel@klabbers.email",
+            "homepage": "https://luceos.com"
         },
         {
-          "name": "David Sevilla Martin",
-          "email": "me+flarum@datitisev.me",
-          "homepage": "https://datitisev.me"
+            "name": "David Sevilla Martin",
+            "email": "me+flarum@datitisev.me",
+            "homepage": "https://datitisev.me"
         },
         {
-          "name": "Clark Winkelmann",
-          "email": "clark.winkelmann@gmail.com",
-          "homepage": "https://clarkwinkelmann.com"
+            "name": "Clark Winkelmann",
+            "email": "clark.winkelmann@gmail.com",
+            "homepage": "https://clarkwinkelmann.com"
         },
         {
-          "name": "Matthew Kilgore",
-          "email": "matthew@kilgore.dev"
+            "name": "Matthew Kilgore",
+            "email": "matthew@kilgore.dev"
         }
     ],
     "support": {
@@ -35,7 +35,7 @@
         "docs": "https://flarum.org/docs/"
     },
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.2",
         "axy/sourcemap": "^0.1.4",
         "components/font-awesome": "5.9.*",
         "dflydev/fig-cookies": "^1.0.2",
@@ -56,11 +56,10 @@
         "illuminate/support": "5.7.*",
         "illuminate/validation": "5.7.*",
         "illuminate/view": "5.7.*",
-        "intervention/image": "^2.3.0",
+        "intervention/image": "^2.5.0",
         "laminas/laminas-diactoros": "^1.8.4",
         "laminas/laminas-httphandlerrunner": "^1.0",
         "laminas/laminas-stratigility": "^3.0",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "league/flysystem": "^1.0.11",
         "matthiasmullie/minify": "^1.3",
         "middlewares/base-path": "^1.1",
@@ -78,7 +77,7 @@
         "symfony/translation": "^3.3",
         "symfony/yaml": "^3.3",
         "tobscure/json-api": "^0.3.0",
-        "wikimedia/less.php": "^2.0"
+        "wikimedia/less.php": "^3.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",

js/.prettierrc.json

@@ -0,0 +1,6 @@
+{
+  "printWidth": 150,
+  "singleQuote": true,
+  "tabWidth": 4,
+  "trailingComma": "es5"
+}

js/admin.js

@@ -1,11 +0,0 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-export * from './src/common';
-export * from './src/admin';

js/admin.ts

@@ -0,0 +1,2 @@
+export * from './src/common';
+export * from './src/admin';

js/forum.js

@@ -1,11 +0,0 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-export * from './src/common';
-export * from './src/forum';

js/forum.ts

@@ -0,0 +1,2 @@
+export * from './src/common';
+export * from './src/forum';

js/package.json

@@ -1,26 +1,60 @@
 {
-  "private": true,
   "name": "@flarum/core",
-  "dependencies": {
-    "bootstrap": "^3.4.1",
-    "classnames": "^2.2.5",
-    "color-thief-browser": "^2.0.2",
-    "expose-loader": "^0.7.5",
-    "flarum-webpack-config": "0.1.0-beta.10",
-    "jquery": "^3.4.1",
-    "jquery.hotkeys": "^0.1.0",
-    "lodash-es": "^4.17.14",
-    "m.attrs.bidi": "github:tobscure/m.attrs.bidi",
-    "mithril": "^0.2.8",
-    "moment": "^2.22.2",
-    "punycode": "^2.1.1",
-    "spin.js": "^3.1.0",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.1.2",
-    "webpack-merge": "^4.1.4"
-  },
+  "private": true,
   "scripts": {
     "dev": "webpack --mode development --watch",
-    "build": "webpack --mode production"
+    "build": "webpack --mode production",
+    "format": "prettier --write src \"*.{ts,js}\"",
+    "format-check": "prettier --check src \"*.{ts,js}\""
+  },
+  "dependencies": {
+    "bootstrap": "^3.4.1",
+    "classnames": "^2.2.6",
+    "colorthief": "^2.3.0",
+    "dayjs": "^1.8.26",
+    "flarum-webpack-config": "^0.1.0-beta.10",
+    "hc-sticky": "^2.2.3",
+    "jump.js": "^1.0.2",
+    "lodash": "^4.17.15",
+    "m.attrs.bidi": "github:tobscure/m.attrs.bidi",
+    "micromodal": "^0.4.6",
+    "mithril": "^2.0.4",
+    "mousetrap": "^1.6.5",
+    "punycode": "^2.1.1",
+    "spin.js": "^4.1.0",
+    "tooltip.js": "^1.3.3",
+    "zepto": "^1.2.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.9.6",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-transform-object-assign": "^7.8.3",
+    "@babel/plugin-transform-react-jsx": "^7.9.4",
+    "@babel/plugin-transform-runtime": "^7.9.6",
+    "@babel/preset-env": "^7.9.6",
+    "@babel/preset-react": "^7.9.4",
+    "@babel/preset-typescript": "^7.9.0",
+    "@babel/runtime": "^7.9.6",
+    "@types/classnames": "^2.2.10",
+    "@types/mithril": "^2.0.2",
+    "@types/zepto": "^1.0.30",
+    "babel-loader": "^8.0.6",
+    "expose-loader": "^0.7.5",
+    "friendly-errors-webpack-plugin": "^1.7.0",
+    "husky": "^4.2.5",
+    "imports-loader": "^0.8.0",
+    "prettier": "^2.0.5",
+    "source-map-loader": "^0.2.4",
+    "typescript": "^3.8.3",
+    "webpack": "^4.43.0",
+    "webpack-bundle-analyzer": "^3.7.0",
+    "webpack-cli": "^3.3.11",
+    "webpack-merge": "^4.2.2"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run format"
+    }
   }
 }

js/shims.d.ts

@@ -0,0 +1,7 @@
+export * from './webpack-flarum-shims';
+
+import Application from './src/common/Application';
+
+declare global {
+    const app: Application;
+}

js/src/admin/Admin.ts

@@ -0,0 +1,91 @@
+import HeaderPrimary from './components/HeaderPrimary';
+import HeaderSecondary from './components/HeaderSecondary';
+import routes from './routes';
+import Application, { ApplicationData } from '../common/Application';
+import Navigation from '../common/components/Navigation';
+import AdminNav from './components/AdminNav';
+
+type Extension = {
+    description: string;
+    extra: object;
+    icon: {
+        name: string;
+    };
+    id: number;
+    version: string;
+};
+
+export type AdminData = ApplicationData & {
+    mysqlVersion: string;
+    phpVersion: string;
+    extensions: {
+        [key: string]: Extension;
+    };
+    permissions: {
+        [key: string]: string[];
+    };
+    settings: {
+        [key: string]: string;
+    };
+};
+
+export default class Admin extends Application {
+    extensionSettings = {};
+
+    history = {
+        canGoBack: () => true,
+        getPrevious: () => {},
+        backUrl: () => this.forum.attribute('baseUrl'),
+        back: function () {
+            window.location = this.backUrl();
+        },
+    };
+
+    data!: AdminData;
+
+    constructor() {
+        super();
+
+        routes(this);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    mount() {
+        m.mount(document.getElementById('app-navigation'), new Navigation({ className: 'App-backControl', drawer: true }));
+        m.mount(document.getElementById('header-navigation'), new Navigation());
+        m.mount(document.getElementById('header-primary'), new HeaderPrimary());
+        m.mount(document.getElementById('header-secondary'), new HeaderSecondary());
+        m.mount(document.getElementById('admin-navigation'), new AdminNav());
+
+        if (!document.location.hash) document.location.hash = '#/';
+
+        m.route.prefix = '#';
+        super.mount();
+
+        // If an extension has just been enabled, then we will run its settings
+        // callback.
+        const enabled = localStorage.getItem('enabledExtension');
+        if (enabled && this.extensionSettings[enabled]) {
+            this.extensionSettings[enabled]();
+            localStorage.removeItem('enabledExtension');
+        }
+    }
+
+    getRequiredPermissions(permission) {
+        const required: string[] = [];
+
+        if (permission === 'startDiscussion' || permission.indexOf('discussion.') === 0) {
+            required.push('viewDiscussions');
+        }
+        if (permission === 'discussion.delete') {
+            required.push('discussion.hide');
+        }
+        if (permission === 'discussion.deletePosts') {
+            required.push('discussion.hidePosts');
+        }
+
+        return required;
+    }
+}

js/src/admin/AdminApplication.js

@@ -1,63 +0,0 @@
-import HeaderPrimary from './components/HeaderPrimary';
-import HeaderSecondary from './components/HeaderSecondary';
-import routes from './routes';
-import Application from '../common/Application';
-import Navigation from '../common/components/Navigation';
-import AdminNav from './components/AdminNav';
-
-export default class AdminApplication extends Application {
-  extensionSettings = {};
-
-  history = {
-    canGoBack: () => true,
-    getPrevious: () => {},
-    backUrl: () => this.forum.attribute('baseUrl'),
-    back: function() {
-      window.location = this.backUrl();
-    }
-  };
-
-  constructor() {
-    super();
-
-    routes(this);
-  }
-
-  /**
-   * @inheritdoc
-   */
-  mount() {
-    m.mount(document.getElementById('app-navigation'), Navigation.component({className: 'App-backControl', drawer: true}));
-    m.mount(document.getElementById('header-navigation'), Navigation.component());
-    m.mount(document.getElementById('header-primary'), HeaderPrimary.component());
-    m.mount(document.getElementById('header-secondary'), HeaderSecondary.component());
-    m.mount(document.getElementById('admin-navigation'), AdminNav.component());
-
-    m.route.mode = 'hash';
-    super.mount();
-
-    // If an extension has just been enabled, then we will run its settings
-    // callback.
-    const enabled = localStorage.getItem('enabledExtension');
-    if (enabled && this.extensionSettings[enabled]) {
-      this.extensionSettings[enabled]();
-      localStorage.removeItem('enabledExtension');
-    }
-  }
-
-  getRequiredPermissions(permission) {
-    const required = [];
-
-    if (permission === 'startDiscussion' || permission.indexOf('discussion.') === 0) {
-      required.push('viewDiscussions');
-    }
-    if (permission === 'discussion.delete') {
-      required.push('discussion.hide');
-    }
-    if (permission === 'discussion.deletePosts') {
-      required.push('discussion.hidePosts');
-    }
-
-    return required;
-  };
-}

js/src/admin/app.ts

@@ -0,0 +1,8 @@
+import Admin from './Admin';
+
+const app = new Admin();
+
+// @ts-ignore
+window.app = app;
+
+export default app;

js/src/admin/compat.ts

@@ -15,7 +15,6 @@ import AddExtensionModal from './components/AddExtensionModal';
 import ExtensionsPage from './components/ExtensionsPage';
 import AdminLinkButton from './components/AdminLinkButton';
 import PermissionGrid from './components/PermissionGrid';
-import Widget from './components/Widget';
 import MailPage from './components/MailPage';
 import UploadImageButton from './components/UploadImageButton';
 import LoadingModal from './components/LoadingModal';
@@ -28,36 +27,35 @@ import AdminNav from './components/AdminNav';
 import EditCustomCssModal from './components/EditCustomCssModal';
 import EditGroupModal from './components/EditGroupModal';
 import routes from './routes';
-import AdminApplication from './AdminApplication';
+import Admin from './Admin';
 
 export default Object.assign(compat, {
-  'utils/saveSettings': saveSettings,
-  'components/SettingDropdown': SettingDropdown,
-  'components/EditCustomFooterModal': EditCustomFooterModal,
-  'components/SessionDropdown': SessionDropdown,
-  'components/HeaderPrimary': HeaderPrimary,
-  'components/AppearancePage': AppearancePage,
-  'components/Page': Page,
-  'components/StatusWidget': StatusWidget,
-  'components/HeaderSecondary': HeaderSecondary,
-  'components/SettingsModal': SettingsModal,
-  'components/DashboardWidget': DashboardWidget,
-  'components/AddExtensionModal': AddExtensionModal,
-  'components/ExtensionsPage': ExtensionsPage,
-  'components/AdminLinkButton': AdminLinkButton,
-  'components/PermissionGrid': PermissionGrid,
-  'components/Widget': Widget,
-  'components/MailPage': MailPage,
-  'components/UploadImageButton': UploadImageButton,
-  'components/LoadingModal': LoadingModal,
-  'components/DashboardPage': DashboardPage,
-  'components/BasicsPage': BasicsPage,
-  'components/EditCustomHeaderModal': EditCustomHeaderModal,
-  'components/PermissionsPage': PermissionsPage,
-  'components/PermissionDropdown': PermissionDropdown,
-  'components/AdminNav': AdminNav,
-  'components/EditCustomCssModal': EditCustomCssModal,
-  'components/EditGroupModal': EditGroupModal,
-  'routes': routes,
-  'AdminApplication': AdminApplication
-});
+    'utils/saveSettings': saveSettings,
+    'components/SettingDropdown': SettingDropdown,
+    'components/EditCustomFooterModal': EditCustomFooterModal,
+    'components/SessionDropdown': SessionDropdown,
+    'components/HeaderPrimary': HeaderPrimary,
+    'components/AppearancePage': AppearancePage,
+    'components/Page': Page,
+    'components/StatusWidget': StatusWidget,
+    'components/HeaderSecondary': HeaderSecondary,
+    'components/SettingsModal': SettingsModal,
+    'components/DashboardWidget': DashboardWidget,
+    'components/AddExtensionModal': AddExtensionModal,
+    'components/ExtensionsPage': ExtensionsPage,
+    'components/AdminLinkButton': AdminLinkButton,
+    'components/PermissionGrid': PermissionGrid,
+    'components/MailPage': MailPage,
+    'components/UploadImageButton': UploadImageButton,
+    'components/LoadingModal': LoadingModal,
+    'components/DashboardPage': DashboardPage,
+    'components/BasicsPage': BasicsPage,
+    'components/EditCustomHeaderModal': EditCustomHeaderModal,
+    'components/PermissionsPage': PermissionsPage,
+    'components/PermissionDropdown': PermissionDropdown,
+    'components/AdminNav': AdminNav,
+    'components/EditCustomCssModal': EditCustomCssModal,
+    'components/EditGroupModal': EditGroupModal,
+    routes: routes,
+    Admin: Admin,
+}) as any;

js/src/admin/components/AddExtensionModal.js

@@ -1,30 +0,0 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-import Modal from '../../common/components/Modal';
-
-export default class AddExtensionModal extends Modal {
-  className() {
-    return 'AddExtensionModal Modal--small';
-  }
-
-  title() {
-    return app.translator.trans('core.admin.add_extension.title');
-  }
-
-  content() {
-    return (
-      <div className="Modal-body">
-        <p>{app.translator.trans('core.admin.add_extension.temporary_text')}</p>
-        <p>{app.translator.trans('core.admin.add_extension.install_text', {a: <a href="https://discuss.flarum.org/t/extensions" target="_blank"/>})}</p>
-        <p>{app.translator.trans('core.admin.add_extension.developer_text', {a: <a href="http://flarum.org/docs/extend" target="_blank"/>})}</p>
-      </div>
-    );
-  }
-}

js/src/admin/components/AddExtensionModal.tsx

@@ -0,0 +1,30 @@
+import app from '../app';
+import Modal from '../../common/components/Modal';
+
+export default class AddExtensionModal extends Modal {
+    className() {
+        return 'AddExtensionModal Modal--small';
+    }
+
+    title() {
+        return app.translator.trans('core.admin.add_extension.title');
+    }
+
+    content() {
+        return (
+            <div className="Modal-body">
+                <p>{app.translator.trans('core.admin.add_extension.temporary_text')}</p>
+                <p>
+                    {app.translator.trans('core.admin.add_extension.install_text', {
+                        a: <a href="https://discuss.flarum.org/t/extensions" target="_blank" />,
+                    })}
+                </p>
+                <p>
+                    {app.translator.trans('core.admin.add_extension.developer_text', {
+                        a: <a href="http://flarum.org/docs/extend" target="_blank" />,
+                    })}
+                </p>
+            </div>
+        );
+    }
+}

js/src/admin/components/AdminLinkButton.js

@@ -1,24 +0,0 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-import LinkButton from '../../common/components/LinkButton';
-
-export default class AdminLinkButton extends LinkButton {
-  getButtonContent() {
-    const content = super.getButtonContent();
-
-    content.push(
-      <div className="AdminLinkButton-description">
-        {this.props.description}
-      </div>
-    );
-
-    return content;
-  }
-}

js/src/admin/components/AdminLinkButton.tsx

@@ -0,0 +1,15 @@
+import LinkButton, { LinkButtonProps } from '../../common/components/LinkButton';
+
+export interface AdminLinkButtonProps extends LinkButtonProps {
+    description?: string;
+}
+
+export default class AdminLinkButton<T extends AdminLinkButtonProps = AdminLinkButtonProps> extends LinkButton<T> {
+    getButtonContent() {
+        const content = super.getButtonContent(this.props.icon, this.props.loading, this.props.children);
+
+        content.push(<div className="AdminLinkButton-description">{this.props.description}</div>);
+
+        return content;
+    }
+}

js/src/admin/components/AdminNav.js

@@ -1,78 +0,0 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-import Component from '../../common/Component';
-import AdminLinkButton from './AdminLinkButton';
-import SelectDropdown from '../../common/components/SelectDropdown';
-import ItemList from '../../common/utils/ItemList';
-
-export default class AdminNav extends Component {
-  view() {
-    return (
-      <SelectDropdown
-        className="AdminNav App-titleControl"
-        buttonClassName="Button">
-        {this.items().toArray()}
-      </SelectDropdown>
-    );
-  }
-
-  /**
-   * Build an item list of links to show in the admin navigation.
-   *
-   * @return {ItemList}
-   */
-  items() {
-    const items = new ItemList();
-
-    items.add('dashboard', AdminLinkButton.component({
-      href: app.route('dashboard'),
-      icon: 'far fa-chart-bar',
-      children: app.translator.trans('core.admin.nav.dashboard_button'),
-      description: app.translator.trans('core.admin.nav.dashboard_text')
-    }));
-
-    items.add('basics', AdminLinkButton.component({
-      href: app.route('basics'),
-      icon: 'fas fa-pencil-alt',
-      children: app.translator.trans('core.admin.nav.basics_button'),
-      description: app.translator.trans('core.admin.nav.basics_text')
-    }));
-
-    items.add('mail', AdminLinkButton.component({
-      href: app.route('mail'),
-      icon: 'fas fa-envelope',
-      children: app.translator.trans('core.admin.nav.email_button'),
-      description: app.translator.trans('core.admin.nav.email_text')
-    }));
-
-    items.add('permissions', AdminLinkButton.component({
-      href: app.route('permissions'),
-      icon: 'fas fa-key',
-      children: app.translator.trans('core.admin.nav.permissions_button'),
-      description: app.translator.trans('core.admin.nav.permissions_text')
-    }));
-
-    items.add('appearance', AdminLinkButton.component({
-      href: app.route('appearance'),
-      icon: 'fas fa-paint-brush',
-      children: app.translator.trans('core.admin.nav.appearance_button'),
-      description: app.translator.trans('core.admin.nav.appearance_text')
-    }));
-
-    items.add('extensions', AdminLinkButton.component({
-      href: app.route('extensions'),
-      icon: 'fas fa-puzzle-piece',
-      children: app.translator.trans('core.admin.nav.extensions_button'),
-      description: app.translator.trans('core.admin.nav.extensions_text')
-    }));
-
-    return items;
-  }
-}

js/src/admin/components/AdminNav.tsx

@@ -0,0 +1,85 @@
+import Component from '../../common/Component';
+import AdminLinkButton from './AdminLinkButton';
+import SelectDropdown from '../../common/components/SelectDropdown';
+import ItemList from '../../common/utils/ItemList';
+
+export default class AdminNav<T> extends Component<T> {
+    view() {
+        return (
+            <SelectDropdown className="AdminNav App-titleControl" buttonClassName="Button">
+                {this.items().toArray()}
+            </SelectDropdown>
+        );
+    }
+
+    /**
+     * Build an item list of links to show in the admin navigation.
+     *
+     * @return {ItemList}
+     */
+    items() {
+        const items = new ItemList();
+
+        items.add(
+            'dashboard',
+            AdminLinkButton.component({
+                href: app.route('dashboard'),
+                icon: 'far fa-chart-bar',
+                children: app.translator.trans('core.admin.nav.dashboard_button'),
+                description: app.translator.trans('core.admin.nav.dashboard_text'),
+            })
+        );
+
+        items.add(
+            'basics',
+            AdminLinkButton.component({
+                href: app.route('basics'),
+                icon: 'fas fa-pencil-alt',
+                children: app.translator.trans('core.admin.nav.basics_button'),
+                description: app.translator.trans('core.admin.nav.basics_text'),
+            })
+        );
+
+        items.add(
+            'mail',
+            AdminLinkButton.component({
+                href: app.route('mail'),
+                icon: 'fas fa-envelope',
+                children: app.translator.trans('core.admin.nav.email_button'),
+                description: app.translator.trans('core.admin.nav.email_text'),
+            })
+        );
+
+        items.add(
+            'permissions',
+            AdminLinkButton.component({
+                href: app.route('permissions'),
+                icon: 'fas fa-key',
+                children: app.translator.trans('core.admin.nav.permissions_button'),
+                description: app.translator.trans('core.admin.nav.permissions_text'),
+            })
+        );
+
+        items.add(
+            'appearance',
+            AdminLinkButton.component({
+                href: app.route('appearance'),
+                icon: 'fas fa-paint-brush',
+                children: app.translator.trans('core.admin.nav.appearance_button'),
+                description: app.translator.trans('core.admin.nav.appearance_text'),
+            })
+        );
+
+        items.add(
+            'extensions',
+            AdminLinkButton.component({
+                href: app.route('extensions'),
+                icon: 'fas fa-puzzle-piece',
+                children: app.translator.trans('core.admin.nav.extensions_button'),
+                description: app.translator.trans('core.admin.nav.extensions_text'),
+            })
+        );
+
+        return items;
+    }
+}

js/src/admin/components/AppearancePage.js

@@ -1,132 +0,0 @@
-import Page from './Page';
-import Button from '../../common/components/Button';
-import Switch from '../../common/components/Switch';
-import EditCustomCssModal from './EditCustomCssModal';
-import EditCustomHeaderModal from './EditCustomHeaderModal';
-import EditCustomFooterModal from './EditCustomFooterModal';
-import UploadImageButton from './UploadImageButton';
-import saveSettings from '../utils/saveSettings';
-
-export default class AppearancePage extends Page {
-  init() {
-    super.init();
-
-    this.primaryColor = m.prop(app.data.settings.theme_primary_color);
-    this.secondaryColor = m.prop(app.data.settings.theme_secondary_color);
-    this.darkMode = m.prop(app.data.settings.theme_dark_mode === '1');
-    this.coloredHeader = m.prop(app.data.settings.theme_colored_header === '1');
-  }
-
-  view() {
-    return (
-      <div className="AppearancePage">
-        <div className="container">
-          <form onsubmit={this.onsubmit.bind(this)}>
-            <fieldset className="AppearancePage-colors">
-              <legend>{app.translator.trans('core.admin.appearance.colors_heading')}</legend>
-              <div className="helpText">
-                {app.translator.trans('core.admin.appearance.colors_text')}
-              </div>
-
-              <div className="AppearancePage-colors-input">
-                <input className="FormControl" type="text" placeholder="#aaaaaa" value={this.primaryColor()} onchange={m.withAttr('value', this.primaryColor)}/>
-                <input className="FormControl" type="text" placeholder="#aaaaaa" value={this.secondaryColor()} onchange={m.withAttr('value', this.secondaryColor)}/>
-              </div>
-
-              {Switch.component({
-                state: this.darkMode(),
-                children: app.translator.trans('core.admin.appearance.dark_mode_label'),
-                onchange: this.darkMode
-              })}
-
-              {Switch.component({
-                state: this.coloredHeader(),
-                children: app.translator.trans('core.admin.appearance.colored_header_label'),
-                onchange: this.coloredHeader
-              })}
-
-              {Button.component({
-                className: 'Button Button--primary',
-                type: 'submit',
-                children: app.translator.trans('core.admin.appearance.submit_button'),
-                loading: this.loading
-              })}
-            </fieldset>
-          </form>
-
-          <fieldset>
-            <legend>{app.translator.trans('core.admin.appearance.logo_heading')}</legend>
-            <div className="helpText">
-              {app.translator.trans('core.admin.appearance.logo_text')}
-            </div>
-            <UploadImageButton name="logo"/>
-          </fieldset>
-
-          <fieldset>
-            <legend>{app.translator.trans('core.admin.appearance.favicon_heading')}</legend>
-            <div className="helpText">
-              {app.translator.trans('core.admin.appearance.favicon_text')}
-            </div>
-            <UploadImageButton name="favicon"/>
-          </fieldset>
-
-          <fieldset>
-            <legend>{app.translator.trans('core.admin.appearance.custom_header_heading')}</legend>
-            <div className="helpText">
-              {app.translator.trans('core.admin.appearance.custom_header_text')}
-            </div>
-            {Button.component({
-              className: 'Button',
-              children: app.translator.trans('core.admin.appearance.edit_header_button'),
-              onclick: () => app.modal.show(new EditCustomHeaderModal())
-            })}
-          </fieldset>
-
-          <fieldset>
-            <legend>{app.translator.trans('core.admin.appearance.custom_footer_heading')}</legend>
-            <div className="helpText">
-              {app.translator.trans('core.admin.appearance.custom_footer_text')}
-            </div>
-            {Button.component({
-              className: 'Button',
-              children: app.translator.trans('core.admin.appearance.edit_footer_button'),
-              onclick: () => app.modal.show(new EditCustomFooterModal())
-            })}
-          </fieldset>
-
-          <fieldset>
-            <legend>{app.translator.trans('core.admin.appearance.custom_styles_heading')}</legend>
-            <div className="helpText">
-              {app.translator.trans('core.admin.appearance.custom_styles_text')}
-            </div>
-            {Button.component({
-              className: 'Button',
-              children: app.translator.trans('core.admin.appearance.edit_css_button'),
-              onclick: () => app.modal.show(new EditCustomCssModal())
-            })}
-          </fieldset>
-        </div>
-      </div>
-    );
-  }
-
-  onsubmit(e) {
-    e.preventDefault();
-
-    const hex = /^#[0-9a-f]{3}([0-9a-f]{3})?$/i;
-
-    if (!hex.test(this.primaryColor()) || !hex.test(this.secondaryColor())) {
-      alert(app.translator.trans('core.admin.appearance.enter_hex_message'));
-      return;
-    }
-
-    this.loading = true;
-
-    saveSettings({
-      theme_primary_color: this.primaryColor(),
-      theme_secondary_color: this.secondaryColor(),
-      theme_dark_mode: this.darkMode(),
-      theme_colored_header: this.coloredHeader()
-    }).then(() => window.location.reload());
-  }
-}

js/src/admin/components/AppearancePage.tsx

@@ -0,0 +1,131 @@
+import app from '../app';
+
+import Page from './Page';
+import Button from '../../common/components/Button';
+import Switch from '../../common/components/Switch';
+import EditCustomCssModal from './EditCustomCssModal';
+import EditCustomHeaderModal from './EditCustomHeaderModal';
+import EditCustomFooterModal from './EditCustomFooterModal';
+import UploadImageButton from './UploadImageButton';
+import saveSettings from '../utils/saveSettings';
+
+export default class AppearancePage extends Page {
+    loading = false;
+    primaryColor = m.prop(app.data.settings.theme_primary_color);
+    secondaryColor = m.prop(app.data.settings.theme_secondary_color);
+    darkMode = m.prop(app.data.settings.theme_dark_mode === '1');
+    coloredHeader = m.prop(app.data.settings.theme_colored_header === '1');
+
+    view() {
+        return (
+            <div className="AppearancePage">
+                <div className="container">
+                    <form onsubmit={this.onsubmit.bind(this)}>
+                        <fieldset className="AppearancePage-colors">
+                            <legend>{app.translator.trans('core.admin.appearance.colors_heading')}</legend>
+                            <div className="helpText">{app.translator.trans('core.admin.appearance.colors_text')}</div>
+
+                            <div className="AppearancePage-colors-input">
+                                <input
+                                    className="FormControl"
+                                    type="text"
+                                    placeholder="#aaaaaa"
+                                    value={this.primaryColor()}
+                                    onchange={m.withAttr('value', this.primaryColor)}
+                                />
+                                <input
+                                    className="FormControl"
+                                    type="text"
+                                    placeholder="#aaaaaa"
+                                    value={this.secondaryColor()}
+                                    onchange={m.withAttr('value', this.secondaryColor)}
+                                />
+                            </div>
+
+                            {Switch.component({
+                                state: this.darkMode(),
+                                children: app.translator.trans('core.admin.appearance.dark_mode_label'),
+                                onchange: this.darkMode,
+                            })}
+
+                            {Switch.component({
+                                state: this.coloredHeader(),
+                                children: app.translator.trans('core.admin.appearance.colored_header_label'),
+                                onchange: this.coloredHeader,
+                            })}
+
+                            {Button.component({
+                                className: 'Button Button--primary',
+                                type: 'submit',
+                                children: app.translator.trans('core.admin.appearance.submit_button'),
+                                loading: this.loading,
+                            })}
+                        </fieldset>
+                    </form>
+
+                    <fieldset>
+                        <legend>{app.translator.trans('core.admin.appearance.logo_heading')}</legend>
+                        <div className="helpText">{app.translator.trans('core.admin.appearance.logo_text')}</div>
+                        <UploadImageButton name="logo" />
+                    </fieldset>
+
+                    <fieldset>
+                        <legend>{app.translator.trans('core.admin.appearance.favicon_heading')}</legend>
+                        <div className="helpText">{app.translator.trans('core.admin.appearance.favicon_text')}</div>
+                        <UploadImageButton name="favicon" />
+                    </fieldset>
+
+                    <fieldset>
+                        <legend>{app.translator.trans('core.admin.appearance.custom_header_heading')}</legend>
+                        <div className="helpText">{app.translator.trans('core.admin.appearance.custom_header_text')}</div>
+                        {Button.component({
+                            className: 'Button',
+                            children: app.translator.trans('core.admin.appearance.edit_header_button'),
+                            onclick: () => app.modal.show(EditCustomHeaderModal),
+                        })}
+                    </fieldset>
+
+                    <fieldset>
+                        <legend>{app.translator.trans('core.admin.appearance.custom_footer_heading')}</legend>
+                        <div className="helpText">{app.translator.trans('core.admin.appearance.custom_footer_text')}</div>
+                        {Button.component({
+                            className: 'Button',
+                            children: app.translator.trans('core.admin.appearance.edit_footer_button'),
+                            onclick: () => app.modal.show(EditCustomFooterModal),
+                        })}
+                    </fieldset>
+
+                    <fieldset>
+                        <legend>{app.translator.trans('core.admin.appearance.custom_styles_heading')}</legend>
+                        <div className="helpText">{app.translator.trans('core.admin.appearance.custom_styles_text')}</div>
+                        {Button.component({
+                            className: 'Button',
+                            children: app.translator.trans('core.admin.appearance.edit_css_button'),
+                            onclick: () => app.modal.show(EditCustomCssModal),
+                        })}
+                    </fieldset>
+                </div>
+            </div>
+        );
+    }
+
+    onsubmit(e) {
+        e.preventDefault();
+
+        const hex = /^#[0-9a-f]{3}([0-9a-f]{3})?$/i;
+
+        if (!hex.test(this.primaryColor()) || !hex.test(this.secondaryColor())) {
+            alert(app.translator.trans('core.admin.appearance.enter_hex_message'));
+            return;
+        }
+
+        this.loading = true;
+
+        saveSettings({
+            theme_primary_color: this.primaryColor(),
+            theme_secondary_color: this.secondaryColor(),
+            theme_dark_mode: this.darkMode(),
+            theme_colored_header: this.coloredHeader(),
+        }).then(() => window.location.reload());
+    }
+}

js/src/admin/components/BasicsPage.js

@@ -1,166 +0,0 @@
-import Page from './Page';
-import FieldSet from '../../common/components/FieldSet';
-import Select from '../../common/components/Select';
-import Button from '../../common/components/Button';
-import Alert from '../../common/components/Alert';
-import saveSettings from '../utils/saveSettings';
-import ItemList from '../../common/utils/ItemList';
-import Switch from '../../common/components/Switch';
-
-export default class BasicsPage extends Page {
-  init() {
-    super.init();
-
-    this.loading = false;
-
-    this.fields = [
-      'forum_title',
-      'forum_description',
-      'default_locale',
-      'show_language_selector',
-      'default_route',
-      'welcome_title',
-      'welcome_message'
-    ];
-    this.values = {};
-
-    const settings = app.data.settings;
-    this.fields.forEach(key => this.values[key] = m.prop(settings[key]));
-
-    this.localeOptions = {};
-    const locales = app.data.locales;
-    for (const i in locales) {
-      this.localeOptions[i] = `${locales[i]} (${i})`;
-    }
-
-    if (typeof this.values.show_language_selector() !== "number") this.values.show_language_selector(1);
-  }
-
-  view() {
-    return (
-      <div className="BasicsPage">
-        <div className="container">
-          <form onsubmit={this.onsubmit.bind(this)}>
-            {FieldSet.component({
-              label: app.translator.trans('core.admin.basics.forum_title_heading'),
-              children: [
-                <input className="FormControl" value={this.values.forum_title()} oninput={m.withAttr('value', this.values.forum_title)}/>
-              ]
-            })}
-
-            {FieldSet.component({
-              label: app.translator.trans('core.admin.basics.forum_description_heading'),
-              children: [
-                <div className="helpText">
-                  {app.translator.trans('core.admin.basics.forum_description_text')}
-                </div>,
-                <textarea className="FormControl" value={this.values.forum_description()} oninput={m.withAttr('value', this.values.forum_description)}/>
-              ]
-            })}
-
-            {Object.keys(this.localeOptions).length > 1
-              ? FieldSet.component({
-                label: app.translator.trans('core.admin.basics.default_language_heading'),
-                children: [
-                  Select.component({
-                    options: this.localeOptions,
-                    value: this.values.default_locale(),
-                    onchange: this.values.default_locale
-                  }),
-                  Switch.component({
-                    state: this.values.show_language_selector(),
-                    onchange: this.values.show_language_selector,
-                    children: app.translator.trans('core.admin.basics.show_language_selector_label'),
-                  })
-                ]
-              })
-              : ''}
-
-            {FieldSet.component({
-              label: app.translator.trans('core.admin.basics.home_page_heading'),
-              className: 'BasicsPage-homePage',
-              children: [
-                <div className="helpText">
-                  {app.translator.trans('core.admin.basics.home_page_text')}
-                </div>,
-                this.homePageItems().toArray().map(({path, label}) =>
-                  <label className="checkbox">
-                    <input type="radio" name="homePage" value={path} checked={this.values.default_route() === path} onclick={m.withAttr('value', this.values.default_route)}/>
-                    {label}
-                  </label>
-                )
-              ]
-            })}
-
-            {FieldSet.component({
-              label: app.translator.trans('core.admin.basics.welcome_banner_heading'),
-              className: 'BasicsPage-welcomeBanner',
-              children: [
-                <div className="helpText">
-                  {app.translator.trans('core.admin.basics.welcome_banner_text')}
-                </div>,
-                <div className="BasicsPage-welcomeBanner-input">
-                  <input className="FormControl" value={this.values.welcome_title()} oninput={m.withAttr('value', this.values.welcome_title)}/>
-                  <textarea className="FormControl" value={this.values.welcome_message()} oninput={m.withAttr('value', this.values.welcome_message)}/>
-                </div>
-              ]
-            })}
-
-            {Button.component({
-              type: 'submit',
-              className: 'Button Button--primary',
-              children: app.translator.trans('core.admin.basics.submit_button'),
-              loading: this.loading,
-              disabled: !this.changed()
-            })}
-          </form>
-        </div>
-      </div>
-    );
-  }
-
-  changed() {
-    return this.fields.some(key => this.values[key]() !== app.data.settings[key]);
-  }
-
-  /**
-   * Build a list of options for the default homepage. Each option must be an
-   * object with `path` and `label` properties.
-   *
-   * @return {ItemList}
-   * @public
-   */
-  homePageItems() {
-    const items = new ItemList();
-
-    items.add('allDiscussions', {
-      path: '/all',
-      label: app.translator.trans('core.admin.basics.all_discussions_label')
-    });
-
-    return items;
-  }
-
-  onsubmit(e) {
-    e.preventDefault();
-
-    if (this.loading) return;
-
-    this.loading = true;
-    app.alerts.dismiss(this.successAlert);
-
-    const settings = {};
-
-    this.fields.forEach(key => settings[key] = this.values[key]());
-
-    saveSettings(settings)
-      .then(() => {
-        app.alerts.show(this.successAlert = new Alert({type: 'success', children: app.translator.trans('core.admin.basics.saved_message')}));
-      })
-      .catch(() => {})
-      .then(() => {
-        this.loading = false;
-        m.redraw();
-      });
-  }
-}

js/src/admin/components/BasicsPage.tsx

@@ -0,0 +1,191 @@
+import app from '../app';
+
+import Page from './Page';
+import Button from '../../common/components/Button';
+import FieldSet from '../../common/components/FieldSet';
+import Select from '../../common/components/Select';
+import Switch from '../../common/components/Switch';
+import saveSettings from '../utils/saveSettings';
+import ItemList from '../../common/utils/ItemList';
+import AlertState from '../../common/states/AlertState';
+
+import Stream from 'mithril/stream';
+
+export default class BasicsPage extends Page {
+    loading: boolean = false;
+    fields: string[] = [
+        'forum_title',
+        'forum_description',
+        'default_locale',
+        'show_language_selector',
+        'default_route',
+        'welcome_title',
+        'welcome_message',
+    ];
+
+    values: { [key: string]: Stream<any> } = {};
+
+    localeOptions: object = {};
+
+    successAlert?: number;
+
+    oninit(vnode) {
+        super.oninit(vnode);
+
+        const settings = app.data.settings;
+        this.fields.forEach((key) => (this.values[key] = m.prop(settings[key])));
+
+        const locales = app.data.locales;
+        for (const i in locales) {
+            this.localeOptions[i] = `${locales[i]} (${i})`;
+        }
+
+        if (typeof this.values.show_language_selector() !== 'number') this.values.show_language_selector(1);
+    }
+
+    view() {
+        return (
+            <div className="BasicsPage">
+                <div className="container">
+                    <form onsubmit={this.onsubmit.bind(this)}>
+                        {FieldSet.component({
+                            label: app.translator.trans('core.admin.basics.forum_title_heading'),
+                            children: [
+                                <input
+                                    className="FormControl"
+                                    value={this.values.forum_title()}
+                                    oninput={m.withAttr('value', this.values.forum_title)}
+                                />,
+                            ],
+                        })}
+
+                        {FieldSet.component({
+                            label: app.translator.trans('core.admin.basics.forum_description_heading'),
+                            children: [
+                                <div className="helpText">{app.translator.trans('core.admin.basics.forum_description_text')}</div>,
+                                <textarea
+                                    className="FormControl"
+                                    value={this.values.forum_description()}
+                                    oninput={m.withAttr('value', this.values.forum_description)}
+                                />,
+                            ],
+                        })}
+
+                        {Object.keys(this.localeOptions).length > 1
+                            ? FieldSet.component({
+                                  label: app.translator.trans('core.admin.basics.default_language_heading'),
+                                  children: [
+                                      Select.component({
+                                          options: this.localeOptions,
+                                          value: this.values.default_locale(),
+                                          onchange: this.values.default_locale,
+                                      }),
+                                      Switch.component({
+                                          state: this.values.show_language_selector(),
+                                          onchange: this.values.show_language_selector,
+                                          children: app.translator.trans('core.admin.basics.show_language_selector_label'),
+                                      }),
+                                  ],
+                              })
+                            : ''}
+
+                        {FieldSet.component({
+                            label: app.translator.trans('core.admin.basics.home_page_heading'),
+                            className: 'BasicsPage-homePage',
+                            children: [
+                                <div className="helpText">{app.translator.trans('core.admin.basics.home_page_text')}</div>,
+                                this.homePageItems()
+                                    .toArray()
+                                    .map(({ path, label }) => (
+                                        <label className="checkbox">
+                                            <input
+                                                type="radio"
+                                                name="homePage"
+                                                value={path}
+                                                checked={this.values.default_route() === path}
+                                                onclick={m.withAttr('value', this.values.default_route)}
+                                            />
+                                            {label}
+                                        </label>
+                                    )),
+                            ],
+                        })}
+
+                        {FieldSet.component({
+                            label: app.translator.trans('core.admin.basics.welcome_banner_heading'),
+                            className: 'BasicsPage-welcomeBanner',
+                            children: [
+                                <div className="helpText">{app.translator.trans('core.admin.basics.welcome_banner_text')}</div>,
+                                <div className="BasicsPage-welcomeBanner-input">
+                                    <input
+                                        className="FormControl"
+                                        value={this.values.welcome_title()}
+                                        oninput={m.withAttr('value', this.values.welcome_title)}
+                                    />
+                                    <textarea
+                                        className="FormControl"
+                                        value={this.values.welcome_message()}
+                                        oninput={m.withAttr('value', this.values.welcome_message)}
+                                    />
+                                </div>,
+                            ],
+                        })}
+
+                        {Button.component({
+                            type: 'submit',
+                            className: 'Button Button--primary',
+                            children: app.translator.trans('core.admin.basics.submit_button'),
+                            loading: this.loading,
+                            disabled: !this.changed(),
+                        })}
+                    </form>
+                </div>
+            </div>
+        );
+    }
+
+    changed() {
+        return this.fields.some((key) => this.values[key]() !== app.data.settings[key]);
+    }
+
+    /**
+     * Build a list of options for the default homepage. Each option must be an
+     * object with `path` and `label` properties.
+     *
+     * @return {ItemList}
+     * @public
+     */
+    homePageItems() {
+        const items = new ItemList();
+
+        items.add('allDiscussions', {
+            path: '/all',
+            label: app.translator.trans('core.admin.basics.all_discussions_label'),
+        });
+
+        return items;
+    }
+
+    onsubmit(e) {
+        e.preventDefault();
+
+        if (this.loading) return;
+
+        this.loading = true;
+        app.alerts.dismiss(this.successAlert);
+
+        const settings = {};
+
+        this.fields.forEach((key) => (settings[key] = this.values[key]()));
+
+        saveSettings(settings)
+            .then(() => {
+                this.successAlert = app.alerts.show({ type: 'success', children: app.translator.trans('core.admin.basics.saved_message') });
+            })
+            .catch(() => {})
+            .then(() => {
+                this.loading = false;
+                m.redraw();
+            });
+    }
+}

js/src/admin/components/DashboardPage.js

@@ -1,18 +0,0 @@
-import Page from './Page';
-import StatusWidget from './StatusWidget';
-
-export default class DashboardPage extends Page {
-  view() {
-    return (
-      <div className="DashboardPage">
-        <div className="container">
-          {this.availableWidgets()}
-        </div>
-      </div>
-    );
-  }
-
-  availableWidgets() {
-    return [<StatusWidget/>];
-  }
-}

js/src/admin/components/DashboardPage.tsx

@@ -0,0 +1,16 @@
+import Page from './Page';
+import StatusWidget from './StatusWidget';
+
+export default class DashboardPage extends Page {
+    view() {
+        return (
+            <div className="DashboardPage">
+                <div className="container">{this.availableWidgets()}</div>
+            </div>
+        );
+    }
+
+    availableWidgets() {
+        return [<StatusWidget />];
+    }
+}

js/src/admin/components/DashboardWidget.js

@@ -1,38 +0,0 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-import Component from '../../common/Component';
-
-export default class Widget extends Component {
-  view() {
-    return (
-      <div className={"Widget "+this.className()}>
-        {this.content()}
-      </div>
-    );
-  }
-
-  /**
-   * Get the class name to apply to the widget.
-   *
-   * @return {String}
-   */
-  className() {
-    return '';
-  }
-
-  /**
-   * Get the content of the widget.
-   *
-   * @return {VirtualElement}
-   */
-  content() {
-    return [];
-  }
-}

js/src/admin/components/DashboardWidget.tsx

@@ -0,0 +1,23 @@
+import Component from '../../common/Component';
+
+export default abstract class DashboardWidget extends Component {
+    view() {
+        return <div className={'DashboardWidget ' + this.className()}>{this.content()}</div>;
+    }
+
+    /**
+     * Get the class name to apply to the widget.
+     *
+     * @return {String}
+     */
+    className() {
+        return '';
+    }
+
+    /**
+     * Get the content of the widget.
+     *
+     * @return {VirtualElement}
+     */
+    abstract content(): JSX.Element;
+}

js/src/admin/components/EditCustomCssModal.js

@@ -1,24 +0,0 @@
-import SettingsModal from './SettingsModal';
-
-export default class EditCustomCssModal extends SettingsModal {
-  className() {
-    return 'EditCustomCssModal Modal--large';
-  }
-
-  title() {
-    return app.translator.trans('core.admin.edit_css.title');
-  }
-
-  form() {
-    return [
-      <p>{app.translator.trans('core.admin.edit_css.customize_text', {a: <a href="https://github.com/flarum/core/tree/master/less" target="_blank"/>})}</p>,
-      <div className="Form-group">
-        <textarea className="FormControl" rows="30" bidi={this.setting('custom_less')}/>
-      </div>
-    ];
-  }
-
-  onsaved() {
-    window.location.reload();
-  }
-}

js/src/admin/components/EditCustomCssModal.tsx

@@ -0,0 +1,28 @@
+import SettingsModal from './SettingsModal';
+
+export default class EditCustomCssModal extends SettingsModal {
+    className() {
+        return 'EditCustomCssModal Modal--large';
+    }
+
+    title() {
+        return app.translator.trans('core.admin.edit_css.title');
+    }
+
+    form() {
+        return [
+            <p>
+                {app.translator.trans('core.admin.edit_css.customize_text', {
+                    a: <a href="https://github.com/flarum/core/tree/master/less" target="_blank" />,
+                })}
+            </p>,
+            <div className="Form-group">
+                <textarea className="FormControl" rows="30" bidi={this.setting('custom_less')} />
+            </div>,
+        ];
+    }
+
+    onsaved() {
+        window.location.reload();
+    }
+}

js/src/admin/components/EditCustomFooterModal.js

@@ -1,24 +0,0 @@
-import SettingsModal from './SettingsModal';
-
-export default class EditCustomFooterModal extends SettingsModal {
-  className() {
-    return 'EditCustomFooterModal Modal--large';
-  }
-
-  title() {
-    return app.translator.trans('core.admin.edit_footer.title');
-  }
-
-  form() {
-    return [
-      <p>{app.translator.trans('core.admin.edit_footer.customize_text')}</p>,
-      <div className="Form-group">
-        <textarea className="FormControl" rows="30" bidi={this.setting('custom_footer')}/>
-      </div>
-    ];
-  }
-
-  onsaved() {
-    window.location.reload();
-  }
-}

js/src/admin/components/EditCustomFooterModal.tsx

@@ -0,0 +1,24 @@
+import SettingsModal from './SettingsModal';
+
+export default class EditCustomFooterModal extends SettingsModal {
+    className() {
+        return 'EditCustomFooterModal Modal--large';
+    }
+
+    title() {
+        return app.translator.trans('core.admin.edit_footer.title');
+    }
+
+    form() {
+        return [
+            <p>{app.translator.trans('core.admin.edit_footer.customize_text')}</p>,
+            <div className="Form-group">
+                <textarea className="FormControl" rows="30" bidi={this.setting('custom_footer')} />
+            </div>,
+        ];
+    }
+
+    onsaved() {
+        window.location.reload();
+    }
+}

js/src/admin/components/EditCustomHeaderModal.js

@@ -1,24 +0,0 @@
-import SettingsModal from './SettingsModal';
-
-export default class EditCustomHeaderModal extends SettingsModal {
-  className() {
-    return 'EditCustomHeaderModal Modal--large';
-  }
-
-  title() {
-    return app.translator.trans('core.admin.edit_header.title');
-  }
-
-  form() {
-    return [
-      <p>{app.translator.trans('core.admin.edit_header.customize_text')}</p>,
-      <div className="Form-group">
-        <textarea className="FormControl" rows="30" bidi={this.setting('custom_header')}/>
-      </div>
-    ];
-  }
-
-  onsaved() {
-    window.location.reload();
-  }
-}

js/src/admin/components/EditCustomHeaderModal.tsx

@@ -0,0 +1,24 @@
+import SettingsModal from './SettingsModal';
+
+export default class EditCustomHeaderModal extends SettingsModal {
+    className() {
+        return 'EditCustomHeaderModal Modal--large';
+    }
+
+    title() {
+        return app.translator.trans('core.admin.edit_header.title');
+    }
+
+    form() {
+        return [
+            <p>{app.translator.trans('core.admin.edit_header.customize_text')}</p>,
+            <div className="Form-group">
+                <textarea className="FormControl" rows="30" bidi={this.setting('custom_header')} />
+            </div>,
+        ];
+    }
+
+    onsaved() {
+        window.location.reload();
+    }
+}

js/src/admin/components/EditGroupModal.js

@@ -1,115 +0,0 @@
-import Modal from '../../common/components/Modal';
-import Button from '../../common/components/Button';
-import Badge from '../../common/components/Badge';
-import Group from '../../common/models/Group';
-import ItemList from '../../common/utils/ItemList';
-
-/**
- * The `EditGroupModal` component shows a modal dialog which allows the user
- * to create or edit a group.
- */
-export default class EditGroupModal extends Modal {
-  init() {
-    this.group = this.props.group || app.store.createRecord('groups');
-
-    this.nameSingular = m.prop(this.group.nameSingular() || '');
-    this.namePlural = m.prop(this.group.namePlural() || '');
-    this.icon = m.prop(this.group.icon() || '');
-    this.color = m.prop(this.group.color() || '');
-  }
-
-  className() {
-    return 'EditGroupModal Modal--small';
-  }
-
-  title() {
-    return [
-      this.color() || this.icon() ? Badge.component({
-        icon: this.icon(),
-        style: {backgroundColor: this.color()}
-      }) : '',
-      ' ',
-      this.namePlural() || app.translator.trans('core.admin.edit_group.title')
-    ];
-  }
-
-  content() {
-    return (
-      <div className="Modal-body">
-        <div className="Form">
-          {this.fields().toArray()}
-        </div>
-      </div>
-    );
-  }
-
-  fields() {
-    const items = new ItemList();
-
-    items.add('name', <div className="Form-group">
-      <label>{app.translator.trans('core.admin.edit_group.name_label')}</label>
-      <div className="EditGroupModal-name-input">
-        <input className="FormControl" placeholder={app.translator.trans('core.admin.edit_group.singular_placeholder')} value={this.nameSingular()} oninput={m.withAttr('value', this.nameSingular)}/>
-        <input className="FormControl" placeholder={app.translator.trans('core.admin.edit_group.plural_placeholder')} value={this.namePlural()} oninput={m.withAttr('value', this.namePlural)}/>
-      </div>
-    </div>, 30);
-
-    items.add('color', <div className="Form-group">
-      <label>{app.translator.trans('core.admin.edit_group.color_label')}</label>
-      <input className="FormControl" placeholder="#aaaaaa" value={this.color()} oninput={m.withAttr('value', this.color)}/>
-    </div>, 20);
-
-    items.add('icon', <div className="Form-group">
-      <label>{app.translator.trans('core.admin.edit_group.icon_label')}</label>
-      <div className="helpText">
-        {app.translator.trans('core.admin.edit_group.icon_text', {a: <a href="https://fontawesome.com/icons?m=free" tabindex="-1"/>})}
-      </div>
-      <input className="FormControl" placeholder="fas fa-bolt" value={this.icon()} oninput={m.withAttr('value', this.icon)}/>
-    </div>, 10);
-
-    items.add('submit', <div className="Form-group">
-      {Button.component({
-        type: 'submit',
-        className: 'Button Button--primary EditGroupModal-save',
-        loading: this.loading,
-        children: app.translator.trans('core.admin.edit_group.submit_button')
-      })}
-      {this.group.exists && this.group.id() !== Group.ADMINISTRATOR_ID ? (
-        <button type="button" className="Button EditGroupModal-delete" onclick={this.deleteGroup.bind(this)}>
-          {app.translator.trans('core.admin.edit_group.delete_button')}
-        </button>
-      ) : ''}
-    </div>, -10);
-
-    return items;
-  }
-
-  submitData() {
-    return {
-      nameSingular: this.nameSingular(),
-      namePlural: this.namePlural(),
-      color: this.color(),
-      icon: this.icon()
-    };
-  }
-
-  onsubmit(e) {
-    e.preventDefault();
-
-    this.loading = true;
-
-    this.group.save(this.submitData(), {errorHandler: this.onerror.bind(this)})
-      .then(this.hide.bind(this))
-      .catch(() => {
-        this.loading = false;
-        m.redraw();
-      });
-  }
-
-  deleteGroup() {
-    if (confirm(app.translator.trans('core.admin.edit_group.delete_confirmation'))) {
-      this.group.delete().then(() => m.redraw());
-      this.hide();
-    }
-  }
-}

js/src/admin/components/EditGroupModal.tsx

@@ -0,0 +1,157 @@
+import app from '../app';
+import { ComponentProps } from '../../common/Component';
+import Modal from '../../common/components/Modal';
+import Button from '../../common/components/Button';
+import Badge from '../../common/components/Badge';
+import Group from '../../common/models/Group';
+import ItemList from '../../common/utils/ItemList';
+
+import Stream from 'mithril/stream';
+
+/**
+ * The `EditGroupModal` component shows a modal dialog which allows the user
+ * to create or edit a group.
+ */
+export default class EditGroupModal extends Modal<ComponentProps> {
+    group: Group;
+
+    nameSingular: Stream<string>;
+    namePlural: Stream<string>;
+    icon: Stream<string>;
+    color: Stream<string>;
+
+    oninit(vnode) {
+        super.oninit(vnode);
+
+        this.group = this.props.group || app.store.createRecord('groups');
+
+        this.nameSingular = m.prop(this.group.nameSingular() || '');
+        this.namePlural = m.prop(this.group.namePlural() || '');
+        this.icon = m.prop(this.group.icon() || '');
+        this.color = m.prop(this.group.color() || '');
+    }
+
+    className() {
+        return 'EditGroupModal Modal--small';
+    }
+
+    title() {
+        return [
+            this.color() || this.icon()
+                ? Badge.component({
+                      icon: this.icon(),
+                      style: { backgroundColor: this.color() },
+                  })
+                : '',
+            ' ',
+            this.namePlural() || app.translator.trans('core.admin.edit_group.title'),
+        ];
+    }
+
+    content() {
+        return (
+            <div className="Modal-body">
+                <div className="Form">{this.fields().toArray()}</div>
+            </div>
+        );
+    }
+
+    fields() {
+        const items = new ItemList();
+
+        items.add(
+            'name',
+            <div className="Form-group">
+                <label>{app.translator.trans('core.admin.edit_group.name_label')}</label>
+                <div className="EditGroupModal-name-input">
+                    <input
+                        className="FormControl"
+                        placeholder={app.translator.transText('core.admin.edit_group.singular_placeholder')}
+                        value={this.nameSingular()}
+                        oninput={m.withAttr('value', this.nameSingular)}
+                    />
+                    <input
+                        className="FormControl"
+                        placeholder={app.translator.transText('core.admin.edit_group.plural_placeholder')}
+                        value={this.namePlural()}
+                        oninput={m.withAttr('value', this.namePlural)}
+                    />
+                </div>
+            </div>,
+            30
+        );
+
+        items.add(
+            'color',
+            <div className="Form-group">
+                <label>{app.translator.trans('core.admin.edit_group.color_label')}</label>
+                <input className="FormControl" placeholder="#aaaaaa" value={this.color()} oninput={m.withAttr('value', this.color)} />
+            </div>,
+            20
+        );
+
+        items.add(
+            'icon',
+            <div className="Form-group">
+                <label>{app.translator.trans('core.admin.edit_group.icon_label')}</label>
+                <div className="helpText">
+                    {app.translator.trans('core.admin.edit_group.icon_text', { a: <a href="https://fontawesome.com/icons?m=free" tabindex="-1" /> })}
+                </div>
+                <input className="FormControl" placeholder="fas fa-bolt" value={this.icon()} oninput={m.withAttr('value', this.icon)} />
+            </div>,
+            10
+        );
+
+        items.add(
+            'submit',
+            <div className="Form-group">
+                {Button.component({
+                    type: 'submit',
+                    className: 'Button Button--primary EditGroupModal-save',
+                    loading: this.loading,
+                    children: app.translator.trans('core.admin.edit_group.submit_button'),
+                })}
+                {this.group.exists && this.group.id() !== Group.ADMINISTRATOR_ID ? (
+                    <button type="button" className="Button EditGroupModal-delete" onclick={this.deleteGroup.bind(this)}>
+                        {app.translator.trans('core.admin.edit_group.delete_button')}
+                    </button>
+                ) : (
+                    ''
+                )}
+            </div>,
+            -10
+        );
+
+        return items;
+    }
+
+    submitData() {
+        return {
+            nameSingular: this.nameSingular(),
+            namePlural: this.namePlural(),
+            color: this.color(),
+            icon: this.icon(),
+        };
+    }
+
+    onsubmit(e) {
+        e.preventDefault();
+
+        this.loading = true;
+
+        this.group
+            .save(this.submitData(), { errorHandler: this.onerror.bind(this) })
+            .then(this.hide.bind(this))
+            .catch(() => {
+                this.loading = false;
+                m.redraw();
+            });
+    }
+
+    deleteGroup() {
+        if (confirm(app.translator.transText('core.admin.edit_group.delete_confirmation'))) {
+            this.group.delete().then(() => m.redraw());
+            this.hide();
+        }
+    }
+}

js/src/admin/components/ExtensionsPage.js

@@ -1,117 +0,0 @@
-import Page from './Page';
-import LinkButton from '../../common/components/LinkButton';
-import Button from '../../common/components/Button';
-import Dropdown from '../../common/components/Dropdown';
-import Separator from '../../common/components/Separator';
-import AddExtensionModal from './AddExtensionModal';
-import LoadingModal from './LoadingModal';
-import ItemList from '../../common/utils/ItemList';
-import icon from '../../common/helpers/icon';
-import listItems from '../../common/helpers/listItems';
-
-export default class ExtensionsPage extends Page {
-  view() {
-    return (
-      <div className="ExtensionsPage">
-        <div className="ExtensionsPage-header">
-          <div className="container">
-            {Button.component({
-              children: app.translator.trans('core.admin.extensions.add_button'),
-              icon: 'fas fa-plus',
-              className: 'Button Button--primary',
-              onclick: () => app.modal.show(new AddExtensionModal())
-            })}
-          </div>
-        </div>
-
-        <div className="ExtensionsPage-list">
-          <div className="container">
-            <ul className="ExtensionList">
-              {Object.keys(app.data.extensions)
-                .map(id => {
-                  const extension = app.data.extensions[id];
-                  const controls = this.controlItems(extension.id).toArray();
-
-                  return <li className={'ExtensionListItem ' + (!this.isEnabled(extension.id) ? 'disabled' : '')}>
-                    <div className="ExtensionListItem-content">
-                      <span className="ExtensionListItem-icon ExtensionIcon" style={extension.icon}>
-                        {extension.icon ? icon(extension.icon.name) : ''}
-                      </span>
-                      {controls.length ? (
-                        <Dropdown
-                          className="ExtensionListItem-controls"
-                          buttonClassName="Button Button--icon Button--flat"
-                          menuClassName="Dropdown-menu--right"
-                          icon="fas fa-ellipsis-h">
-                          {controls}
-                        </Dropdown>
-                      ) : ''}
-                      <div className="ExtensionListItem-main">
-                        <label className="ExtensionListItem-title">
-                          <input type="checkbox" checked={this.isEnabled(extension.id)} onclick={this.toggle.bind(this, extension.id)}/> {' '}
-                            {extension.extra['flarum-extension'].title}
-                        </label>
-                        <div className="ExtensionListItem-version">{extension.version}</div>
-                        <div className="ExtensionListItem-description">{extension.description}</div>
-                      </div>
-                    </div>
-                  </li>;
-                })}
-            </ul>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  controlItems(name) {
-    const items = new ItemList();
-    const enabled = this.isEnabled(name);
-
-    if (app.extensionSettings[name]) {
-      items.add('settings', Button.component({
-        icon: 'fas fa-cog',
-        children: app.translator.trans('core.admin.extensions.settings_button'),
-        onclick: app.extensionSettings[name]
-      }));
-    }
-
-    if (!enabled) {
-      items.add('uninstall', Button.component({
-        icon: 'far fa-trash-alt',
-        children: app.translator.trans('core.admin.extensions.uninstall_button'),
-        onclick: () => {
-          app.request({
-            url: app.forum.attribute('apiUrl') + '/extensions/' + name,
-            method: 'DELETE'
-          }).then(() => window.location.reload());
-
-          app.modal.show(new LoadingModal());
-        }
-      }));
-    }
-
-    return items;
-  }
-
-  isEnabled(name) {
-    const enabled = JSON.parse(app.data.settings.extensions_enabled);
-
-    return enabled.indexOf(name) !== -1;
-  }
-
-  toggle(id) {
-    const enabled = this.isEnabled(id);
-
-    app.request({
-      url: app.forum.attribute('apiUrl') + '/extensions/' + id,
-      method: 'PATCH',
-      data: {enabled: !enabled}
-    }).then(() => {
-      if (!enabled) localStorage.setItem('enabledExtension', id);
-      window.location.reload();
-    });
-
-    app.modal.show(new LoadingModal());
-  }
-}

js/src/admin/components/ExtensionsPage.tsx

@@ -0,0 +1,130 @@
+import app from '../app';
+
+import Page from './Page';
+import Button from '../../common/components/Button';
+import Dropdown from '../../common/components/Dropdown';
+import AddExtensionModal from './AddExtensionModal';
+import LoadingModal from './LoadingModal';
+import ItemList from '../../common/utils/ItemList';
+import icon from '../../common/helpers/icon';
+
+export default class ExtensionsPage extends Page {
+    view() {
+        return (
+            <div className="ExtensionsPage">
+                <div className="ExtensionsPage-header">
+                    <div className="container">
+                        {Button.component({
+                            children: app.translator.trans('core.admin.extensions.add_button'),
+                            icon: 'fas fa-plus',
+                            className: 'Button Button--primary',
+                            onclick: () => app.modal.show(AddExtensionModal),
+                        })}
+                    </div>
+                </div>
+
+                <div className="ExtensionsPage-list">
+                    <div className="container">
+                        <ul className="ExtensionList">
+                            {Object.keys(app.data.extensions).map((id) => {
+                                const extension = app.data.extensions[id];
+                                const controls = this.controlItems(extension.id).toArray();
+
+                                return (
+                                    <li className={'ExtensionListItem ' + (!this.isEnabled(extension.id) ? 'disabled' : '')}>
+                                        <div className="ExtensionListItem-content">
+                                            <span className="ExtensionListItem-icon ExtensionIcon" style={extension.icon}>
+                                                {extension.icon ? icon(extension.icon.name) : ''}
+                                            </span>
+                                            {controls.length ? (
+                                                <Dropdown
+                                                    className="ExtensionListItem-controls"
+                                                    buttonClassName="Button Button--icon Button--flat"
+                                                    menuClassName="Dropdown-menu--right"
+                                                    icon="fas fa-ellipsis-h"
+                                                >
+                                                    {controls}
+                                                </Dropdown>
+                                            ) : (
+                                                ''
+                                            )}
+                                            <div className="ExtensionListItem-main">
+                                                <label className="ExtensionListItem-title">
+                                                    <input
+                                                        type="checkbox"
+                                                        checked={this.isEnabled(extension.id)}
+                                                        onclick={this.toggle.bind(this, extension.id)}
+                                                    />{' '}
+                                                    {extension.extra['flarum-extension'].title}
+                                                </label>
+                                                <div className="ExtensionListItem-version">{extension.version}</div>
+                                                <div className="ExtensionListItem-description">{extension.description}</div>
+                                            </div>
+                                        </div>
+                                    </li>
+                                );
+                            })}
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        );
+    }
+
+    controlItems(name) {
+        const items = new ItemList();
+        const enabled = this.isEnabled(name);
+
+        if (app.extensionSettings[name]) {
+            items.add(
+                'settings',
+                Button.component({
+                    icon: 'fas fa-cog',
+                    children: app.translator.trans('core.admin.extensions.settings_button'),
+                    onclick: app.extensionSettings[name],
+                })
+            );
+        }
+
+        if (!enabled) {
+            items.add(
+                'uninstall',
+                Button.component({
+                    icon: 'far fa-trash-alt',
+                    children: app.translator.trans('core.admin.extensions.uninstall_button'),
+                    onclick: () => {
+                        app.request({
+                            url: app.forum.attribute('apiUrl') + '/extensions/' + name,
+                            method: 'DELETE',
+                        }).then(() => window.location.reload());
+
+                        app.modal.show(LoadingModal);
+                    },
+                })
+            );
+        }
+
+        return items;
+    }
+
+    isEnabled(name) {
+        const enabled = JSON.parse(app.data.settings.extensions_enabled);
+
+        return enabled.indexOf(name) !== -1;
+    }
+
+    toggle(id) {
+        const enabled = this.isEnabled(id);
+
+        app.request({
+            url: app.forum.attribute('apiUrl') + '/extensions/' + id,
+            method: 'PATCH',
+            body: { enabled: !enabled },
+        }).then(() => {
+            if (!enabled) localStorage.setItem('enabledExtension', id);
+            window.location.reload();
+        });
+
+        app.modal.show(LoadingModal);
+    }
+}

js/src/admin/components/HeaderPrimary.js

@@ -1,33 +0,0 @@
-import Component from '../../common/Component';
-import ItemList from '../../common/utils/ItemList';
-import listItems from '../../common/helpers/listItems';
-
-/**
- * The `HeaderPrimary` component displays primary header controls. On the
- * default skin, these are shown just to the right of the forum title.
- */
-export default class HeaderPrimary extends Component {
-  view() {
-    return (
-      <ul className="Header-controls">
-        {listItems(this.items().toArray())}
-      </ul>
-    );
-  }
-
-  config(isInitialized, context) {
-    // Since this component is 'above' the content of the page (that is, it is a
-    // part of the global UI that persists between routes), we will flag the DOM
-    // to be retained across route changes.
-    context.retain = true;
-  }
-
-  /**
-   * Build an item list for the controls.
-   *
-   * @return {ItemList}
-   */
-  items() {
-    return new ItemList();
-  }
-}

js/src/admin/components/HeaderPrimary.tsx

@@ -0,0 +1,22 @@
+import Component from '../../common/Component';
+import ItemList from '../../common/utils/ItemList';
+import listItems from '../../common/helpers/listItems';
+
+/**
+ * The `HeaderPrimary` component displays primary header controls. On the
+ * default skin, these are shown just to the right of the forum title.
+ */
+export default class HeaderPrimary extends Component {
+    view() {
+        return <ul className="Header-controls">{listItems(this.items().toArray())}</ul>;
+    }
+
+    /**
+     * Build an item list for the controls.
+     *
+     * @return {ItemList}
+     */
+    items() {
+        return new ItemList();
+    }
+}

js/src/admin/components/HeaderSecondary.js

@@ -1,37 +0,0 @@
-import Component from '../../common/Component';
-import SessionDropdown from './SessionDropdown';
-import ItemList from '../../common/utils/ItemList';
-import listItems from '../../common/helpers/listItems';
-
-/**
- * The `HeaderSecondary` component displays secondary header controls.
- */
-export default class HeaderSecondary extends Component {
-  view() {
-    return (
-      <ul className="Header-controls">
-        {listItems(this.items().toArray())}
-      </ul>
-    );
-  }
-
-  config(isInitialized, context) {
-    // Since this component is 'above' the content of the page (that is, it is a
-    // part of the global UI that persists between routes), we will flag the DOM
-    // to be retained across route changes.
-    context.retain = true;
-  }
-
-  /**
-   * Build an item list for the controls.
-   *
-   * @return {ItemList}
-   */
-  items() {
-    const items = new ItemList();
-
-    items.add('session', SessionDropdown.component());
-
-    return items;
-  }
-}

js/src/admin/components/HeaderSecondary.tsx

@@ -0,0 +1,26 @@
+import Component from '../../common/Component';
+import SessionDropdown from './SessionDropdown';
+import ItemList from '../../common/utils/ItemList';
+import listItems from '../../common/helpers/listItems';
+
+/**
+ * The `HeaderSecondary` component displays secondary header controls.
+ */
+export default class HeaderSecondary extends Component {
+    view() {
+        return <ul className="Header-controls">{listItems(this.items().toArray())}</ul>;
+    }
+
+    /**
+     * Build an item list for the controls.
+     *
+     * @return {ItemList}
+     */
+    items() {
+        const items = new ItemList();
+
+        items.add('session', SessionDropdown.component());
+
+        return items;
+    }
+}

js/src/admin/components/LoadingModal.js

@@ -1,19 +0,0 @@
-import Modal from '../../common/components/Modal';
-
-export default class LoadingModal extends Modal {
-  isDismissible() {
-    return false;
-  }
-
-  className() {
-    return 'LoadingModal Modal--small';
-  }
-
-  title() {
-    return app.translator.trans('core.admin.loading.title');
-  }
-
-  content() {
-    return '';
-  }
-}

js/src/admin/components/LoadingModal.tsx

@@ -0,0 +1,20 @@
+import { ComponentProps } from '../../common/Component';
+import Modal from '../../common/components/Modal';
+
+export default class LoadingModal extends Modal<ComponentProps> {
+    isDismissible() {
+        return false;
+    }
+
+    className() {
+        return 'LoadingModal Modal--small';
+    }
+
+    title() {
+        return app.translator.transText('core.admin.loading.title');
+    }
+
+    content() {
+        return '';
+    }
+}

js/src/admin/components/MailPage.js

@@ -1,168 +0,0 @@
-import Page from './Page';
-import FieldSet from '../../common/components/FieldSet';
-import Button from '../../common/components/Button';
-import Alert from '../../common/components/Alert';
-import Select from '../../common/components/Select';
-import LoadingIndicator from '../../common/components/LoadingIndicator';
-import saveSettings from '../utils/saveSettings';
-
-export default class MailPage extends Page {
-  init() {
-    super.init();
-
-    this.saving = false;
-    this.refresh();
-  }
-
-  refresh() {
-    this.loading = true;
-
-    this.driverFields = {};
-    this.fields = ['mail_driver', 'mail_from'];
-    this.values = {};
-    this.status = {sending: false, errors: {}};
-
-    const settings = app.data.settings;
-    this.fields.forEach(key => this.values[key] = m.prop(settings[key]));
-
-    app.request({
-      method: 'GET',
-      url: app.forum.attribute('apiUrl') + '/mail-settings'
-    }).then(response => {
-      this.driverFields = response['data']['attributes']['fields'];
-      this.status.sending = response['data']['attributes']['sending'];
-      this.status.errors = response['data']['attributes']['errors'];
-
-      for (const driver in this.driverFields) {
-        for (const field in this.driverFields[driver]) {
-          this.fields.push(field);
-          this.values[field] = m.prop(settings[field]);
-        }
-      }
-
-      this.loading = false;
-      m.redraw();
-    });
-  }
-
-  view() {
-    if (this.loading || this.saving) {
-      return (
-        <div className="MailPage">
-          <div className="container">
-            <LoadingIndicator />
-          </div>
-        </div>
-      );
-    }
-
-    const fields = this.driverFields[this.values.mail_driver()];
-    const fieldKeys = Object.keys(fields);
-
-    return (
-      <div className="MailPage">
-        <div className="container">
-          <form onsubmit={this.onsubmit.bind(this)}>
-            <h2>{app.translator.trans('core.admin.email.heading')}</h2>
-            <div className="helpText">
-              {app.translator.trans('core.admin.email.text')}
-            </div>
-
-            {FieldSet.component({
-              label: app.translator.trans('core.admin.email.addresses_heading'),
-              className: 'MailPage-MailSettings',
-              children: [
-                <div className="MailPage-MailSettings-input">
-                  <label>
-                    {app.translator.trans('core.admin.email.from_label')}
-                    <input className="FormControl" value={this.values.mail_from() || ''} oninput={m.withAttr('value', this.values.mail_from)} />
-                  </label>
-                </div>
-              ]
-            })}
-
-            {FieldSet.component({
-              label: app.translator.trans('core.admin.email.driver_heading'),
-              className: 'MailPage-MailSettings',
-              children: [
-                <div className="MailPage-MailSettings-input">
-                  <label>
-                    {app.translator.trans('core.admin.email.driver_label')}
-                    <Select value={this.values.mail_driver()} options={Object.keys(this.driverFields).reduce((memo, val) => ({...memo, [val]: val}), {})} onchange={this.values.mail_driver} />
-                  </label>
-                </div>
-              ]
-            })}
-
-            {this.status.sending || Alert.component({
-              children: app.translator.trans('core.admin.email.not_sending_message'),
-              dismissible: false,
-            })}
-
-            {fieldKeys.length > 0 && FieldSet.component({
-              label: app.translator.trans(`core.admin.email.${this.values.mail_driver()}_heading`),
-              className: 'MailPage-MailSettings',
-              children: [
-                <div className="MailPage-MailSettings-input">
-                  {fieldKeys.map(field => [
-                    <label>
-                      {app.translator.trans(`core.admin.email.${field}_label`)}
-                      {this.renderField(field)}
-                    </label>,
-                    this.status.errors[field] && <p className='ValidationError'>{this.status.errors[field]}</p>,
-                  ])}
-                </div>
-              ]
-            })}
-
-            {Button.component({
-              type: 'submit',
-              className: 'Button Button--primary',
-              children: app.translator.trans('core.admin.email.submit_button'),
-              disabled: !this.changed()
-            })}
-          </form>
-        </div>
-      </div>
-    );
-  }
-
-  renderField(name) {
-    const driver = this.values.mail_driver();
-    const field = this.driverFields[driver][name];
-    const prop = this.values[name];
-
-    if (typeof field === 'string') {
-      return <input className="FormControl" value={prop() || ''} oninput={m.withAttr('value', prop)} />;
-    } else {
-      return <Select value={prop()} options={field} onchange={prop} />;
-    }
-  }
-
-  changed() {
-    return this.fields.some(key => this.values[key]() !== app.data.settings[key]);
-  }
-
-  onsubmit(e) {
-    e.preventDefault();
-
-    if (this.saving) return;
-
-    this.saving = true;
-    app.alerts.dismiss(this.successAlert);
-
-    const settings = {};
-
-    this.fields.forEach(key => settings[key] = this.values[key]());
-
-    saveSettings(settings)
-      .then(() => {
-        app.alerts.show(this.successAlert = new Alert({type: 'success', children: app.translator.trans('core.admin.basics.saved_message')}));
-      })
-      .catch(() => {})
-      .then(() => {
-        this.saving = false;
-        this.refresh();
-      });
-  }
-}

js/src/admin/components/MailPage.tsx

@@ -0,0 +1,191 @@
+import app from '../app';
+
+import Page from './Page';
+import Alert from '../../common/components/Alert';
+import Button from '../../common/components/Button';
+import FieldSet from '../../common/components/FieldSet';
+import LoadingIndicator from '../../common/components/LoadingIndicator';
+import Select from '../../common/components/Select';
+import saveSettings from '../utils/saveSettings';
+import AlertState from '../../common/states/AlertState';
+
+import Stream from 'mithril/stream';
+
+export default class MailPage extends Page {
+    loading = true;
+    saving = false;
+
+    driverFields = {};
+    fields = [];
+
+    values: { [key: string]: Stream<any> } = {};
+
+    status = { sending: false, errors: {} };
+
+    successAlert?: number;
+
+    oninit(vnode) {
+        super.oninit(vnode);
+
+        this.refresh();
+    }
+
+    refresh() {
+        this.loading = true;
+        this.fields = ['mail_driver', 'mail_from'];
+        this.values = {};
+
+        app.request({
+            method: 'GET',
+            url: app.forum.attribute('apiUrl') + '/mail-settings',
+        }).then((response) => {
+            this.driverFields = response['data']['attributes']['fields'];
+            this.status.sending = response['data']['attributes']['sending'];
+            this.status.errors = response['data']['attributes']['errors'];
+
+            for (const driver in this.driverFields) {
+                for (const field in this.driverFields[driver]) {
+                    this.fields.push(field);
+                }
+            }
+
+            const settings = app.data.settings;
+            this.fields.forEach((key) => (this.values[key] = m.prop(settings[key])));
+
+            this.loading = false;
+            m.redraw();
+        });
+    }
+
+    view() {
+        if (this.loading || this.saving) {
+            return (
+                <div className="MailPage">
+                    <div className="container">
+                        <LoadingIndicator />
+                    </div>
+                </div>
+            );
+        }
+
+        const fields = this.driverFields[this.values.mail_driver()];
+        const fieldKeys = Object.keys(fields);
+
+        return (
+            <div className="MailPage">
+                <div className="container">
+                    <form onsubmit={this.onsubmit.bind(this)}>
+                        <h2>{app.translator.trans('core.admin.email.heading')}</h2>
+                        <div className="helpText">{app.translator.trans('core.admin.email.text')}</div>
+
+                        {FieldSet.component({
+                            label: app.translator.trans('core.admin.email.addresses_heading'),
+                            className: 'MailPage-MailSettings',
+                            children: [
+                                <div className="MailPage-MailSettings-input">
+                                    <label>
+                                        {app.translator.trans('core.admin.email.from_label')}
+                                        <input
+                                            className="FormControl"
+                                            value={this.values.mail_from() || ''}
+                                            oninput={m.withAttr('value', this.values.mail_from)}
+                                        />
+                                    </label>
+                                </div>,
+                            ],
+                        })}
+
+                        {FieldSet.component({
+                            label: app.translator.trans('core.admin.email.driver_heading'),
+                            className: 'MailPage-MailSettings',
+                            children: [
+                                <div className="MailPage-MailSettings-input">
+                                    <label>
+                                        {app.translator.trans('core.admin.email.driver_label')}
+                                        <Select
+                                            value={this.values.mail_driver()}
+                                            options={Object.keys(this.driverFields).reduce((memo, val) => ({ ...memo, [val]: val }), {})}
+                                            onchange={this.values.mail_driver}
+                                        />
+                                    </label>
+                                </div>,
+                            ],
+                        })}
+
+                        {this.status.sending ||
+                            Alert.component({
+                                children: app.translator.trans('core.admin.email.not_sending_message'),
+                                dismissible: false,
+                            })}
+
+                        {fieldKeys.length > 0 &&
+                            FieldSet.component({
+                                label: app.translator.trans(`core.admin.email.${this.values.mail_driver()}_heading`),
+                                className: 'MailPage-MailSettings',
+                                children: [
+                                    <div className="MailPage-MailSettings-input">
+                                        {fieldKeys.map((field) => [
+                                            <label>
+                                                {app.translator.trans(`core.admin.email.${field}_label`)}
+                                                {this.renderField(field)}
+                                            </label>,
+                                            this.status.errors[field] && <p className="ValidationError">{this.status.errors[field]}</p>,
+                                        ])}
+                                    </div>,
+                                ],
+                            })}
+
+                        {Button.component({
+                            type: 'submit',
+                            className: 'Button Button--primary',
+                            children: app.translator.trans('core.admin.email.submit_button'),
+                            disabled: !this.changed(),
+                        })}
+                    </form>
+                </div>
+            </div>
+        );
+    }
+
+    renderField(name) {
+        const driver = this.values.mail_driver();
+        const field = this.driverFields[driver][name];
+        const prop = this.values[name];
+
+        if (prop == undefined) {
+        }
+
+        if (typeof field === 'string') {
+            return <input className="FormControl" value={prop() || ''} oninput={m.withAttr('value', prop)} />;
+        } else {
+            return <Select value={prop()} options={field} onchange={prop} />;
+        }
+    }
+
+    changed() {
+        return this.fields.some((key) => this.values[key]() !== app.data.settings[key]);
+    }
+
+    onsubmit(e) {
+        e.preventDefault();
+
+        if (this.saving) return;
+
+        this.saving = true;
+        app.alerts.dismiss(this.successAlert);
+
+        const settings = {};
+
+        this.fields.forEach((key) => (settings[key] = this.values[key]()));
+
+        saveSettings(settings)
+            .then(() => {
+                this.successAlert = app.alerts.show({ type: 'success', children: app.translator.trans('core.admin.basics.saved_message') });
+            })
+            .catch(() => {})
+            .then(() => {
+                this.saving = false;
+                this.refresh();
+            });
+    }
+}

js/src/admin/components/Page.js

@@ -1,32 +0,0 @@
-import Component from '../../common/Component';
-
-/**
- * The `Page` component
- *
- * @abstract
- */
-export default class Page extends Component {
-  init() {
-    app.previous = app.current;
-    app.current = this;
-
-    app.modal.close();
-
-    /**
-     * A class name to apply to the body while the route is active.
-     *
-     * @type {String}
-     */
-    this.bodyClass = '';
-  }
-
-  config(isInitialized, context) {
-    if (isInitialized) return;
-
-    if (this.bodyClass) {
-      $('#app').addClass(this.bodyClass);
-
-      context.onunload = () => $('#app').removeClass(this.bodyClass);
-    }
-  }
-}

js/src/admin/components/Page.tsx

@@ -0,0 +1,3 @@
+import Page from '../../common/components/Page';
+
+export default Page;

js/src/admin/components/PermissionDropdown.js

@@ -1,149 +0,0 @@
-import Dropdown from '../../common/components/Dropdown';
-import Button from '../../common/components/Button';
-import Separator from '../../common/components/Separator';
-import Group from '../../common/models/Group';
-import Badge from '../../common/components/Badge';
-import GroupBadge from '../../common/components/GroupBadge';
-
-function badgeForId(id) {
-  const group = app.store.getById('groups', id);
-
-  return group ? GroupBadge.component({group, label: null}) : '';
-}
-
-function filterByRequiredPermissions(groupIds, permission) {
-  app.getRequiredPermissions(permission)
-    .forEach(required => {
-      const restrictToGroupIds = app.data.permissions[required] || [];
-
-      if (restrictToGroupIds.indexOf(Group.GUEST_ID) !== -1) {
-        // do nothing
-      } else if (restrictToGroupIds.indexOf(Group.MEMBER_ID) !== -1) {
-        groupIds = groupIds.filter(id => id !== Group.GUEST_ID);
-      } else if (groupIds.indexOf(Group.MEMBER_ID) !== -1) {
-        groupIds = restrictToGroupIds;
-      } else {
-        groupIds = restrictToGroupIds.filter(id => groupIds.indexOf(id) !== -1);
-      }
-
-      groupIds = filterByRequiredPermissions(groupIds, required);
-    });
-
-  return groupIds;
-}
-
-export default class PermissionDropdown extends Dropdown {
-  static initProps(props) {
-    super.initProps(props);
-
-    props.className = 'PermissionDropdown';
-    props.buttonClassName = 'Button Button--text';
-  }
-
-  view() {
-    this.props.children = [];
-
-    let groupIds = app.data.permissions[this.props.permission] || [];
-
-    groupIds = filterByRequiredPermissions(groupIds, this.props.permission);
-
-    const everyone = groupIds.indexOf(Group.GUEST_ID) !== -1;
-    const members = groupIds.indexOf(Group.MEMBER_ID) !== -1;
-    const adminGroup = app.store.getById('groups', Group.ADMINISTRATOR_ID);
-
-    if (everyone) {
-      this.props.label = Badge.component({icon: 'fas fa-globe'});
-    } else if (members) {
-      this.props.label = Badge.component({icon: 'fas fa-user'});
-    } else {
-      this.props.label = [
-        badgeForId(Group.ADMINISTRATOR_ID),
-        groupIds.map(badgeForId)
-      ];
-    }
-
-    if (this.showing) {
-      if (this.props.allowGuest) {
-        this.props.children.push(
-          Button.component({
-            children: [Badge.component({icon: 'fas fa-globe'}), ' ', app.translator.trans('core.admin.permissions_controls.everyone_button')],
-            icon: everyone ? 'fas fa-check' : true,
-            onclick: () => this.save([Group.GUEST_ID]),
-            disabled: this.isGroupDisabled(Group.GUEST_ID)
-          })
-        );
-      }
-
-      this.props.children.push(
-        Button.component({
-          children: [Badge.component({icon: 'fas fa-user'}), ' ', app.translator.trans('core.admin.permissions_controls.members_button')],
-          icon: members ? 'fas fa-check' : true,
-          onclick: () => this.save([Group.MEMBER_ID]),
-          disabled: this.isGroupDisabled(Group.MEMBER_ID)
-        }),
-
-        Separator.component(),
-
-        Button.component({
-          children: [badgeForId(adminGroup.id()), ' ', adminGroup.namePlural()],
-          icon: !everyone && !members ? 'fas fa-check' : true,
-          disabled: !everyone && !members,
-          onclick: e => {
-            if (e.shiftKey) e.stopPropagation();
-            this.save([]);
-          }
-        })
-      );
-
-      [].push.apply(
-        this.props.children,
-        app.store.all('groups')
-          .filter(group => [Group.ADMINISTRATOR_ID, Group.GUEST_ID, Group.MEMBER_ID].indexOf(group.id()) === -1)
-          .map(group => Button.component({
-            children: [badgeForId(group.id()), ' ', group.namePlural()],
-            icon: groupIds.indexOf(group.id()) !== -1 ? 'fas fa-check' : true,
-            onclick: (e) => {
-              if (e.shiftKey) e.stopPropagation();
-              this.toggle(group.id());
-            },
-            disabled: this.isGroupDisabled(group.id()) && this.isGroupDisabled(Group.MEMBER_ID) && this.isGroupDisabled(Group.GUEST_ID)
-          }))
-      );
-    }
-
-    return super.view();
-  }
-
-  save(groupIds) {
-    const permission = this.props.permission;
-
-    app.data.permissions[permission] = groupIds;
-
-    app.request({
-      method: 'POST',
-      url: app.forum.attribute('apiUrl') + '/permission',
-      data: {permission, groupIds}
-    });
-  }
-
-  toggle(groupId) {
-    const permission = this.props.permission;
-
-    let groupIds = app.data.permissions[permission] || [];
-
-    const index = groupIds.indexOf(groupId);
-
-    if (index !== -1) {
-      groupIds.splice(index, 1);
-    } else {
-      groupIds.push(groupId);
-      groupIds = groupIds.filter(id => [Group.GUEST_ID, Group.MEMBER_ID].indexOf(id) === -1);
-    }
-
-    this.save(groupIds);
-  }
-
-  isGroupDisabled(id) {
-    return filterByRequiredPermissions([id], this.props.permission).indexOf(id) === -1;
-  }
-}

js/src/admin/components/PermissionDropdown.tsx

@@ -0,0 +1,159 @@
+import app from '../app';
+
+import Dropdown, { DropdownProps } from '../../common/components/Dropdown';
+import Button from '../../common/components/Button';
+import Separator from '../../common/components/Separator';
+import Group from '../../common/models/Group';
+import Badge from '../../common/components/Badge';
+import GroupBadge from '../../common/components/GroupBadge';
+
+function badgeForId(id) {
+    const group = app.store.getById('groups', id);
+
+    return group ? GroupBadge.component({ group, label: null }) : '';
+}
+
+function filterByRequiredPermissions(groupIds, permission) {
+    app.getRequiredPermissions(permission).forEach((required) => {
+        const restrictToGroupIds = app.data.permissions[required] || [];
+
+        if (restrictToGroupIds.indexOf(Group.GUEST_ID) !== -1) {
+            // do nothing
+        } else if (restrictToGroupIds.indexOf(Group.MEMBER_ID) !== -1) {
+            groupIds = groupIds.filter((id) => id !== Group.GUEST_ID);
+        } else if (groupIds.indexOf(Group.MEMBER_ID) !== -1) {
+            groupIds = restrictToGroupIds;
+        } else {
+            groupIds = restrictToGroupIds.filter((id) => groupIds.indexOf(id) !== -1);
+        }
+
+        groupIds = filterByRequiredPermissions(groupIds, required);
+    });
+
+    return groupIds;
+}
+
+export interface PermissionDropdownProps extends DropdownProps {
+    label?: Badge[];
+}
+
+export default class PermissionDropdown<T extends PermissionDropdownProps = PermissionDropdownProps> extends Dropdown<T> {
+    static initProps(props) {
+        super.initProps(props);
+
+        props.className = 'PermissionDropdown';
+        props.buttonClassName = 'Button Button--text';
+    }
+
+    view() {
+        this.props.children = [];
+
+        let groupIds = app.data.permissions[this.props.permission] || [];
+
+        groupIds = filterByRequiredPermissions(groupIds, this.props.permission);
+
+        const everyone = groupIds.indexOf(Group.GUEST_ID) !== -1;
+        const members = groupIds.indexOf(Group.MEMBER_ID) !== -1;
+        const adminGroup: Group = app.store.getById('groups', Group.ADMINISTRATOR_ID);
+
+        if (everyone) {
+            this.props.label = Badge.component({ icon: 'fas fa-globe' });
+        } else if (members) {
+            this.props.label = Badge.component({ icon: 'fas fa-user' });
+        } else {
+            this.props.label = [badgeForId(Group.ADMINISTRATOR_ID), groupIds.map(badgeForId)];
+        }
+
+        if (this.showing) {
+            if (this.props.allowGuest) {
+                this.props.children.push(
+                    Button.component({
+                        children: [
+                            Badge.component({ icon: 'fas fa-globe' }),
+                            ' ',
+                            app.translator.trans('core.admin.permissions_controls.everyone_button'),
+                        ],
+                        icon: everyone ? 'fas fa-check' : true,
+                        onclick: () => this.save([Group.GUEST_ID]),
+                        disabled: this.isGroupDisabled(Group.GUEST_ID),
+                    })
+                );
+            }
+
+            this.props.children.push(
+                Button.component({
+                    children: [Badge.component({ icon: 'fas fa-user' }), ' ', app.translator.trans('core.admin.permissions_controls.members_button')],
+                    icon: members ? 'fas fa-check' : true,
+                    onclick: () => this.save([Group.MEMBER_ID]),
+                    disabled: this.isGroupDisabled(Group.MEMBER_ID),
+                }),
+
+                Separator.component(),
+
+                Button.component({
+                    children: [badgeForId(adminGroup.id()), ' ', adminGroup.namePlural()],
+                    icon: !everyone && !members ? 'fas fa-check' : true,
+                    disabled: !everyone && !members,
+                    onclick: (e) => {
+                        if (e.shiftKey) e.stopPropagation();
+                        this.save([]);
+                    },
+                })
+            );
+
+            [].push.apply(
+                this.props.children,
+                app.store
+                    .all('groups')
+                    .filter((group) => [Group.ADMINISTRATOR_ID, Group.GUEST_ID, Group.MEMBER_ID].indexOf(group.id()) === -1)
+                    .map((group: Group) =>
+                        Button.component({
+                            children: [badgeForId(group.id()), ' ', group.namePlural()],
+                            icon: groupIds.indexOf(group.id()) !== -1 ? 'fas fa-check' : true,
+                            onclick: (e) => {
+                                if (e.shiftKey) e.stopPropagation();
+                                this.toggle(group.id());
+                            },
+                            disabled:
+                                this.isGroupDisabled(group.id()) && this.isGroupDisabled(Group.MEMBER_ID) && this.isGroupDisabled(Group.GUEST_ID),
+                        })
+                    )
+            );
+        }
+
+        return super.view();
+    }
+
+    save(groupIds) {
+        const permission = this.props.permission;
+
+        app.data.permissions[permission] = groupIds;
+
+        app.request({
+            method: 'POST',
+            url: app.forum.attribute('apiUrl') + '/permission',
+            body: { permission, groupIds },
+        });
+    }
+
+    toggle(groupId) {
+        const permission = this.props.permission;
+
+        let groupIds = app.data.permissions[permission] || [];
+
+        const index = groupIds.indexOf(groupId);
+
+        if (index !== -1) {
+            groupIds.splice(index, 1);
+        } else {
+            groupIds.push(groupId);
+            groupIds = groupIds.filter((id) => [Group.GUEST_ID, Group.MEMBER_ID].indexOf(id) === -1);
+        }
+
+        this.save(groupIds);
+    }
+
+    isGroupDisabled(id) {
+        return filterByRequiredPermissions([id], this.props.permission).indexOf(id) === -1;
+    }
+}

js/src/admin/components/PermissionGrid.js

@@ -1,271 +0,0 @@
-import Component from '../../common/Component';
-import PermissionDropdown from './PermissionDropdown';
-import SettingDropdown from './SettingDropdown';
-import Button from '../../common/components/Button';
-import ItemList from '../../common/utils/ItemList';
-import icon from '../../common/helpers/icon';
-
-export default class PermissionGrid extends Component {
-  init() {
-    this.permissions = this.permissionItems().toArray();
-  }
-
-  view() {
-    const scopes = this.scopeItems().toArray();
-
-    const permissionCells = permission => {
-      return scopes.map(scope => (
-        <td>
-          {scope.render(permission)}
-        </td>
-      ));
-    };
-
-    return (
-      <table className="PermissionGrid">
-        <thead>
-          <tr>
-            <td></td>
-            {scopes.map(scope => (
-              <th>
-                {scope.label}{' '}
-                {scope.onremove ? Button.component({icon: 'fas fa-times', className: 'Button Button--text PermissionGrid-removeScope', onclick: scope.onremove}) : ''}
-              </th>
-            ))}
-            <th>{this.scopeControlItems().toArray()}</th>
-          </tr>
-        </thead>
-        {this.permissions.map(section => (
-          <tbody>
-            <tr className="PermissionGrid-section">
-              <th>{section.label}</th>
-              {permissionCells(section)}
-              <td/>
-            </tr>
-            {section.children.map(child => (
-              <tr className="PermissionGrid-child">
-                <th>{icon(child.icon)}{child.label}</th>
-                {permissionCells(child)}
-                <td/>
-              </tr>
-            ))}
-          </tbody>
-        ))}
-      </table>
-    );
-  }
-
-  permissionItems() {
-    const items = new ItemList();
-
-    items.add('view', {
-      label: app.translator.trans('core.admin.permissions.read_heading'),
-      children: this.viewItems().toArray()
-    }, 100);
-
-    items.add('start', {
-      label: app.translator.trans('core.admin.permissions.create_heading'),
-      children: this.startItems().toArray()
-    }, 90);
-
-    items.add('reply', {
-      label: app.translator.trans('core.admin.permissions.participate_heading'),
-      children: this.replyItems().toArray()
-    }, 80);
-
-    items.add('moderate', {
-      label: app.translator.trans('core.admin.permissions.moderate_heading'),
-      children: this.moderateItems().toArray()
-    }, 70);
-
-    return items;
-  }
-
-  viewItems() {
-    const items = new ItemList();
-
-    items.add('viewDiscussions', {
-      icon: 'fas fa-eye',
-      label: app.translator.trans('core.admin.permissions.view_discussions_label'),
-      permission: 'viewDiscussions',
-      allowGuest: true
-    }, 100);
-
-    items.add('viewUserList', {
-      icon: 'fas fa-users',
-      label: app.translator.trans('core.admin.permissions.view_user_list_label'),
-      permission: 'viewUserList',
-      allowGuest: true
-    }, 100);
-
-    items.add('signUp', {
-      icon: 'fas fa-user-plus',
-      label: app.translator.trans('core.admin.permissions.sign_up_label'),
-      setting: () => SettingDropdown.component({
-        key: 'allow_sign_up',
-        options: [
-          {value: '1', label: app.translator.trans('core.admin.permissions_controls.signup_open_button')},
-          {value: '0', label: app.translator.trans('core.admin.permissions_controls.signup_closed_button')}
-        ]
-      })
-    }, 90);
-
-    items.add('viewLastSeenAt', {
-      icon: 'far fa-clock',
-      label: app.translator.trans('core.admin.permissions.view_last_seen_at_label'),
-      permission: 'user.viewLastSeenAt',
-    });
-
-    return items;
-  }
-
-  startItems() {
-    const items = new ItemList();
-
-    items.add('start', {
-      icon: 'fas fa-edit',
-      label: app.translator.trans('core.admin.permissions.start_discussions_label'),
-      permission: 'startDiscussion'
-    }, 100);
-
-    items.add('allowRenaming', {
-      icon: 'fas fa-i-cursor',
-      label: app.translator.trans('core.admin.permissions.allow_renaming_label'),
-      setting: () => {
-        const minutes = parseInt(app.data.settings.allow_renaming, 10);
-
-        return SettingDropdown.component({
-          defaultLabel: minutes
-            ? app.translator.transChoice('core.admin.permissions_controls.allow_some_minutes_button', minutes, {count: minutes})
-            : app.translator.trans('core.admin.permissions_controls.allow_indefinitely_button'),
-          key: 'allow_renaming',
-          options: [
-            {value: '-1', label: app.translator.trans('core.admin.permissions_controls.allow_indefinitely_button')},
-            {value: '10', label: app.translator.trans('core.admin.permissions_controls.allow_ten_minutes_button')},
-            {value: 'reply', label: app.translator.trans('core.admin.permissions_controls.allow_until_reply_button')}
-          ]
-        });
-      }
-    }, 90);
-
-    return items;
-  }
-
-  replyItems() {
-    const items = new ItemList();
-
-    items.add('reply', {
-      icon: 'fas fa-reply',
-      label: app.translator.trans('core.admin.permissions.reply_to_discussions_label'),
-      permission: 'discussion.reply'
-    }, 100);
-
-    items.add('allowPostEditing', {
-      icon: 'fas fa-pencil-alt',
-      label: app.translator.trans('core.admin.permissions.allow_post_editing_label'),
-      setting: () => {
-        const minutes = parseInt(app.data.settings.allow_post_editing, 10);
-
-        return SettingDropdown.component({
-          defaultLabel: minutes
-            ? app.translator.transChoice('core.admin.permissions_controls.allow_some_minutes_button', minutes, {count: minutes})
-            : app.translator.trans('core.admin.permissions_controls.allow_indefinitely_button'),
-          key: 'allow_post_editing',
-          options: [
-            {value: '-1', label: app.translator.trans('core.admin.permissions_controls.allow_indefinitely_button')},
-            {value: '10', label: app.translator.trans('core.admin.permissions_controls.allow_ten_minutes_button')},
-            {value: 'reply', label: app.translator.trans('core.admin.permissions_controls.allow_until_reply_button')}
-          ]
-        });
-      }
-    }, 90);
-
-    return items;
-  }
-
-  moderateItems() {
-    const items = new ItemList();
-
-    items.add('viewIpsPosts', {
-      icon: 'fas fa-bullseye',
-      label: app.translator.trans('core.admin.permissions.view_post_ips_label'),
-      permission: 'discussion.viewIpsPosts'
-    }, 110);
-
-    items.add('renameDiscussions', {
-      icon: 'fas fa-i-cursor',
-      label: app.translator.trans('core.admin.permissions.rename_discussions_label'),
-      permission: 'discussion.rename'
-    }, 100);
-
-    items.add('hideDiscussions', {
-      icon: 'far fa-trash-alt',
-      label: app.translator.trans('core.admin.permissions.delete_discussions_label'),
-      permission: 'discussion.hide'
-    }, 90);
-
-    items.add('deleteDiscussions', {
-      icon: 'fas fa-times',
-      label: app.translator.trans('core.admin.permissions.delete_discussions_forever_label'),
-      permission: 'discussion.delete'
-    }, 80);
-
-    items.add('postWithoutThrottle', {
-      icon: 'fas fa-swimmer',
-      label: app.translator.trans('core.admin.permissions.post_without_throttle_label'),
-      permission: 'postWithoutThrottle'
-    }, 70);
-
-    items.add('editPosts', {
-      icon: 'fas fa-pencil-alt',
-      label: app.translator.trans('core.admin.permissions.edit_posts_label'),
-      permission: 'discussion.editPosts'
-    }, 70);
-
-    items.add('hidePosts', {
-      icon: 'far fa-trash-alt',
-      label: app.translator.trans('core.admin.permissions.delete_posts_label'),
-      permission: 'discussion.hidePosts'
-    }, 60);
-
-    items.add('deletePosts', {
-      icon: 'fas fa-times',
-      label: app.translator.trans('core.admin.permissions.delete_posts_forever_label'),
-      permission: 'discussion.deletePosts'
-    }, 60);
-
-    items.add('userEdit', {
-      icon: 'fas fa-user-cog',
-      label: app.translator.trans('core.admin.permissions.edit_users_label'),
-      permission: 'user.edit'
-    }, 60);
-
-    return items;
-  }
-
-  scopeItems() {
-    const items = new ItemList();
-
-    items.add('global', {
-      label: app.translator.trans('core.admin.permissions.global_heading'),
-      render: item => {
-        if (item.setting) {
-          return item.setting();
-        } else if (item.permission) {
-          return PermissionDropdown.component({
-            permission: item.permission,
-            allowGuest: item.allowGuest
-          });
-        }
-
-        return '';
-      }
-    }, 100);
-
-    return items;
-  }
-
-  scopeControlItems() {
-    return new ItemList();
-  }
-}

js/src/admin/components/PermissionGrid.tsx

@@ -0,0 +1,361 @@
+import app from '../app';
+
+import Component from '../../common/Component';
+import PermissionDropdown from './PermissionDropdown';
+import SettingDropdown from './SettingDropdown';
+import Button from '../../common/components/Button';
+import ItemList from '../../common/utils/ItemList';
+import icon from '../../common/helpers/icon';
+
+export default class PermissionGrid extends Component {
+    view() {
+        const scopes = this.scopeItems().toArray();
+
+        const permissionCells = (permission) => {
+            return scopes.map((scope) => <td>{scope.render(permission)}</td>);
+        };
+
+        return (
+            <table className="PermissionGrid">
+                <thead>
+                    <tr>
+                        <td></td>
+                        {scopes.map((scope) => (
+                            <th>
+                                {scope.label}{' '}
+                                {scope.onremove
+                                    ? Button.component({
+                                          icon: 'fas fa-times',
+                                          className: 'Button Button--text PermissionGrid-removeScope',
+                                          onclick: scope.onremove,
+                                      })
+                                    : ''}
+                            </th>
+                        ))}
+                        <th>{this.scopeControlItems().toArray()}</th>
+                    </tr>
+                </thead>
+                {this.permissionItems()
+                    .toArray()
+                    .map((section) => (
+                        <tbody>
+                            <tr className="PermissionGrid-section">
+                                <th>{section.label}</th>
+                                {permissionCells(section)}
+                                <td />
+                            </tr>
+                            {section.children.map((child) => (
+                                <tr className="PermissionGrid-child">
+                                    <th>
+                                        {icon(child.icon)}
+                                        {child.label}
+                                    </th>
+                                    {permissionCells(child)}
+                                    <td />
+                                </tr>
+                            ))}
+                        </tbody>
+                    ))}
+            </table>
+        );
+    }
+
+    permissionItems() {
+        const items = new ItemList();
+
+        items.add(
+            'view',
+            {
+                label: app.translator.trans('core.admin.permissions.read_heading'),
+                children: this.viewItems().toArray(),
+            },
+            100
+        );
+
+        items.add(
+            'start',
+            {
+                label: app.translator.trans('core.admin.permissions.create_heading'),
+                children: this.startItems().toArray(),
+            },
+            90
+        );
+
+        items.add(
+            'reply',
+            {
+                label: app.translator.trans('core.admin.permissions.participate_heading'),
+                children: this.replyItems().toArray(),
+            },
+            80
+        );
+
+        items.add(
+            'moderate',
+            {
+                label: app.translator.trans('core.admin.permissions.moderate_heading'),
+                children: this.moderateItems().toArray(),
+            },
+            70
+        );
+
+        return items;
+    }
+
+    viewItems() {
+        const items = new ItemList();
+
+        items.add(
+            'viewDiscussions',
+            {
+                icon: 'fas fa-eye',
+                label: app.translator.trans('core.admin.permissions.view_discussions_label'),
+                permission: 'viewDiscussions',
+                allowGuest: true,
+            },
+            100
+        );
+
+        items.add(
+            'viewUserList',
+            {
+                icon: 'fas fa-users',
+                label: app.translator.trans('core.admin.permissions.view_user_list_label'),
+                permission: 'viewUserList',
+                allowGuest: true,
+            },
+            100
+        );
+
+        items.add(
+            'signUp',
+            {
+                icon: 'fas fa-user-plus',
+                label: app.translator.trans('core.admin.permissions.sign_up_label'),
+                setting: () =>
+                    SettingDropdown.component({
+                        key: 'allow_sign_up',
+                        options: [
+                            { value: '1', label: app.translator.transText('core.admin.permissions_controls.signup_open_button') },
+                            { value: '0', label: app.translator.transText('core.admin.permissions_controls.signup_closed_button') },
+                        ],
+                    }),
+            },
+            90
+        );
+
+        items.add('viewLastSeenAt', {
+            icon: 'far fa-clock',
+            label: app.translator.trans('core.admin.permissions.view_last_seen_at_label'),
+            permission: 'user.viewLastSeenAt',
+        });
+
+        return items;
+    }
+
+    startItems() {
+        const items = new ItemList();
+
+        items.add(
+            'start',
+            {
+                icon: 'fas fa-edit',
+                label: app.translator.trans('core.admin.permissions.start_discussions_label'),
+                permission: 'startDiscussion',
+            },
+            100
+        );
+
+        items.add(
+            'allowRenaming',
+            {
+                icon: 'fas fa-i-cursor',
+                label: app.translator.trans('core.admin.permissions.allow_renaming_label'),
+                setting: () => {
+                    const minutes = parseInt(app.data.settings.allow_renaming, 10);
+
+                    return SettingDropdown.component({
+                        defaultLabel: minutes
+                            ? app.translator.transChoice('core.admin.permissions_controls.allow_some_minutes_button', minutes, { count: minutes })
+                            : app.translator.trans('core.admin.permissions_controls.allow_indefinitely_button'),
+                        key: 'allow_renaming',
+                        options: [
+                            { value: '-1', label: app.translator.transText('core.admin.permissions_controls.allow_indefinitely_button') },
+                            { value: '10', label: app.translator.transText('core.admin.permissions_controls.allow_ten_minutes_button') },
+                            { value: 'reply', label: app.translator.transText('core.admin.permissions_controls.allow_until_reply_button') },
+                        ],
+                    });
+                },
+            },
+            90
+        );
+
+        return items;
+    }
+
+    replyItems() {
+        const items = new ItemList();
+
+        items.add(
+            'reply',
+            {
+                icon: 'fas fa-reply',
+                label: app.translator.trans('core.admin.permissions.reply_to_discussions_label'),
+                permission: 'discussion.reply',
+            },
+            100
+        );
+
+        items.add(
+            'allowPostEditing',
+            {
+                icon: 'fas fa-pencil-alt',
+                label: app.translator.trans('core.admin.permissions.allow_post_editing_label'),
+                setting: () => {
+                    const minutes = parseInt(app.data.settings.allow_post_editing, 10);
+
+                    return SettingDropdown.component({
+                        defaultLabel: minutes
+                            ? app.translator.transChoice('core.admin.permissions_controls.allow_some_minutes_button', minutes, { count: minutes })
+                            : app.translator.trans('core.admin.permissions_controls.allow_indefinitely_button'),
+                        key: 'allow_post_editing',
+                        options: [
+                            { value: '-1', label: app.translator.transText('core.admin.permissions_controls.allow_indefinitely_button') },
+                            { value: '10', label: app.translator.transText('core.admin.permissions_controls.allow_ten_minutes_button') },
+                            { value: 'reply', label: app.translator.transText('core.admin.permissions_controls.allow_until_reply_button') },
+                        ],
+                    });
+                },
+            },
+            90
+        );
+
+        return items;
+    }
+
+    moderateItems() {
+        const items = new ItemList();
+
+        items.add(
+            'viewIpsPosts',
+            {
+                icon: 'fas fa-bullseye',
+                label: app.translator.trans('core.admin.permissions.view_post_ips_label'),
+                permission: 'discussion.viewIpsPosts',
+            },
+            110
+        );
+
+        items.add(
+            'renameDiscussions',
+            {
+                icon: 'fas fa-i-cursor',
+                label: app.translator.trans('core.admin.permissions.rename_discussions_label'),
+                permission: 'discussion.rename',
+            },
+            100
+        );
+
+        items.add(
+            'hideDiscussions',
+            {
+                icon: 'far fa-trash-alt',
+                label: app.translator.trans('core.admin.permissions.delete_discussions_label'),
+                permission: 'discussion.hide',
+            },
+            90
+        );
+
+        items.add(
+            'deleteDiscussions',
+            {
+                icon: 'fas fa-times',
+                label: app.translator.trans('core.admin.permissions.delete_discussions_forever_label'),
+                permission: 'discussion.delete',
+            },
+            80
+        );
+
+        items.add(
+            'postWithoutThrottle',
+            {
+                icon: 'fas fa-swimmer',
+                label: app.translator.trans('core.admin.permissions.post_without_throttle_label'),
+                permission: 'postWithoutThrottle',
+            },
+            70
+        );
+
+        items.add(
+            'editPosts',
+            {
+                icon: 'fas fa-pencil-alt',
+                label: app.translator.trans('core.admin.permissions.edit_posts_label'),
+                permission: 'discussion.editPosts',
+            },
+            70
+        );
+
+        items.add(
+            'hidePosts',
+            {
+                icon: 'far fa-trash-alt',
+                label: app.translator.trans('core.admin.permissions.delete_posts_label'),
+                permission: 'discussion.hidePosts',
+            },
+            60
+        );
+
+        items.add(
+            'deletePosts',
+            {
+                icon: 'fas fa-times',
+                label: app.translator.trans('core.admin.permissions.delete_posts_forever_label'),
+                permission: 'discussion.deletePosts',
+            },
+            60
+        );
+
+        items.add(
+            'userEdit',
+            {
+                icon: 'fas fa-user-cog',
+                label: app.translator.trans('core.admin.permissions.edit_users_label'),
+                permission: 'user.edit',
+            },
+            60
+        );
+
+        return items;
+    }
+
+    scopeItems() {
+        const items = new ItemList();
+
+        items.add(
+            'global',
+            {
+                label: app.translator.trans('core.admin.permissions.global_heading'),
+                render: (item) => {
+                    if (item.setting) {
+                        return item.setting();
+                    } else if (item.permission) {
+                        return PermissionDropdown.component({
+                            permission: item.permission,
+                            allowGuest: item.allowGuest,
+                        });
+                    }
+
+                    return '';
+                },
+            },
+            100
+        );
+
+        return items;
+    }
+
+    scopeControlItems() {
+        return new ItemList();
+    }
+}

js/src/admin/components/PermissionsPage.js

@@ -1,41 +0,0 @@
-import Page from './Page';
-import GroupBadge from '../../common/components/GroupBadge';
-import EditGroupModal from './EditGroupModal';
-import Group from '../../common/models/Group';
-import icon from '../../common/helpers/icon';
-import PermissionGrid from './PermissionGrid';
-
-export default class PermissionsPage extends Page {
-  view() {
-    return (
-      <div className="PermissionsPage">
-        <div className="PermissionsPage-groups">
-          <div className="container">
-            {app.store.all('groups')
-              .filter(group => [Group.GUEST_ID, Group.MEMBER_ID].indexOf(group.id()) === -1)
-              .map(group => (
-                <button className="Button Group" onclick={() => app.modal.show(new EditGroupModal({group}))}>
-                  {GroupBadge.component({
-                    group,
-                    className: 'Group-icon',
-                    label: null
-                  })}
-                  <span className="Group-name">{group.namePlural()}</span>
-                </button>
-              ))}
-            <button className="Button Group Group--add" onclick={() => app.modal.show(new EditGroupModal())}>
-              {icon('fas fa-plus', {className: 'Group-icon'})}
-              <span className="Group-name">{app.translator.trans('core.admin.permissions.new_group_button')}</span>
-            </button>
-          </div>
-        </div>
-
-        <div className="PermissionsPage-permissions">
-          <div className="container">
-            {PermissionGrid.component()}
-          </div>
-        </div>
-      </div>
-    );
-  }
-}

js/src/admin/components/PermissionsPage.tsx

@@ -0,0 +1,42 @@
+import app from '../app';
+
+import Page from './Page';
+import GroupBadge from '../../common/components/GroupBadge';
+import EditGroupModal from './EditGroupModal';
+import Group from '../../common/models/Group';
+import icon from '../../common/helpers/icon';
+import PermissionGrid from './PermissionGrid';
+
+export default class PermissionsPage extends Page {
+    view() {
+        return (
+            <div className="PermissionsPage">
+                <div className="PermissionsPage-groups">
+                    <div className="container">
+                        {app.store
+                            .all('groups')
+                            .filter((group) => [Group.GUEST_ID, Group.MEMBER_ID].indexOf(group.id()) === -1)
+                            .map((group: Group) => (
+                                <button className="Button Group" onclick={() => app.modal.show(EditGroupModal, { group })}>
+                                    {GroupBadge.component({
+                                        group,
+                                        className: 'Group-icon',
+                                        label: null,
+                                    })}
+                                    <span className="Group-name">{group.namePlural()}</span>
+                                </button>
+                            ))}
+                        <button className="Button Group Group--add" onclick={() => app.modal.show(EditGroupModal)}>
+                            {icon('fas fa-plus', { className: 'Group-icon' })}
+                            <span className="Group-name">{app.translator.trans('core.admin.permissions.new_group_button')}</span>
+                        </button>
+                    </div>
+                </div>
+
+                <div className="PermissionsPage-permissions">
+                    <div className="container">{PermissionGrid.component()}</div>
+                </div>
+            </div>
+        );
+    }
+}

js/src/admin/components/SessionDropdown.js

@@ -1,54 +0,0 @@
-import avatar from '../../common/helpers/avatar';
-import username from '../../common/helpers/username';
-import Dropdown from '../../common/components/Dropdown';
-import Button from '../../common/components/Button';
-import ItemList from '../../common/utils/ItemList';
-
-/**
- * The `SessionDropdown` component shows a button with the current user's
- * avatar/name, with a dropdown of session controls.
- */
-export default class SessionDropdown extends Dropdown {
-  static initProps(props) {
-    super.initProps(props);
-
-    props.className = 'SessionDropdown';
-    props.buttonClassName = 'Button Button--user Button--flat';
-    props.menuClassName = 'Dropdown-menu--right';
-  }
-
-  view() {
-    this.props.children = this.items().toArray();
-
-    return super.view();
-  }
-
-  getButtonContent() {
-    const user = app.session.user;
-
-    return [
-      avatar(user), ' ',
-      <span className="Button-label">{username(user)}</span>
-    ];
-  }
-
-  /**
-   * Build an item list for the contents of the dropdown menu.
-   *
-   * @return {ItemList}
-   */
-  items() {
-    const items = new ItemList();
-
-    items.add('logOut',
-      Button.component({
-        icon: 'fas fa-sign-out-alt',
-        children: app.translator.trans('core.admin.header.log_out_button'),
-        onclick: app.session.logout.bind(app.session)
-      }),
-      -100
-    );
-
-    return items;
-  }
-}

js/src/admin/components/SessionDropdown.tsx

@@ -0,0 +1,52 @@
+import avatar from '../../common/helpers/avatar';
+import username from '../../common/helpers/username';
+import Dropdown from '../../common/components/Dropdown';
+import Button from '../../common/components/Button';
+import ItemList from '../../common/utils/ItemList';
+
+/**
+ * The `SessionDropdown` component shows a button with the current user's
+ * avatar/name, with a dropdown of session controls.
+ */
+export default class SessionDropdown extends Dropdown {
+    static initProps(props) {
+        super.initProps(props);
+
+        props.className = 'SessionDropdown';
+        props.buttonClassName = 'Button Button--user Button--flat';
+        props.menuClassName = 'Dropdown-menu--right';
+    }
+
+    view() {
+        this.props.children = this.items().toArray();
+
+        return super.view();
+    }
+
+    getButtonContent() {
+        const user = app.session.user;
+
+        return [avatar(user), ' ', <span className="Button-label">{username(user)}</span>];
+    }
+
+    /**
+     * Build an item list for the contents of the dropdown menu.
+     *
+     * @return {ItemList}
+     */
+    items() {
+        const items = new ItemList();
+
+        items.add(
+            'logOut',
+            Button.component({
+                icon: 'fas fa-sign-out-alt',
+                children: app.translator.trans('core.admin.header.log_out_button'),
+                onclick: app.session.logout.bind(app.session),
+            }),
+            -100
+        );
+
+        return items;
+    }
+}

js/src/admin/components/SettingDropdown.js

@@ -1,25 +0,0 @@
-import SelectDropdown from '../../common/components/SelectDropdown';
-import Button from '../../common/components/Button';
-import saveSettings from '../utils/saveSettings';
-
-export default class SettingDropdown extends SelectDropdown {
-  static initProps(props) {
-    super.initProps(props);
-
-    props.className = 'SettingDropdown';
-    props.buttonClassName = 'Button Button--text';
-    props.caretIcon = 'fas fa-caret-down';
-    props.defaultLabel = 'Custom';
-
-    props.children = props.options.map(({value, label}) => {
-      const active = app.data.settings[props.key] === value;
-
-      return Button.component({
-        children: label,
-        icon: active ? 'fas fa-check' : true,
-        onclick: saveSettings.bind(this, {[props.key]: value}),
-        active
-      });
-    });
-  }
-}

js/src/admin/components/SettingDropdown.tsx

@@ -0,0 +1,27 @@
+import app from '../app';
+
+import SelectDropdown from '../../common/components/SelectDropdown';
+import Button from '../../common/components/Button';
+import saveSettings from '../utils/saveSettings';
+
+export default class SettingDropdown extends SelectDropdown {
+    static initProps(props) {
+        super.initProps(props);
+
+        props.className = 'SettingDropdown';
+        props.buttonClassName = 'Button Button--text';
+        props.caretIcon = 'fas fa-caret-down';
+        props.defaultLabel = 'Custom';
+
+        props.children = props.options.map(({ value, label }) => {
+            const active = app.data.settings[props.key] === value;
+
+            return Button.component({
+                children: label,
+                icon: active ? 'fas fa-check' : true,
+                onclick: saveSettings.bind(this, { [props.key]: value }),
+                active,
+            });
+        });
+    }
+}

js/src/admin/components/SettingsModal.js

@@ -1,79 +0,0 @@
-import Modal from '../../common/components/Modal';
-import Button from '../../common/components/Button';
-import saveSettings from '../utils/saveSettings';
-
-export default class SettingsModal extends Modal {
-  init() {
-    this.settings = {};
-    this.loading = false;
-  }
-
-  form() {
-    return '';
-  }
-
-  content() {
-    return (
-      <div className="Modal-body">
-        <div className="Form">
-          {this.form()}
-
-          <div className="Form-group">
-            {this.submitButton()}
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  submitButton() {
-    return (
-      <Button
-        type="submit"
-        className="Button Button--primary"
-        loading={this.loading}
-        disabled={!this.changed()}>
-        {app.translator.trans('core.admin.settings.submit_button')}
-      </Button>
-    );
-  }
-
-  setting(key, fallback = '') {
-    this.settings[key] = this.settings[key] || m.prop(app.data.settings[key] || fallback);
-
-    return this.settings[key];
-  }
-
-  dirty() {
-    const dirty = {};
-
-    Object.keys(this.settings).forEach(key => {
-      const value = this.settings[key]();
-
-      if (value !== app.data.settings[key]) {
-        dirty[key] = value;
-      }
-    });
-
-    return dirty;
-  }
-
-  changed() {
-    return Object.keys(this.dirty()).length;
-  }
-
-  onsubmit(e) {
-    e.preventDefault();
-
-    this.loading = true;
-
-    saveSettings(this.dirty()).then(
-      this.onsaved.bind(this),
-      this.loaded.bind(this)
-    );
-  }
-
-  onsaved() {
-    this.hide();
-  }
-}

js/src/admin/components/SettingsModal.tsx

@@ -0,0 +1,70 @@
+import app from '../app';
+
+import Modal from '../../common/components/Modal';
+import Button from '../../common/components/Button';
+import saveSettings from '../utils/saveSettings';
+
+export default abstract class SettingsModal extends Modal {
+    settings: object = {};
+    loading: boolean = false;
+
+    form(): string | JSX.Element[] {
+        return '';
+    }
+
+    content() {
+        return (
+            <div className="Modal-body">
+                <div className="Form">
+                    {this.form()}
+
+                    <div className="Form-group">{this.submitButton()}</div>
+                </div>
+            </div>
+        );
+    }
+
+    submitButton() {
+        return (
+            <Button type="submit" className="Button Button--primary" loading={this.loading} disabled={!this.changed()}>
+                {app.translator.trans('core.admin.settings.submit_button')}
+            </Button>
+        );
+    }
+
+    setting(key, fallback = '') {
+        this.settings[key] = this.settings[key] || m.prop(app.data.settings[key] || fallback);
+
+        return this.settings[key];
+    }
+
+    dirty() {
+        const dirty = {};
+
+        Object.keys(this.settings).forEach((key) => {
+            const value = this.settings[key]();
+
+            if (value !== app.data.settings[key]) {
+                dirty[key] = value;
+            }
+        });
+
+        return dirty;
+    }
+
+    changed() {
+        return Object.keys(this.dirty()).length;
+    }
+
+    onsubmit(e) {
+        e.preventDefault();
+
+        this.loading = true;
+
+        saveSettings(this.dirty()).then(this.onsaved.bind(this), this.loaded.bind(this));
+    }
+
+    onsaved() {
+        this.hide();
+    }
+}

js/src/admin/components/StatusWidget.js

@@ -1,58 +0,0 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-import DashboardWidget from './DashboardWidget';
-import listItems from '../../common/helpers/listItems';
-import ItemList from '../../common/utils/ItemList';
-import Dropdown from '../../common/components/Dropdown';
-import Button from '../../common/components/Button';
-import LoadingModal from './LoadingModal';
-
-export default class StatusWidget extends DashboardWidget {
-  className() {
-    return 'StatusWidget';
-  }
-
-  content() {
-    return (
-      <ul>{listItems(this.items().toArray())}</ul>
-    );
-  }
-
-  items() {
-    const items = new ItemList();
-
-    items.add('tools', (
-      <Dropdown
-        label={app.translator.trans('core.admin.dashboard.tools_button')}
-        icon="fas fa-cog"
-        buttonClassName="Button"
-        menuClassName="Dropdown-menu--right">
-        <Button onclick={this.handleClearCache.bind(this)}>
-          {app.translator.trans('core.admin.dashboard.clear_cache_button')}
-        </Button>
-      </Dropdown>
-    ));
-
-    items.add('version-flarum', [<strong>Flarum</strong>, <br/>, app.forum.attribute('version')]);
-    items.add('version-php', [<strong>PHP</strong>, <br/>, app.data.phpVersion]);
-    items.add('version-mysql', [<strong>MySQL</strong>, <br/>, app.data.mysqlVersion]);
-
-    return items;
-  }
-
-  handleClearCache(e) {
-    app.modal.show(new LoadingModal());
-
-    app.request({
-      method: 'DELETE',
-      url: app.forum.attribute('apiUrl') + '/cache'
-    }).then(() => window.location.reload());
-  }
-}

js/src/admin/components/StatusWidget.tsx

@@ -0,0 +1,49 @@
+import app from '../app';
+
+import DashboardWidget from './DashboardWidget';
+import listItems from '../../common/helpers/listItems';
+import ItemList from '../../common/utils/ItemList';
+import Dropdown from '../../common/components/Dropdown';
+import Button from '../../common/components/Button';
+import LoadingModal from './LoadingModal';
+
+export default class StatusWidget extends DashboardWidget {
+    className() {
+        return 'StatusWidget';
+    }
+
+    content() {
+        return <ul>{listItems(this.items().toArray())}</ul>;
+    }
+
+    items() {
+        const items = new ItemList();
+
+        items.add(
+            'tools',
+            <Dropdown
+                label={app.translator.transText('core.admin.dashboard.tools_button')}
+                icon="fas fa-cog"
+                buttonClassName="Button"
+                menuClassName="Dropdown-menu--right"
+            >
+                <Button onclick={this.handleClearCache.bind(this)}>{app.translator.trans('core.admin.dashboard.clear_cache_button')}</Button>
+            </Dropdown>
+        );
+
+        items.add('version-flarum', [<strong>Flarum</strong>, <br />, app.forum.attribute('version')]);
+        items.add('version-php', [<strong>PHP</strong>, <br />, app.data.phpVersion]);
+        items.add('version-mysql', [<strong>MySQL</strong>, <br />, app.data.mysqlVersion]);
+
+        return items;
+    }
+
+    handleClearCache(e) {
+        app.modal.show(LoadingModal);
+
+        app.request({
+            method: 'DELETE',
+            url: app.forum.attribute('apiUrl') + '/cache',
+        }).then(() => window.location.reload());
+    }
+}

js/src/admin/components/UploadImageButton.js

@@ -1,97 +0,0 @@
-import Button from '../../common/components/Button';
-
-export default class UploadImageButton extends Button {
-  init() {
-    this.loading = false;
-  }
-
-  view() {
-    this.props.loading = this.loading;
-    this.props.className = (this.props.className || '') + ' Button';
-
-    if (app.data.settings[this.props.name + '_path']) {
-      this.props.onclick = this.remove.bind(this);
-      this.props.children = app.translator.trans('core.admin.upload_image.remove_button');
-
-      return (
-        <div>
-          <p><img src={app.forum.attribute(this.props.name+'Url')} alt=""/></p>
-          <p>{super.view()}</p>
-        </div>
-      );
-    } else {
-      this.props.onclick = this.upload.bind(this);
-      this.props.children = app.translator.trans('core.admin.upload_image.upload_button');
-    }
-
-    return super.view();
-  }
-
-  /**
-   * Prompt the user to upload an image.
-   */
-  upload() {
-    if (this.loading) return;
-
-    const $input = $('<input type="file">');
-
-    $input.appendTo('body').hide().click().on('change', e => {
-      const data = new FormData();
-      data.append(this.props.name, $(e.target)[0].files[0]);
-
-      this.loading = true;
-      m.redraw();
-
-      app.request({
-        method: 'POST',
-        url: this.resourceUrl(),
-        serialize: raw => raw,
-        data
-      }).then(
-        this.success.bind(this),
-        this.failure.bind(this)
-      );
-    });
-  }
-
-  /**
-   * Remove the logo.
-   */
-  remove() {
-    this.loading = true;
-    m.redraw();
-
-    app.request({
-      method: 'DELETE',
-      url: this.resourceUrl()
-    }).then(
-      this.success.bind(this),
-      this.failure.bind(this)
-    );
-  }
-
-  resourceUrl() {
-    return app.forum.attribute('apiUrl') + '/' + this.props.name;
-  }
-
-  /**
-   * After a successful upload/removal, reload the page.
-   *
-   * @param {Object} response
-   * @protected
-   */
-  success(response) {
-    window.location.reload();
-  }
-
-  /**
-   * If upload/removal fails, stop loading.
-   *
-   * @param {Object} response
-   * @protected
-   */
-  failure(response) {
-    this.loading = false;
-    m.redraw();
-  }
-}

js/src/admin/components/UploadImageButton.tsx

@@ -0,0 +1,97 @@
+import app from '../app';
+
+import Button, { ButtonProps } from '../../common/components/Button';
+
+export default class UploadImageButton<T extends ButtonProps = ButtonProps> extends Button<T> {
+    loading: boolean = false;
+
+    view() {
+        this.props.loading = this.loading;
+        this.props.className = (this.props.className || '') + ' Button';
+
+        if (app.data.settings[this.props.name + '_path']) {
+            this.props.onclick = this.remove.bind(this);
+            this.props.children = app.translator.trans('core.admin.upload_image.remove_button');
+
+            return (
+                <div>
+                    <p>
+                        <img src={app.forum.attribute(this.props.name + 'Url')} alt="" />
+                    </p>
+                    <p>{super.view()}</p>
+                </div>
+            );
+        } else {
+            this.props.onclick = this.upload.bind(this);
+            this.props.children = app.translator.trans('core.admin.upload_image.upload_button');
+        }
+
+        return super.view();
+    }
+
+    /**
+     * Prompt the user to upload an image.
+     */
+    upload() {
+        if (this.loading) return;
+
+        const $input = $('<input type="file">');
+
+        $input
+            .appendTo('body')
+            .hide()
+            .click()
+            .on('change', (e) => {
+                const data = new FormData();
+                data.append(this.props.name, $(e.target)[0].files[0]);
+
+                this.loading = true;
+                m.redraw();
+
+                app.request({
+                    method: 'POST',
+                    url: this.resourceUrl(),
+                    serialize: (raw) => raw,
+                    body: data,
+                }).then(this.success.bind(this), this.failure.bind(this));
+            });
+    }
+
+    /**
+     * Remove the logo.
+     */
+    remove() {
+        this.loading = true;
+        m.redraw();
+
+        app.request({
+            method: 'DELETE',
+            url: this.resourceUrl(),
+        }).then(this.success.bind(this), this.failure.bind(this));
+    }
+
+    resourceUrl() {
+        return app.forum.attribute('apiUrl') + '/' + this.props.name;
+    }
+
+    /**
+     * After a successful upload/removal, reload the page.
+     *
+     * @param {Object} response
+     * @protected
+     */
+    success(response) {
+        window.location.reload();
+    }
+
+    /**
+     * If upload/removal fails, stop loading.
+     *
+     * @param {Object} response
+     * @protected
+     */
+    failure(response) {
+        this.loading = false;
+        m.redraw();
+    }
+}

js/src/admin/components/Widget.js

@@ -1,38 +0,0 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-import Component from '../../common/Component';
-
-export default class DashboardWidget extends Component {
-  view() {
-    return (
-      <div className={"DashboardWidget "+this.className()}>
-        {this.content()}
-      </div>
-    );
-  }
-
-  /**
-   * Get the class name to apply to the widget.
-   *
-   * @return {String}
-   */
-  className() {
-    return '';
-  }
-
-  /**
-   * Get the content of the widget.
-   *
-   * @return {VirtualElement}
-   */
-  content() {
-    return [];
-  }
-}

js/src/admin/index.js

@@ -1,18 +0,0 @@
-import AdminApplication from './AdminApplication';
-
-const app = new AdminApplication();
-
-// Backwards compatibility
-window.app = app;
-
-export { app };
-
-// Export public API
-
-
-// Export compat API
-import compat from './compat';
-
-compat.app = app;
-
-export { compat };

js/src/admin/index.ts

@@ -0,0 +1,10 @@
+import app from './app';
+
+export { app };
+
+// Export compat API
+import compat from './compat';
+
+compat.app = app;
+
+export { compat };

js/src/admin/routes.js

@@ -1,22 +0,0 @@
-import DashboardPage from './components/DashboardPage';
-import BasicsPage from './components/BasicsPage';
-import PermissionsPage from './components/PermissionsPage';
-import AppearancePage from './components/AppearancePage';
-import ExtensionsPage from './components/ExtensionsPage';
-import MailPage from './components/MailPage';
-
-/**
- * The `routes` initializer defines the forum app's routes.
- *
- * @param {App} app
- */
-export default function(app) {
-  app.routes = {
-    'dashboard': {path: '/', component: DashboardPage.component()},
-    'basics': {path: '/basics', component: BasicsPage.component()},
-    'permissions': {path: '/permissions', component: PermissionsPage.component()},
-    'appearance': {path: '/appearance', component: AppearancePage.component()},
-    'extensions': {path: '/extensions', component: ExtensionsPage.component()},
-    'mail': {path: '/mail', component: MailPage.component()}
-  };
-}

js/src/admin/routes.ts

@@ -0,0 +1,17 @@
+import BasicsPage from './components/BasicsPage';
+import DashboardPage from './components/DashboardPage';
+import MailPage from './components/MailPage';
+import PermissionsPage from './components/PermissionsPage';
+import AppearancePage from './components/AppearancePage';
+import ExtensionsPage from './components/ExtensionsPage';
+
+export default (app) => {
+    app.routes = {
+        dashboard: { path: '/', component: DashboardPage },
+        basics: { path: '/basics', component: BasicsPage },
+        mail: { path: '/mail', component: MailPage },
+        permissions: { path: '/permissions', component: PermissionsPage },
+        appearance: { path: '/appearance', component: AppearancePage },
+        extensions: { path: '/extensions', component: ExtensionsPage },
+    };
+};

js/src/admin/utils/saveSettings.js

@@ -1,14 +0,0 @@
-export default function saveSettings(settings) {
-  const oldSettings = JSON.parse(JSON.stringify(app.data.settings));
-
-  Object.assign(app.data.settings, settings);
-
-  return app.request({
-    method: 'POST',
-    url: app.forum.attribute('apiUrl') + '/settings',
-    data: settings
-  }).catch(error => {
-    app.data.settings = oldSettings;
-    throw error;
-  });
-}

js/src/admin/utils/saveSettings.ts

@@ -0,0 +1,18 @@
+import app from '../app';
+
+export default function saveSettings(settings) {
+    const oldSettings = JSON.parse(JSON.stringify(app.data.settings));
+
+    Object.assign(app.data.settings, settings);
+
+    return app
+        .request({
+            method: 'POST',
+            url: app.forum.attribute('apiUrl') + '/settings',
+            body: settings,
+        })
+        .catch((error) => {
+            app.data.settings = oldSettings;
+            throw error;
+        });
+}

js/src/common/Application.js

@@ -1,380 +0,0 @@
-import ItemList from './utils/ItemList';
-import Alert from './components/Alert';
-import Button from './components/Button';
-import ModalManager from './components/ModalManager';
-import AlertManager from './components/AlertManager';
-import RequestErrorModal from './components/RequestErrorModal';
-import Translator from './Translator';
-import Store from './Store';
-import Session from './Session';
-import extract from './utils/extract';
-import Drawer from './utils/Drawer';
-import mapRoutes from './utils/mapRoutes';
-import RequestError from './utils/RequestError';
-import ScrollListener from './utils/ScrollListener';
-import { extend } from './extend';
-
-import Forum from './models/Forum';
-import User from './models/User';
-import Discussion from './models/Discussion';
-import Post from './models/Post';
-import Group from './models/Group';
-import Notification from './models/Notification';
-import { flattenDeep } from 'lodash-es';
-
-/**
- * The `App` class provides a container for an application, as well as various
- * utilities for the rest of the app to use.
- */
-export default class Application {
-  /**
-   * The forum model for this application.
-   *
-   * @type {Forum}
-   * @public
-   */
-  forum = null;
-
-  /**
-   * A map of routes, keyed by a unique route name. Each route is an object
-   * containing the following properties:
-   *
-   * - `path` The path that the route is accessed at.
-   * - `component` The Mithril component to render when this route is active.
-   *
-   * @example
-   * app.routes.discussion = {path: '/d/:id', component: DiscussionPage.component()};
-   *
-   * @type {Object}
-   * @public
-   */
-  routes = {};
-
-  /**
-   * An ordered list of initializers to bootstrap the application.
-   *
-   * @type {ItemList}
-   * @public
-   */
-  initializers = new ItemList();
-
-  /**
-   * The app's session.
-   *
-   * @type {Session}
-   * @public
-   */
-  session = null;
-
-  /**
-   * The app's translator.
-   *
-   * @type {Translator}
-   * @public
-   */
-  translator = new Translator();
-
-  /**
-   * The app's data store.
-   *
-   * @type {Store}
-   * @public
-   */
-  store = new Store({
-    forums: Forum,
-    users: User,
-    discussions: Discussion,
-    posts: Post,
-    groups: Group,
-    notifications: Notification
-  });
-
-  /**
-   * A local cache that can be used to store data at the application level, so
-   * that is persists between different routes.
-   *
-   * @type {Object}
-   * @public
-   */
-  cache = {};
-
-  /**
-   * Whether or not the app has been booted.
-   *
-   * @type {Boolean}
-   * @public
-   */
-  booted = false;
-
-  /**
-   * An Alert that was shown as a result of an AJAX request error. If present,
-   * it will be dismissed on the next successful request.
-   *
-   * @type {null|Alert}
-   * @private
-   */
-  requestError = null;
-
-  data;
-
-  title = '';
-  titleCount = 0;
-
-  load(payload) {
-    this.data = payload;
-    this.translator.locale = payload.locale;
-  }
-
-  boot() {
-    this.initializers.toArray().forEach(initializer => initializer(this));
-
-    this.store.pushPayload({data: this.data.resources});
-
-    this.forum = this.store.getById('forums', 1);
-
-    this.session = new Session(
-        this.store.getById('users', this.data.session.userId),
-        this.data.session.csrfToken
-    );
-
-    this.mount();
-  }
-
-  bootExtensions(extensions) {
-    Object.keys(extensions).forEach(name => {
-      const extension = extensions[name];
-
-      const extenders = flattenDeep(extension.extend);
-
-      for (const extender of extenders) {
-        extender.extend(this, { name, exports: extension });
-      }
-    });
-  }
-
-  mount(basePath = '') {
-    this.modal = m.mount(document.getElementById('modal'), <ModalManager/>);
-    this.alerts = m.mount(document.getElementById('alerts'), <AlertManager/>);
-
-    this.drawer = new Drawer();
-
-    m.route(
-      document.getElementById('content'),
-      basePath + '/',
-      mapRoutes(this.routes, basePath)
-    );
-
-    // Add a class to the body which indicates that the page has been scrolled
-    // down.
-    new ScrollListener(top => {
-      const $app = $('#app');
-      const offset = $app.offset().top;
-
-      $app
-        .toggleClass('affix', top >= offset)
-        .toggleClass('scrolled', top > offset);
-    }).start();
-
-    $(() => {
-      $('body').addClass('ontouchstart' in window ? 'touch' : 'no-touch');
-    });
-  }
-
-  /**
-   * Get the API response document that has been preloaded into the application.
-   *
-   * @return {Object|null}
-   * @public
-   */
-  preloadedApiDocument() {
-    if (this.data.apiDocument) {
-      const results = this.store.pushPayload(this.data.apiDocument);
-
-      this.data.apiDocument = null;
-
-      return results;
-    }
-
-    return null;
-  }
-
-  /**
-   * Set the <title> of the page.
-   *
-   * @param {String} title
-   * @public
-   */
-  setTitle(title) {
-    this.title = title;
-    this.updateTitle();
-  }
-
-  /**
-   * Set a number to display in the <title> of the page.
-   *
-   * @param {Integer} count
-   */
-  setTitleCount(count) {
-    this.titleCount = count;
-    this.updateTitle();
-  }
-
-  updateTitle() {
-    document.title = (this.titleCount ? `(${this.titleCount}) ` : '') +
-      (this.title ? this.title + ' - ' : '') +
-      this.forum.attribute('title');
-  }
-
-  /**
-   * Make an AJAX request, handling any low-level errors that may occur.
-   *
-   * @see https://lhorie.github.io/mithril/mithril.request.html
-   * @param {Object} options
-   * @return {Promise}
-   * @public
-   */
-  request(originalOptions) {
-    const options = Object.assign({}, originalOptions);
-
-    // Set some default options if they haven't been overridden. We want to
-    // authenticate all requests with the session token. We also want all
-    // requests to run asynchronously in the background, so that they don't
-    // prevent redraws from occurring.
-    options.background = options.background || true;
-
-    extend(options, 'config', (result, xhr) => xhr.setRequestHeader('X-CSRF-Token', this.session.csrfToken));
-
-    // If the method is something like PATCH or DELETE, which not all servers
-    // and clients support, then we'll send it as a POST request with the
-    // intended method specified in the X-HTTP-Method-Override header.
-    if (options.method !== 'GET' && options.method !== 'POST') {
-      const method = options.method;
-      extend(options, 'config', (result, xhr) => xhr.setRequestHeader('X-HTTP-Method-Override', method));
-      options.method = 'POST';
-    }
-
-    // When we deserialize JSON data, if for some reason the server has provided
-    // a dud response, we don't want the application to crash. We'll show an
-    // error message to the user instead.
-    options.deserialize = options.deserialize || (responseText => responseText);
-
-    options.errorHandler = options.errorHandler || (error => {
-      throw error;
-    });
-
-    // When extracting the data from the response, we can check the server
-    // response code and show an error message to the user if something's gone
-    // awry.
-    const original = options.extract;
-    options.extract = xhr => {
-      let responseText;
-
-      if (original) {
-        responseText = original(xhr.responseText);
-      } else {
-        responseText = xhr.responseText || null;
-      }
-
-      const status = xhr.status;
-
-      if (status < 200 || status > 299) {
-        throw new RequestError(status, responseText, options, xhr);
-      }
-
-      if (xhr.getResponseHeader) {
-        const csrfToken = xhr.getResponseHeader('X-CSRF-Token');
-        if (csrfToken) app.session.csrfToken = csrfToken;
-      }
-
-      try {
-        return JSON.parse(responseText);
-      } catch (e) {
-        throw new RequestError(500, responseText, options, xhr);
-      }
-    };
-
-    if (this.requestError) this.alerts.dismiss(this.requestError.alert);
-
-    // Now make the request. If it's a failure, inspect the error that was
-    // returned and show an alert containing its contents.
-    const deferred = m.deferred();
-
-    m.request(options).then(response => deferred.resolve(response), error => {
-      this.requestError = error;
-
-      let children;
-
-      switch (error.status) {
-        case 422:
-          children = error.response.errors
-            .map(error => [error.detail, <br/>])
-            .reduce((a, b) => a.concat(b), [])
-            .slice(0, -1);
-          break;
-
-        case 401:
-        case 403:
-          children = app.translator.trans('core.lib.error.permission_denied_message');
-          break;
-
-        case 404:
-        case 410:
-          children = app.translator.trans('core.lib.error.not_found_message');
-          break;
-
-        case 429:
-          children = app.translator.trans('core.lib.error.rate_limit_exceeded_message');
-          break;
-
-        default:
-          children = app.translator.trans('core.lib.error.generic_message');
-      }
-
-      const isDebug = app.forum.attribute('debug');
-
-      error.alert = new Alert({
-        type: 'error',
-        children,
-        controls: isDebug && [
-          <Button className="Button Button--link" onclick={this.showDebug.bind(this, error)}>Debug</Button>
-        ]
-      });
-
-      try {
-        options.errorHandler(error);
-      } catch (error) {
-        this.alerts.show(error.alert);
-      }
-
-      deferred.reject(error);
-    });
-
-    return deferred.promise;
-  }
-
-  /**
-   * @param {RequestError} error
-   * @private
-   */
-  showDebug(error) {
-    this.alerts.dismiss(this.requestError.alert);
-
-    this.modal.show(new RequestErrorModal({error}));
-  }
-
-  /**
-   * Construct a URL to the route with the given name.
-   *
-   * @param {String} name
-   * @param {Object} params
-   * @return {String}
-   * @public
-   */
-  route(name, params = {}) {
-    const url = this.routes[name].path.replace(/:([^\/]+)/g, (m, key) => extract(params, key));
-    const queryString = m.route.buildQueryString(params);
-    const prefix = m.route.mode === 'pathname' ? app.forum.attribute('basePath') : '';
-
-    return prefix + url + (queryString ? '?' + queryString : '');
-  }
-}

js/src/common/Application.ts

@@ -0,0 +1,363 @@
+import Mithril from 'mithril';
+
+import Translator from './Translator';
+import Session from './Session';
+import Store from './Store';
+import { extend } from './extend';
+
+import extract from './utils/extract';
+import mapRoutes from './utils/mapRoutes';
+import Drawer from './utils/Drawer';
+import RequestError from './utils/RequestError';
+import ItemList from './utils/ItemList';
+import ScrollListener from './utils/ScrollListener';
+
+import Forum from './models/Forum';
+import Discussion from './models/Discussion';
+import User from './models/User';
+import Post from './models/Post';
+import Group from './models/Group';
+import Notification from './models/Notification';
+
+import AlertManager from './components/AlertManager';
+import Button from './components/Button';
+import ModalManager from './components/ModalManager';
+import Page from './components/Page';
+import RequestErrorModal from './components/RequestErrorModal';
+
+import AlertState from './states/AlertState';
+
+import flattenDeep from 'lodash/flattenDeep';
+
+export type ApplicationData = {
+    apiDocument: any;
+    locale: string;
+    locales: any;
+    resources: any[];
+    session: any;
+};
+
+export default abstract class Application {
+    /**
+     * The forum model for this application.
+     */
+    public forum!: Forum;
+
+    /**
+     * A map of routes, keyed by a unique route name. Each route is an object
+     * containing the following properties:
+     *
+     * - `path` The path that the route is accessed at.
+     * - `component` The Mithril component to render when this route is active.
+     *
+     * @example
+     * app.routes.discussion = {path: '/d/:id', component: DiscussionPage.component()};
+     */
+    public routes: { [key: string]: { path: string; component: any; [key: string]: any } } = {};
+
+    /**
+     * An ordered list of initializers to bootstrap the application.
+     */
+    public initializers = new ItemList();
+
+    /**
+     * The app's session.
+     */
+    public session!: Session;
+
+    /**
+     * The app's translator.
+     */
+    public translator = new Translator();
+
+    /**
+     * The app's data store.
+     */
+    public store = new Store({
+        forums: Forum,
+        users: User,
+        discussions: Discussion,
+        posts: Post,
+        groups: Group,
+        notifications: Notification,
+    });
+
+    /**
+     * A local cache that can be used to store data at the application level, so
+     * that is persists between different routes.
+     */
+    public cache: { [key: string]: any } = {};
+
+    /**
+     * Whether or not the app has been booted.
+     */
+    public booted: boolean = false;
+
+    /**
+     * An Alert that was shown as a result of an AJAX request error. If present,
+     * it will be dismissed on the next successful request.
+     */
+    private requestError: RequestError | null = null;
+
+    data!: ApplicationData;
+
+    title = '';
+    titleCount = 0;
+
+    drawer = new Drawer();
+
+    modal!: ModalManager;
+    alerts!: AlertManager;
+
+    current?: Page;
+    previous?: Page;
+
+    load(payload) {
+        this.data = payload;
+        this.translator.locale = payload.locale;
+    }
+
+    boot() {
+        this.initializers.toArray().forEach((initializer) => initializer(this));
+
+        this.store.pushPayload({ data: this.data.resources });
+
+        this.forum = this.store.getById('forums', 1);
+
+        this.session = new Session(this.store.getById('users', this.data.session.userId), this.data.session.csrfToken);
+
+        this.mount();
+
+        this.booted = true;
+    }
+
+    bootExtensions(extensions) {
+        Object.keys(extensions).forEach((name) => {
+            const extension = extensions[name];
+
+            const extenders = flattenDeep(extension.extend);
+
+            for (const extender of extenders) {
+                extender.extend(this, { name, exports: extension });
+            }
+        });
+    }
+
+    mount(basePath = '') {
+        const $modal = document.getElementById('modal');
+        const $alerts = document.getElementById('alerts');
+        const $content = document.getElementById('content');
+
+        if ($modal) m.mount($modal, (this.modal = new ModalManager()));
+
+        if ($alerts) m.mount($alerts, (this.alerts = new AlertManager({ oninit: (vnode) => (this.alerts = vnode.state) })));
+
+        if ($content) m.route($content, basePath + '/', mapRoutes(this.routes, basePath));
+
+        // Add a class to the body which indicates that the page has been scrolled
+        // down.
+        new ScrollListener((top) => {
+            const $app = $('#app');
+            const offset = $app.offset().top;
+
+            $app.toggleClass('affix', top >= offset).toggleClass('scrolled', top > offset);
+        }).start();
+
+        $(() => {
+            $('body').addClass('ontouchstart' in window ? 'touch' : 'no-touch');
+        });
+    }
+
+    /**
+     * Get the API response document that has been preloaded into the application.
+     */
+    preloadedApiDocument() {
+        if (this.data.apiDocument) {
+            const results = this.store.pushPayload(this.data.apiDocument);
+
+            this.data.apiDocument = null;
+
+            return results;
+        }
+
+        return null;
+    }
+
+    /**
+     * Set the <title> of the page.
+     */
+    setTitle(title: string) {
+        this.title = title;
+        this.updateTitle();
+    }
+
+    /**
+     * Set a number to display in the <title> of the page.
+     */
+    setTitleCount(count: number) {
+        this.titleCount = count;
+        this.updateTitle();
+    }
+
+    updateTitle() {
+        document.title = (this.titleCount ? `(${this.titleCount}) ` : '') + (this.title ? this.title + ' - ' : '') + this.forum.attribute('title');
+    }
+
+    /**
+     * Construct a URL to the route with the given name.
+     */
+    route(name: string, params: object = {}): string {
+        const route = this.routes[name];
+
+        if (!route) throw new Error(`Route '${name}' does not exist`);
+
+        const url = route.path.replace(/:([^\/]+)/g, (m, key) => extract(params, key));
+
+        // Remove falsy values in params to avoid
+        // having urls like '/?sort&q'
+        for (const key in params) {
+            if (params.hasOwnProperty(key) && !params[key]) delete params[key];
+        }
+
+        const queryString = m.buildQueryString(params as Mithril.Params);
+        const prefix = m.route.prefix === '' ? this.forum.attribute('basePath') : '';
+
+        return prefix + url + (queryString ? '?' + queryString : '');
+    }
+
+    /**
+     * Make an AJAX request, handling any low-level errors that may occur.
+     *
+     * @see https://mithril.js.org/request.html
+     */
+    request(originalOptions: Mithril.RequestOptions<JSON> | any): Promise<any> {
+        const options: Mithril.RequestOptions<JSON> | any = Object.assign({}, originalOptions);
+
+        // Set some default options if they haven't been overridden. We want to
+        // authenticate all requests with the session token. We also want all
+        // requests to run asynchronously in the background, so that they don't
+        // prevent redraws from occurring.
+        options.background = options.background || true;
+
+        extend(options, 'config', (result, xhr: XMLHttpRequest) => xhr.setRequestHeader('X-CSRF-Token', this.session.csrfToken!));
+
+        // If the method is something like PATCH or DELETE, which not all servers
+        // and clients support, then we'll send it as a POST request with the
+        // intended method specified in the X-HTTP-Method-Override header.
+        if (options.method !== 'GET' && options.method !== 'POST') {
+            const method = options.method;
+            extend(options, 'config', (result, xhr: XMLHttpRequest) => xhr.setRequestHeader('X-HTTP-Method-Override', method));
+            options.method = 'POST';
+        }
+
+        // When we deserialize JSON data, if for some reason the server has provided
+        // a dud response, we don't want the application to crash. We'll show an
+        // error message to the user instead.
+        options.deserialize = options.deserialize || ((responseText) => responseText);
+
+        options.errorHandler =
+            options.errorHandler ||
+            ((error) => {
+                throw error;
+            });
+
+        // When extracting the data from the response, we can check the server
+        // response code and show an error message to the user if something's gone
+        // awry.
+        const original = options.extract;
+        options.extract = (xhr) => {
+            let responseText;
+
+            if (original) {
+                responseText = original(xhr.responseText);
+            } else {
+                responseText = xhr.responseText || null;
+            }
+
+            const status = xhr.status;
+
+            if (status < 200 || status > 299) {
+                throw new RequestError(status, responseText, options, xhr);
+            }
+
+            if (xhr.getResponseHeader) {
+                const csrfToken = xhr.getResponseHeader('X-CSRF-Token');
+                if (csrfToken) app.session.csrfToken = csrfToken;
+            }
+
+            try {
+                return JSON.parse(responseText);
+            } catch (e) {
+                throw new RequestError(500, responseText, options, xhr);
+            }
+        };
+
+        if (this.requestError) this.alerts.dismiss(this.requestError.alert);
+
+        // Now make the request. If it's a failure, inspect the error that was
+        // returned and show an alert containing its contents.
+        return m.request(options).then(
+            (res) => res,
+            (error) => {
+                this.requestError = error;
+
+                let children;
+
+                switch (error.status) {
+                    case 422:
+                        children = error.response.errors
+                            .map((error) => [error.detail, m('br')])
+                            .reduce((a, b) => a.concat(b), [])
+                            .slice(0, -1);
+                        break;
+
+                    case 401:
+                    case 403:
+                        children = this.translator.trans('core.lib.error.permission_denied_message');
+                        break;
+
+                    case 404:
+                    case 410:
+                        children = this.translator.trans('core.lib.error.not_found_message');
+                        break;
+
+                    case 429:
+                        children = this.translator.trans('core.lib.error.rate_limit_exceeded_message');
+                        break;
+
+                    default:
+                        children = this.translator.trans('core.lib.error.generic_message');
+                }
+
+                const isDebug = app.forum.attribute('debug');
+
+                error.alert = new AlertState({
+                    type: 'error',
+                    children,
+                    controls: isDebug && [
+                        Button.component({
+                            className: 'Button Button--link',
+                            onclick: this.showDebug.bind(this, error),
+                            children: 'DEBUG', // TODO make translatable
+                        }),
+                    ],
+                });
+
+                try {
+                    options.errorHandler(error);
+                } catch (error) {
+                    console.error(error);
+                    this.alerts.show(error.alert);
+                }
+
+                return Promise.reject(error);
+            }
+        );
+    }
+
+    private showDebug(error: RequestError) {
+        this.alerts.dismiss(this.requestError!.alert);
+
+        this.modal.show(RequestErrorModal, { error });
+    }
+}

js/src/common/Component.js

@@ -1,225 +0,0 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * The `Component` class defines a user interface 'building block'. A component
- * can generate a virtual DOM to be rendered on each redraw.
- *
- * An instance's virtual DOM can be retrieved directly using the {@link
- * Component#render} method.
- *
- * @example
- * this.myComponentInstance = new MyComponent({foo: 'bar'});
- * return m('div', this.myComponentInstance.render());
- *
- * Alternatively, components can be nested, letting Mithril take care of
- * instance persistence. For this, the static {@link Component.component} method
- * can be used.
- *
- * @example
- * return m('div', MyComponent.component({foo: 'bar'));
- *
- * @see https://lhorie.github.io/mithril/mithril.component.html
- * @abstract
- */
-export default class Component {
-  /**
-   * @param {Object} props
-   * @param {Array|Object} children
-   * @public
-   */
-  constructor(props = {}, children = null) {
-    if (children) props.children = children;
-
-    this.constructor.initProps(props);
-
-    /**
-     * The properties passed into the component.
-     *
-     * @type {Object}
-     */
-    this.props = props;
-
-    /**
-     * The root DOM element for the component.
-     *
-     * @type DOMElement
-     * @public
-     */
-    this.element = null;
-
-    /**
-     * Whether or not to retain the component's subtree on redraw.
-     *
-     * @type {boolean}
-     * @public
-     */
-    this.retain = false;
-
-    this.init();
-  }
-
-  /**
-   * Called when the component is constructed.
-   *
-   * @protected
-   */
-  init() {
-  }
-
-  /**
-   * Called when the component is destroyed, i.e. after a redraw where it is no
-   * longer a part of the view.
-   *
-   * @see https://lhorie.github.io/mithril/mithril.component.html#unloading-components
-   * @param {Object} e
-   * @public
-   */
-  onunload() {
-  }
-
-  /**
-   * Get the renderable virtual DOM that represents the component's view.
-   *
-   * This should NOT be overridden by subclasses. Subclasses wishing to define
-   * their virtual DOM should override Component#view instead.
-   *
-   * @example
-   * this.myComponentInstance = new MyComponent({foo: 'bar'});
-   * return m('div', this.myComponentInstance.render());
-   *
-   * @returns {Object}
-   * @final
-   * @public
-   */
-  render() {
-    const vdom = this.retain ? {subtree: 'retain'} : this.view();
-
-    // Override the root element's config attribute with our own function, which
-    // will set the component instance's element property to the root DOM
-    // element, and then run the component class' config method.
-    vdom.attrs = vdom.attrs || {};
-
-    const originalConfig = vdom.attrs.config;
-
-    vdom.attrs.config = (...args) => {
-      this.element = args[0];
-      this.config.apply(this, args.slice(1));
-      if (originalConfig) originalConfig.apply(this, args);
-    };
-
-    return vdom;
-  }
-
-  /**
-   * Returns a jQuery object for this component's element. If you pass in a
-   * selector string, this method will return a jQuery object, using the current
-   * element as its buffer.
-   *
-   * For example, calling `component.$('li')` will return a jQuery object
-   * containing all of the `li` elements inside the DOM element of this
-   * component.
-   *
-   * @param {String} [selector] a jQuery-compatible selector string
-   * @returns {jQuery} the jQuery object for the DOM node
-   * @final
-   * @public
-   */
-  $(selector) {
-    const $element = $(this.element);
-
-    return selector ? $element.find(selector) : $element;
-  }
-
-  /**
-   * Called after the component's root element is redrawn. This hook can be used
-   * to perform any actions on the DOM, both on the initial draw and any
-   * subsequent redraws. See Mithril's documentation for more information.
-   *
-   * @see https://lhorie.github.io/mithril/mithril.html#the-config-attribute
-   * @param {Boolean} isInitialized
-   * @param {Object} context
-   * @param {Object} vdom
-   * @public
-   */
-  config() {
-  }
-
-  /**
-   * Get the virtual DOM that represents the component's view.
-   *
-   * @return {Object} The virtual DOM
-   * @protected
-   */
-  view() {
-    throw new Error('Component#view must be implemented by subclass');
-  }
-
-  /**
-   * Get a Mithril component object for this component, preloaded with props.
-   *
-   * @see https://lhorie.github.io/mithril/mithril.component.html
-   * @param {Object} [props] Properties to set on the component
-   * @param children
-   * @return {Object} The Mithril component object
-   * @property {function} controller
-   * @property {function} view
-   * @property {Object} component The class of this component
-   * @property {Object} props The props that were passed to the component
-   * @public
-   */
-  static component(props = {}, children = null) {
-    const componentProps = Object.assign({}, props);
-
-    if (children) componentProps.children = children;
-
-    this.initProps(componentProps);
-
-    // Set up a function for Mithril to get the component's view. It will accept
-    // the component's controller (which happens to be the component itself, in
-    // our case), update its props with the ones supplied, and then render the view.
-    const view = (component) => {
-      component.props = componentProps;
-      return component.render();
-    };
-
-    // Mithril uses this property on the view function to cache component
-    // controllers between redraws, thus persisting component state.
-    view.$original = this.prototype.view;
-
-    // Our output object consists of a controller constructor + a view function
-    // which Mithril will use to instantiate and render the component. We also
-    // attach a reference to the props that were passed through and the
-    // component's class for reference.
-    const output = {
-      controller: this.bind(undefined, componentProps),
-      view: view,
-      props: componentProps,
-      component: this
-    };
-
-    // If a `key` prop was set, then we'll assume that we want that to actually
-    // show up as an attribute on the component object so that Mithril's key
-    // algorithm can be applied.
-    if (componentProps.key) {
-      output.attrs = {key: componentProps.key};
-    }
-
-    return output;
-  }
-
-  /**
-   * Initialize the component's props.
-   *
-   * @param {Object} props
-   * @public
-   */
-  static initProps(props) {
-  }
-}

js/src/common/Component.ts

@@ -0,0 +1,90 @@
+import Mithril, { ClassComponent, Vnode } from 'mithril';
+
+export type ComponentProps = {
+    children?: Mithril.Children;
+
+    className?: string;
+
+    [key: string]: any;
+};
+
+export default class Component<T extends ComponentProps = any> implements ClassComponent {
+    element!: HTMLElement;
+
+    props: T;
+
+    constructor(props: T = <T>{}) {
+        this.props = props.tag ? <T>{} : props;
+    }
+
+    view(vnode) {
+        throw new Error('Component#view must be implemented by subclass');
+    }
+
+    oninit(vnode) {
+        this.setProps(vnode);
+    }
+
+    oncreate(vnode) {
+        this.setProps(vnode);
+        this.element = vnode.dom;
+    }
+
+    onbeforeupdate(vnode) {
+        this.setProps(vnode);
+    }
+
+    onupdate(vnode) {
+        this.setProps(vnode);
+    }
+
+    onbeforeremove(vnode) {
+        this.setProps(vnode);
+    }
+
+    onremove(vnode) {
+        this.setProps(vnode);
+    }
+
+    /**
+     * Returns a jQuery object for this component's element. If you pass in a
+     * selector string, this method will return a jQuery object, using the current
+     * element as its buffer.
+     *
+     * For example, calling `component.$('li')` will return a jQuery object
+     * containing all of the `li` elements inside the DOM element of this
+     * component.
+     *
+     * @param selector a jQuery-compatible selector string
+     * @final
+     */
+    $(selector?: string): ZeptoCollection {
+        const $element = $(this.element);
+
+        return selector ? $element.find(selector) : $element;
+    }
+
+    render() {
+        return m(this.constructor as typeof Component, this.props);
+    }
+
+    static component(props: ComponentProps | any = {}, children?: Mithril.Children) {
+        const componentProps: ComponentProps = Object.assign({}, props);
+
+        if (children) componentProps.children = children;
+
+        return m(this, componentProps);
+    }
+
+    static initProps(props: ComponentProps = {}) {}
+
+    private setProps(vnode: Vnode<T, this>) {
+        const props = vnode.attrs || {};
+
+        (this.constructor as typeof Component).initProps(props);
+
+        if (!props.children) props.children = vnode.children;
+
+        this.props = props;
+    }
+}

js/src/common/Model.js

@@ -1,307 +0,0 @@
-/**
- * The `Model` class represents a local data resource. It provides methods to
- * persist changes via the API.
- *
- * @abstract
- */
-export default class Model {
-  /**
-   * @param {Object} data A resource object from the API.
-   * @param {Store} store The data store that this model should be persisted to.
-   * @public
-   */
-  constructor(data = {}, store = null) {
-    /**
-     * The resource object from the API.
-     *
-     * @type {Object}
-     * @public
-     */
-    this.data = data;
-
-    /**
-     * The time at which the model's data was last updated. Watching the value
-     * of this property is a fast way to retain/cache a subtree if data hasn't
-     * changed.
-     *
-     * @type {Date}
-     * @public
-     */
-    this.freshness = new Date();
-
-    /**
-     * Whether or not the resource exists on the server.
-     *
-     * @type {Boolean}
-     * @public
-     */
-    this.exists = false;
-
-    /**
-     * The data store that this resource should be persisted to.
-     *
-     * @type {Store}
-     * @protected
-     */
-    this.store = store;
-  }
-
-  /**
-   * Get the model's ID.
-   *
-   * @return {Integer}
-   * @public
-   * @final
-   */
-  id() {
-    return this.data.id;
-  }
-
-  /**
-   * Get one of the model's attributes.
-   *
-   * @param {String} attribute
-   * @return {*}
-   * @public
-   * @final
-   */
-  attribute(attribute) {
-    return this.data.attributes[attribute];
-  }
-
-  /**
-   * Merge new data into this model locally.
-   *
-   * @param {Object} data A resource object to merge into this model
-   * @public
-   */
-  pushData(data) {
-    // Since most of the top-level items in a resource object are objects
-    // (e.g. relationships, attributes), we'll need to check and perform the
-    // merge at the second level if that's the case.
-    for (const key in data) {
-      if (typeof data[key] === 'object') {
-        this.data[key] = this.data[key] || {};
-
-        // For every item in a second-level object, we want to check if we've
-        // been handed a Model instance. If so, we will convert it to a
-        // relationship data object.
-        for (const innerKey in data[key]) {
-          if (data[key][innerKey] instanceof Model) {
-            data[key][innerKey] = {data: Model.getIdentifier(data[key][innerKey])};
-          }
-          this.data[key][innerKey] = data[key][innerKey];
-        }
-      } else {
-        this.data[key] = data[key];
-      }
-    }
-
-    // Now that we've updated the data, we can say that the model is fresh.
-    // This is an easy way to invalidate retained subtrees etc.
-    this.freshness = new Date();
-  }
-
-  /**
-   * Merge new attributes into this model locally.
-   *
-   * @param {Object} attributes The attributes to merge.
-   * @public
-   */
-  pushAttributes(attributes) {
-    this.pushData({attributes});
-  }
-
-  /**
-   * Merge new attributes into this model, both locally and with persistence.
-   *
-   * @param {Object} attributes The attributes to save. If a 'relationships' key
-   *     exists, it will be extracted and relationships will also be saved.
-   * @param {Object} [options]
-   * @return {Promise}
-   * @public
-   */
-  save(attributes, options = {}) {
-    const data = {
-      type: this.data.type,
-      id: this.data.id,
-      attributes
-    };
-
-    // If a 'relationships' key exists, extract it from the attributes hash and
-    // set it on the top-level data object instead. We will be sending this data
-    // object to the API for persistence.
-    if (attributes.relationships) {
-      data.relationships = {};
-
-      for (const key in attributes.relationships) {
-        const model = attributes.relationships[key];
-
-        data.relationships[key] = {
-          data: model instanceof Array
-            ? model.map(Model.getIdentifier)
-            : Model.getIdentifier(model)
-        };
-      }
-
-      delete attributes.relationships;
-    }
-
-    // Before we update the model's data, we should make a copy of the model's
-    // old data so that we can revert back to it if something goes awry during
-    // persistence.
-    const oldData = this.copyData();
-
-    this.pushData(data);
-
-    const request = {data};
-    if (options.meta) request.meta = options.meta;
-
-    return app.request(Object.assign({
-      method: this.exists ? 'PATCH' : 'POST',
-      url: app.forum.attribute('apiUrl') + this.apiEndpoint(),
-      data: request
-    }, options)).then(
-      // If everything went well, we'll make sure the store knows that this
-      // model exists now (if it didn't already), and we'll push the data that
-      // the API returned into the store.
-      payload => {
-        this.store.data[payload.data.type] = this.store.data[payload.data.type] || {};
-        this.store.data[payload.data.type][payload.data.id] = this;
-        return this.store.pushPayload(payload);
-      },
-
-      // If something went wrong, though... good thing we backed up our model's
-      // old data! We'll revert to that and let others handle the error.
-      response => {
-        this.pushData(oldData);
-        m.lazyRedraw();
-        throw response;
-      }
-    );
-  }
-
-  /**
-   * Send a request to delete the resource.
-   *
-   * @param {Object} data Data to send along with the DELETE request.
-   * @param {Object} [options]
-   * @return {Promise}
-   * @public
-   */
-  delete(data, options = {}) {
-    if (!this.exists) return m.deferred().resolve().promise;
-
-    return app.request(Object.assign({
-      method: 'DELETE',
-      url: app.forum.attribute('apiUrl') + this.apiEndpoint(),
-      data
-    }, options)).then(() => {
-      this.exists = false;
-      this.store.remove(this);
-    });
-  }
-
-  /**
-   * Construct a path to the API endpoint for this resource.
-   *
-   * @return {String}
-   * @protected
-   */
-  apiEndpoint() {
-    return '/' + this.data.type + (this.exists ? '/' + this.data.id : '');
-  }
-
-  copyData() {
-    return JSON.parse(JSON.stringify(this.data));
-  }
-
-  /**
-   * Generate a function which returns the value of the given attribute.
-   *
-   * @param {String} name
-   * @param {function} [transform] A function to transform the attribute value
-   * @return {*}
-   * @public
-   */
-  static attribute(name, transform) {
-    return function() {
-      const value = this.data.attributes && this.data.attributes[name];
-
-      return transform ? transform(value) : value;
-    };
-  }
-
-  /**
-   * Generate a function which returns the value of the given has-one
-   * relationship.
-   *
-   * @param {String} name
-   * @return {Model|Boolean|undefined} false if no information about the
-   *     relationship exists; undefined if the relationship exists but the model
-   *     has not been loaded; or the model if it has been loaded.
-   * @public
-   */
-  static hasOne(name) {
-    return function() {
-      if (this.data.relationships) {
-        const relationship = this.data.relationships[name];
-
-        if (relationship) {
-          return app.store.getById(relationship.data.type, relationship.data.id);
-        }
-      }
-
-      return false;
-    };
-  }
-
-  /**
-   * Generate a function which returns the value of the given has-many
-   * relationship.
-   *
-   * @param {String} name
-   * @return {Array|Boolean} false if no information about the relationship
-   *     exists; an array if it does, containing models if they have been
-   *     loaded, and undefined for those that have not.
-   * @public
-   */
-  static hasMany(name) {
-    return function() {
-      if (this.data.relationships) {
-        const relationship = this.data.relationships[name];
-
-        if (relationship) {
-          return relationship.data.map(data => app.store.getById(data.type, data.id));
-        }
-      }
-
-      return false;
-    };
-  }
-
-  /**
-   * Transform the given value into a Date object.
-   *
-   * @param {String} value
-   * @return {Date|null}
-   * @public
-   */
-  static transformDate(value) {
-    return value ? new Date(value) : null;
-  }
-
-  /**
-   * Get a resource identifier object for the given model.
-   *
-   * @param {Model} model
-   * @return {Object}
-   * @protected
-   */
-  static getIdentifier(model) {
-    return {
-      type: model.data.type,
-      id: model.data.id
-    };
-  }
-}

js/src/common/Model.ts

@@ -0,0 +1,299 @@
+import Store from './Store';
+
+export interface Identifier {
+    type: string;
+    id: string;
+}
+
+export interface Data extends Identifier {
+    attributes?: { [key: string]: any };
+    relationships?: { [key: string]: { data: Identifier | Identifier[] } };
+}
+
+/**
+ * The `Model` class represents a local data resource. It provides methods to
+ * persist changes via the API.
+ */
+export default abstract class Model {
+    /**
+     * The resource object from the API.
+     */
+    data: Data;
+
+    payload: any;
+
+    /**
+     * The time at which the model's data was last updated. Watching the value
+     * of this property is a fast way to retain/cache a subtree if data hasn't
+     * changed.
+     */
+    freshness: Date;
+
+    /**
+     * Whether or not the resource exists on the server.
+     */
+    exists: boolean;
+
+    /**
+     * The data store that this resource should be persisted to.
+     */
+    protected store?: Store;
+
+    /**
+     * @param data A resource object from the API.
+     * @param store The data store that this model should be persisted to.
+     */
+    constructor(data = <Data>{}, store?: Store) {
+        this.data = data;
+        this.store = store;
+
+        this.freshness = new Date();
+        this.exists = false;
+    }
+
+    /**
+     * Get the model's ID.
+     * @final
+     */
+    id(): string {
+        return this.data.id;
+    }
+
+    /**
+     * Get one of the model's attributes.
+     * @final
+     */
+    attribute(attribute: string): any {
+        return this.data.attributes && this.data.attributes[attribute];
+    }
+
+    /**
+     * Merge new data into this model locally.
+     *
+     * @param data A resource object to merge into this model
+     */
+    public pushData(data: {}) {
+        // Since most of the top-level items in a resource object are objects
+        // (e.g. relationships, attributes), we'll need to check and perform the
+        // merge at the second level if that's the case.
+        for (const key in data) {
+            if (typeof data[key] === 'object') {
+                this.data[key] = this.data[key] || {};
+
+                // For every item in a second-level object, we want to check if we've
+                // been handed a Model instance. If so, we will convert it to a
+                // relationship data object.
+                for (const innerKey in data[key]) {
+                    if (data[key][innerKey] instanceof Model) {
+                        data[key][innerKey] = { data: Model.getIdentifier(data[key][innerKey]) };
+                    }
+                    this.data[key][innerKey] = data[key][innerKey];
+                }
+            } else {
+                this.data[key] = data[key];
+            }
+        }
+
+        // Now that we've updated the data, we can say that the model is fresh.
+        // This is an easy way to invalidate retained subtrees etc.
+        this.freshness = new Date();
+    }
+
+    /**
+     * Merge new attributes into this model locally.
+     *
+     * @param attributes The attributes to merge.
+     */
+    pushAttributes(attributes: any) {
+        this.pushData({ attributes });
+    }
+
+    /**
+     * Merge new attributes into this model, both locally and with persistence.
+     *
+     * @param attributes The attributes to save. If a 'relationships' key
+     *     exists, it will be extracted and relationships will also be saved.
+     * @param [options]
+     */
+    save(attributes: any, options: any = {}): Promise<Model | Model[]> {
+        const data: Data = {
+            type: this.data.type,
+            id: this.data.id,
+            attributes,
+        };
+
+        // If a 'relationships' key exists, extract it from the attributes hash and
+        // set it on the top-level data object instead. We will be sending this data
+        // object to the API for persistence.
+        if (attributes.relationships) {
+            data.relationships = {};
+
+            for (const key in attributes.relationships) {
+                const model = attributes.relationships[key];
+
+                data.relationships[key] = {
+                    data: model instanceof Array ? model.map(Model.getIdentifier) : Model.getIdentifier(model),
+                };
+            }
+
+            delete attributes.relationships;
+        }
+
+        // Before we update the model's data, we should make a copy of the model's
+        // old data so that we can revert back to it if something goes awry during
+        // persistence.
+        const oldData = this.copyData();
+
+        this.pushData(data);
+
+        const request = { data };
+        if (options.meta) request.meta = options.meta;
+
+        return app
+            .request(
+                Object.assign(
+                    {
+                        method: this.exists ? 'PATCH' : 'POST',
+                        url: app.forum.attribute('apiUrl') + this.apiEndpoint(),
+                        body: request,
+                    },
+                    options
+                )
+            )
+            .then(
+                // If everything went well, we'll make sure the store knows that this
+                // model exists now (if it didn't already), and we'll push the data that
+                // the API returned into the store.
+                (payload) => {
+                    this.store.data[payload.data.type] = this.store.data[payload.data.type] || {};
+                    this.store.data[payload.data.type][payload.data.id] = this;
+                    return this.store.pushPayload(payload);
+                },
+
+                // If something went wrong, though... good thing we backed up our model's
+                // old data! We'll revert to that and let others handle the error.
+                (response) => {
+                    this.pushData(oldData);
+                    m.redraw();
+                    throw response;
+                }
+            );
+    }
+
+    /**
+     * Send a request to delete the resource.
+     *
+     * @param {Object} body Data to send along with the DELETE request.
+     * @param {Object} [options]
+     * @return {Promise}
+     * @public
+     */
+    delete(body = {}, options = {}) {
+        if (!this.exists) return Promise.resolve();
+
+        return app
+            .request(
+                Object.assign(
+                    {
+                        method: 'DELETE',
+                        url: app.forum.attribute('apiUrl') + this.apiEndpoint(),
+                        body,
+                    },
+                    options
+                )
+            )
+            .then(() => {
+                this.exists = false;
+                this.store!.remove(this);
+            });
+    }
+
+    /**
+     * Construct a path to the API endpoint for this resource.
+     *
+     * @return {String}
+     * @protected
+     */
+    apiEndpoint() {
+        return '/' + this.data.type + (this.exists ? '/' + this.data.id : '');
+    }
+
+    copyData() {
+        return JSON.parse(JSON.stringify(this.data));
+    }
+
+    /**
+     * Generate a function which returns the value of the given attribute.
+     *
+     * @param name
+     * @param [transform] A function to transform the attribute value
+     */
+    static attribute(name: string, transform?: Function): () => any {
+        return function (this: Model) {
+            const value = this.data.attributes && this.data.attributes[name];
+
+            return transform ? transform(value) : value;
+        };
+    }
+
+    /**
+     * Generate a function which returns the value of the given has-one
+     * relationship.
+     *
+     * @return false if no information about the
+     *     relationship exists; undefined if the relationship exists but the model
+     *     has not been loaded; or the model if it has been loaded.
+     */
+    static hasOne(name: string): () => Model | boolean {
+        return function (this: Model) {
+            if (this.data.relationships) {
+                const relationship = this.data.relationships[name];
+
+                if (relationship && !Array.isArray(relationship.data)) {
+                    return app.store.getById(relationship.data.type, relationship.data.id);
+                }
+            }
+
+            return false;
+        };
+    }
+
+    /**
+     * Generate a function which returns the value of the given has-many
+     * relationship.
+     *
+     * @return false if no information about the relationship
+     *     exists; an array if it does, containing models if they have been
+     *     loaded, and undefined for those that have not.
+     */
+    static hasMany(name: string): () => any[] | false {
+        return function (this: Model) {
+            if (this.data.relationships) {
+                const relationship = this.data.relationships[name];
+
+                if (relationship && Array.isArray(relationship.data)) {
+                    return relationship.data.map((data) => app.store.getById(data.type, data.id));
+                }
+            }
+
+            return false;
+        };
+    }
+
+    /**
+     * Transform the given value into a Date object.
+     */
+    static transformDate(value: string): Date | null {
+        return value ? new Date(value) : null;
+    }
+
+    /**
+     * Get a resource identifier object for the given model.
+     */
+    protected static getIdentifier(model: Model): Identifier {
+        return {
+            type: model.data.type,
+            id: model.data.id,
+        };
+    }
+}

js/src/common/Session.js

@@ -1,49 +0,0 @@
-/**
- * The `Session` class defines the current user session. It stores a reference
- * to the current authenticated user, and provides methods to log in/out.
- */
-export default class Session {
-  constructor(user, csrfToken) {
-    /**
-     * The current authenticated user.
-     *
-     * @type {User|null}
-     * @public
-     */
-    this.user = user;
-
-    /**
-     * The CSRF token.
-     *
-     * @type {String|null}
-     * @public
-     */
-    this.csrfToken = csrfToken;
-  }
-
-  /**
-   * Attempt to log in a user.
-   *
-   * @param {String} identification The username/email.
-   * @param {String} password
-   * @param {Object} [options]
-   * @return {Promise}
-   * @public
-   */
-  login(data, options = {}) {
-    return app.request(Object.assign({
-      method: 'POST',
-      url: app.forum.attribute('baseUrl') + '/login',
-      data
-    }, options));
-  }
-
-  /**
-   * Log the user out.
-   *
-   * @public
-   */
-  logout() {
-    window.location = app.forum.attribute('baseUrl') + '/logout?token=' + this.csrfToken;
-  }
-}

js/src/common/Session.ts

@@ -0,0 +1,48 @@
+import User from './models/User';
+
+/**
+ * The `Session` class defines the current user session. It stores a reference
+ * to the current authenticated user, and provides methods to log in/out.
+ */
+export default class Session {
+    /**
+     * The current authenticated user.
+     */
+    user: User;
+
+    /**
+     * The CSRF token.
+     */
+    csrfToken?: string;
+
+    constructor(user, csrfToken) {
+        this.user = user;
+
+        this.csrfToken = csrfToken;
+    }
+
+    /**
+     * Attempt to log in a user.
+     */
+    login(body: { identification: string; password: string; remember?: boolean }, options = {}) {
+        return app.request(
+            Object.assign(
+                {
+                    method: 'POST',
+                    url: `${app.forum.attribute('baseUrl')}/login`,
+                    body,
+                },
+                options
+            )
+        );
+    }
+
+    /**
+     * Log the user out.
+     *
+     * @public
+     */
+    logout() {
+        window.location.href = `${app.forum.attribute('baseUrl')}/logout?token=${this.csrfToken}`;
+    }
+}

js/src/common/Store.js

@@ -1,165 +0,0 @@
-/**
- * The `Store` class defines a local data store, and provides methods to
- * retrieve data from the API.
- */
-export default class Store {
-  constructor(models) {
-    /**
-     * The local data store. A tree of resource types to IDs, such that
-     * accessing data[type][id] will return the model for that type/ID.
-     *
-     * @type {Object}
-     * @protected
-     */
-    this.data = {};
-
-    /**
-     * The model registry. A map of resource types to the model class that
-     * should be used to represent resources of that type.
-     *
-     * @type {Object}
-     * @public
-     */
-    this.models = models;
-  }
-
-  /**
-   * Push resources contained within an API payload into the store.
-   *
-   * @param {Object} payload
-   * @return {Model|Model[]} The model(s) representing the resource(s) contained
-   *     within the 'data' key of the payload.
-   * @public
-   */
-  pushPayload(payload) {
-    if (payload.included) payload.included.map(this.pushObject.bind(this));
-
-    const result = payload.data instanceof Array
-      ? payload.data.map(this.pushObject.bind(this))
-      : this.pushObject(payload.data);
-
-    // Attach the original payload to the model that we give back. This is
-    // useful to consumers as it allows them to access meta information
-    // associated with their request.
-    result.payload = payload;
-
-    return result;
-  }
-
-  /**
-   * Create a model to represent a resource object (or update an existing one),
-   * and push it into the store.
-   *
-   * @param {Object} data The resource object
-   * @return {Model|null} The model, or null if no model class has been
-   *     registered for this resource type.
-   * @public
-   */
-  pushObject(data) {
-    if (!this.models[data.type]) return null;
-
-    const type = this.data[data.type] = this.data[data.type] || {};
-
-    if (type[data.id]) {
-      type[data.id].pushData(data);
-    } else {
-      type[data.id] = this.createRecord(data.type, data);
-    }
-
-    type[data.id].exists = true;
-
-    return type[data.id];
-  }
-
-  /**
-   * Make a request to the API to find record(s) of a specific type.
-   *
-   * @param {String} type The resource type.
-   * @param {Integer|Integer[]|Object} [id] The ID(s) of the model(s) to retrieve.
-   *     Alternatively, if an object is passed, it will be handled as the
-   *     `query` parameter.
-   * @param {Object} [query]
-   * @param {Object} [options]
-   * @return {Promise}
-   * @public
-   */
-  find(type, id, query = {}, options = {}) {
-    let data = query;
-    let url = app.forum.attribute('apiUrl') + '/' + type;
-
-    if (id instanceof Array) {
-      url += '?filter[id]=' + id.join(',');
-    } else if (typeof id === 'object') {
-      data = id;
-    } else if (id) {
-      url += '/' + id;
-    }
-
-    return app.request(Object.assign({
-      method: 'GET',
-      url,
-      data
-    }, options)).then(this.pushPayload.bind(this));
-  }
-
-  /**
-   * Get a record from the store by ID.
-   *
-   * @param {String} type The resource type.
-   * @param {Integer} id The resource ID.
-   * @return {Model}
-   * @public
-   */
-  getById(type, id) {
-    return this.data[type] && this.data[type][id];
-  }
-
-  /**
-   * Get a record from the store by the value of a model attribute.
-   *
-   * @param {String} type The resource type.
-   * @param {String} key The name of the method on the model.
-   * @param {*} value The value of the model attribute.
-   * @return {Model}
-   * @public
-   */
-  getBy(type, key, value) {
-    return this.all(type).filter(model => model[key]() === value)[0];
-  }
-
-  /**
-   * Get all loaded records of a specific type.
-   *
-   * @param {String} type
-   * @return {Model[]}
-   * @public
-   */
-  all(type) {
-    const records = this.data[type];
-
-    return records ? Object.keys(records).map(id => records[id]) : [];
-  }
-
-  /**
-   * Remove the given model from the store.
-   *
-   * @param {Model} model
-   */
-  remove(model) {
-    delete this.data[model.data.type][model.id()];
-  }
-
-  /**
-   * Create a new record of the given type.
-   *
-   * @param {String} type The resource type
-   * @param {Object} [data] Any data to initialize the model with
-   * @return {Model}
-   * @public
-   */
-  createRecord(type, data = {}) {
-    data.type = data.type || type;
-
-    return new (this.models[type])(data, this);
-  }
-}

js/src/common/Store.ts

@@ -0,0 +1,152 @@
+import Model from './Model';
+
+/**
+ * The `Store` class defines a local data store, and provides methods to
+ * retrieve data from the API.
+ */
+export default class Store {
+    /**
+     * The local data store. A tree of resource types to IDs, such that
+     * accessing data[type][id] will return the model for that type/ID.
+     */
+    data: { [key: string]: Model[] } = {};
+
+    /**
+     * The model registry. A map of resource types to the model class that
+     * should be used to represent resources of that type.
+     */
+    models: {};
+
+    constructor(models) {
+        this.models = models;
+    }
+
+    /**
+     * Push resources contained within an API payload into the store.
+     *
+     * @param payload
+     * @return The model(s) representing the resource(s) contained
+     *     within the 'data' key of the payload.
+     */
+    pushPayload(payload: { included?: {}[]; data?: {} | {}[] }): Model | Model[] {
+        if (payload.included) payload.included.map(this.pushObject.bind(this));
+
+        const result: any = payload.data instanceof Array ? payload.data.map(this.pushObject.bind(this)) : this.pushObject(payload.data);
+
+        // Attach the original payload to the model that we give back. This is
+        // useful to consumers as it allows them to access meta information
+        // associated with their request.
+        result.payload = payload;
+
+        return result;
+    }
+
+    /**
+     * Create a model to represent a resource object (or update an existing one),
+     * and push it into the store.
+     *
+     * @param {Object} data The resource object
+     * @return The model, or null if no model class has been
+     *     registered for this resource type.
+     */
+    pushObject(data): Model | null {
+        if (!this.models[data.type]) return null;
+
+        const type = (this.data[data.type] = this.data[data.type] || {});
+
+        if (type[data.id]) {
+            type[data.id].pushData(data);
+        } else {
+            type[data.id] = this.createRecord(data.type, data);
+        }
+
+        type[data.id].exists = true;
+
+        return type[data.id];
+    }
+
+    /**
+     * Make a request to the API to find record(s) of a specific type.
+     *
+     * @param type The resource type.
+     * @param [id] The ID(s) of the model(s) to retrieve.
+     *     Alternatively, if an object is passed, it will be handled as the
+     *     `query` parameter.
+     * @param query
+     * @param options
+     */
+    find<T extends Model = Model>(type: string, id?: number | number[] | any, query = {}, options = {}): Promise<T | T[]> {
+        let params = query;
+        let url = `${app.forum.attribute('apiUrl')}/${type}`;
+
+        if (id instanceof Array) {
+            url += `?filter[id]=${id.join(',')}`;
+        } else if (typeof id === 'object') {
+            params = id;
+        } else if (id) {
+            url += `/${id}`;
+        }
+
+        return <Promise<T | T[]>>app
+            .request(
+                Object.assign(
+                    {
+                        method: 'GET',
+                        url,
+                        params,
+                    },
+                    options
+                )
+            )
+            .then(this.pushPayload.bind(this));
+    }
+
+    /**
+     * Get a record from the store by ID.
+     *
+     * @param type The resource type.
+     * @param id The resource ID.
+     */
+    getById<T extends Model = Model>(type: string, id: number | string): T {
+        return this.data[type] && (this.data[type][id] as T);
+    }
+
+    /**
+     * Get a record from the store by the value of a model attribute.
+     *
+     * @param type The resource type.
+     * @param key The name of the method on the model.
+     * @param value The value of the model attribute.
+     */
+    getBy<T extends Model = Model>(type: string, key: string, value: any): T {
+        return this.all<T>(type).filter((model) => model[key]() === value)[0];
+    }
+
+    /**
+     * Get all loaded records of a specific type.
+     */
+    all<T extends Model = Model>(type: string): T[] {
+        const records = this.data[type];
+
+        return records ? Object.keys(records).map((id) => records[id]) : [];
+    }
+
+    /**
+     * Remove the given model from the store.
+     */
+    remove(model: Model) {
+        delete this.data[model.data.type][model.id()];
+    }
+
+    /**
+     * Create a new record of the given type.
+     *
+     * @param {String} type The resource type
+     * @param {Object} [data] Any data to initialize the model with
+     */
+    createRecord<T extends Model = Model>(type: string, data: any = {}): T {
+        data.type = data.type || type;
+
+        return new this.models[type](data, this);
+    }
+}

js/src/common/Translator.js

@@ -1,288 +0,0 @@
-import User from './models/User';
-import username from './helpers/username';
-import extract from './utils/extract';
-
-/**
- * Translator with the same API as Symfony's.
- *
- * Derived from https://github.com/willdurand/BazingaJsTranslationBundle
- * which is available under the MIT License.
- * Copyright (c) William Durand <william.durand1@gmail.com>
- */
-export default class Translator {
-  constructor() {
-    /**
-     * A map of translation keys to their translated values.
-     *
-     * @type {Object}
-     * @public
-     */
-    this.translations = {};
-
-    this.locale = null;
-  }
-
-  addTranslations(translations) {
-    Object.assign(this.translations, translations);
-  }
-
-  trans(id, parameters) {
-    const translation = this.translations[id];
-
-    if (translation) {
-      return this.apply(translation, parameters || {});
-    }
-
-    return id;
-  }
-
-  transChoice(id, number, parameters) {
-    let translation = this.translations[id];
-
-    if (translation) {
-      number = parseInt(number, 10);
-
-      translation = this.pluralize(translation, number);
-
-      return this.apply(translation, parameters || {});
-    }
-
-    return id;
-  }
-
-  apply(translation, input) {
-    // If we've been given a user model as one of the input parameters, then
-    // we'll extract the username and use that for the translation. In the
-    // future there should be a hook here to inspect the user and change the
-    // translation key. This will allow a gender property to determine which
-    // translation key is used.
-    if ('user' in input) {
-      const user = extract(input, 'user');
-
-      if (!input.username) input.username = username(user);
-    }
-
-    translation = translation.split(new RegExp('({[a-z0-9_]+}|</?[a-z0-9_]+>)', 'gi'));
-
-    const hydrated = [];
-    const open = [hydrated];
-
-    translation.forEach(part => {
-      const match = part.match(new RegExp('{([a-z0-9_]+)}|<(/?)([a-z0-9_]+)>', 'i'));
-
-      if (match) {
-        if (match[1]) {
-          open[0].push(input[match[1]]);
-        } else if (match[3]) {
-          if (match[2]) {
-            open.shift();
-          } else {
-            let tag = input[match[3]] || {tag: match[3], children: []};
-            open[0].push(tag);
-            open.unshift(tag.children || tag);
-          }
-        }
-      } else {
-        open[0].push(part);
-      }
-    });
-
-    return hydrated.filter(part => part);
-  }
-
-  pluralize(translation, number) {
-    const sPluralRegex = new RegExp(/^\w+\: +(.+)$/),
-      cPluralRegex = new RegExp(/^\s*((\{\s*(\-?\d+[\s*,\s*\-?\d+]*)\s*\})|([\[\]])\s*(-Inf|\-?\d+)\s*,\s*(\+?Inf|\-?\d+)\s*([\[\]]))\s?(.+?)$/),
-      iPluralRegex = new RegExp(/^\s*(\{\s*(\-?\d+[\s*,\s*\-?\d+]*)\s*\})|([\[\]])\s*(-Inf|\-?\d+)\s*,\s*(\+?Inf|\-?\d+)\s*([\[\]])/),
-      standardRules = [],
-      explicitRules = [];
-
-    translation.split('|').forEach(part => {
-      if (cPluralRegex.test(part)) {
-        const matches = part.match(cPluralRegex);
-        explicitRules[matches[0]] = matches[matches.length - 1];
-      } else if (sPluralRegex.test(part)) {
-        const matches = part.match(sPluralRegex);
-        standardRules.push(matches[1]);
-      } else {
-        standardRules.push(part);
-      }
-    });
-
-    explicitRules.forEach((rule, e) => {
-      if (iPluralRegex.test(e)) {
-        const matches = e.match(iPluralRegex);
-
-        if (matches[1]) {
-          const ns = matches[2].split(',');
-
-          for (let n in ns) {
-            if (number == ns[n]) {
-              return explicitRules[e];
-            }
-          }
-        } else {
-          var leftNumber  = this.convertNumber(matches[4]);
-          var rightNumber = this.convertNumber(matches[5]);
-
-          if (('[' === matches[3] ? number >= leftNumber : number > leftNumber) &&
-            (']' === matches[6] ? number <= rightNumber : number < rightNumber)) {
-            return explicitRules[e];
-          }
-        }
-      }
-    });
-
-    return standardRules[this.pluralPosition(number, this.locale)] || standardRules[0] || undefined;
-  }
-
-  convertNumber(number) {
-    if ('-Inf' === number) {
-      return Number.NEGATIVE_INFINITY;
-    } else if ('+Inf' === number || 'Inf' === number) {
-      return Number.POSITIVE_INFINITY;
-    }
-
-    return parseInt(number, 10);
-  }
-
-  pluralPosition(number, locale) {
-    if ('pt_BR' === locale) {
-      locale = 'xbr';
-    }
-
-    if (locale.length > 3) {
-      locale = locale.split('_')[0];
-    }
-
-    switch (locale) {
-      case 'bo':
-      case 'dz':
-      case 'id':
-      case 'ja':
-      case 'jv':
-      case 'ka':
-      case 'km':
-      case 'kn':
-      case 'ko':
-      case 'ms':
-      case 'th':
-      case 'vi':
-      case 'zh':
-        return 0;
-
-      case 'af':
-      case 'az':
-      case 'bn':
-      case 'bg':
-      case 'ca':
-      case 'da':
-      case 'de':
-      case 'el':
-      case 'en':
-      case 'eo':
-      case 'es':
-      case 'et':
-      case 'eu':
-      case 'fa':
-      case 'fi':
-      case 'fo':
-      case 'fur':
-      case 'fy':
-      case 'gl':
-      case 'gu':
-      case 'ha':
-      case 'he':
-      case 'hu':
-      case 'is':
-      case 'it':
-      case 'ku':
-      case 'lb':
-      case 'ml':
-      case 'mn':
-      case 'mr':
-      case 'nah':
-      case 'nb':
-      case 'ne':
-      case 'nl':
-      case 'nn':
-      case 'no':
-      case 'om':
-      case 'or':
-      case 'pa':
-      case 'pap':
-      case 'ps':
-      case 'pt':
-      case 'so':
-      case 'sq':
-      case 'sv':
-      case 'sw':
-      case 'ta':
-      case 'te':
-      case 'tk':
-      case 'tr':
-      case 'ur':
-      case 'zu':
-        return (number == 1) ? 0 : 1;
-
-      case 'am':
-      case 'bh':
-      case 'fil':
-      case 'fr':
-      case 'gun':
-      case 'hi':
-      case 'ln':
-      case 'mg':
-      case 'nso':
-      case 'xbr':
-      case 'ti':
-      case 'wa':
-        return ((number === 0) || (number == 1)) ? 0 : 1;
-
-      case 'be':
-      case 'bs':
-      case 'hr':
-      case 'ru':
-      case 'sr':
-      case 'uk':
-        return ((number % 10 == 1) && (number % 100 != 11)) ? 0 : (((number % 10 >= 2) && (number % 10 <= 4) && ((number % 100 < 10) || (number % 100 >= 20))) ? 1 : 2);
-
-      case 'cs':
-      case 'sk':
-        return (number == 1) ? 0 : (((number >= 2) && (number <= 4)) ? 1 : 2);
-
-      case 'ga':
-        return (number == 1) ? 0 : ((number == 2) ? 1 : 2);
-
-      case 'lt':
-        return ((number % 10 == 1) && (number % 100 != 11)) ? 0 : (((number % 10 >= 2) && ((number % 100 < 10) || (number % 100 >= 20))) ? 1 : 2);
-
-      case 'sl':
-        return (number % 100 == 1) ? 0 : ((number % 100 == 2) ? 1 : (((number % 100 == 3) || (number % 100 == 4)) ? 2 : 3));
-
-      case 'mk':
-        return (number % 10 == 1) ? 0 : 1;
-
-      case 'mt':
-        return (number == 1) ? 0 : (((number === 0) || ((number % 100 > 1) && (number % 100 < 11))) ? 1 : (((number % 100 > 10) && (number % 100 < 20)) ? 2 : 3));
-
-      case 'lv':
-        return (number === 0) ? 0 : (((number % 10 == 1) && (number % 100 != 11)) ? 1 : 2);
-
-      case 'pl':
-        return (number == 1) ? 0 : (((number % 10 >= 2) && (number % 10 <= 4) && ((number % 100 < 12) || (number % 100 > 14))) ? 1 : 2);
-
-      case 'cy':
-        return (number == 1) ? 0 : ((number == 2) ? 1 : (((number == 8) || (number == 11)) ? 2 : 3));
-
-      case 'ro':
-        return (number == 1) ? 0 : (((number === 0) || ((number % 100 > 0) && (number % 100 < 20))) ? 1 : 2);
-
-      case 'ar':
-        return (number === 0) ? 0 : ((number == 1) ? 1 : ((number == 2) ? 2 : (((number >= 3) && (number <= 10)) ? 3 : (((number >= 11) && (number <= 99)) ? 4 : 5))));
-
-      default:
-        return 0;
-    }
-  }
-}

js/src/common/Translator.ts

@@ -0,0 +1,281 @@
+import extract from './utils/extract';
+import extractText from './utils/extractText';
+import username from './helpers/username';
+
+type Translations = { [key: string]: string };
+
+export default class Translator {
+    /**
+     * A map of translation keys to their translated values.
+     */
+    translations: Translations = {};
+    locale?: string;
+
+    addTranslations(translations) {
+        Object.assign(this.translations, translations);
+    }
+
+    trans(id: string, parameters?: any): string | any[] {
+        const translation = this.translations[id];
+
+        if (translation) {
+            return this.apply(translation, parameters || {});
+        }
+
+        return id;
+    }
+
+    transText(id: string, parameters?: any): string {
+        return extractText(this.trans(id, parameters));
+    }
+
+    transChoice(id: string, number: number, parameters: any): string | any[] {
+        let translation: string = this.translations[id];
+
+        if (translation) {
+            translation = this.pluralize(translation, number);
+
+            return this.apply(translation, parameters || {});
+        }
+
+        return id;
+    }
+
+    apply(translation: string, input: any) {
+        if ('user' in input) {
+            const user = extract(input, 'user');
+            if (!input.username) input.username = username(user);
+        }
+
+        const parts = translation.split(new RegExp('({[a-z0-9_]+}|</?[a-z0-9_]+>)', 'gi'));
+
+        const hydrated: any[] = [];
+        const open: any[][] = [hydrated];
+
+        parts.forEach((part) => {
+            const match = part.match(new RegExp('{([a-z0-9_]+)}|<(/?)([a-z0-9_]+)>', 'i'));
+
+            if (match) {
+                if (match[1]) {
+                    open[0].push(input[match[1]]);
+                } else if (match[3]) {
+                    if (match[2]) {
+                        open.shift();
+                    } else {
+                        let tag = input[match[3]] || { tag: match[3], children: [] };
+                        open[0].push(tag);
+                        open.unshift(tag.children || tag);
+                    }
+                }
+            } else {
+                open[0].push({ tag: 'span', text: part });
+            }
+        });
+
+        return hydrated.filter((part) => part);
+    }
+
+    pluralize(translation: string, number: number): string | undefined {
+        const sPluralRegex = new RegExp(/^\w+\: +(.+)$/),
+            cPluralRegex = new RegExp(
+                /^\s*((\{\s*(\-?\d+[\s*,\s*\-?\d+]*)\s*\})|([\[\]])\s*(-Inf|\-?\d+)\s*,\s*(\+?Inf|\-?\d+)\s*([\[\]]))\s?(.+?)$/
+            ),
+            iPluralRegex = new RegExp(/^\s*(\{\s*(\-?\d+[\s*,\s*\-?\d+]*)\s*\})|([\[\]])\s*(-Inf|\-?\d+)\s*,\s*(\+?Inf|\-?\d+)\s*([\[\]])/),
+            standardRules = [],
+            explicitRules = [];
+
+        translation.split('|').forEach((part) => {
+            if (cPluralRegex.test(part)) {
+                const matches = part.match(cPluralRegex);
+                explicitRules[matches[0]] = matches[matches.length - 1];
+            } else if (sPluralRegex.test(part)) {
+                const matches = part.match(sPluralRegex);
+                standardRules.push(matches[1]);
+            } else {
+                standardRules.push(part);
+            }
+        });
+
+        explicitRules.forEach((rule, e) => {
+            if (iPluralRegex.test(e)) {
+                const matches = e.match(iPluralRegex);
+
+                if (matches[1]) {
+                    const ns = matches[2].split(',');
+
+                    for (let n in ns) {
+                        if (number == ns[n]) {
+                            return explicitRules[e];
+                        }
+                    }
+                } else {
+                    const leftNumber = this.convertNumber(matches[4]);
+                    const rightNumber = this.convertNumber(matches[5]);
+
+                    if (
+                        ('[' === matches[3] ? number >= leftNumber : number > leftNumber) &&
+                        (']' === matches[6] ? number <= rightNumber : number < rightNumber)
+                    ) {
+                        return explicitRules[e];
+                    }
+                }
+            }
+        });
+
+        return standardRules[this.pluralPosition(number, this.locale)] || standardRules[0] || undefined;
+    }
+
+    convertNumber(number: string): number {
+        if ('-Inf' === number) {
+            return Number.NEGATIVE_INFINITY;
+        } else if ('+Inf' === number || 'Inf' === number) {
+            return Number.POSITIVE_INFINITY;
+        }
+
+        return parseInt(number, 10);
+    }
+
+    pluralPosition(number: number, locale: string): number {
+        if ('pt_BR' === locale) {
+            locale = 'xbr';
+        }
+
+        if (locale.length > 3) {
+            locale = locale.split('_')[0];
+        }
+
+        switch (locale) {
+            case 'bo':
+            case 'dz':
+            case 'id':
+            case 'ja':
+            case 'jv':
+            case 'ka':
+            case 'km':
+            case 'kn':
+            case 'ko':
+            case 'ms':
+            case 'th':
+            case 'vi':
+            case 'zh':
+                return 0;
+
+            case 'af':
+            case 'az':
+            case 'bn':
+            case 'bg':
+            case 'ca':
+            case 'da':
+            case 'de':
+            case 'el':
+            case 'en':
+            case 'eo':
+            case 'es':
+            case 'et':
+            case 'eu':
+            case 'fa':
+            case 'fi':
+            case 'fo':
+            case 'fur':
+            case 'fy':
+            case 'gl':
+            case 'gu':
+            case 'ha':
+            case 'he':
+            case 'hu':
+            case 'is':
+            case 'it':
+            case 'ku':
+            case 'lb':
+            case 'ml':
+            case 'mn':
+            case 'mr':
+            case 'nah':
+            case 'nb':
+            case 'ne':
+            case 'nl':
+            case 'nn':
+            case 'no':
+            case 'om':
+            case 'or':
+            case 'pa':
+            case 'pap':
+            case 'ps':
+            case 'pt':
+            case 'so':
+            case 'sq':
+            case 'sv':
+            case 'sw':
+            case 'ta':
+            case 'te':
+            case 'tk':
+            case 'tr':
+            case 'ur':
+            case 'zu':
+                return number == 1 ? 0 : 1;
+
+            case 'am':
+            case 'bh':
+            case 'fil':
+            case 'fr':
+            case 'gun':
+            case 'hi':
+            case 'ln':
+            case 'mg':
+            case 'nso':
+            case 'xbr':
+            case 'ti':
+            case 'wa':
+                return number === 0 || number == 1 ? 0 : 1;
+
+            case 'be':
+            case 'bs':
+            case 'hr':
+            case 'ru':
+            case 'sr':
+            case 'uk':
+                return number % 10 == 1 && number % 100 != 11
+                    ? 0
+                    : number % 10 >= 2 && number % 10 <= 4 && (number % 100 < 10 || number % 100 >= 20)
+                    ? 1
+                    : 2;
+
+            case 'cs':
+            case 'sk':
+                return number == 1 ? 0 : number >= 2 && number <= 4 ? 1 : 2;
+
+            case 'ga':
+                return number == 1 ? 0 : number == 2 ? 1 : 2;
+
+            case 'lt':
+                return number % 10 == 1 && number % 100 != 11 ? 0 : number % 10 >= 2 && (number % 100 < 10 || number % 100 >= 20) ? 1 : 2;
+
+            case 'sl':
+                return number % 100 == 1 ? 0 : number % 100 == 2 ? 1 : number % 100 == 3 || number % 100 == 4 ? 2 : 3;
+
+            case 'mk':
+                return number % 10 == 1 ? 0 : 1;
+
+            case 'mt':
+                return number == 1 ? 0 : number === 0 || (number % 100 > 1 && number % 100 < 11) ? 1 : number % 100 > 10 && number % 100 < 20 ? 2 : 3;
+
+            case 'lv':
+                return number === 0 ? 0 : number % 10 == 1 && number % 100 != 11 ? 1 : 2;
+
+            case 'pl':
+                return number == 1 ? 0 : number % 10 >= 2 && number % 10 <= 4 && (number % 100 < 12 || number % 100 > 14) ? 1 : 2;
+
+            case 'cy':
+                return number == 1 ? 0 : number == 2 ? 1 : number == 8 || number == 11 ? 2 : 3;
+
+            case 'ro':
+                return number == 1 ? 0 : number === 0 || (number % 100 > 0 && number % 100 < 20) ? 1 : 2;
+
+            case 'ar':
+                return number === 0 ? 0 : number == 1 ? 1 : number == 2 ? 2 : number >= 3 && number <= 10 ? 3 : number >= 11 && number <= 99 ? 4 : 5;
+
+            default:
+                return 0;
+        }
+    }
+}

js/src/common/compat.ts

@@ -1,10 +1,14 @@
+import Application from './Application';
+import Component from './Component';
 import * as extend from './extend';
+import Model from './Model';
 import Session from './Session';
 import Store from './Store';
-import evented from './utils/evented';
-import liveHumanTimes from './utils/liveHumanTimes';
+import Translator from './Translator';
+
+import Evented from './utils/Evented';
+// import liveHumanTimes from './utils/liveHumanTimes';
 import ItemList from './utils/ItemList';
-import mixin from './utils/mixin';
 import humanTime from './utils/humanTime';
 import computed from './utils/computed';
 import Drawer from './utils/Drawer';
@@ -17,18 +21,17 @@ import extract from './utils/extract';
 import ScrollListener from './utils/ScrollListener';
 import stringToColor from './utils/stringToColor';
 import patchMithril from './utils/patchMithril';
-import classList from './utils/classList';
 import extractText from './utils/extractText';
 import formatNumber from './utils/formatNumber';
 import mapRoutes from './utils/mapRoutes';
+
 import Notification from './models/Notification';
 import User from './models/User';
 import Post from './models/Post';
 import Discussion from './models/Discussion';
 import Group from './models/Group';
 import Forum from './models/Forum';
-import Component from './Component';
-import Translator from './Translator';
+
 import AlertManager from './components/AlertManager';
 import Switch from './components/Switch';
 import Badge from './components/Badge';
@@ -49,79 +52,78 @@ import ModalManager from './components/ModalManager';
 import Button from './components/Button';
 import Modal from './components/Modal';
 import GroupBadge from './components/GroupBadge';
-import Model from './Model';
-import Application from './Application';
+
 import fullTime from './helpers/fullTime';
 import avatar from './helpers/avatar';
 import icon from './helpers/icon';
 import humanTimeHelper from './helpers/humanTime';
-import punctuateSeries from './helpers/punctuateSeries';
+// import punctuateSeries from './helpers/punctuateSeries';
 import highlight from './helpers/highlight';
 import username from './helpers/username';
 import userOnline from './helpers/userOnline';
 import listItems from './helpers/listItems';
 
 export default {
-  'extend': extend,
-  'Session': Session,
-  'Store': Store,
-  'utils/evented': evented,
-  'utils/liveHumanTimes': liveHumanTimes,
-  'utils/ItemList': ItemList,
-  'utils/mixin': mixin,
-  'utils/humanTime': humanTime,
-  'utils/computed': computed,
-  'utils/Drawer': Drawer,
-  'utils/anchorScroll': anchorScroll,
-  'utils/RequestError': RequestError,
-  'utils/abbreviateNumber': abbreviateNumber,
-  'utils/string': string,
-  'utils/SubtreeRetainer': SubtreeRetainer,
-  'utils/extract': extract,
-  'utils/ScrollListener': ScrollListener,
-  'utils/stringToColor': stringToColor,
-  'utils/patchMithril': patchMithril,
-  'utils/classList': classList,
-  'utils/extractText': extractText,
-  'utils/formatNumber': formatNumber,
-  'utils/mapRoutes': mapRoutes,
-  'models/Notification': Notification,
-  'models/User': User,
-  'models/Post': Post,
-  'models/Discussion': Discussion,
-  'models/Group': Group,
-  'models/Forum': Forum,
-  'Component': Component,
-  'Translator': Translator,
-  'components/AlertManager': AlertManager,
-  'components/Switch': Switch,
-  'components/Badge': Badge,
-  'components/LoadingIndicator': LoadingIndicator,
-  'components/Placeholder': Placeholder,
-  'components/Separator': Separator,
-  'components/Dropdown': Dropdown,
-  'components/SplitDropdown': SplitDropdown,
-  'components/RequestErrorModal': RequestErrorModal,
-  'components/FieldSet': FieldSet,
-  'components/Select': Select,
-  'components/Navigation': Navigation,
-  'components/Alert': Alert,
-  'components/LinkButton': LinkButton,
-  'components/Checkbox': Checkbox,
-  'components/SelectDropdown': SelectDropdown,
-  'components/ModalManager': ModalManager,
-  'components/Button': Button,
-  'components/Modal': Modal,
-  'components/GroupBadge': GroupBadge,
-  'Model': Model,
-  'Application': Application,
-  'helpers/fullTime': fullTime,
-  'helpers/avatar': avatar,
-  'helpers/icon': icon,
-  'helpers/humanTime': humanTimeHelper,
-  'helpers/punctuateSeries': punctuateSeries,
-  'helpers/highlight': highlight,
-  'helpers/username': username,
-  'helpers/userOnline': userOnline,
-  'helpers/listItems': listItems
+    Application: Application,
+    Component: Component,
+    extend: extend,
+    Model: Model,
+    Session: Session,
+    Store: Store,
+    Translator: Translator,
+
+    'utils/Evented': Evented,
+    // 'utils/liveHumanTimes': liveHumanTimes,
+    'utils/ItemList': ItemList,
+    'utils/humanTime': humanTime,
+    'utils/computed': computed,
+    'utils/Drawer': Drawer,
+    'utils/anchorScroll': anchorScroll,
+    'utils/RequestError': RequestError,
+    'utils/abbreviateNumber': abbreviateNumber,
+    'utils/string': string,
+    'utils/SubtreeRetainer': SubtreeRetainer,
+    'utils/extract': extract,
+    'utils/ScrollListener': ScrollListener,
+    'utils/stringToColor': stringToColor,
+    'utils/patchMithril': patchMithril,
+    'utils/extractText': extractText,
+    'utils/formatNumber': formatNumber,
+    'utils/mapRoutes': mapRoutes,
+    'models/Notification': Notification,
+    'models/User': User,
+    'models/Post': Post,
+    'models/Discussion': Discussion,
+    'models/Group': Group,
+    'models/Forum': Forum,
+    'components/AlertManager': AlertManager,
+    'components/Switch': Switch,
+    'components/Badge': Badge,
+    'components/LoadingIndicator': LoadingIndicator,
+    'components/Placeholder': Placeholder,
+    'components/Separator': Separator,
+    'components/Dropdown': Dropdown,
+    'components/SplitDropdown': SplitDropdown,
+    'components/RequestErrorModal': RequestErrorModal,
+    'components/FieldSet': FieldSet,
+    'components/Select': Select,
+    'components/Navigation': Navigation,
+    'components/Alert': Alert,
+    'components/LinkButton': LinkButton,
+    'components/Checkbox': Checkbox,
+    'components/SelectDropdown': SelectDropdown,
+    'components/ModalManager': ModalManager,
+    'components/Button': Button,
+    'components/Modal': Modal,
+    'components/GroupBadge': GroupBadge,
+
+    'helpers/fullTime': fullTime,
+    'helpers/avatar': avatar,
+    'helpers/icon': icon,
+    'helpers/humanTime': humanTimeHelper,
+    // 'helpers/punctuateSeries': punctuateSeries,
+    'helpers/highlight': highlight,
+    'helpers/username': username,
+    'helpers/userOnline': userOnline,
+    'helpers/listItems': listItems,
 };

js/src/common/components/Alert.js

@@ -1,57 +0,0 @@
-import Component from '../Component';
-import Button from './Button';
-import listItems from '../helpers/listItems';
-import extract from '../utils/extract';
-
-/**
- * The `Alert` component represents an alert box, which contains a message,
- * some controls, and may be dismissible.
- *
- * The alert may have the following special props:
- *
- * - `type` The type of alert this is. Will be used to give the alert a class
- *   name of `Alert--{type}`.
- * - `controls` An array of controls to show in the alert.
- * - `dismissible` Whether or not the alert can be dismissed.
- * - `ondismiss` A callback to run when the alert is dismissed.
- *
- * All other props will be assigned as attributes on the alert element.
- */
-export default class Alert extends Component {
-  view() {
-    const attrs = Object.assign({}, this.props);
-
-    const type = extract(attrs, 'type');
-    attrs.className = 'Alert Alert--' + type + ' ' + (attrs.className || '');
-
-    const children = extract(attrs, 'children');
-    const controls = extract(attrs, 'controls') || [];
-
-    // If the alert is meant to be dismissible (which is the case by default),
-    // then we will create a dismiss button to append as the final control in
-    // the alert.
-    const dismissible = extract(attrs, 'dismissible');
-    const ondismiss = extract(attrs, 'ondismiss');
-    const dismissControl = [];
-
-    if (dismissible || dismissible === undefined) {
-      dismissControl.push(
-        <Button
-          icon="fas fa-times"
-          className="Button Button--link Button--icon Alert-dismiss"
-          onclick={ondismiss}/>
-      );
-    }
-
-    return (
-      <div {...attrs}>
-        <span className="Alert-body">
-          {children}
-        </span>
-        <ul className="Alert-controls">
-          {listItems(controls.concat(dismissControl))}
-        </ul>
-      </div>
-    );
-  }
-}

js/src/common/components/Alert.tsx

@@ -0,0 +1,71 @@
+import * as Mithril from 'mithril';
+
+import Component, { ComponentProps } from '../Component';
+import Button from './Button';
+import listItems from '../helpers/listItems';
+import extract from '../utils/extract';
+import AlertState from '../states/AlertState';
+
+export interface AlertData extends ComponentProps {
+    /**
+     * An array of controls to show in the alert.
+     */
+    controls?: Mithril.ChildArray;
+
+    /**
+     * The type of alert this is. Will be used to give the alert a class
+     *   name of `Alert--{type}`.
+     */
+    type?: string;
+
+    /**
+     * Whether or not the alert can be dismissed.
+     */
+    dismissible?: boolean;
+
+    /**
+     * A callback to run when the alert is dismissed.
+     */
+    ondismiss?: () => any;
+}
+
+export interface AlertProps extends AlertData {
+    state: AlertState;
+}
+
+/**
+ * The `Alert` component represents an alert box, which contains a message,
+ * some controls, and may be dismissible.
+ *
+ * All other props will be assigned as attributes on the alert element.
+ */
+export default class Alert extends Component<AlertProps> {
+    view() {
+        const data = this.props.state?.data || this.props;
+        const attrs: AlertData = Object.assign({}, data);
+
+        const type: string = extract(attrs, 'type');
+        attrs.className = `Alert Alert--${type} ${attrs.className || ''}`;
+
+        const children: Mithril.Children = extract(attrs, 'children');
+        const controls: Mithril.ChildArray = extract(attrs, 'controls') || [];
+
+        // If the alert is meant to be dismissible (which is the case by default),
+        // then we will create a dismiss button to append as the final control in
+        // the alert.
+        const dismissible: boolean | undefined = extract(attrs, 'dismissible');
+        const ondismiss: () => any = extract(attrs, 'ondismiss');
+        const dismissControl: JSX.Element[] = [];
+
+        if (dismissible || dismissible === undefined) {
+            dismissControl.push(<Button icon="fas fa-times" className="Button Button--link Button--icon Alert-dismiss" onclick={ondismiss} />);
+        }
+
+        return (
+            <div {...attrs}>
+                <span className="Alert-body">{children}</span>
+                <ul className="Alert-controls">{listItems(controls.concat(dismissControl))}</ul>
+            </div>
+        );
+    }
+}

js/src/common/components/AlertManager.js

@@ -1,75 +0,0 @@
-import Component from '../Component';
-import Alert from './Alert';
-
-/**
- * The `AlertManager` component provides an area in which `Alert` components can
- * be shown and dismissed.
- */
-export default class AlertManager extends Component {
-  init() {
-    /**
-     * An array of Alert components which are currently showing.
-     *
-     * @type {Alert[]}
-     * @protected
-     */
-    this.components = [];
-  }
-
-  view() {
-    return (
-      <div className="AlertManager">
-        {this.components.map(component => <div className="AlertManager-alert">{component}</div>)}
-      </div>
-    );
-  }
-
-  config(isInitialized, context) {
-    // Since this component is 'above' the content of the page (that is, it is a
-    // part of the global UI that persists between routes), we will flag the DOM
-    // to be retained across route changes.
-    context.retain = true;
-  }
-
-  /**
-   * Show an Alert in the alerts area.
-   *
-   * @param {Alert} component
-   * @public
-   */
-  show(component) {
-    if (!(component instanceof Alert)) {
-      throw new Error('The AlertManager component can only show Alert components');
-    }
-
-    component.props.ondismiss = this.dismiss.bind(this, component);
-
-    this.components.push(component);
-    m.redraw();
-  }
-
-  /**
-   * Dismiss an alert.
-   *
-   * @param {Alert} component
-   * @public
-   */
-  dismiss(component) {
-    const index = this.components.indexOf(component);
-
-    if (index !== -1) {
-      this.components.splice(index, 1);
-      m.redraw();
-    }
-  }
-
-  /**
-   * Clear all alerts.
-   *
-   * @public
-   */
-  clear() {
-    this.components = [];
-    m.redraw();
-  }
-}

js/src/common/components/AlertManager.tsx

@@ -0,0 +1,62 @@
+import Component from '../Component';
+import AlertState from '../states/AlertState';
+import Alert, { AlertData } from './Alert';
+
+/**
+ * The `AlertManager` component provides an area in which `Alert` components can
+ * be shown and dismissed.
+ */
+export default class AlertManager extends Component {
+    /**
+     * An array of Alert components which are currently showing.
+     */
+    protected states: AlertState[] = [];
+
+    view() {
+        return (
+            <div className="AlertManager">
+                {this.states.map((state) => (
+                    <div className="AlertManager-alert">
+                        <Alert state={state} ondismiss={this.dismiss.bind(this)} />
+                    </div>
+                ))}
+            </div>
+        );
+    }
+
+    /**
+     * Show an Alert in the alerts area.
+     */
+    public show(state: AlertState | AlertData): number {
+        if (!(state instanceof AlertState)) state = new AlertState(state);
+
+        this.states.push(state as AlertState);
+        m.redraw();
+
+        return state.key;
+    }
+
+    /**
+     * Dismiss an alert.
+     */
+    public dismiss(keyOrState?: AlertState | number) {
+        if (!keyOrState) return;
+
+        const key = keyOrState instanceof AlertState ? keyOrState.key : keyOrState;
+
+        let index = this.states.indexOf(this.states.filter((a) => a.key == key)[0]);
+
+        if (index !== -1) {
+            this.states.splice(index, 1);
+            m.redraw();
+        }
+    }
+
+    /**
+     * Clear all alerts.
+     */
+    public clear() {
+        this.states = [];
+        m.redraw();
+    }
+}

js/src/common/components/Badge.tsx

@@ -16,24 +16,20 @@ import extract from '../utils/extract';
  * All other props will be assigned as attributes on the badge element.
  */
 export default class Badge extends Component {
-  view() {
-    const attrs = Object.assign({}, this.props);
-    const type = extract(attrs, 'type');
-    const iconName = extract(attrs, 'icon');
+    view(vnode) {
+        const attrs = vnode.attrs;
+        const type = extract(attrs, 'type');
+        const iconName = extract(attrs, 'icon');
 
-    attrs.className = 'Badge ' + (type ? 'Badge--' + type : '') + ' ' + (attrs.className || '');
-    attrs.title = extract(attrs, 'label') || '';
+        attrs.className = `Badge ${type ? `Badge--${type}` : ''} ${attrs.className || ''}`;
+        attrs.title = extract(attrs, 'label') || '';
 
-    return (
-      <span {...attrs}>
-        {iconName ? icon(iconName, {className: 'Badge-icon'}) : m.trust('&nbsp;')}
-      </span>
-    );
-  }
+        return <span {...attrs}>{iconName ? icon(iconName, { className: 'Badge-icon' }) : m.trust('&nbsp;')}</span>;
+    }
 
-  config(isInitialized) {
-    if (isInitialized) return;
+    oncreate(vnode) {
+        super.oncreate(vnode);
 
-    if (this.props.label) this.$().tooltip({container: 'body'});
-  }
+        if (this.props.label) this.$().tooltip({ container: 'body' });
+    }
 }

js/src/common/components/Button.js

@@ -1,70 +0,0 @@
-import Component from '../Component';
-import icon from '../helpers/icon';
-import extract from '../utils/extract';
-import extractText from '../utils/extractText';
-import LoadingIndicator from './LoadingIndicator';
-
-/**
- * The `Button` component defines an element which, when clicked, performs an
- * action. The button may have the following special props:
- *
- * - `icon` The name of the icon class. If specified, the button will be given a
- *   'has-icon' class name.
- * - `disabled` Whether or not the button is disabled. If truthy, the button
- *   will be given a 'disabled' class name, and any `onclick` handler will be
- *   removed.
- * - `loading` Whether or not the button should be in a disabled loading state.
- *
- * All other props will be assigned as attributes on the button element.
- *
- * Note that a Button has no default class names. This is because a Button can
- * be used to represent any generic clickable control, like a menu item.
- */
-export default class Button extends Component {
-  view() {
-    const attrs = Object.assign({}, this.props);
-
-    delete attrs.children;
-
-    attrs.className = attrs.className || '';
-    attrs.type = attrs.type || 'button';
-
-    // If a tooltip was provided for buttons without additional content, we also
-    // use this tooltip as text for screen readers
-    if (attrs.title && !this.props.children) {
-      attrs['aria-label'] = attrs.title;
-    }
-
-    // If nothing else is provided, we use the textual button content as tooltip
-    if (!attrs.title && this.props.children) {
-      attrs.title = extractText(this.props.children);
-    }
-
-    const iconName = extract(attrs, 'icon');
-    if (iconName) attrs.className += ' hasIcon';
-
-    const loading = extract(attrs, 'loading');
-    if (attrs.disabled || loading) {
-      attrs.className += ' disabled' + (loading ? ' loading' : '');
-      delete attrs.onclick;
-    }
-
-    return <button {...attrs}>{this.getButtonContent()}</button>;
-  }
-
-  /**
-   * Get the template for the button's content.
-   *
-   * @return {*}
-   * @protected
-   */
-  getButtonContent() {
-    const iconName = this.props.icon;
-
-    return [
-      iconName && iconName !== true ? icon(iconName, {className: 'Button-icon'}) : '',
-      this.props.children ? <span className="Button-label">{this.props.children}</span> : '',
-      this.props.loading ? LoadingIndicator.component({size: 'tiny', className: 'LoadingIndicator--inline'}) : ''
-    ];
-  }
-}

js/src/common/components/Button.tsx

@@ -0,0 +1,90 @@
+import Component, { ComponentProps } from '../Component';
+import icon from '../helpers/icon';
+import extract from '../utils/extract';
+import extractText from '../utils/extractText';
+import LoadingIndicator from './LoadingIndicator';
+
+export interface ButtonProps extends ComponentProps {
+    /**
+     * A tooltip for the button.
+     */
+    title?: string;
+
+    /**
+     * An html type attribute for the button.
+     */
+    type?: string;
+
+    /**
+     * The name of the icon class. If specified, the button will be given a
+     * 'has-icon' class name.
+     */
+    icon?: string;
+
+    /**
+     * Whether or not the button should be in a disabled loading state.
+     */
+    loading?: boolean;
+
+    /**
+     * Whether or not the button is disabled. If truthy, the button
+     * will be given a 'disabled' class name, and any `onclick` handler will be
+     * removed.
+     */
+    disabled?: boolean;
+
+    /**
+     * A callback to run when the button is clicked.
+     */
+    onclick?: Function;
+}
+
+/**
+ * The `Button` component defines an element which, when clicked, performs an
+ * action.
+ *
+ * Note that a Button has no default class names. This is because a Button can
+ * be used to represent any generic clickable control, like a menu item.
+ */
+export default class Button<T extends ButtonProps = ButtonProps> extends Component<T> {
+    view() {
+        const attrs = (({ children, ...o }) => o)(this.props) as T;
+        const children = this.props.children;
+
+        attrs.className = attrs.className || '';
+        attrs.type = attrs.type || 'button';
+
+        // If a tooltip was provided for buttons without additional content, we also
+        // use this tooltip as text for screen readers
+        if (attrs.title && !children) {
+            attrs['aria-label'] = attrs.title;
+        }
+
+        // If nothing else is provided, we use the textual button content as tooltip
+        if (!attrs.title && children) {
+            attrs.title = extractText(children);
+        }
+
+        const iconName = extract(attrs, 'icon');
+        if (iconName) attrs.className += ' hasIcon';
+
+        const loading = extract(attrs, 'loading');
+        if (attrs.disabled || loading) {
+            attrs.className = classNames(attrs.className, 'disabled', loading && 'loading');
+            delete attrs.onclick;
+        }
+
+        return <button {...attrs}>{this.getButtonContent(iconName, loading, children)}</button>;
+    }
+
+    /**
+     * Get the template for the button's content.
+     */
+    protected getButtonContent(iconName?: string | boolean, loading?: boolean, children?: any): any[] {
+        return [
+            iconName && iconName !== true ? icon(iconName, { className: 'Button-icon' }) : '',
+            children ? <span className="Button-label">{children}</span> : '',
+            loading ? LoadingIndicator.component({ size: 'tiny', className: 'LoadingIndicator--inline' }) : '',
+        ];
+    }
+}

js/src/common/components/Checkbox.js

@@ -1,67 +0,0 @@
-import Component from '../Component';
-import LoadingIndicator from './LoadingIndicator';
-import icon from '../helpers/icon';
-
-/**
- * The `Checkbox` component defines a checkbox input.
- *
- * ### Props
- *
- * - `state` Whether or not the checkbox is checked.
- * - `className` The class name for the root element.
- * - `disabled` Whether or not the checkbox is disabled.
- * - `onchange` A callback to run when the checkbox is checked/unchecked.
- * - `children` A text label to display next to the checkbox.
- */
-export default class Checkbox extends Component {
-  init() {
-    /**
-     * Whether or not the checkbox's value is in the process of being saved.
-     *
-     * @type {Boolean}
-     * @public
-     */
-    this.loading = false;
-  }
-
-  view() {
-    let className = 'Checkbox ' + (this.props.state ? 'on' : 'off') + ' ' + (this.props.className || '');
-    if (this.loading) className += ' loading';
-    if (this.props.disabled) className += ' disabled';
-
-    return (
-      <label className={className}>
-        <input type="checkbox"
-          checked={this.props.state}
-          disabled={this.props.disabled}
-          onchange={m.withAttr('checked', this.onchange.bind(this))}/>
-        <div className="Checkbox-display">
-          {this.getDisplay()}
-        </div>
-        {this.props.children}
-      </label>
-    );
-  }
-
-  /**
-   * Get the template for the checkbox's display (tick/cross icon).
-   *
-   * @return {*}
-   * @protected
-   */
-  getDisplay() {
-    return this.loading
-      ? LoadingIndicator.component({size: 'tiny'})
-      : icon(this.props.state ? 'fas fa-check' : 'fas fa-times');
-  }
-
-  /**
-   * Run a callback when the state of the checkbox is changed.
-   *
-   * @param {Boolean} checked
-   * @protected
-   */
-  onchange(checked) {
-    if (this.props.onchange) this.props.onchange(checked, this);
-  }
-}

js/src/common/components/Checkbox.tsx

@@ -0,0 +1,67 @@
+import Component, { ComponentProps } from '../Component';
+import LoadingIndicator from './LoadingIndicator';
+import icon from '../helpers/icon';
+
+export interface CheckboxProps extends ComponentProps {
+    /**
+     * Whether or not the checkbox is checked
+     */
+    state: boolean;
+
+    /**
+     * Whether or not the checkbox is disabled.
+     */
+    disabled: boolean;
+
+    /**
+     * A callback to run when the checkbox is checked/unchecked.
+     */
+    onchange?: Function;
+}
+
+/**
+ * The `Checkbox` component defines a checkbox input.
+ */
+export default class Checkbox<T extends CheckboxProps = CheckboxProps> extends Component<CheckboxProps> {
+    /**
+     * Whether or not the checkbox's value is in the process of being saved.
+     */
+    loading = false;
+
+    view() {
+        const className = classNames(
+            'Checkbox',
+            this.props.className,
+            this.props.state ? 'on' : 'off',
+            this.loading && 'loading',
+            this.props.disabled && 'disabled'
+        );
+
+        return (
+            <label className={className}>
+                <input
+                    type="checkbox"
+                    checked={this.props.state}
+                    disabled={this.props.disabled}
+                    onchange={m.withAttr('checked', this.onchange.bind(this))}
+                />
+                <div className="Checkbox-display">{this.getDisplay()}</div>
+                {this.props.children}
+            </label>
+        );
+    }
+
+    /**
+     * Get the template for the checkbox's display (tick/cross icon).
+     */
+    protected getDisplay() {
+        return this.loading ? LoadingIndicator.component({ size: 'tiny' }) : icon(this.props.state ? 'fas fa-check' : 'fas fa-times');
+    }
+
+    /**
+     * Run a callback when the state of the checkbox is changed.
+     */
+    protected onchange(checked: boolean) {
+        if (this.props.onchange) this.props.onchange(checked, this);
+    }
+}