L8 requires constructor arguments to PhpEngine

* Beta 16 Changelog

* Review tweaks

* Consistent letter casing

* IOS -> iOS

* Removed accidentally added F

* Csrf -> CSRF

Co-authored-by: David Wheatley <hi@davwheat.dev>

.editorconfig

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

.gitattributes

@@ -11,3 +11,5 @@ phpunit.xml export-ignore
 tests export-ignore
 
 js/dist/* -diff
+
+* text=auto eol=lf

.github/workflows/lint.yml

@@ -1,4 +1,4 @@
-name: Lint code
+name: Lint
 
 on:
   push:
@@ -12,7 +12,7 @@ jobs:
   prettier:
     runs-on: ubuntu-latest
 
-    name: Lint JS code with Prettier
+    name: JS / Prettier
 
     steps:
       - uses: actions/checkout@master

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.2, 7.3, 7.4]
+        php: [7.3, 7.4, '8.0']
         service: ['mysql:5.7', mariadb]
         prefix: ['', flarum_]
 
@@ -21,16 +21,16 @@ jobs:
             prefixStr: (prefix)
 
         exclude:
-          - php: 7.2
+          - php: 7.3
             service: 'mysql:5.7'
             prefix: flarum_
-          - php: 7.2
+          - php: 7.3
             service: mariadb
             prefix: flarum_
-          - php: 7.3
+          - php: 8.0
             service: 'mysql:5.7'
             prefix: flarum_
-          - php: 7.3
+          - php: 8.0
             service: mariadb
             prefix: flarum_
 
@@ -45,13 +45,22 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Select PHP version
-        run: sudo update-alternatives --set php $(which php${{ matrix.php }})
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+          extensions: curl, dom, gd, json, mbstring, openssl, pdo_mysql, tokenizer, zip
+          tools: phpunit, composer:v2
 
+      # The authentication alter is necessary because newer mysql versions use the `caching_sha2_password` driver,
+      # which isn't supported prior to PHP7.4
+      # When we drop support for PHP7.3, we should remove this from the setup.
       - name: Create MySQL Database
         run: |
           sudo systemctl start mysql
           mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 13306
+          mysql -uroot -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root';" --port 13306
 
       - name: Install Composer dependencies
         run: composer install
@@ -65,3 +74,5 @@ jobs:
 
       - name: Run Composer tests
         run: composer test
+        env:
+          COMPOSER_PROCESS_TIMEOUT: 600

.gitignore

@@ -4,6 +4,8 @@ composer.phar
 node_modules
 .DS_Store
 Thumbs.db
+tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant
 .idea/*
+.vscode

CHANGELOG.md

@@ -1,5 +1,314 @@
 # Changelog
 
+## [0.1.0-beta.16](https://github.com/flarum/core/compare/v0.1.0-beta.15...v0.1.0-beta.16)
+
+### Added
+- Allow event subscribers (https://github.com/flarum/core/pull/2535)
+- Allow Settings extender to have a default value (https://github.com/flarum/core/pull/2495)
+- Allow hooking into the sending of notifications before being send (https://github.com/flarum/core/pull/2533)
+- PHP 8 support (https://github.com/flarum/core/pull/2507)
+- Search extender (https://github.com/flarum/core/pull/2483)
+- User badges to post preview (https://github.com/flarum/core/pull/2555)
+- Optional extension dependencies allow a booting order (https://github.com/flarum/core/pull/2579)
+- Auth extender (https://github.com/flarum/core/pull/2176)
+- `X-Powered-By` header added to allow indexers easier data aggregation of Flarum adoption (https://github.com/flarum/core/pull/2618)
+
+### Changed
+- Run integration tests in transaction (https://github.com/flarum/core/pull/2304)
+- Allow policies to return a boolean for simplified allow/deny (https://github.com/flarum/core/pull/2534)
+- Converted highlight helper to typescript (https://github.com/flarum/core/pull/2532)
+- Add accessibility attributes to Mark as Read button (https://github.com/flarum/core/pull/2564)
+- Dismiss errors on change email modal upon a new request ([00913d5](https://github.com/flarum/core/commit/00913d5b0be2172cfce1f16aaf64a24f3d2e6d4b))
+- Disabled extensions now are marked with a red circle instead of a red dot (https://github.com/flarum/core/pull/2562)
+- Extension dependency errors now show the extension title instead of the ID (https://github.com/flarum/core/pull/2563)
+- Change `mutate` method on ApiSerializer extender to `attributes` (https://github.com/flarum/core/pull/2578)
+- Moved locale files to the core from the language pack (https://github.com/flarum/core/pull/2408)
+- AdminPage extensibility and generic improvements (https://github.com/flarum/core/pull/2593)
+- Remove entry of authors, link to https://flarum.org/team (https://github.com/flarum/core/pull/2625)
+- Search and filtering are split (https://github.com/flarum/core/pull/2454)
+- Move IP identification into a middleware (https://github.com/flarum/core/pull/2624)
+- Editor Driver abstraction introduced (https://github.com/flarum/core/pull/2594)
+- Allow overriding routes (https://github.com/flarum/core/pull/2577)
+- Split user edit permissions into permissions for editing of user credentials, username, groups and suspending (https://github.com/flarum/core/pull/2620)
+- Reduced number of admin extension categories (https://github.com/flarum/core/pull/2604)
+- Move search related classes to a dedicated Query namespace (https://github.com/flarum/core/pull/2645)
+- Rewrite common helpers into typescript (https://github.com/flarum/core/pull/2541)
+- `TextEditor` is moved to the common namespace for use in the admin frontend (https://github.com/flarum/core/pull/2649)
+- Update Laravel/Illuminate components to 8 (https://github.com/flarum/core/pull/2576)
+- Eager load relations in discussion listing to improve performance (https://github.com/flarum/core/pull/2639)
+- Adopt flarum/testing package (https://github.com/flarum/core/pull/2545)
+- Replace `user` gambit with `author` gambit ([612a57c](https://github.com/flarum/core/commit/612a57c4664415a3ea120103483645c32acc6f12))
+- Posts page of on user profile loads posts using username instead of id ([30017ee](https://github.com/flarum/core/commit/30017eef09ae9e78640c4e2cacd4909fffa8d775))
+
+### Fixed
+- Transform css breaks iOS scroll functionality (https://github.com/flarum/core/pull/2527)
+- Composer header is hidden on mobile devices (https://github.com/flarum/core/pull/2279)
+- Cannot delete a post or discussion of a deleted user (https://github.com/flarum/core/pull/2521)
+- DiscussionListPane jumps around not keeping the scroll position (https://github.com/flarum/core/pull/2402)
+- Infinite scroll on notifications dropdown broken (https://github.com/flarum/core/pull/2524)
+- The show language selector switch remains toggled on ([9347b12](https://github.com/flarum/core/commit/9347b12b47bf4ab97ffb7ca92673604b237c1012))
+- Model Visibility extender throws exception on extensions that aren't installed or enabled (https://github.com/flarum/core/pull/2580)
+- Extensions are marked as enabled when enabling fails to unmet extension dependencies (https://github.com/flarum/core/pull/2558)
+- Routes to admin extension pages without a valid ID break the admin page (https://github.com/flarum/core/pull/2584)
+- Disabled fieldset use an incorrect CSS property `disallowed` (https://github.com/flarum/core/pull/2585)
+- Scrolling to a post that is already loaded the Load More button shows and does not trigger (https://github.com/flarum/core/pull/2388)
+- Opening discussions on some mobile devices require a double tap (https://github.com/flarum/core/pull/2607)
+- iOS devices show erratic behavior in the post stream while updating (https://github.com/flarum/core/pull/2548)
+- Small mobile screens partially hides the composer when the keyboard is open (https://github.com/flarum/core/pull/2631)
+- Clearing cache does not clear the template cache in storage/views (https://github.com/flarum/core/pull/2648)
+- Boot errors show critical information (https://github.com/flarum/core/pull/2633)
+- List user endpoint discloses last online even if user choose against it (https://github.com/flarum/core/pull/2634)
+- Group gambit disclosed hidden groups (https://github.com/flarum/core/pull/2657)
+- Search results on small windows not fully visible (https://github.com/flarum/core/pull/2650)
+- Composer goes off screen on Safari when starting to type (https://github.com/flarum/core/pull/2660)
+- A search that has no results shows the search results dropdown ([b88a7cb](https://github.com/flarum/core/commit/b88a7cb33b56e318f11670e9e2d563aef94db039))
+- The composer modal moves around when typing on Safari ([a64c398](https://github.com/flarum/core/commit/a64c39835aba43e831209609f4a9638ae589aa41))
+
+### Removed
+- Deprecated CSRF wildcard path match
+- Deprecated policy and visibility scoping events
+- Deprecated post types event
+- Deprecated validation events
+- Deprecated notification events
+- Deprecated floodgate
+- Deprecated user preferences event
+- Deprecated formatting events
+- Deprecated api events
+- Deprecated bootstrap.php support
+- PHP 7.2 support (https://github.com/flarum/core/pull/2507)
+- Bidi attribute in the rendered HTML (https://github.com/flarum/core/pull/2602)
+- `AccessToken::find`, use `AccessToken::findValid` instead (https://github.com/flarum/core/pull/2651)
+
+### Deprecated
+- `GetModelIsPrivate` event (https://github.com/flarum/core/pull/2587)
+- `CheckingPassword` event (https://github.com/flarum/core/pull/2176)
+- `event()` helper (https://github.com/flarum/core/pull/2608)
+- `AccessToken::generate` argument `$lifetime` (https://github.com/flarum/core/pull/2651)
+- `Rememberer::remember` argument `$token` should receive an instance of `RememberAccessToken` with `AccessToken` being deprecated (https://github.com/flarum/core/pull/2651)
+- `Rememberer::rememberUser` (https://github.com/flarum/core/pull/2651)
+- `SessionAuthenticator::logIn` argument `$userId`, should be replaced with `AccessToken` (https://github.com/flarum/core/pull/2651)
+- `TextEditor` has been moved to `common` (https://github.com/flarum/core/pull/2649) 
+- `UserFilter` ([91e8b56](https://github.com/flarum/core/commit/91e8b569618957c86757ef89bac666e9102db5ae))
+
+
+## [0.1.0-beta.15](https://github.com/flarum/core/compare/v0.1.0-beta.14.1...v0.1.0-beta.15)
+
+### Added
+
+- Slug drivers support (https://github.com/flarum/core/pull/2456).
+- Notification type extender (https://github.com/flarum/core/pull/2424).
+- Validation extender (https://github.com/flarum/core/pull/2102).
+- Post extender (https://github.com/flarum/core/pull/2101).
+- Notification channel extender (https://github.com/flarum/core/pull/2432).
+- Service provider extender (https://github.com/flarum/core/pull/2437).
+- API serializer extender (https://github.com/flarum/core/pull/2438).
+- User preferences extender (https://github.com/flarum/core/pull/2463).
+- Settings extender (https://github.com/flarum/core/pull/2452).
+- ApiController extender (https://github.com/flarum/core/pull/2451).
+- Model visibility extender (https://github.com/flarum/core/pull/2460).
+- Policy extender (https://github.com/flarum/core/pull/2461).
+
+### Changed
+
+- Time helpers converted to Typescript (https://github.com/flarum/core/pull/2391).
+- Improved the formatter extender (https://github.com/flarum/core/pull/2098).
+- Improve wording on installer when facing file permission issues (https://github.com/flarum/core/pull/2435).
+- Background color of checkbox toggles improved for better usability (https://github.com/flarum/core/pull/2443).
+- Route resolving refactored (https://github.com/flarum/core/pull/2425).
+- Administration panel UX refactored (https://github.com/flarum/core/pull/2409).
+- Floodgate moved to middleware and extender added (https://github.com/flarum/core/pull/2170).
+- DRY up image uploading logic (https://github.com/flarum/core/pull/2477).
+- Process isolation on testing (https://github.com/flarum/core/commit/984f751c718c89501cc09857bc271efa2c7eea8c).
+- Forum and admin javascript exports namespaced (https://github.com/flarum/core/pull/2488).
+
+### Fixed
+
+- Web updater does not take into account subfolder installations (https://github.com/flarum/core/pull/2426).
+- Callables handling in extenders failed (https://github.com/flarum/core/pull/2423).
+- Scrolling on mobile from PostSteam changes didn't work correctly (https://github.com/flarum/core/pull/2385).
+- Side pane covers part of the discussion page due to `app.discussions` being empty (https://github.com/flarum/core/commit/102e76b084bf47fdfb4c73f95e1fbb322537f7aa).
+- Change email modal keeps showing the previous error message even on success (https://github.com/flarum/core/pull/2467).
+- Comment count not updated when discussions are deleted (https://github.com/flarum/core/pull/2472).
+- `goToIndex` in PostStream does not trigger an xhr to retrieve new data (https://github.com/flarum/core/commit/09e2736cbcc267594b660beabbd001d9030f9880).
+- On refresh the post number is reduced by one (https://github.com/flarum/core/pull/2476).
+- Queue worker would instantiate a new Queue factory, not the bound one (https://github.com/flarum/core/pull/2481).
+- Header accidentally has a border bottom (https://github.com/flarum/core/pull/2489).
+- Namespace mentioned in docblock is incorrect (https://github.com/flarum/core/pull/2494).
+- Scrolling inside longer discussions (especially Firefox) skips posts (https://github.com/flarum/core/commit/210a6b3e253d7917bd1eacd3ed8d2f95073ae99d).
+- Uploading avatars that are jpg/jpeg fails with a validation error (https://github.com/flarum/core/pull/2497).
+
+### Removed
+
+- MomentJS alias (https://github.com/flarum/core/pull/2428).
+- Deprecated user events `GetDisplayName` and `PrepareUserGroups` (https://github.com/flarum/core/pull/2428).
+- AssertPermissionTrait (https://github.com/flarum/core/pull/2428).
+- Path related helpers and methods in Application (https://github.com/flarum/core/pull/2428).
+- Backward compatibility layers from the frontend rewrite (https://github.com/flarum/core/pull/2428).
+
+### Deprecated
+
+- `CheckingForFlooding` (https://github.com/flarum/core/commit/8e25bcb68f86cc992c46dfa70368419fe9f936ac).
+
+## [0.1.0-beta.14.1](https://github.com/flarum/core/compare/v0.1.0-beta.14...v0.1.0-beta.14.1)
+
+### Fixed
+
+- SuperTextarea component is not exported.
+- Symfony dependencies do not match those depended on by Laravel (https://github.com/flarum/core/pull/2407).
+- Scripts from textformatter aren't executed (https://github.com/flarum/core/pull/2415)
+- Sub path installations have no page title.
+- Losing focus of Composer area when coming from fullscreen.
+
+## [0.1.0-beta.14](https://github.com/flarum/core/compare/v0.1.0-beta.13...v0.1.0-beta.14)
+
+### Added
+
+- Check dependencies before enabling / disabling extensions (https://github.com/flarum/core/pull/2188)
+- Set up temporary infrastructure for TypeScript in core (https://github.com/flarum/core/pull/2206)
+- Better UI for request error modals (https://github.com/flarum/core/pull/1929)
+- Display name extender, tests, frontend UI (https://github.com/flarum/core/pull/2174)
+- Scroll to post or show alert when editing a post from another page (https://github.com/flarum/core/pull/2108)
+- Feature to test email config by sending an email to the current user (https://github.com/flarum/core/pull/2023)
+- Allow searching users by group ID using the group gambit (https://github.com/flarum/core/pull/2192)
+- Use `liveHumanTimes` helper to update times without reload/rerender (https://github.com/flarum/core/pull/2208)
+- View extender, tests (https://github.com/flarum/core/pull/2134)
+- User extender to replace `PrepareUserGroups` (https://github.com/flarum/core/pull/2110)
+- Increase extensibility of skeleton PHP (https://github.com/flarum/core/pull/2308, https://github.com/flarum/core/pull/2318)
+- Pass a translator instance to `getEmailSubject` in `MailableInterface` (https://github.com/flarum/core/pull/2244)
+- Force LF line endings on windows (https://github.com/flarum/core/pull/2321)
+- Add a `Link` component for internal and external links (https://github.com/flarum/core/pull/2315)
+- `ConfirmDocumentUnload` component
+- Error handler middleware can now be manipulated by the middleware extender
+
+### Changed
+
+- Update to Mithril 2 (https://github.com/flarum/core/pull/2255)
+- Stop storing component instances (https://github.com/flarum/core/issues/1821, https://github.com/flarum/core/issues/2144)
+- Update to Laravel 6.x (https://github.com/flarum/core/issues/2055)
+- `Flarum\Foundation\Application` no longer implements `Illuminate\Contracts\Foundation\Application` (#2142)
+- `Flarum\Foundation\Application` no longer inherits `Illuminate\Container\Container` (#2142)
+- `paths` have been split off from `Flarum\Foundation\Application` into `Flarum\Foundation\Paths`, which can be injected where needed  (#2142)
+- `Flarum\User\Gate` no longer implements `Illuminate\Contracts\Auth\Access\Gate` (https://github.com/flarum/core/pull/2181)
+- Improve Group Gambit performance (https://github.com/flarum/core/pull/2192)
+- Switch to `dayjs` from `momentjs` (https://github.com/flarum/core/pull/2219)
+- Don't create a `bio` column in `users` for new installations (https://github.com/flarum/core/pull/2215)
+- Start converting core JS to TypeScript (https://github.com/flarum/core/pull/2207)
+- Make Carbon an explicit dependency (https://github.com/flarum/core/commit/3b39c212e0fef7522e7d541a9214ff3817138d5d)
+- Use Symfony's translator interface instead of Laravel's (https://github.com/flarum/core/pull/2243)
+- Use newer versions of fontawesome (https://github.com/flarum/core/pull/2274)
+- Use URL generator instead of `app()->url()` where possible (https://github.com/flarum/core/pull/2302)
+- Move config from `config.php` into an injectable helper class (https://github.com/flarum/core/pull/2271)
+- Use reserved TLD for bogus and test urls (https://github.com/flarum/core/commit/6860b24b70bd04544dde90e537ce021a5fc5a689)
+- Replace `m.stream` with `flarum/utils/Stream` (https://github.com/flarum/core/pull/2316)
+- Replace `affixedSidebar` util with `AffixedSidebar` component
+- Replace `m.withAttr` with `flarum/utils/withAttr`
+- Scroll Listener is now passive, performance improvement (https://github.com/flarum/core/pull/2387)
+
+### Fixed
+
+- `generate:migration` command for extensions (https://github.com/flarum/core/commit/443949f7b9d7558dbc1e0994cb898cbac59bec87)
+- Container config for `UninstalledSite` (https://github.com/flarum/core/commit/ecdce44d555dd36a365fd472b2916e677ef173cf)
+- Tooltip glitch on page chang (https://github.com/flarum/core/issues/2118)
+- Using multiple extenders in tests (https://github.com/flarum/core/commit/c4f4f218bf4b175a30880b807f9ccb1a37a25330)
+- Header glitch when opening modals (https://github.com/flarum/core/pull/2131)
+- Ensure `SameSite` is explicitly set for cookies (https://github.com/flarum/core/pull/2159)
+- Ensure `Flarum\User\Event\AvatarChanged` event is properly dispatched (https://github.com/flarum/core/pull/2197)
+- Show correct error message on wrong password when changing email (https://github.com/flarum/core/pull/2171)
+- Discussion unreadCount could be higher than commentCount if posts deleted (https://github.com/flarum/core/pull/2195)
+- Don't show page title on the default route (https://github.com/flarum/core/pull/2047)
+- Add page title to `All Discussions` page when it isn't the default route (https://github.com/flarum/core/pull/2047)
+- Accept `'0'` as `false` for `flarum/components/Checkbox` (https://github.com/flarum/core/pull/2210)
+- Fix PostStreamScrubber background (https://github.com/flarum/core/pull/2222)
+- Test port on BaseUrl tests (https://github.com/flarum/core/pull/2226)
+- `UrlGenerator` can now generate urls with optional parameters (https://github.com/flarum/core/pull/2246)
+- Allow `less` to be compiled independently of Flarum (https://github.com/flarum/core/pull/2252)
+- Use correct number abbreviation (https://github.com/flarum/core/pull/2261)
+- Ensure avatar html uses alt tags for accessibility (https://github.com/flarum/core/pull/2269)
+- Escape regex when searching (https://github.com/flarum/core/pull/2273)
+- Remove unneeded semicolons inserted during JS compilation (https://github.com/flarum/core/pull/2280)
+- Don't require a username/password for SMTP (https://github.com/flarum/core/pull/2287)
+- Allow uppercase entries for SMTP encryption validation (https://github.com/flarum/core/pull/2289)
+- Ensure that the right number of posts is returned from list posts API (https://github.com/flarum/core/pull/2291)
+- Fix a variety of PostStream bugs (https://github.com/flarum/core/pull/2160, https://github.com/flarum/core/pull/2160)
+- Sliding discussion glitch on mobile (https://github.com/flarum/core/pull/2324)
+- Sliding discussion button in wrong place (https://github.com/flarum/core/pull/2330, https://github.com/flarum/core/pull/2383)
+- Sliding discussion glitch on mobile (https://github.com/flarum/core/pull/2381)
+- Fix PostStream for posts with top margins, and scrubber position when scrolling below posts (https://github.com/flarum/core/pull/2369)
+
+### Removed
+
+- `Flarum\Event\AbstractConfigureRoutes` event class
+- `Flarum\Event\ConfigureApiRoutes` event class
+- `Flarum\Event\ConfigureForumRoutes` event class
+- `Flarum\Console\Event\Configuring` event class
+- `Flarum\Event\ConfigureModelDates` event class
+- `Flarum\Event\ConfigureLocales` event class
+- `Flarum\Event\ConfigureModelDefaultAttributes` event class
+- `Flarum\Event\GetModelRelationship` event class
+- `Flarum\User\Event\BioChanged` event class
+- `Flarum\Database\MigrationServiceProvider` moved into `Flarum\Database\DatabaseServiceProvider`
+- Unused `admin/components/Widget` component (`admin/component/DashboardWidget` should be used instead)
+- Mandrill mail driver (https://github.com/flarum/core/commit/bca833d3f1c34d45d95bf905902368a2753b8908)
+
+### Deprecated
+
+- `Flarum\User\Event\GetDisplayName` event class
+- Global path helpers, `Flarum\Foundation\Application` path methods (https://github.com/flarum/core/pull/2155)
+- `Flarum\User\AssertPermissionTrait` (https://github.com/flarum/core/pull/2044)
+
+## [0.1.0-beta.13](https://github.com/flarum/core/compare/v0.1.0-beta.12...v0.1.0-beta.13)
+
+### Added
+- Console extender (#2057)
+- CSRF extender (#2095)
+- Event extender (#2097)
+- Mail extender (#2012)
+- Model extender (#2100)
+- Posts by users that started a discussion now have the CSS class `.Post--by-start-user`
+- PHPUnit 8 compatibility
+- Composer 2 compatibility
+- Permission groups can now be hidden (#2129)
+- Confirmation popup when hiding or deleting posts (#2135)
+
+### Changed
+- Updated less.php dependency version to 3.0
+- Updated JS dependencies
+- All notifications and other emails now processed through the queue, if enabled (#978, #1928, #1931, #2096)
+- Simplified uploads, removing need to store intermediate files (#2117)
+- Improved date handling for dates older than 1 year (#2034)
+- Linting and automatic formatting for JS (#2099)
+- Translation files from Language Packs are only loaded for extensions that are enabled (#2020)
+- PHP extenders' properties are now `private` instead of `protected`, intentionally making it harder to extend these classes (#1958)
+- Preparation for upgrading Laravel components to 5.8 and then 6.0 (#2055, #2117)
+- Allowed permission checks based on model classes in addition to instances (#1977)
+
+### Fixed
+- Users can no longer restore discussions hidden by admins (#2037)
+- Issues of the Modal not showing or auto hiding (#1504, #1813, #2080)
+- Columnar layout on admin extensions page was broken in Firefox (#2029, #2111)
+- Non-dismissible modals could still be dismissed using the ESC key (#1917)
+- New discussions were added to the discussion list above unread sticky posts (#1751, #1868)
+- New discussions not visible to users when using Pusher (#2076, #2077)
+- Permission icons were aligned unevenly in admin permissions list (#2016, #2018)
+- Notification bubble not inversed on mobile with colored header (#1983, #2109)
+- Post stream scrubber clicks jumped back to first post (#1945)
+- Loading state of Switch toggle component was hard to see (#2039, #1491)
+- `Flarum\Extend\Middleware`: The methods `insertBefore()` and `insertAfter()` did not work as described (#2063, #2084)
+
+### Removed
+- Support for PHP 7.1 (#2014)
+- Zend compatibility bridge (#2010)
+- SES mail support (#2011)
+- Backward compatibility layer for `Flarum\Mail\DriverInterface`, new methods from beta.12 are now required
+- `Flarum\Util\Str` helper class
+- `Flarum\Event\ConfigureMiddleware` event
+
+### Deprecated
+- `Flarum\Event\AbstractConfigureRoutes` event class
+- `Flarum\Event\ConfigureApiRoutes` event class
+- `Flarum\Event\ConfigureForumRoutes` event class
+- `Flarum\Event\ConfigureLocales` event class
+
 ## [0.1.0-beta.12](https://github.com/flarum/core/compare/v0.1.0-beta.11.1...v0.1.0-beta.12)
 
 ### Added

FRONTEND FRAMEWORK REWRITE CHANGES.md

@@ -1,26 +0,0 @@
-### 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`

README.md

@@ -1,12 +1,14 @@
-<p align="center"><img src="https://flarum.org/img/logo.png"></p>
+<p align="center"><img src="https://flarum.org/assets/img/logo.png"></p>
 
 <p align="center">
-<a href="https://travis-ci.org/flarum/core"><img src="https://travis-ci.org/flarum/core.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/flarum/core"><img src="https://poser.pugx.org/flarum/core/d/total.svg" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/flarum/core"><img src="https://poser.pugx.org/flarum/core/v/stable.svg" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/flarum/core"><img src="https://poser.pugx.org/flarum/core/license.svg" alt="License"></a>
+<a href="https://github.com/flarum/core/actions?query=workflow%3ATests"><img src="https://github.com/flarum/core/workflows/Tests/badge.svg" alt="PHP Tests"></a>
+<a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/packagist/dt/flarum/core" alt="Total Downloads"></a>
+<a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/github/v/release/flarum/core?sort=semver" alt="Latest Version"></a>
+<a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/packagist/l/flarum/core" alt="License"></a>
+<a href="https://github.styleci.io/repos/28257573"><img src="https://github.styleci.io/repos/28257573/shield?style=flat" alt="StyleCI"></a>
 </p>
 
+
 ## About Flarum
 
 **[Flarum](https://flarum.org/) is a delightfully simple discussion platform for your website.** It's fast and easy to use, with all the features you need to run a successful community. It is designed to be:
@@ -32,4 +34,3 @@ If you discover a security vulnerability within Flarum, please send an e-mail to
 ## License
 
 Flarum is open-source software licensed under the [MIT License](https://github.com/flarum/flarum/blob/master/LICENSE).
-

composer.json

@@ -1,32 +1,17 @@
 {
     "name": "flarum/core",
     "description": "Delightfully simple forum software.",
-    "keywords": ["forum", "discussion"],
+    "keywords": [
+        "forum",
+        "discussion"
+    ],
     "homepage": "https://flarum.org/",
     "license": "MIT",
     "authors": [
         {
-            "name": "Franz Liedke",
-            "email": "franz@develophp.org"
-        },
-        {
-            "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": "Clark Winkelmann",
-            "email": "clark.winkelmann@gmail.com",
-            "homepage": "https://clarkwinkelmann.com"
-        },
-        {
-            "name": "Matthew Kilgore",
-            "email": "matthew@kilgore.dev"
+            "name": "Flarum",
+            "email": "info@flarum.org",
+            "homepage": "https://flarum.org/team"
         }
     ],
     "support": {
@@ -35,60 +20,62 @@
         "docs": "https://flarum.org/docs/"
     },
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.3",
         "axy/sourcemap": "^0.1.4",
-        "components/font-awesome": "5.9.*",
-        "dflydev/fig-cookies": "^1.0.2",
+        "components/font-awesome": "^5.14.0",
+        "dflydev/fig-cookies": "^3.0.0",
         "doctrine/dbal": "^2.7",
-        "franzl/whoops-middleware": "^0.4.0",
-        "illuminate/bus": "5.7.*",
-        "illuminate/cache": "5.7.*",
-        "illuminate/config": "5.7.*",
-        "illuminate/container": "5.7.*",
-        "illuminate/contracts": "5.7.*",
-        "illuminate/database": "5.7.*",
-        "illuminate/events": "5.7.*",
-        "illuminate/filesystem": "5.7.*",
-        "illuminate/hashing": "5.7.*",
-        "illuminate/mail": "5.7.*",
-        "illuminate/queue": "5.7.*",
-        "illuminate/session": "5.7.*",
-        "illuminate/support": "5.7.*",
-        "illuminate/validation": "5.7.*",
-        "illuminate/view": "5.7.*",
+        "franzl/whoops-middleware": "^2.0.0",
+        "illuminate/bus": "^8.0",
+        "illuminate/cache": "^8.0",
+        "illuminate/config": "^8.0",
+        "illuminate/container": "^8.0",
+        "illuminate/contracts": "^8.0",
+        "illuminate/database": "^8.0",
+        "illuminate/events": "^8.0",
+        "illuminate/filesystem": "^8.0",
+        "illuminate/hashing": "^8.0",
+        "illuminate/mail": "^8.0",
+        "illuminate/queue": "^8.0",
+        "illuminate/session": "^8.0",
+        "illuminate/support": "^8.0",
+        "illuminate/validation": "^8.0",
+        "illuminate/view": "^8.0",
         "intervention/image": "^2.5.0",
-        "laminas/laminas-diactoros": "^1.8.4",
-        "laminas/laminas-httphandlerrunner": "^1.0",
-        "laminas/laminas-stratigility": "^3.0",
+        "laminas/laminas-diactoros": "^2.4.1",
+        "laminas/laminas-httphandlerrunner": "^1.2.0",
+        "laminas/laminas-stratigility": "^3.2.2",
         "league/flysystem": "^1.0.11",
         "matthiasmullie/minify": "^1.3",
-        "middlewares/base-path": "^1.1",
-        "middlewares/base-path-router": "^0.2.1",
-        "middlewares/request-handler": "^1.2",
+        "middlewares/base-path": "^2.0.1",
+        "middlewares/base-path-router": "^2.0.1",
+        "middlewares/request-handler": "^2.0.1",
         "monolog/monolog": "^1.16.0",
+        "nesbot/carbon": "^2.0",
         "nikic/fast-route": "^0.6",
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "s9e/text-formatter": "^2.3.6",
-        "symfony/config": "^3.3",
-        "symfony/console": "^4.2",
-        "symfony/event-dispatcher": "^4.3.2",
-        "symfony/translation": "^3.3",
-        "symfony/yaml": "^3.3",
+        "symfony/config": "^5.2.2",
+        "symfony/console": "^5.2.2",
+        "symfony/event-dispatcher": "^5.2.2",
+        "symfony/mime": "^5.2.0",
+        "symfony/translation": "^5.1.5",
+        "symfony/yaml": "^5.2.2",
         "tobscure/json-api": "^0.3.0",
         "wikimedia/less.php": "^3.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^7.0"
+        "flarum/testing": "^0.1.0-beta.16"
     },
     "autoload": {
         "psr-4": {
             "Flarum\\": "src/"
         },
         "files": [
-            "src/helpers.php"
+            "src/helpers.php",
+            "src/TranslatorInterface.php"
         ]
     },
     "autoload-dev": {

js/.prettierrc.json

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

js/admin.js

@@ -0,0 +1,11 @@
+/*
+ * 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

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

js/forum.js

@@ -0,0 +1,11 @@
+/*
+ * 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

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

js/package.json

@@ -1,56 +1,35 @@
 {
-  "name": "@flarum/core",
   "private": true,
+  "name": "@flarum/core",
+  "dependencies": {
+    "@babel/preset-typescript": "^7.10.1",
+    "@types/mithril": "^2.0.3",
+    "bootstrap": "^3.4.1",
+    "classnames": "^2.2.5",
+    "color-thief-browser": "^2.0.2",
+    "dayjs": "^1.8.28",
+    "expose-loader": "^0.7.5",
+    "flarum-webpack-config": "0.1.0-beta.10",
+    "jquery": "^3.5.1",
+    "jquery.hotkeys": "^0.1.0",
+    "lodash-es": "^4.17.14",
+    "mithril": "^2.0.4",
+    "punycode": "^2.1.1",
+    "spin.js": "^3.1.0",
+    "textarea-caret": "^3.1.0",
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.11",
+    "webpack-merge": "^4.1.4"
+  },
+  "devDependencies": {
+    "husky": "^4.2.5",
+    "prettier": "2.0.2"
+  },
   "scripts": {
     "dev": "webpack --mode development --watch",
     "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"
+    "format": "prettier --write src",
+    "format-check": "prettier --check src"
   },
   "husky": {
     "hooks": {

js/shims.d.ts

@@ -1,7 +1,32 @@
-export * from './webpack-flarum-shims';
+// Mithril
+import Mithril from 'mithril';
 
+// Other third-party libs
+import * as _dayjs from 'dayjs';
+import * as _$ from 'jquery';
+
+// Globals from flarum/core
 import Application from './src/common/Application';
 
+/**
+ * flarum/core exposes several extensions globally:
+ *
+ * - jQuery for convenient DOM manipulation
+ * - Mithril for VDOM and components
+ * - dayjs for date/time operations
+ *
+ * Since these are already part of the global namespace, extensions won't need
+ * to (and should not) bundle these themselves.
+ */
 declare global {
-    const app: Application;
+  const $: typeof _$;
+  const m: Mithril.Static;
+  const dayjs: typeof _dayjs;
+}
+
+/**
+ * All global variables owned by flarum/core.
+ */
+declare global {
+  const app: Application;
 }

js/src/admin/Admin.ts

@@ -1,91 +0,0 @@
-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

@@ -0,0 +1,72 @@
+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';
+import ExtensionData from './utils/ExtensionData';
+
+export default class AdminApplication extends Application {
+  extensionData = new ExtensionData();
+
+  extensionCategories = {
+    feature: 30,
+    theme: 20,
+    language: 10,
+  };
+
+  history = {
+    canGoBack: () => true,
+    getPrevious: () => {},
+    backUrl: () => this.forum.attribute('baseUrl'),
+    back: function () {
+      window.location = this.backUrl();
+    },
+  };
+
+  constructor() {
+    super();
+
+    routes(this);
+  }
+
+  /**
+   * @inheritdoc
+   */
+  mount() {
+    // Mithril does not render the home route on https://example.com/admin, so
+    // we need to go to https://example.com/admin#/ explicitly.
+    if (!document.location.hash) document.location.hash = '#/';
+
+    m.route.prefix = '#';
+    super.mount();
+
+    m.mount(document.getElementById('app-navigation'), {
+      view: () =>
+        Navigation.component({
+          className: 'App-backControl',
+          drawer: true,
+        }),
+    });
+    m.mount(document.getElementById('header-navigation'), Navigation);
+    m.mount(document.getElementById('header-primary'), HeaderPrimary);
+    m.mount(document.getElementById('header-secondary'), HeaderSecondary);
+    m.mount(document.getElementById('admin-navigation'), AdminNav);
+  }
+
+  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

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

js/src/admin/compat.js

@@ -0,0 +1,71 @@
+import compat from '../common/compat';
+
+import saveSettings from './utils/saveSettings';
+import ExtensionData from './utils/ExtensionData';
+import isExtensionEnabled from './utils/isExtensionEnabled';
+import getCategorizedExtensions from './utils/getCategorizedExtensions';
+import SettingDropdown from './components/SettingDropdown';
+import EditCustomFooterModal from './components/EditCustomFooterModal';
+import SessionDropdown from './components/SessionDropdown';
+import HeaderPrimary from './components/HeaderPrimary';
+import AdminPage from './components/AdminPage';
+import AppearancePage from './components/AppearancePage';
+import StatusWidget from './components/StatusWidget';
+import ExtensionsWidget from './components/ExtensionsWidget';
+import HeaderSecondary from './components/HeaderSecondary';
+import SettingsModal from './components/SettingsModal';
+import DashboardWidget from './components/DashboardWidget';
+import ExtensionPage from './components/ExtensionPage';
+import ExtensionLinkButton from './components/ExtensionLinkButton';
+import PermissionGrid from './components/PermissionGrid';
+import ExtensionPermissionGrid from './components/ExtensionPermissionGrid';
+import MailPage from './components/MailPage';
+import UploadImageButton from './components/UploadImageButton';
+import LoadingModal from './components/LoadingModal';
+import DashboardPage from './components/DashboardPage';
+import BasicsPage from './components/BasicsPage';
+import EditCustomHeaderModal from './components/EditCustomHeaderModal';
+import PermissionsPage from './components/PermissionsPage';
+import PermissionDropdown from './components/PermissionDropdown';
+import AdminNav from './components/AdminNav';
+import AdminHeader from './components/AdminHeader';
+import EditCustomCssModal from './components/EditCustomCssModal';
+import EditGroupModal from './components/EditGroupModal';
+import routes from './routes';
+import AdminApplication from './AdminApplication';
+
+export default Object.assign(compat, {
+  'utils/saveSettings': saveSettings,
+  'utils/ExtensionData': ExtensionData,
+  'utils/isExtensionEnabled': isExtensionEnabled,
+  'utils/getCategorizedExtensions': getCategorizedExtensions,
+  'components/SettingDropdown': SettingDropdown,
+  'components/EditCustomFooterModal': EditCustomFooterModal,
+  'components/SessionDropdown': SessionDropdown,
+  'components/HeaderPrimary': HeaderPrimary,
+  'components/AdminPage': AdminPage,
+  'components/AppearancePage': AppearancePage,
+  'components/StatusWidget': StatusWidget,
+  'components/ExtensionsWidget': ExtensionsWidget,
+  'components/HeaderSecondary': HeaderSecondary,
+  'components/SettingsModal': SettingsModal,
+  'components/DashboardWidget': DashboardWidget,
+  'components/ExtensionPage': ExtensionPage,
+  'components/ExtensionLinkButton': ExtensionLinkButton,
+  'components/PermissionGrid': PermissionGrid,
+  'components/ExtensionPermissionGrid': ExtensionPermissionGrid,
+  '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/AdminHeader': AdminHeader,
+  'components/EditCustomCssModal': EditCustomCssModal,
+  'components/EditGroupModal': EditGroupModal,
+  routes: routes,
+  AdminApplication: AdminApplication,
+});

js/src/admin/compat.ts

@@ -1,61 +0,0 @@
-import compat from '../common/compat';
-
-import saveSettings from './utils/saveSettings';
-import SettingDropdown from './components/SettingDropdown';
-import EditCustomFooterModal from './components/EditCustomFooterModal';
-import SessionDropdown from './components/SessionDropdown';
-import HeaderPrimary from './components/HeaderPrimary';
-import AppearancePage from './components/AppearancePage';
-import Page from './components/Page';
-import StatusWidget from './components/StatusWidget';
-import HeaderSecondary from './components/HeaderSecondary';
-import SettingsModal from './components/SettingsModal';
-import DashboardWidget from './components/DashboardWidget';
-import AddExtensionModal from './components/AddExtensionModal';
-import ExtensionsPage from './components/ExtensionsPage';
-import AdminLinkButton from './components/AdminLinkButton';
-import PermissionGrid from './components/PermissionGrid';
-import MailPage from './components/MailPage';
-import UploadImageButton from './components/UploadImageButton';
-import LoadingModal from './components/LoadingModal';
-import DashboardPage from './components/DashboardPage';
-import BasicsPage from './components/BasicsPage';
-import EditCustomHeaderModal from './components/EditCustomHeaderModal';
-import PermissionsPage from './components/PermissionsPage';
-import PermissionDropdown from './components/PermissionDropdown';
-import AdminNav from './components/AdminNav';
-import EditCustomCssModal from './components/EditCustomCssModal';
-import EditGroupModal from './components/EditGroupModal';
-import routes from './routes';
-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/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.tsx

@@ -1,30 +0,0 @@
-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/AdminHeader.js

@@ -0,0 +1,19 @@
+import Component from '../../common/Component';
+import classList from '../../common/utils/classList';
+import icon from '../../common/helpers/icon';
+
+export default class AdminHeader extends Component {
+  view(vnode) {
+    return [
+      <div className={classList(['AdminHeader', this.attrs.className])}>
+        <div className="container">
+          <h2>
+            {icon(this.attrs.icon)}
+            {vnode.children}
+          </h2>
+          <div className="AdminHeader-description">{this.attrs.description}</div>
+        </div>
+      </div>,
+    ];
+  }
+}

js/src/admin/components/AdminLinkButton.tsx

@@ -1,15 +0,0 @@
-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

@@ -0,0 +1,150 @@
+import ExtensionLinkButton from './ExtensionLinkButton';
+import Component from '../../common/Component';
+import LinkButton from '../../common/components/LinkButton';
+import SelectDropdown from '../../common/components/SelectDropdown';
+import getCategorizedExtensions from '../utils/getCategorizedExtensions';
+import ItemList from '../../common/utils/ItemList';
+import Stream from '../../common/utils/Stream';
+
+export default class AdminNav extends Component {
+  oninit(vnode) {
+    super.oninit(vnode);
+
+    this.query = Stream('');
+  }
+
+  view() {
+    return (
+      <SelectDropdown className="AdminNav App-titleControl AdminNav-Main" buttonClassName="Button">
+        {this.items().toArray().concat(this.extensionItems().toArray())}
+      </SelectDropdown>
+    );
+  }
+
+  oncreate(vnode) {
+    super.oncreate(vnode);
+
+    this.scrollToActive();
+  }
+
+  onupdate() {
+    this.scrollToActive();
+  }
+
+  scrollToActive() {
+    const children = $('.Dropdown-menu').children('.active');
+    const nav = $('#admin-navigation');
+    const time = app.previous.type ? 250 : 0;
+
+    if (
+      children.length > 0 &&
+      (children[0].offsetTop > nav.scrollTop() + nav.outerHeight() || children[0].offsetTop + children[0].offsetHeight < nav.scrollTop())
+    ) {
+      nav.animate(
+        {
+          scrollTop: children[0].offsetTop - nav.height() / 2,
+        },
+        time
+      );
+    }
+  }
+
+  /**
+   * Build an item list of main links to show in the admin navigation.
+   *
+   * @return {ItemList}
+   */
+  items() {
+    const items = new ItemList();
+
+    items.add('category-core', <h4 className="ExtensionListTitle">{app.translator.trans('core.admin.nav.categories.core')}</h4>);
+
+    items.add(
+      'dashboard',
+      <LinkButton href={app.route('dashboard')} icon="far fa-chart-bar" title={app.translator.trans('core.admin.nav.dashboard_title')}>
+        {app.translator.trans('core.admin.nav.dashboard_button')}
+      </LinkButton>
+    );
+
+    items.add(
+      'basics',
+      <LinkButton href={app.route('basics')} icon="fas fa-pencil-alt" title={app.translator.trans('core.admin.nav.basics_title')}>
+        {app.translator.trans('core.admin.nav.basics_button')}
+      </LinkButton>
+    );
+
+    items.add(
+      'mail',
+      <LinkButton href={app.route('mail')} icon="fas fa-envelope" title={app.translator.trans('core.admin.nav.email_title')}>
+        {app.translator.trans('core.admin.nav.email_button')}
+      </LinkButton>
+    );
+
+    items.add(
+      'permissions',
+      <LinkButton href={app.route('permissions')} icon="fas fa-key" title={app.translator.trans('core.admin.nav.permissions_title')}>
+        {app.translator.trans('core.admin.nav.permissions_button')}
+      </LinkButton>
+    );
+
+    items.add(
+      'appearance',
+      <LinkButton href={app.route('appearance')} icon="fas fa-paint-brush" title={app.translator.trans('core.admin.nav.appearance_title')}>
+        {app.translator.trans('core.admin.nav.appearance_button')}
+      </LinkButton>
+    );
+
+    items.add(
+      'search',
+      <div className="Search-input">
+        <input
+          className="FormControl SearchBar"
+          bidi={this.query}
+          type="search"
+          placeholder={app.translator.trans('core.admin.nav.search_placeholder')}
+        />
+      </div>
+    );
+
+    return items;
+  }
+
+  extensionItems() {
+    const items = new ItemList();
+
+    const categorizedExtensions = getCategorizedExtensions();
+    const categories = app.extensionCategories;
+
+    Object.keys(categorizedExtensions).map((category) => {
+      if (!this.query()) {
+        items.add(
+          `category-${category}`,
+          <h4 className="ExtensionListTitle">{app.translator.trans(`core.admin.nav.categories.${category}`)}</h4>,
+          categories[category]
+        );
+      }
+
+      categorizedExtensions[category].map((extension) => {
+        const query = this.query().toUpperCase();
+        const title = extension.extra['flarum-extension'].title;
+
+        if (!query || title.toUpperCase().includes(query) || extension.description.toUpperCase().includes(query)) {
+          items.add(
+            `extension-${extension.id}`,
+            <ExtensionLinkButton
+              href={app.route('extension', { id: extension.id })}
+              extensionId={extension.id}
+              className="ExtensionNavButton"
+              title={extension.description}
+            >
+              {title}
+            </ExtensionLinkButton>,
+            categories[category]
+          );
+        }
+      });
+    });
+
+    return items;
+  }
+}

js/src/admin/components/AdminNav.tsx

@@ -1,85 +0,0 @@
-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/AdminPage.js

@@ -0,0 +1,174 @@
+import Page from '../../common/components/Page';
+import Button from '../../common/components/Button';
+import Switch from '../../common/components/Switch';
+import Select from '../../common/components/Select';
+import classList from '../../common/utils/classList';
+import Stream from '../../common/utils/Stream';
+import saveSettings from '../utils/saveSettings';
+import AdminHeader from './AdminHeader';
+
+export default class AdminPage extends Page {
+  oninit(vnode) {
+    super.oninit(vnode);
+
+    this.settings = {};
+
+    this.loading = false;
+  }
+
+  view() {
+    const className = classList(['AdminPage', this.headerInfo().className]);
+
+    return (
+      <div className={className}>
+        {this.header()}
+        <div className="container">{this.content()}</div>
+      </div>
+    );
+  }
+
+  content() {
+    return '';
+  }
+
+  submitButton() {
+    return (
+      <Button onclick={this.saveSettings.bind(this)} className="Button Button--primary" loading={this.loading} disabled={!this.isChanged()}>
+        {app.translator.trans('core.admin.settings.submit_button')}
+      </Button>
+    );
+  }
+
+  header() {
+    const headerInfo = this.headerInfo();
+
+    return (
+      <AdminHeader icon={headerInfo.icon} description={headerInfo.description} className={headerInfo.className + '-header'}>
+        {headerInfo.title}
+      </AdminHeader>
+    );
+  }
+
+  headerInfo() {
+    return {
+      className: '',
+      icon: '',
+      title: '',
+      description: '',
+    };
+  }
+
+  /**
+   * buildSettingComponent takes a settings object and turns it into a component.
+   * Depending on the type of input, you can set the type to 'bool', 'select', or
+   * any standard <input> type. Any values inside the 'extra' object will be added
+   * to the component as an attribute.
+   *
+   * Alternatively, you can pass a callback that will be executed in ExtensionPage's
+   * context to include custom JSX elements.
+   *
+   * @example
+   *
+   * {
+   *    setting: 'acme.checkbox',
+   *    label: app.translator.trans('acme.admin.setting_label'),
+   *    type: 'bool',
+   *    help: app.translator.trans('acme.admin.setting_help'),
+   *    className: 'Setting-item'
+   * }
+   *
+   * @example
+   *
+   * {
+   *    setting: 'acme.select',
+   *    label: app.translator.trans('acme.admin.setting_label'),
+   *    type: 'select',
+   *    options: {
+   *      'option1': 'Option 1 label',
+   *      'option2': 'Option 2 label',
+   *    },
+   *    default: 'option1',
+   * }
+   *
+   * @param setting
+   * @returns {JSX.Element}
+   */
+  buildSettingComponent(entry) {
+    if (typeof entry === 'function') {
+      return entry.call(this);
+    }
+
+    const setting = entry.setting;
+    const help = entry.help;
+    delete entry.help;
+
+    const value = this.setting([setting])();
+    if (['bool', 'checkbox', 'switch', 'boolean'].includes(entry.type)) {
+      return (
+        <div className="Form-group">
+          <Switch state={!!value && value !== '0'} onchange={this.settings[setting]} {...entry}>
+            {entry.label}
+          </Switch>
+          <div className="helpText">{help}</div>
+        </div>
+      );
+    } else if (['select', 'dropdown', 'selectdropdown'].includes(entry.type)) {
+      return (
+        <div className="Form-group">
+          <label>{entry.label}</label>
+          <div className="helpText">{help}</div>
+          <Select value={value || entry.default} options={entry.options} buttonClassName="Button" onchange={this.settings[setting]} {...entry} />
+        </div>
+      );
+    } else {
+      entry.className = classList(['FormControl', entry.className]);
+      return (
+        <div className="Form-group">
+          {entry.label ? <label>{entry.label}</label> : ''}
+          <div className="helpText">{help}</div>
+          <input type={entry.type} bidi={this.setting(setting)} {...entry} />
+        </div>
+      );
+    }
+  }
+
+  onsaved() {
+    this.loading = false;
+
+    app.alerts.show({ type: 'success' }, app.translator.trans('core.admin.settings.saved_message'));
+  }
+
+  setting(key, fallback = '') {
+    this.settings[key] = this.settings[key] || Stream(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;
+  }
+
+  isChanged() {
+    return Object.keys(this.dirty()).length;
+  }
+
+  saveSettings(e) {
+    e.preventDefault();
+
+    app.alerts.clear();
+
+    this.loading = true;
+
+    return saveSettings(this.dirty()).then(this.onsaved.bind(this));
+  }
+}

js/src/admin/components/AppearancePage.js

@@ -0,0 +1,120 @@
+import Button from '../../common/components/Button';
+import EditCustomCssModal from './EditCustomCssModal';
+import EditCustomHeaderModal from './EditCustomHeaderModal';
+import EditCustomFooterModal from './EditCustomFooterModal';
+import UploadImageButton from './UploadImageButton';
+import AdminPage from './AdminPage';
+
+export default class AppearancePage extends AdminPage {
+  headerInfo() {
+    return {
+      className: 'AppearancePage',
+      icon: 'fas fa-paint-brush',
+      title: app.translator.trans('core.admin.appearance.title'),
+      description: app.translator.trans('core.admin.appearance.description'),
+    };
+  }
+
+  content() {
+    return [
+      <div className="Form">
+        <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">
+            {this.buildSettingComponent({
+              type: 'text',
+              setting: 'theme_primary_color',
+              placeholder: '#aaaaaa',
+            })}
+            {this.buildSettingComponent({
+              type: 'text',
+              setting: 'theme_secondary_color',
+              placeholder: '#aaaaaa',
+            })}
+          </div>
+
+          {this.buildSettingComponent({
+            type: 'switch',
+            setting: 'theme_dark_mode',
+            label: app.translator.trans('core.admin.appearance.dark_mode_label'),
+          })}
+
+          {this.buildSettingComponent({
+            type: 'switch',
+            setting: 'theme_colored_header',
+            label: app.translator.trans('core.admin.appearance.colored_header_label'),
+          })}
+
+          {this.submitButton()}
+        </fieldset>
+      </div>,
+
+      <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',
+            onclick: () => app.modal.show(EditCustomHeaderModal),
+          },
+          app.translator.trans('core.admin.appearance.edit_header_button')
+        )}
+      </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',
+            onclick: () => app.modal.show(EditCustomFooterModal),
+          },
+          app.translator.trans('core.admin.appearance.edit_footer_button')
+        )}
+      </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',
+            onclick: () => app.modal.show(EditCustomCssModal),
+          },
+          app.translator.trans('core.admin.appearance.edit_css_button')
+        )}
+      </fieldset>,
+    ];
+  }
+
+  onsaved() {
+    window.location.reload();
+  }
+
+  saveSettings(e) {
+    e.preventDefault();
+
+    const hex = /^#[0-9a-f]{3}([0-9a-f]{3})?$/i;
+
+    if (!hex.test(this.settings['theme_primary_color']()) || !hex.test(this.settings['theme_secondary_color']())) {
+      alert(app.translator.trans('core.admin.appearance.enter_hex_message'));
+      return;
+    }
+
+    super.saveSettings(e);
+  }
+}

js/src/admin/components/AppearancePage.tsx

@@ -1,131 +0,0 @@
-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

@@ -0,0 +1,135 @@
+import FieldSet from '../../common/components/FieldSet';
+import ItemList from '../../common/utils/ItemList';
+import AdminPage from './AdminPage';
+
+export default class BasicsPage extends AdminPage {
+  oninit(vnode) {
+    super.oninit(vnode);
+
+    this.localeOptions = {};
+    const locales = app.data.locales;
+    for (const i in locales) {
+      this.localeOptions[i] = `${locales[i]} (${i})`;
+    }
+
+    this.displayNameOptions = {};
+    const displayNameDrivers = app.data.displayNameDrivers;
+    displayNameDrivers.forEach(function (identifier) {
+      this.displayNameOptions[identifier] = identifier;
+    }, this);
+
+    this.slugDriverOptions = {};
+    Object.keys(app.data.slugDrivers).forEach((model) => {
+      this.slugDriverOptions[model] = {};
+
+      app.data.slugDrivers[model].forEach((option) => {
+        this.slugDriverOptions[model][option] = option;
+      });
+    });
+  }
+
+  headerInfo() {
+    return {
+      className: 'BasicsPage',
+      icon: 'fas fa-pencil-alt',
+      title: app.translator.trans('core.admin.basics.title'),
+      description: app.translator.trans('core.admin.basics.description'),
+    };
+  }
+
+  content() {
+    return [
+      <div className="Form">
+        {this.buildSettingComponent({
+          type: 'text',
+          setting: 'forum_title',
+          label: app.translator.trans('core.admin.basics.forum_title_heading'),
+        })}
+        {this.buildSettingComponent({
+          type: 'text',
+          setting: 'forum_description',
+          label: app.translator.trans('core.admin.basics.forum_description_heading'),
+          help: app.translator.trans('core.admin.basics.forum_description_text'),
+        })}
+
+        {Object.keys(this.localeOptions).length > 1
+          ? [
+              this.buildSettingComponent({
+                type: 'select',
+                setting: 'default_locale',
+                options: this.localeOptions,
+                label: app.translator.trans('core.admin.basics.default_language_heading'),
+              }),
+              this.buildSettingComponent({
+                type: 'switch',
+                setting: 'show_language_selector',
+                label: app.translator.trans('core.admin.basics.show_language_selector_label'),
+              }),
+            ]
+          : ''}
+
+        <FieldSet className="BasicsPage-homePage Form-group" label={app.translator.trans('core.admin.basics.home_page_heading')}>
+          <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} bidi={this.setting('default_route')} />
+                {label}
+              </label>
+            ))}
+        </FieldSet>
+
+        <div className="Form-group BasicsPage-welcomeBanner-input">
+          <label>{app.translator.trans('core.admin.basics.welcome_banner_heading')}</label>
+          <div className="helpText">{app.translator.trans('core.admin.basics.welcome_banner_text')}</div>
+          <input type="text" className="FormControl" bidi={this.setting('welcome_title')} />
+          <textarea className="FormControl" bidi={this.setting('welcome_message')} />
+        </div>
+
+        {Object.keys(this.displayNameOptions).length > 1
+          ? this.buildSettingComponent({
+              type: 'select',
+              setting: 'display_name_driver',
+              options: this.displayNameOptions,
+              label: app.translator.trans('core.admin.basics.display_name_heading'),
+              help: app.translator.trans('core.admin.basics.display_name_text'),
+            })
+          : ''}
+
+        {Object.keys(this.slugDriverOptions).map((model) => {
+          const options = this.slugDriverOptions[model];
+          if (Object.keys(options).length > 1) {
+            return this.buildSettingComponent({
+              type: 'select',
+              setting: `slug_driver_${model}`,
+              options,
+              label: app.translator.trans('core.admin.basics.slug_driver_heading', { model }),
+              help: app.translator.trans('core.admin.basics.slug_driver_text', { model }),
+            });
+          }
+        })}
+
+        {this.submitButton()}
+      </div>,
+    ];
+  }
+
+  /**
+   * 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;
+  }
+}

js/src/admin/components/BasicsPage.tsx

@@ -1,191 +0,0 @@
-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

@@ -0,0 +1,29 @@
+import StatusWidget from './StatusWidget';
+import ExtensionsWidget from './ExtensionsWidget';
+import ItemList from '../../common/utils/ItemList';
+import AdminPage from './AdminPage';
+
+export default class DashboardPage extends AdminPage {
+  headerInfo() {
+    return {
+      className: 'DashboardPage',
+      icon: 'fas fa-chart-bar',
+      title: app.translator.trans('core.admin.dashboard.title'),
+      description: app.translator.trans('core.admin.dashboard.description'),
+    };
+  }
+
+  content() {
+    return this.availableWidgets().toArray();
+  }
+
+  availableWidgets() {
+    const items = new ItemList();
+
+    items.add('status', <StatusWidget />, 30);
+
+    items.add('extensions', <ExtensionsWidget />, 10);
+
+    return items;
+  }
+}

js/src/admin/components/DashboardPage.tsx

@@ -1,16 +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/DashboardWidget.js

@@ -0,0 +1,25 @@
+import Component from '../../common/Component';
+
+export default class DashboardWidget extends Component {
+  view() {
+    return <div className={'DashboardWidget 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

@@ -1,23 +0,0 @@
-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

@@ -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/EditCustomCssModal.tsx

@@ -1,28 +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/EditCustomFooterModal.js

@@ -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/EditCustomFooterModal.tsx

@@ -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/EditCustomHeaderModal.js

@@ -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/EditCustomHeaderModal.tsx

@@ -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/EditGroupModal.js

@@ -0,0 +1,156 @@
+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 Switch from '../../common/components/Switch';
+import Stream from '../../common/utils/Stream';
+
+/**
+ * The `EditGroupModal` component shows a modal dialog which allows the user
+ * to create or edit a group.
+ */
+export default class EditGroupModal extends Modal {
+  oninit(vnode) {
+    super.oninit(vnode);
+
+    this.group = this.attrs.group || app.store.createRecord('groups');
+
+    this.nameSingular = Stream(this.group.nameSingular() || '');
+    this.namePlural = Stream(this.group.namePlural() || '');
+    this.icon = Stream(this.group.icon() || '');
+    this.color = Stream(this.group.color() || '');
+    this.isHidden = Stream(this.group.isHidden() || false);
+  }
+
+  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')} bidi={this.nameSingular} />
+          <input className="FormControl" placeholder={app.translator.trans('core.admin.edit_group.plural_placeholder')} bidi={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" bidi={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" bidi={this.icon} />
+      </div>,
+      10
+    );
+
+    items.add(
+      'hidden',
+      <div className="Form-group">
+        {Switch.component(
+          {
+            state: !!Number(this.isHidden()),
+            onchange: this.isHidden,
+          },
+          app.translator.trans('core.admin.edit_group.hide_label')
+        )}
+      </div>,
+      10
+    );
+
+    items.add(
+      'submit',
+      <div className="Form-group">
+        {Button.component(
+          {
+            type: 'submit',
+            className: 'Button Button--primary EditGroupModal-save',
+            loading: this.loading,
+          },
+          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(),
+      isHidden: this.isHidden(),
+    };
+  }
+
+  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

@@ -1,157 +0,0 @@
-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/ExtensionLinkButton.js

@@ -0,0 +1,29 @@
+import isExtensionEnabled from '../utils/isExtensionEnabled';
+import LinkButton from '../../common/components/LinkButton';
+import icon from '../../common/helpers/icon';
+import ItemList from '../../common/utils/ItemList';
+
+export default class ExtensionLinkButton extends LinkButton {
+  getButtonContent(children) {
+    const content = super.getButtonContent(children);
+    const extension = app.data.extensions[this.attrs.extensionId];
+    const statuses = this.statusItems(extension.id).toArray();
+
+    content.unshift(
+      <span className="ExtensionListItem-icon ExtensionIcon" style={extension.icon}>
+        {extension.icon ? icon(extension.icon.name) : ''}
+      </span>
+    );
+    content.push(statuses);
+
+    return content;
+  }
+
+  statusItems(name) {
+    const items = new ItemList();
+
+    items.add('enabled', <span class={'ExtensionListItem-Dot ' + (isExtensionEnabled(name) ? 'enabled' : 'disabled')} />);
+
+    return items;
+  }
+}

js/src/admin/components/ExtensionPage.js

@@ -0,0 +1,248 @@
+import Button from '../../common/components/Button';
+import Link from '../../common/components/Link';
+import LinkButton from '../../common/components/LinkButton';
+import Switch from '../../common/components/Switch';
+import icon from '../../common/helpers/icon';
+import punctuateSeries from '../../common/helpers/punctuateSeries';
+import listItems from '../../common/helpers/listItems';
+import ItemList from '../../common/utils/ItemList';
+import LoadingModal from './LoadingModal';
+import ExtensionPermissionGrid from './ExtensionPermissionGrid';
+import isExtensionEnabled from '../utils/isExtensionEnabled';
+import AdminPage from './AdminPage';
+
+export default class ExtensionPage extends AdminPage {
+  oninit(vnode) {
+    super.oninit(vnode);
+
+    this.extension = app.data.extensions[this.attrs.id];
+    this.changingState = false;
+
+    this.infoFields = {
+      discuss: 'fas fa-comment-alt',
+      documentation: 'fas fa-book',
+      support: 'fas fa-life-ring',
+      website: 'fas fa-link',
+      donate: 'fas fa-donate',
+      source: 'fas fa-code',
+    };
+
+    if (!this.extension) {
+      return m.route.set(app.route('dashboard'));
+    }
+  }
+
+  className() {
+    if (!this.extension) return '';
+
+    return this.extension.id + '-Page';
+  }
+
+  view() {
+    if (!this.extension) return null;
+
+    return (
+      <div className={'ExtensionPage ' + this.className()}>
+        {this.header()}
+        {!this.isEnabled() ? (
+          <div className="container">
+            <h3 className="ExtensionPage-subHeader">{app.translator.trans('core.admin.extension.enable_to_see')}</h3>
+          </div>
+        ) : (
+          <div className="ExtensionPage-body">{this.sections().toArray()}</div>
+        )}
+      </div>
+    );
+  }
+
+  header() {
+    const isEnabled = this.isEnabled();
+
+    return [
+      <div className="ExtensionPage-header">
+        <div className="container">
+          <div className="ExtensionTitle">
+            <span className="ExtensionIcon" style={this.extension.icon}>
+              {this.extension.icon ? icon(this.extension.icon.name) : ''}
+            </span>
+            <div className="ExtensionName">
+              <h2>{this.extension.extra['flarum-extension'].title}</h2>
+            </div>
+            <div className="ExtensionPage-headerTopItems">
+              <ul>{listItems(this.topItems().toArray())}</ul>
+            </div>
+          </div>
+          <div className="helpText">{this.extension.description}</div>
+          <div className="ExtensionPage-headerItems">
+            <Switch
+              state={this.changingState ? !isEnabled : isEnabled}
+              loading={this.changingState}
+              onchange={this.toggle.bind(this, this.extension.id)}
+            >
+              {isEnabled ? app.translator.trans('core.admin.extension.enabled') : app.translator.trans('core.admin.extension.disabled')}
+            </Switch>
+            <aside className="ExtensionInfo">
+              <ul>{listItems(this.infoItems().toArray())}</ul>
+            </aside>
+          </div>
+        </div>
+      </div>,
+    ];
+  }
+
+  sections() {
+    const items = new ItemList();
+
+    items.add('content', this.content());
+
+    items.add('permissions', [
+      <div className="ExtensionPage-permissions">
+        <div className="ExtensionPage-permissions-header">
+          <div className="container">
+            <h2 className="ExtensionTitle">{app.translator.trans('core.admin.extension.permissions_title')}</h2>
+          </div>
+        </div>
+        <div className="container">
+          {app.extensionData.extensionHasPermissions(this.extension.id) ? (
+            ExtensionPermissionGrid.component({ extensionId: this.extension.id })
+          ) : (
+            <h3 className="ExtensionPage-subHeader">{app.translator.trans('core.admin.extension.no_permissions')}</h3>
+          )}
+        </div>
+      </div>,
+    ]);
+
+    return items;
+  }
+
+  content() {
+    const settings = app.extensionData.getSettings(this.extension.id);
+
+    return (
+      <div className="ExtensionPage-settings">
+        <div className="container">
+          {settings ? (
+            <div className="Form">
+              {settings.map(this.buildSettingComponent.bind(this))}
+              <div className="Form-group">{this.submitButton()}</div>
+            </div>
+          ) : (
+            <h3 className="ExtensionPage-subHeader">{app.translator.trans('core.admin.extension.no_settings')}</h3>
+          )}
+        </div>
+      </div>
+    );
+  }
+
+  topItems() {
+    const items = new ItemList();
+
+    items.add('version', <span className="ExtensionVersion">{this.extension.version}</span>);
+
+    if (!this.isEnabled()) {
+      const uninstall = () => {
+        if (confirm(app.translator.trans('core.admin.extension.confirm_uninstall'))) {
+          app
+            .request({
+              url: app.forum.attribute('apiUrl') + '/extensions/' + this.extension.id,
+              method: 'DELETE',
+            })
+            .then(() => window.location.reload());
+
+          app.modal.show(LoadingModal);
+        }
+      };
+
+      items.add(
+        'uninstall',
+        <Button icon="fas fa-trash-alt" className="Button Button--primary" onclick={uninstall.bind(this)}>
+          {app.translator.trans('core.admin.extension.uninstall_button')}
+        </Button>
+      );
+    }
+
+    return items;
+  }
+
+  infoItems() {
+    const items = new ItemList();
+
+    const links = this.extension.links;
+
+    if (links.authors.length) {
+      let authors = [];
+
+      links.authors.map((author) => {
+        authors.push(
+          <Link href={author.link} external={true} target="_blank">
+            {author.name}
+          </Link>
+        );
+      });
+
+      items.add('authors', [icon('fas fa-user'), <span>{punctuateSeries(authors)}</span>]);
+    }
+
+    Object.keys(this.infoFields).map((field) => {
+      if (links[field]) {
+        items.add(
+          field,
+          <LinkButton href={links[field]} icon={this.infoFields[field]} external={true} target="_blank">
+            {app.translator.trans(`core.admin.extension.info_links.${field}`)}
+          </LinkButton>
+        );
+      }
+    });
+
+    return items;
+  }
+
+  toggle() {
+    const enabled = this.isEnabled();
+
+    this.changingState = true;
+
+    app
+      .request({
+        url: app.forum.attribute('apiUrl') + '/extensions/' + this.extension.id,
+        method: 'PATCH',
+        body: { enabled: !enabled },
+        errorHandler: this.onerror.bind(this),
+      })
+      .then(() => {
+        if (!enabled) localStorage.setItem('enabledExtension', this.extension.id);
+        window.location.reload();
+      });
+
+    app.modal.show(LoadingModal);
+  }
+
+  isEnabled() {
+    return isExtensionEnabled(this.extension.id);
+  }
+
+  onerror(e) {
+    // We need to give the modal animation time to start; if we close the modal too early,
+    // it breaks the bootstrap modal library.
+    // TODO: This workaround should be removed when we move away from bootstrap JS for modals.
+    setTimeout(() => {
+      app.modal.close();
+    }, 300); // Bootstrap's Modal.TRANSITION_DURATION is 300 ms.
+
+    this.changingState = false;
+
+    if (e.status !== 409) {
+      throw e;
+    }
+
+    const error = e.response.errors[0];
+
+    app.alerts.show(
+      { type: 'error' },
+      app.translator.trans(`core.lib.error.${error.code}_message`, {
+        extension: error.extension,
+        extensions: error.extensions.join(', '),
+      })
+    );
+  }
+}

js/src/admin/components/ExtensionPermissionGrid.js

@@ -0,0 +1,53 @@
+import PermissionGrid from './PermissionGrid';
+import Button from '../../common/components/Button';
+import ItemList from '../../common/utils/ItemList';
+
+export default class ExtensionPermissionGrid extends PermissionGrid {
+  oninit(vnode) {
+    super.oninit(vnode);
+
+    this.extensionId = this.attrs.extensionId;
+  }
+
+  permissionItems() {
+    const permissionCategories = super.permissionItems();
+
+    permissionCategories.items = Object.entries(permissionCategories.items)
+      .filter(([category, info]) => info.content.children.length > 0)
+      .reduce((obj, [category, info]) => {
+        obj[category] = info;
+        return obj;
+      }, {});
+
+    return permissionCategories;
+  }
+
+  viewItems() {
+    return app.extensionData.getExtensionPermissions(this.extensionId, 'view') || new ItemList();
+  }
+
+  startItems() {
+    return app.extensionData.getExtensionPermissions(this.extensionId, 'start') || new ItemList();
+  }
+
+  replyItems() {
+    return app.extensionData.getExtensionPermissions(this.extensionId, 'reply') || new ItemList();
+  }
+
+  moderateItems() {
+    return app.extensionData.getExtensionPermissions(this.extensionId, 'moderate') || new ItemList();
+  }
+
+  scopeControlItems() {
+    const items = new ItemList();
+
+    items.add(
+      'configureScopes',
+      <Button className="Button Button--text" onclick={() => m.route.set(app.route('permissions'))}>
+        {app.translator.trans('core.admin.extension.configure_scopes')}
+      </Button>
+    );
+
+    return items;
+  }
+}

js/src/admin/components/ExtensionsPage.tsx

@@ -1,130 +0,0 @@
-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/ExtensionsWidget.js

@@ -0,0 +1,51 @@
+import DashboardWidget from './DashboardWidget';
+import isExtensionEnabled from '../utils/isExtensionEnabled';
+import getCategorizedExtensions from '../utils/getCategorizedExtensions';
+import Link from '../../common/components/Link';
+import icon from '../../common/helpers/icon';
+
+export default class ExtensionsWidget extends DashboardWidget {
+  oninit(vnode) {
+    super.oninit(vnode);
+
+    this.categorizedExtensions = getCategorizedExtensions();
+  }
+
+  className() {
+    return 'ExtensionsWidget';
+  }
+
+  content() {
+    const categories = app.extensionCategories;
+
+    return (
+      <div className="ExtensionsWidget-list">
+        {Object.keys(categories).map((category) => (this.categorizedExtensions[category] ? this.extensionCategory(category) : ''))}
+      </div>
+    );
+  }
+
+  extensionCategory(category) {
+    return (
+      <div className="ExtensionList-Category">
+        <h4 className="ExtensionList-Label">{app.translator.trans(`core.admin.nav.categories.${category}`)}</h4>
+        <ul className="ExtensionList">{this.categorizedExtensions[category].map((extension) => this.extensionWidget(extension))}</ul>
+      </div>
+    );
+  }
+
+  extensionWidget(extension) {
+    return (
+      <li className={'ExtensionListItem ' + (!isExtensionEnabled(extension.id) ? 'disabled' : '')}>
+        <Link href={app.route('extension', { id: extension.id })}>
+          <div className="ExtensionListItem-content">
+            <span className="ExtensionListItem-icon ExtensionIcon" style={extension.icon}>
+              {extension.icon ? icon(extension.icon.name) : ''}
+            </span>
+            <span className="ExtensionListItem-title">{extension.extra['flarum-extension'].title}</span>
+          </div>
+        </Link>
+      </li>
+    );
+  }
+}

js/src/admin/components/HeaderPrimary.js

@@ -0,0 +1,29 @@
+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

@@ -1,22 +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>;
-    }
-
-    /**
-     * Build an item list for the controls.
-     *
-     * @return {ItemList}
-     */
-    items() {
-        return new ItemList();
-    }
-}

js/src/admin/components/HeaderSecondary.js

@@ -0,0 +1,34 @@
+import Component from '../../common/Component';
+import LinkButton from '../../common/components/LinkButton';
+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(
+      'help',
+      <LinkButton href="https://docs.flarum.org/troubleshoot.html" icon="fas fa-question-circle" external={true} target="_blank">
+        {app.translator.trans('core.admin.header.get_help')}
+      </LinkButton>
+    );
+
+    items.add('session', SessionDropdown.component());
+
+    return items;
+  }
+}

js/src/admin/components/HeaderSecondary.tsx

@@ -1,26 +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>;
-    }
-
-    /**
-     * 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

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

js/src/admin/components/LoadingModal.tsx

@@ -1,20 +0,0 @@
-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

@@ -0,0 +1,136 @@
+import FieldSet from '../../common/components/FieldSet';
+import Button from '../../common/components/Button';
+import Alert from '../../common/components/Alert';
+import LoadingIndicator from '../../common/components/LoadingIndicator';
+import AdminPage from './AdminPage';
+
+export default class MailPage extends AdminPage {
+  oninit(vnode) {
+    super.oninit(vnode);
+
+    this.sendingTest = false;
+    this.refresh();
+  }
+
+  headerInfo() {
+    return {
+      className: 'MailPage',
+      icon: 'fas fa-envelope',
+      title: app.translator.trans('core.admin.email.title'),
+      description: app.translator.trans('core.admin.email.description'),
+    };
+  }
+
+  refresh() {
+    this.loading = true;
+
+    this.status = { sending: false, errors: {} };
+
+    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'];
+
+        this.loading = false;
+        m.redraw();
+      });
+  }
+
+  content() {
+    if (this.loading) {
+      return <LoadingIndicator />;
+    }
+
+    const fields = this.driverFields[this.setting('mail_driver')()];
+    const fieldKeys = Object.keys(fields);
+
+    return (
+      <div className="Form">
+        {this.buildSettingComponent({
+          type: 'text',
+          setting: 'mail_from',
+          label: app.translator.trans('core.admin.email.addresses_heading'),
+          className: 'MailPage-MailSettings',
+        })}
+        {this.buildSettingComponent({
+          type: 'select',
+          setting: 'mail_driver',
+          options: Object.keys(this.driverFields).reduce((memo, val) => ({ ...memo, [val]: val }), {}),
+          label: app.translator.trans('core.admin.email.driver_heading'),
+          className: 'MailPage-MailSettings',
+        })}
+        {this.status.sending ||
+          Alert.component(
+            {
+              dismissible: false,
+            },
+            app.translator.trans('core.admin.email.not_sending_message')
+          )}
+
+        {fieldKeys.length > 0 && (
+          <FieldSet label={app.translator.trans(`core.admin.email.${this.setting('mail_driver')()}_heading`)} className="MailPage-MailSettings">
+            <div className="MailPage-MailSettings-input">
+              {fieldKeys.map((field) => {
+                const fieldInfo = fields[field];
+
+                return [
+                  this.buildSettingComponent({
+                    type: typeof this.setting(field)() === 'string' ? 'text' : 'select',
+                    label: app.translator.trans(`core.admin.email.${field}_label`),
+                    setting: field,
+                    options: fieldInfo,
+                  }),
+                  this.status.errors[field] && <p className="ValidationError">{this.status.errors[field]}</p>,
+                ];
+              })}
+            </div>
+          </FieldSet>
+        )}
+        {this.submitButton()}
+
+        <FieldSet label={app.translator.trans('core.admin.email.send_test_mail_heading')} className="MailPage-MailSettings">
+          <div className="helpText">{app.translator.trans('core.admin.email.send_test_mail_text', { email: app.session.user.email() })}</div>
+          {Button.component(
+            {
+              className: 'Button Button--primary',
+              disabled: this.sendingTest || this.isChanged(),
+              onclick: () => this.sendTestEmail(),
+            },
+            app.translator.trans('core.admin.email.send_test_mail_button')
+          )}
+        </FieldSet>
+      </div>
+    );
+  }
+
+  sendTestEmail() {
+    if (this.saving || this.sendingTest) return;
+
+    this.sendingTest = true;
+    app.alerts.dismiss(this.testEmailSuccessAlert);
+
+    app
+      .request({
+        method: 'POST',
+        url: app.forum.attribute('apiUrl') + '/mail/test',
+      })
+      .then((response) => {
+        this.sendingTest = false;
+        this.testEmailSuccessAlert = app.alerts.show({ type: 'success' }, app.translator.trans('core.admin.email.send_test_mail_success'));
+      })
+      .catch((error) => {
+        this.sendingTest = false;
+        m.redraw();
+        throw error;
+      });
+  }
+
+  saveSettings(e) {
+    super.saveSettings(e).then(this.refresh());
+  }
+}

js/src/admin/components/MailPage.tsx

@@ -1,191 +0,0 @@
-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.tsx

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

js/src/admin/components/PermissionDropdown.js

@@ -0,0 +1,156 @@
+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 initAttrs(attrs) {
+    super.initAttrs(attrs);
+
+    attrs.className = 'PermissionDropdown';
+    attrs.buttonClassName = 'Button Button--text';
+  }
+
+  view(vnode) {
+    const children = [];
+
+    let groupIds = app.data.permissions[this.attrs.permission] || [];
+
+    groupIds = filterByRequiredPermissions(groupIds, this.attrs.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.attrs.label = Badge.component({ icon: 'fas fa-globe' });
+    } else if (members) {
+      this.attrs.label = Badge.component({ icon: 'fas fa-user' });
+    } else {
+      this.attrs.label = [badgeForId(Group.ADMINISTRATOR_ID), groupIds.map(badgeForId)];
+    }
+
+    if (this.showing) {
+      if (this.attrs.allowGuest) {
+        children.push(
+          Button.component(
+            {
+              icon: everyone ? 'fas fa-check' : true,
+              onclick: () => this.save([Group.GUEST_ID]),
+              disabled: this.isGroupDisabled(Group.GUEST_ID),
+            },
+            [Badge.component({ icon: 'fas fa-globe' }), ' ', app.translator.trans('core.admin.permissions_controls.everyone_button')]
+          )
+        );
+      }
+
+      children.push(
+        Button.component(
+          {
+            icon: members ? 'fas fa-check' : true,
+            onclick: () => this.save([Group.MEMBER_ID]),
+            disabled: this.isGroupDisabled(Group.MEMBER_ID),
+          },
+          [Badge.component({ icon: 'fas fa-user' }), ' ', app.translator.trans('core.admin.permissions_controls.members_button')]
+        ),
+
+        Separator.component(),
+
+        Button.component(
+          {
+            icon: !everyone && !members ? 'fas fa-check' : true,
+            disabled: !everyone && !members,
+            onclick: (e) => {
+              if (e.shiftKey) e.stopPropagation();
+              this.save([]);
+            },
+          },
+          [badgeForId(adminGroup.id()), ' ', adminGroup.namePlural()]
+        )
+      );
+
+      [].push.apply(
+        children,
+        app.store
+          .all('groups')
+          .filter((group) => [Group.ADMINISTRATOR_ID, Group.GUEST_ID, Group.MEMBER_ID].indexOf(group.id()) === -1)
+          .map((group) =>
+            Button.component(
+              {
+                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),
+              },
+              [badgeForId(group.id()), ' ', group.namePlural()]
+            )
+          )
+      );
+    }
+
+    return super.view({ ...vnode, children });
+  }
+
+  save(groupIds) {
+    const permission = this.attrs.permission;
+
+    app.data.permissions[permission] = groupIds;
+
+    app.request({
+      method: 'POST',
+      url: app.forum.attribute('apiUrl') + '/permission',
+      body: { permission, groupIds },
+    });
+  }
+
+  toggle(groupId) {
+    const permission = this.attrs.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.attrs.permission).indexOf(id) === -1;
+  }
+}

js/src/admin/components/PermissionDropdown.tsx

@@ -1,159 +0,0 @@
-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

@@ -0,0 +1,393 @@
+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(
+      'viewHiddenGroups',
+      {
+        icon: 'fas fa-users',
+        label: app.translator.trans('core.admin.permissions.view_hidden_groups_label'),
+        permission: 'viewHiddenGroups',
+      },
+      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',
+    });
+
+    items.merge(app.extensionData.getAllExtensionPermissions('view'));
+
+    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
+    );
+
+    items.merge(app.extensionData.getAllExtensionPermissions('start'));
+
+    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
+    );
+
+    items.merge(app.extensionData.getAllExtensionPermissions('reply'));
+
+    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(
+      'userEditCredentials',
+      {
+        icon: 'fas fa-user-cog',
+        label: app.translator.trans('core.admin.permissions.edit_users_credentials_label'),
+        permission: 'user.editCredentials',
+      },
+      60
+    );
+
+    items.add(
+      'userEditGroups',
+      {
+        icon: 'fas fa-users-cog',
+        label: app.translator.trans('core.admin.permissions.edit_users_groups_label'),
+        permission: 'user.editGroups',
+      },
+      60
+    );
+
+    items.add(
+      'userEdit',
+      {
+        icon: 'fas fa-address-card',
+        label: app.translator.trans('core.admin.permissions.edit_users_label'),
+        permission: 'user.edit',
+      },
+      60
+    );
+
+    items.merge(app.extensionData.getAllExtensionPermissions('moderate'));
+
+    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

@@ -1,361 +0,0 @@
-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

@@ -0,0 +1,43 @@
+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';
+import AdminPage from './AdminPage';
+
+export default class PermissionsPage extends AdminPage {
+  headerInfo() {
+    return {
+      className: 'PermissionsPage',
+      icon: 'fas fa-key',
+      title: app.translator.trans('core.admin.permissions.title'),
+      description: app.translator.trans('core.admin.permissions.description'),
+    };
+  }
+
+  content() {
+    return [
+      <div className="PermissionsPage-groups">
+        {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(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 className="PermissionsPage-permissions">{PermissionGrid.component()}</div>,
+    ];
+  }
+}

js/src/admin/components/PermissionsPage.tsx

@@ -1,42 +0,0 @@
-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

@@ -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 initAttrs(attrs) {
+    super.initAttrs(attrs);
+
+    attrs.className = 'SessionDropdown';
+    attrs.buttonClassName = 'Button Button--user Button--flat';
+    attrs.menuClassName = 'Dropdown-menu--right';
+  }
+
+  view(vnode) {
+    return super.view({ ...vnode, children: this.items().toArray() });
+  }
+
+  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',
+          onclick: app.session.logout.bind(app.session),
+        },
+        app.translator.trans('core.admin.header.log_out_button')
+      ),
+      -100
+    );
+
+    return items;
+  }
+}

js/src/admin/components/SessionDropdown.tsx

@@ -1,52 +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/SettingDropdown.js

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

js/src/admin/components/SettingDropdown.tsx

@@ -1,27 +0,0 @@
-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

@@ -0,0 +1,73 @@
+import Modal from '../../common/components/Modal';
+import Button from '../../common/components/Button';
+import Stream from '../../common/utils/Stream';
+import saveSettings from '../utils/saveSettings';
+
+export default class SettingsModal extends Modal {
+  oninit(vnode) {
+    super.oninit(vnode);
+
+    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] || Stream(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

@@ -1,70 +0,0 @@
-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

@@ -0,0 +1,58 @@
+/*
+ * 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(LoadingModal);
+
+    app
+      .request({
+        method: 'DELETE',
+        url: app.forum.attribute('apiUrl') + '/cache',
+      })
+      .then(() => window.location.reload());
+  }
+}

js/src/admin/components/StatusWidget.tsx

@@ -1,49 +0,0 @@
-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

@@ -0,0 +1,97 @@
+import Button from '../../common/components/Button';
+
+export default class UploadImageButton extends Button {
+  loading = false;
+
+  view(vnode) {
+    this.attrs.loading = this.loading;
+    this.attrs.className = (this.attrs.className || '') + ' Button';
+
+    if (app.data.settings[this.attrs.name + '_path']) {
+      this.attrs.onclick = this.remove.bind(this);
+
+      return (
+        <div>
+          <p>
+            <img src={app.forum.attribute(this.attrs.name + 'Url')} alt="" />
+          </p>
+          <p>{super.view({ ...vnode, children: app.translator.trans('core.admin.upload_image.remove_button') })}</p>
+        </div>
+      );
+    } else {
+      this.attrs.onclick = this.upload.bind(this);
+    }
+
+    return super.view({ ...vnode, children: app.translator.trans('core.admin.upload_image.upload_button') });
+  }
+
+  /**
+   * 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 body = new FormData();
+        body.append(this.attrs.name, $(e.target)[0].files[0]);
+
+        this.loading = true;
+        m.redraw();
+
+        app
+          .request({
+            method: 'POST',
+            url: this.resourceUrl(),
+            serialize: (raw) => raw,
+            body,
+          })
+          .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.attrs.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

@@ -1,97 +0,0 @@
-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/index.js

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

js/src/admin/index.ts

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

js/src/admin/resolvers/ExtensionPageResolver.ts

@@ -0,0 +1,19 @@
+import DefaultResolver from '../../common/resolvers/DefaultResolver';
+
+/**
+ * A custom route resolver for ExtensionPage that generates handles routes
+ * to default extension pages or a page provided by an extension.
+ */
+export default class ExtensionPageResolver extends DefaultResolver {
+  static extension: string | null = null;
+
+  onmatch(args, requestedPath, route) {
+    const extensionPage = app.extensionData.getPage(args.id);
+
+    if (extensionPage) {
+      return extensionPage;
+    }
+
+    return super.onmatch(args, requestedPath, route);
+  }
+}

js/src/admin/routes.js

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

js/src/admin/routes.ts

@@ -1,17 +0,0 @@
-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/ExtensionData.js

@@ -0,0 +1,177 @@
+import ItemList from '../../common/utils/ItemList';
+
+export default class ExtensionData {
+  constructor() {
+    this.data = {};
+    this.currentExtension = null;
+  }
+
+  /**
+   * This function simply takes the extension id
+   *
+   * @example
+   * app.extensionData.load('flarum-tags')
+   *
+   * flarum/flags -> flarum-flags | acme/extension -> acme-extension
+   *
+   * @param extension
+   */
+  for(extension) {
+    this.currentExtension = extension;
+    this.data[extension] = this.data[extension] || {};
+
+    return this;
+  }
+
+  /**
+   * This function registers your settings with Flarum
+   *
+   * It takes either a settings object or a callback.
+   *
+   * @example
+   *
+   * .registerSetting({
+   *   setting: 'flarum-flags.guidelines_url',
+   *   type: 'text', // This will be inputted into the input tag for the setting (text/number/etc)
+   *   label: app.translator.trans('flarum-flags.admin.settings.guidelines_url_label')
+   * }, 15) // priority is optional (ItemList)
+   *
+   *
+   * @param content
+   * @param priority
+   * @returns {ExtensionData}
+   */
+  registerSetting(content, priority = 0) {
+    this.data[this.currentExtension].settings = this.data[this.currentExtension].settings || new ItemList();
+
+    // Callbacks can be passed in instead of settings to display custom content.
+    // By default, they will be added with the `null` key, since they don't have a `.setting` attr.
+    // To support multiple such items for one extension, we assign a random ID.
+    // 36 is arbitrary length, but makes collisions very unlikely.
+    if (typeof content === 'function') {
+      content.setting = Math.random().toString(36);
+    }
+
+    this.data[this.currentExtension].settings.add(content.setting, content, priority);
+
+    return this;
+  }
+
+  /**
+   * This function registers your permission with Flarum
+   *
+   * @example
+   *
+   * .registerPermission('permissions', {
+   *     icon: 'fas fa-flag',
+   *     label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),
+   *     permission: 'discussion.viewFlags'
+   * }, 'moderate', 65)
+   *
+   * @param content
+   * @param permissionType
+   * @param priority
+   * @returns {ExtensionData}
+   */
+  registerPermission(content, permissionType = null, priority = 0) {
+    this.data[this.currentExtension].permissions = this.data[this.currentExtension].permissions || {};
+
+    if (!this.data[this.currentExtension].permissions[permissionType]) {
+      this.data[this.currentExtension].permissions[permissionType] = new ItemList();
+    }
+
+    this.data[this.currentExtension].permissions[permissionType].add(content.permission, content, priority);
+
+    return this;
+  }
+
+  /**
+   * Replace the default extension page with a custom component.
+   * This component would typically extend ExtensionPage
+   *
+   * @param component
+   * @returns {ExtensionData}
+   */
+  registerPage(component) {
+    this.data[this.currentExtension].page = component;
+
+    return this;
+  }
+
+  /**
+   * Get an extension's registered settings
+   *
+   * @param extensionId
+   * @returns {boolean|*}
+   */
+  getSettings(extensionId) {
+    if (this.data[extensionId] && this.data[extensionId].settings) {
+      return this.data[extensionId].settings.toArray();
+    }
+
+    return false;
+  }
+
+  /**
+   *
+   * Get an ItemList of all extensions' registered permissions
+   *
+   * @param extension
+   * @param type
+   * @returns {ItemList}
+   */
+  getAllExtensionPermissions(type) {
+    const items = new ItemList();
+
+    Object.keys(this.data).map((extension) => {
+      if (this.extensionHasPermissions(extension) && this.data[extension].permissions[type]) {
+        items.merge(this.data[extension].permissions[type]);
+      }
+    });
+
+    return items;
+  }
+
+  /**
+   * Get a singular extension's registered permissions
+   *
+   * @param extension
+   * @param type
+   * @returns {boolean|*}
+   */
+  getExtensionPermissions(extension, type) {
+    if (this.extensionHasPermissions(extension) && this.data[extension].permissions[type]) {
+      return this.data[extension].permissions[type];
+    }
+
+    return new ItemList();
+  }
+
+  /**
+   * Checks whether a given extension has registered permissions.
+   *
+   * @param extension
+   * @returns {boolean}
+   */
+  extensionHasPermissions(extension) {
+    if (this.data[extension] && this.data[extension].permissions) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Returns an extension's custom page component if it exists.
+   *
+   * @param extension
+   * @returns {boolean|*}
+   */
+  getPage(extension) {
+    if (this.data[extension]) {
+      return this.data[extension].page;
+    }
+
+    return false;
+  }
+}

js/src/admin/utils/getCategorizedExtensions.js

@@ -0,0 +1,25 @@
+export default function getCategorizedExtensions() {
+  let extensions = {};
+
+  Object.keys(app.data.extensions).map((id) => {
+    const extension = app.data.extensions[id];
+    let category = extension.extra['flarum-extension'].category;
+
+    // Wrap languages packs into new system
+    if (extension.extra['flarum-locale']) {
+      category = 'language';
+    }
+
+    if (category in app.extensionCategories) {
+      extensions[category] = extensions[category] || [];
+
+      extensions[category].push(extension);
+    } else {
+      extensions.feature = extensions.feature || [];
+
+      extensions.feature.push(extension);
+    }
+  });
+
+  return extensions;
+}

js/src/admin/utils/isExtensionEnabled.js

@@ -0,0 +1,5 @@
+export default function isExtensionEnabled(name) {
+  const enabled = JSON.parse(app.data.settings.extensions_enabled);
+
+  return enabled.includes(name);
+}

js/src/admin/utils/saveSettings.js

@@ -0,0 +1,16 @@
+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/admin/utils/saveSettings.ts

@@ -1,18 +0,0 @@
-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

@@ -0,0 +1,457 @@
+import ItemList from './utils/ItemList';
+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 liveHumanTimes from './utils/liveHumanTimes';
+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';
+import PageState from './states/PageState';
+import ModalManagerState from './states/ModalManagerState';
+import AlertManagerState from './states/AlertManagerState';
+
+/**
+ * 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;
+
+  /**
+   * The key for 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 {int}
+   * @private
+   */
+  requestErrorAlert = null;
+
+  /**
+   * The page the app is currently on.
+   *
+   * This object holds information about the type of page we are currently
+   * visiting, and sometimes additional arbitrary page state that may be
+   * relevant to lower-level components.
+   *
+   * @type {PageState}
+   */
+  current = new PageState(null);
+
+  /**
+   * The page the app was on before the current page.
+   *
+   * Once the application navigates to another page, the object previously
+   * assigned to this.current will be moved to this.previous, while this.current
+   * is re-initialized.
+   *
+   * @type {PageState}
+   */
+  previous = new PageState(null);
+
+  /*
+   * An object that manages modal state.
+   *
+   * @type {ModalManagerState}
+   */
+  modal = new ModalManagerState();
+
+  /**
+   * An object that manages the state of active alerts.
+   *
+   * @type {AlertManagerState}
+   */
+  alerts = new AlertManagerState();
+
+  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 = '') {
+    // An object with a callable view property is used in order to pass arguments to the component; see https://mithril.js.org/mount.html
+    m.mount(document.getElementById('modal'), { view: () => ModalManager.component({ state: this.modal }) });
+    m.mount(document.getElementById('alerts'), { view: () => AlertManager.component({ state: this.alerts }) });
+
+    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. When this happens, we'll add classes to the header and app body
+    // which will set the navbar's position to fixed. We don't want to always
+    // have it fixed, as that could overlap with custom headers.
+    const scrollListener = new ScrollListener((top) => {
+      const $app = $('#app');
+      const offset = $app.offset().top;
+
+      $app.toggleClass('affix', top >= offset).toggleClass('scrolled', top > offset);
+      $('.App-header').toggleClass('navbar-fixed-top', top >= offset);
+    });
+
+    scrollListener.start();
+    scrollListener.update();
+
+    $(() => {
+      $('body').addClass('ontouchstart' in window ? 'touch' : 'no-touch');
+    });
+
+    liveHumanTimes();
+  }
+
+  /**
+   * 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;
+  }
+
+  /**
+   * Determine the current screen mode, based on our media queries.
+   *
+   * @returns {String} - one of "phone", "tablet", "desktop" or "desktop-hd"
+   */
+  screen() {
+    const styles = getComputedStyle(document.documentElement);
+    return styles.getPropertyValue('--flarum-screen');
+  }
+
+  /**
+   * 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() {
+    const count = this.titleCount ? `(${this.titleCount}) ` : '';
+    const pageTitleWithSeparator = this.title && m.route.get() !== this.forum.attribute('basePath') + '/' ? this.title + ' - ' : '';
+    const title = this.forum.attribute('title');
+    document.title = count + pageTitleWithSeparator + title;
+  }
+
+  /**
+   * Make an AJAX request, handling any low-level errors that may occur.
+   *
+   * @see https://mithril.js.org/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.requestErrorAlert) this.alerts.dismiss(this.requestErrorAlert);
+
+    // 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(
+      (response) => response,
+      (error) => {
+        let content;
+
+        switch (error.status) {
+          case 422:
+            content = error.response.errors
+              .map((error) => [error.detail, <br />])
+              .reduce((a, b) => a.concat(b), [])
+              .slice(0, -1);
+            break;
+
+          case 401:
+          case 403:
+            content = app.translator.trans('core.lib.error.permission_denied_message');
+            break;
+
+          case 404:
+          case 410:
+            content = app.translator.trans('core.lib.error.not_found_message');
+            break;
+
+          case 429:
+            content = app.translator.trans('core.lib.error.rate_limit_exceeded_message');
+            break;
+
+          default:
+            content = app.translator.trans('core.lib.error.generic_message');
+        }
+
+        const isDebug = app.forum.attribute('debug');
+        // contains a formatted errors if possible, response must be an JSON API array of errors
+        // the details property is decoded to transform escaped characters such as '\n'
+        const errors = error.response && error.response.errors;
+        const formattedError = Array.isArray(errors) && errors[0] && errors[0].detail && errors.map((e) => decodeURI(e.detail));
+
+        error.alert = {
+          type: 'error',
+          content,
+          controls: isDebug && [
+            <Button className="Button Button--link" onclick={this.showDebug.bind(this, error, formattedError)}>
+              Debug
+            </Button>,
+          ],
+        };
+
+        try {
+          options.errorHandler(error);
+        } catch (error) {
+          if (isDebug && error.xhr) {
+            const { method, url } = error.options;
+            const { status = '' } = error.xhr;
+
+            console.group(`${method} ${url} ${status}`);
+
+            console.error(...(formattedError || [error]));
+
+            console.groupEnd();
+          }
+
+          this.requestErrorAlert = this.alerts.show(error.alert, error.alert.content);
+        }
+
+        return Promise.reject(error);
+      }
+    );
+  }
+
+  /**
+   * @param {RequestError} error
+   * @param {string[]} [formattedError]
+   * @private
+   */
+  showDebug(error, formattedError) {
+    this.alerts.dismiss(this.requestErrorAlert);
+
+    this.modal.show(RequestErrorModal, { error, formattedError });
+  }
+
+  /**
+   * Construct a URL to the route with the given name.
+   *
+   * @param {String} name
+   * @param {Object} params
+   * @return {String}
+   * @public
+   */
+  route(name, params = {}) {
+    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);
+    const prefix = m.route.prefix === '' ? this.forum.attribute('basePath') : '';
+
+    return prefix + url + (queryString ? '?' + queryString : '');
+  }
+}

js/src/common/Application.ts

@@ -1,363 +0,0 @@
-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.ts

@@ -1,90 +1,132 @@
-import Mithril, { ClassComponent, Vnode } from 'mithril';
+import * as Mithril from 'mithril';
 
-export type ComponentProps = {
-    children?: Mithril.Children;
+export interface ComponentAttrs extends Mithril.Attributes {}
 
-    className?: string;
+/**
+ * The `Component` class defines a user interface 'building block'. A component
+ * generates a virtual DOM to be rendered on each redraw.
+ *
+ * Essentially, this is a wrapper for Mithril's components that adds several useful features:
+ *
+ *  - In the `oninit` and `onbeforeupdate` lifecycle hooks, we store vnode attrs in `this.attrs.
+ *    This allows us to use attrs across components without having to pass the vnode to every single
+ *    method.
+ *  - The static `initAttrs` method allows a convenient way to provide defaults (or to otherwise modify)
+ *    the attrs that have been passed into a component.
+ *  - When the component is created in the DOM, we store its DOM element under `this.element`; this lets
+ *    us use jQuery to modify child DOM state from internal methods via the `this.$()` method.
+ *  - A convenience `component` method, which serves as an alternative to hyperscript and JSX.
+ *
+ * As with other Mithril components, components extending Component can be initialized
+ * and nested using JSX, hyperscript, or a combination of both. The `component` method can also
+ * be used.
+ *
+ * @example
+ * return m('div', <MyComponent foo="bar"><p>Hello World</p></MyComponent>);
+ *
+ * @example
+ * return m('div', MyComponent.component({foo: 'bar'), m('p', 'Hello World!'));
+ *
+ * @see https://mithril.js.org/components.html
+ */
+export default abstract class Component<T extends ComponentAttrs = ComponentAttrs> implements Mithril.ClassComponent<T> {
+  /**
+   * The root DOM element for the component.
+   */
+  protected element!: Element;
 
-    [key: string]: any;
-};
+  /**
+   * The attributes passed into the component.
+   *
+   * @see https://mithril.js.org/components.html#passing-data-to-components
+   */
+  protected attrs!: T;
 
-export default class Component<T extends ComponentProps = any> implements ClassComponent {
-    element!: HTMLElement;
+  /**
+   * @inheritdoc
+   */
+  abstract view(vnode: Mithril.Vnode<T, this>): Mithril.Children;
 
-    props: T;
+  /**
+   * @inheritdoc
+   */
+  oninit(vnode: Mithril.Vnode<T, this>) {
+    this.setAttrs(vnode.attrs);
+  }
 
-    constructor(props: T = <T>{}) {
-        this.props = props.tag ? <T>{} : props;
+  /**
+   * @inheritdoc
+   */
+  oncreate(vnode: Mithril.VnodeDOM<T, this>) {
+    this.element = vnode.dom;
+  }
+
+  /**
+   * @inheritdoc
+   */
+  onbeforeupdate(vnode: Mithril.VnodeDOM<T, this>) {
+    this.setAttrs(vnode.attrs);
+  }
+
+  /**
+   * 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
+   */
+  protected $(selector) {
+    const $element = $(this.element);
+
+    return selector ? $element.find(selector) : $element;
+  }
+
+  /**
+   * Convenience method to attach a component without JSX.
+   * Has the same effect as calling `m(THIS_CLASS, attrs, children)`.
+   *
+   * @see https://mithril.js.org/hyperscript.html#mselector,-attributes,-children
+   */
+  static component(attrs = {}, children = null): Mithril.Vnode {
+    const componentAttrs = Object.assign({}, attrs);
+
+    return m(this as any, componentAttrs, children);
+  }
+
+  /**
+   * Saves a reference to the vnode attrs after running them through initAttrs,
+   * and checking for common issues.
+   */
+  private setAttrs(attrs: T = {} as T): void {
+    (this.constructor as typeof Component).initAttrs(attrs);
+
+    if (attrs) {
+      if ('children' in attrs) {
+        throw new Error(
+          `[${
+            (this.constructor as any).name
+          }] The "children" attribute of attrs should never be used. Either pass children in as the vnode children or rename the attribute`
+        );
+      }
+
+      if ('tag' in attrs) {
+        throw new Error(`[${(this.constructor as any).name}] You cannot use the "tag" attribute name with Mithril 2.`);
+      }
     }
 
-    view(vnode) {
-        throw new Error('Component#view must be implemented by subclass');
-    }
+    this.attrs = attrs;
+  }
 
-    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;
-    }
+  /**
+   * Initialize the component's attrs.
+   *
+   * This can be used to assign default values for missing, optional attrs.
+   */
+  protected static initAttrs<T>(attrs: T): void {}
 }

js/src/common/Fragment.ts

@@ -0,0 +1,74 @@
+import * as Mithril from 'mithril';
+
+/**
+ * The `Fragment` class represents a chunk of DOM that is rendered once with Mithril and then takes
+ * over control of its own DOM and lifecycle.
+ *
+ * This is very similar to the `Component` wrapper class, but is used for more fine-grained control over
+ * the rendering and display of some significant chunks of the DOM. In contrast to components, fragments
+ * do not offer Mithril's lifecycle hooks.
+ *
+ * Use this when you want to enjoy the benefits of JSX / VDOM for initial rendering, combined with
+ * small helper methods that then make updates to that DOM directly, instead of fully redrawing
+ * everything through Mithril.
+ *
+ * This should only be used when necessary, and only with `m.render`. If you are unsure whether you need
+ * this or `Component, you probably need `Component`.
+ */
+export default abstract class Fragment {
+  /**
+   * The root DOM element for the fragment.
+   */
+  protected element!: Element;
+
+  /**
+   * Returns a jQuery object for this fragment'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 `fragment.$('li')` will return a jQuery object
+   * containing all of the `li` elements inside the DOM element of this
+   * fragment.
+   *
+   * @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;
+  }
+
+  /**
+   * Get the renderable virtual DOM that represents the fragment's view.
+   *
+   * This should NOT be overridden by subclasses. Subclasses wishing to define
+   * their virtual DOM should override Fragment#view instead.
+   *
+   * @example
+   * const fragment = new MyFragment();
+   * m.render(document.body, fragment.render());
+   *
+   * @final
+   */
+  public render(): Mithril.Vnode<Mithril.Attributes, this> {
+    const vdom = this.view();
+
+    vdom.attrs = vdom.attrs || {};
+
+    const originalOnCreate = vdom.attrs.oncreate;
+
+    vdom.attrs.oncreate = (vnode) => {
+      this.element = vnode.dom;
+      if (originalOnCreate) originalOnCreate.apply(this, [vnode]);
+    };
+
+    return vdom;
+  }
+
+  /**
+   * Creates a view out of virtual elements.
+   */
+  abstract view(): Mithril.Vnode<Mithril.Attributes, this>;
+}

js/src/common/Model.js

@@ -0,0 +1,319 @@
+/**
+ * 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(),
+            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 {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

@@ -1,299 +0,0 @@
-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

@@ -0,0 +1,54 @@
+/**
+ * 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(body, options = {}) {
+    return app.request(
+      Object.assign(
+        {
+          method: 'POST',
+          url: `${app.forum.attribute('baseUrl')}/login`,
+          body,
+        },
+        options
+      )
+    );
+  }
+
+  /**
+   * Log the user out.
+   *
+   * @public
+   */
+  logout() {
+    window.location = `${app.forum.attribute('baseUrl')}/logout?token=${this.csrfToken}`;
+  }
+}

js/src/common/Session.ts

@@ -1,48 +0,0 @@
-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

@@ -0,0 +1,170 @@
+/**
+ * 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 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 app
+      .request(
+        Object.assign(
+          {
+            method: 'GET',
+            url,
+            params,
+          },
+          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

@@ -1,152 +0,0 @@
-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

@@ -0,0 +1,305 @@
+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) {
+        // Either an opening or closing tag.
+        if (match[1]) {
+          open[0].push(input[match[1]]);
+        } else if (match[3]) {
+          if (match[2]) {
+            // Closing tag. We start by removing all raw children (generally in the form of strings) from the temporary
+            // holding array, then run them through m.fragment to convert them to vnodes. Usually this will just give us a
+            // text vnode, but using m.fragment as opposed to an explicit conversion should be more flexible. This is necessary because
+            // otherwise, our generated vnode will have raw strings as its children, and mithril expects vnodes.
+            // Finally, we add the now-processed vnodes back onto the holding array (which is the same object in memory as the
+            // children array of the vnode we are currently processing), and remove the reference to the holding array so that
+            // further text will be added to the full set of returned elements.
+            const rawChildren = open[0].splice(0, open[0].length);
+            open[0].push(...m.fragment(rawChildren).children);
+            open.shift();
+          } else {
+            // If a vnode with a matching tag was provided in the translator input, we use that. Otherwise, we create a new vnode
+            // with this tag, and an empty children array (since we're expecting to insert children, as that's the point of having this in translator)
+            let tag = input[match[3]] || { tag: match[3], children: [] };
+            open[0].push(tag);
+            // Insert the tag's children array as the first element of open, so that text in between the opening
+            // and closing tags will be added to the tag's children, not to the full set of returned elements.
+            open.unshift(tag.children || tag);
+          }
+        }
+      } else {
+        // Not an html tag, we add it to open[0], which is either the full set of returned elements (vnodes and text),
+        // or if an html tag is currently being processed, the children attribute of that html tag's vnode.
+        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

@@ -1,281 +0,0 @@
-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;
-        }
-    }
-}