Apply fixes from StyleCI

[ci skip] [skip ci]

.editorconfig

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

.gitattributes

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

.github/CONTRIBUTING.md

@@ -0,0 +1,3 @@
+# Contributing to Flarum
+
+Howdy! We're really excited that you are interested in contributing to Flarum. Before submitting your contribution, please take a moment and read through the [Contributing Guidelines](https://github.com/flarum/flarum/blob/master/CONTRIBUTING.md).

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-github: flarum
-open_collective: flarum
-tidelift: packagist/flarum/core

.github/ISSUE_TEMPLATE/bug-report.md

@@ -3,6 +3,9 @@ name: "🐛 Bug Report"
 about: "If something isn't working as expected"
 
 ---
+<!--
+IMPORTANT: If you discover a security vulnerability within Flarum, please send an email to [security@flarum.org](mailto:security@flarum.org) instead. We will address these with the utmost urgency and it will prevent vulnerabilities, which may be abused, from popping up on our issue tracker.
+-->
 ## Bug Report
 
 **Current Behavior**

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,7 +16,7 @@ IMPORTANT: We applaud pull requests, they excite us every single time. As we hav
 **Confirmed**
 
 - [ ] Frontend changes: tested on a local Flarum installation.
-- [ ] Backend changes: tests are green (run `composer test`).
+- [ ] Backend changes: tests are green (run `php vendor/bin/phpunit`).
 
 **Required changes:**
 

.github/SECURITY.md

@@ -1,13 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-During the beta phase, we will only patch security vulnerabilities in the latest beta release.
-
-## Reporting a Vulnerability
-
-If you discover a security vulnerability within Flarum, please send an email to security@flarum.org so we can address it promptly.
-
-We will get back to you as time allows.
-Discussions may commence internally, so you may not hear back immediately.
-When reporting a vulnerability, please provide your GitHub username (if available), so that we can invite you to collaborate on a [security advisory on GitHub](https://help.github.com/en/articles/about-maintainer-security-advisories).

.github/stale.yml

@@ -1,26 +0,0 @@
-daysUntilStale: 90
-daysUntilClose: 30
-
-staleLabel: stale
-
-exemptLabels:
-- org/keep
-- type/bug
-- type/regression
-- critical
-- security
-exemptAssignees: true
-exemptMilestones: true
-exemptProjects: true
-
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. We do this
-  to keep the amount of open issues to a manageable minimum.
-
-  In any case, thanks for taking an interest in this software and contributing
-  by opening the issue in the first place!
-
-closeComment: >
-  We are closing this issue as it seems to have grown stale. If you still
-  encounter this problem with the latest version, feel free to re-open it.

.github/workflows/build.yml

@@ -1,30 +0,0 @@
-name: JavaScript
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    name: JS / Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Restore npm cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('js/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      # Our action will install npm, cd into `./js`, run `npm run build`,
-      # then commit and upload any changes
-      - name: Build production JS
-        uses: flarum/action-build@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -1,76 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-# Run on:
-# - pushes to master, or
-# - PRs with a base of `master`
-# - which do not **only** consist of changes to .md or .less files
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '**/*.md'
-      - '**/*.less'
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-      - '**/*.md'
-      - '**/*.less'
-  schedule:
-    - cron: '0 0 * * 1,3,5'
-
-jobs:
-  analyze:
-    name: Analyze / ${{ matrix.language }}
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1

.github/workflows/lint.yml

@@ -1,28 +0,0 @@
-name: Lint
-
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - 'js/src/**'
-  pull_request:
-    paths:
-      - 'js/src/**'
-
-jobs:
-  prettier:
-    name: JS / Prettier
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: "14"
-
-      - name: Check JS formatting
-        run: npx prettier --check src
-        working-directory: ./js

.github/workflows/pr_size_change.yml

@@ -1,45 +0,0 @@
-name: Bundle size checker
-
-on:
-  workflow_dispatch:
-
-  push:
-    paths:
-      - "js/**"
-  pull_request:
-    paths:
-      - "js/**"
-
-jobs:
-  bundlewatch:
-    runs-on: ubuntu-latest
-
-    name: Bundlewatch
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: "14"
-
-      - name: Use npm v7
-        run: sudo npm install -g npm@7.x.x
-
-      - name: Install JS dependencies
-        # We need to use `npm install` here. If we don't, the workflow will fail.
-        run: npm install
-        working-directory: ./js
-
-      - name: Build production assets
-        run: npm run build
-        working-directory: ./js
-
-      - name: Check bundle size change
-        run: node_modules/.bin/bundlewatch --config .bundlewatch.config.json
-        working-directory: ./js
-        env:
-          BUNDLEWATCH_GITHUB_TOKEN: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}
-          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}

.github/workflows/test.yml

@@ -1,79 +0,0 @@
-name: Tests
-
-on: [push, pull_request]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php: [7.3, 7.4, '8.0']
-        service: ['mysql:5.7', mariadb]
-        prefix: ['', flarum_]
-
-        include:
-          - service: 'mysql:5.7'
-            db: MySQL
-          - service: mariadb
-            db: MariaDB
-          - prefix: flarum_
-            prefixStr: (prefix)
-
-        exclude:
-          - php: 7.3
-            service: 'mysql:5.7'
-            prefix: flarum_
-          - php: 7.3
-            service: mariadb
-            prefix: flarum_
-          - php: 8.0
-            service: 'mysql:5.7'
-            prefix: flarum_
-          - php: 8.0
-            service: mariadb
-            prefix: flarum_
-
-    services:
-      mysql:
-        image: ${{ matrix.service }}
-        ports:
-          - 13306:3306
-
-    name: 'PHP ${{ matrix.php }} / ${{ matrix.db }} ${{ matrix.prefixStr }}'
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@0b9d33cd0782337377999751fc10ea079fdd7104 # pin@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
-
-      - name: Setup Composer tests
-        run: composer test:setup
-        env:
-          DB_PORT: 13306
-          DB_PASSWORD: root
-          DB_PREFIX: ${{ matrix.prefix }}
-
-      - name: Run Composer tests
-        run: composer test
-        env:
-          COMPOSER_PROCESS_TIMEOUT: 600

.gitignore

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

.styleci.yml

@@ -12,3 +12,7 @@ disabled:
   - phpdoc_order
   - phpdoc_separation
   - phpdoc_types
+
+finder:
+  exclude:
+    - "stubs"

.travis.yml

@@ -0,0 +1,48 @@
+language: php
+
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+    - $HOME/.npm
+
+install:
+  - composer install
+  - mysql -e 'CREATE DATABASE flarum;'
+
+script:
+  - vendor/bin/phpunit --coverage-clover=coverage.xml
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+
+jobs:
+  include:
+    - php: 7.1
+      env: DB=mysql
+
+    - php: 7.2
+      env: DB=mysql
+
+    - php: 7.2
+      env: DB=mysql PREFIX=forum_
+
+    - php: 7.1
+      addons:
+        mariadb: '10.2'
+      env: DB=mariadb
+
+    - php: 7.2
+      addons:
+        mariadb: '10.2'
+      env: DB=mariadb
+
+    - stage: build
+      language: generic
+      if: branch = master AND type = push
+      install: skip
+      script: bash .travis/build.sh
+        -k $encrypted_678139e2bc67_key
+        -i $encrypted_678139e2bc67_iv
+      after_success: skip

.travis/build.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+main() {
+  while getopts ":k:i:" opt; do
+    case $opt in
+      k) encrypted_key="$OPTARG"
+      ;;
+      i) encrypted_iv="$OPTARG"
+      ;;
+      \?) echo "Invalid option -$OPTARG" >&2
+      ;;
+    esac
+  done
+
+  git checkout -f $TRAVIS_BRANCH
+  git config user.name "flarum-bot"
+  git config user.email "bot@flarum.org"
+
+  cd js
+  npm i -g npm@6.1.0
+  npm ci
+  npm run build
+
+  git add dist/* -f
+  git commit -m "Bundled output for commit $TRAVIS_COMMIT [skip ci]"
+
+  eval `ssh-agent -s`
+  openssl aes-256-cbc -K $encrypted_key -iv $encrypted_iv -in ../.deploy.enc -d | ssh-add -
+
+  git push git@github.com:$TRAVIS_REPO_SLUG.git $TRAVIS_BRANCH
+}
+
+main "$@"

CHANGELOG.md

@@ -1,452 +0,0 @@
-# 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
-- Full support for PHP 7.4 (#1980)
-- Mail settings: Configure region for the Mailgun driver (#1834, #1850)
-- Mail settings: Alert admins about incomplete settings (#1763, #1921)
-- New permission that allows users to post without throttling (#1255, #1938)
-- Basic transliteration of discussion "slugs" / pretty URLs (#194, #1975)
-- User profiles: Render basic content on server side (#1901)
-- New extender for configuring middleware (#1919, #1952, #1957, #1971)
-- New extender for configuring error handling (#1781, #1970)
-- Automated tests for PHP extenders to guarantee their backwards compatibility
-
-### Changed
-- Profile URLs for non-existing users properly return HTTP 404 (#1846, #1901)
-- Confirmation email subject no longer contains the forum title (#1613)
-- Improved error handling during Flarum's early boot phase (#1607)
-- Updated deprecated "Zend" libraries to their new "Laminas" equivalents (#1963)
-
-### Fixed
-- Update page did not work when installed in subdirectories (#1947)
-- Avatar upload did not work in IE11 / Edge (#1125, #1570)
-- Translation fallback was ignored for client-rendered pages (#1774, #1961)
-- The success alert when posting replies was invisible (#1976)
-
-## [0.1.0-beta.11.1](https://github.com/flarum/core/compare/v0.1.0-beta.11...v0.1.0-beta.11.1)
-
-### Fixed
-- Saving custom css in admin failed (#1946)
-
-## [0.1.0-beta.11](https://github.com/flarum/core/compare/v0.1.0-beta.10...v0.1.0-beta.11)
-
-### Added
-- Comments have an additional class `Post--by-actor` when posted by the user (#1927)
-
-### Changed
-- Improved support for URL identification during installation (#1861)
-- KeyboardNavigatable now has a callback ability (#1922)
-- Links are no longer opened with target `_blank` but in the same window (#859)
-- Links now have `nofollow ugc` by default as their `rel` attribute (#859, #1884)
-- Improved performance of the full text gambit when searching for users (#1877)
-- The Queue implementation is now available under its Illuminate contract
-
-### Fixed
-- No error handling was possible in the console/cli (#1789)
-- Enable scrollbars in log in modals so it fits for GitHub (#1716)
-- Reduce log in modal for SSO so it fits for Facebook (#1727)
-- Deleting discussions permanently did not delete its posts (#1909)
-- Fixed the queue:restart command (#1932)
-- Deleted posts were visible to all visitors (#1827)
-- Old avatars weren't being deleted when replaced (#1918)
-- The search performance regression was reverted (#1764)
-- No profile background could be set for remote images (#445)
-- Back button sends to home even though it could actually go back (#1942)
-- Debug button no longer visible (#1687)
-- Modals on smaller screens use the whole width of the page
-
-## [0.1.0-beta.10](https://github.com/flarum/core/compare/v0.1.0-beta.9...v0.1.0-beta.10)
-
-### Added
-- Initial queue support: Infrastructure for offloading long-running tasks (e.g. email sending) to background workers (#1773)
-- Notifications can now be marked as read without visiting a discussion (#151)
-- SEO: The discussion list now has a `rel="canonical"` meta tag, preventing duplicate content (#1134, #1814)
-- The "Edit User" permission can now be edited in the UI (#1845)
-- New status message and redirect after user deletion (#1750, #1777)
-- Errors in Flarum's boot process are now presented with more detailed information (#1607)
-
-### Changed
-- Better, more detailed and extensible error handling (#1641, #1843)
-- Error pages in debug mode now return the same HTTP status codes as in production (#1648)
-- Tweak HTTP status codes for authentication / authorization errors (#1854)
-- Already-used links from account activation emails now show a better error message (#1337)
-
-### Fixed
-- Security vulnerabilities in dependencies
-- Performance: High CPU usage when scrolling in a discussion (#1222)
-- Special characters crashed the search (#1498)
-- Missing declarations for language and text direction in HTML output (#1772)
-- Private messages were counted in user post counts (#1695)
-- Extensions could not change the forum's default page (#1819)
-- API requests authenticated using access tokens needed to provide a CSRF token (#1828)
-- Accessibility: Screenreaders did not read the "Back to discussion list" link (#1835)
-
-## [0.1.0-beta.9](https://github.com/flarum/core/compare/v0.1.0-beta.8.2...v0.1.0-beta.9)
-
-### Added
-- New `hasPermission()` helper method for `Group` objects ([9684fbc](https://github.com/flarum/core/commit/9684fbc4da07d32aa322d9228302a23418412cb9))
-- Expose supported mail drivers in IoC container ([208bad3](https://github.com/flarum/core/commit/208bad393f37bfdb76007afcddfa4b7451563e9d))
-- More test for some API endpoints ([1670590](https://github.com/flarum/core/commit/167059027e5a066d618599c90164ef1b5a509148))
-- The `Formatter\Rendering` event now receives the HTTP request instance as well ([0ab9fac](https://github.com/flarum/core/commit/0ab9facc4bd59a260575e6fc650793c663e5866a))
-- More and better validation in installer UIs
-- Check and enforce minimum MariaDB ([7ff9a90](https://github.com/flarum/core/commit/7ff9a90204923293adc520d3c02dc984845d4f9f))
-- Revert publication of assets when installation fails ([ed9591c](https://github.com/flarum/core/commit/ed9591c16fb2ea7a4be3387b805d855a53e0a7d5))
-- Benefit from Laravel's database reconnection logic in long-running tasks ([e0becd0](https://github.com/flarum/core/commit/e0becd0c7bda939048923c1f86648793feee78d5))
-- The "vendor path" (where Composer dependencies can be found) can now be configured ([5e1680c](https://github.com/flarum/core/commit/5e1680c458cd3ba274faeb92de3ac2053789131e))
-
-### Changed
-- Performance: Actually cache translations on disk ([0d16fac](https://github.com/flarum/core/commit/0d16fac001bb735ee66e82871183516aeac269b7))
-- Allow per-site extenders to override extension extenders ([ba594de](https://github.com/flarum/core/commit/ba594de13a033480834d53d73f747b05fe9796f8))
-- Do not resolve objects from the IoC container (in service providers and extenders) until they are actually used
-- Replace event subscribers (that resolve objects from the IoC container) with listeners (that resolve lazily)
-- Use custom service provider for Mail component ([ac5e26a](https://github.com/flarum/core/commit/ac5e26a254d89e21bd4c115b6cbd40338e2e4b4b))
-- Update to Laravel 5.7, revert custom logic for building database index names
-- Refactored installer, extracted Installation class and pipeline for reuse in CLI and web installers ([790d5be](https://github.com/flarum/core/commit/790d5beee5e283178716bc8f9901c758d9e5b6a0))
-- Use whitelist for enabling pre-installed extensions during installation ([4585f03](https://github.com/flarum/core/commit/4585f03ee356c92942fbc2ae8c683c651b473954))
-- Update minimum MySQL version ([7ff9a90](https://github.com/flarum/core/commit/7ff9a90204923293adc520d3c02dc984845d4f9f))
-
-### Fixed
-- Signing up via OAuth providers was broken ([67f9375](https://github.com/flarum/core/commit/67f9375d4745add194ae3249d526197c32fd5461))
-- Group badges were overlapping ([16eb1fa](https://github.com/flarum/core/commit/16eb1fa63b6d7b80ec30c24c0e406a2b7ab09934))
-- API: Endpoint for uninstalling extensions returned an error ([c761802](https://github.com/flarum/core/commit/c76180290056ddbab67baf5ede814fcedf1dcf14))
-- Documentation links in installer were outdated ([b58380e](https://github.com/flarum/core/commit/b58380e224ee54abdade3d0a4cc107ef5c91c9a9))
-- Event posts where counted when aggregating user posts ([671fdec](https://github.com/flarum/core/commit/671fdec8d0a092ccceb5d4d5f657d0f4287fc4c7))
-- Admins could not reset user passwords ([c67fb2d](https://github.com/flarum/core/commit/c67fb2d4b6a128c71d65dc6703310c0b62f91be2))
-- Several down migrations were invalid
-- Validation errors on reset password page resulted in HTTP 404 ([4611abe](https://github.com/flarum/core/commit/4611abe5db8b94ca3dc7bf9c447fca7c67358ee3))
-- `is:unread` gambit generated an invalid query ([e17bb0b](https://github.com/flarum/core/commit/e17bb0b4331f2c92459292195c6b7db8cde1f9f3))
-- Entire forum was breaking when the `custom_less` setting was missing from the database ([bf2c5a5](https://github.com/flarum/core/commit/bf2c5a5564dff3f5ef13efe7a8d69f2617570ce6))
-- Dropdown icon was not showing in user card when on user page ([12fdfc9](https://github.com/flarum/core/commit/12fdfc9b544a27f6fe59c82ad6bddd3420cc0181))
-- Requests were missing the `original*` attributes, which broke installations in subfolders ([56fde28](https://github.com/flarum/core/commit/56fde28e436f52fee0c03c538f0a6049bc584b53))
-- Special characters such as `%` and `_` could return incorrect results ([ee3640e](https://github.com/flarum/core/commit/ee3640e1605ff67fef4b3d5cd0596f14a6ae73c9))
-- FontAwesome component package changed paths in version 5.9.0 ([5eb69e1](https://github.com/flarum/core/commit/5eb69e1f59fa73fdfd5badbf41a05a6a040e7426))
-- Some server environments had problems accessing the system-wide tmp path for storing JS file maps ([54660eb](https://github.com/flarum/core/commit/54660ebd6311f9ea142f1b573263d0d907400786))
-- Content length of posts.content was not migrated to mediumText in 2017 ([590b311](https://github.com/flarum/core/commit/590b3115708bf94a9c7f169d98c6126380c7056e))
-- An error occurred when going to the previous route if there was no previous route found ([985b87da](https://github.com/flarum/core/commit/985b87da6c9942c568a1a192e2fdcfde72e030ee))
-
-### Removed
-- `php flarum install --defaults` - this was meant to be used in our old development VM ([44c9109](https://github.com/flarum/core/commit/44c91099cd77138bb5fc29f14fb1e81a9781272d))
-- Obsolete `id` attributes in JSON-API responses ([ecc3b5e](https://github.com/flarum/core/commit/ecc3b5e2271f8d9b38d52cd54476d86995dbe32e) and [7a44086](https://github.com/flarum/core/commit/7a44086bf3a0e3ba907dceb13d07ac695eca05ea))
-
-## [0.1.0-beta.8.1](https://github.com/flarum/core/compare/v0.1.0-beta.8...v0.1.0-beta.8.1)
-
-### Fixed
-- Fix live output in `migrate:reset` command ([f591585](https://github.com/flarum/core/commit/f591585d02f8c4ff0211c5bf4413dd6baa724c05))
-- Fix search with database prefix ([7705a2b](https://github.com/flarum/core/commit/7705a2b7d751943ef9d0c7379ec34f8530b99310))
-- Fix invalid join time of admin user created by installer ([57f73c9](https://github.com/flarum/core/commit/57f73c9638eeb825f9e336ed3c443afccfd8995e))
-- Ensure InnoDB engine is used for all tables ([fb6b51b](https://github.com/flarum/core/commit/fb6b51b1cfef0af399607fe038603c8240800b2b), [6370f7e](https://github.com/flarum/core/commit/6370f7ecffa9ea7d5fb64d9551400edbc63318db))
-- Fix dropping foreign keys in `down` migrations ([57d5846](https://github.com/flarum/core/commit/57d5846b647881009d9e60f9ffca20b1bb77776e))
-- Fix discussion list scroll position not being maintained when hero is not visible ([40dc6ac](https://github.com/flarum/core/commit/40dc6ac604c2a0973356b38217aa8d09352daae5))
-- Fix empty meta description tag ([88e43cc](https://github.com/flarum/core/commit/88e43cc6940ee30d6529e9ce659471ec4fb1c474))
-- Remove empty attributes on `<html>` tag ([796b577](https://github.com/flarum/core/commit/796b57753d34d4ea741dbebcbc550b17808f6c94))

LICENSE

@@ -1,7 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2020 Stichting Flarum (Flarum Foundation)
-Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)
+Copyright (c) 2014-2018 Toby Zerner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,36 +1,11 @@
-<p align="center"><img src="https://flarum.org/assets/img/logo.png"></p>
+# Flarum Core
 
-<p align="center">
-<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:
-
-* **Fast and simple.** No clutter, no bloat, no complex dependencies. Flarum is built with PHP so it’s quick and easy to deploy. The interface is powered by Mithril, a performant JavaScript framework with a tiny footprint.
-
-* **Beautiful and responsive.** This is forum software for humans. Flarum is carefully designed to be consistent and intuitive across platforms, out-of-the-box.
-
-* **Powerful and extensible.** Customize, extend, and integrate Flarum to suit your community. Flarum’s architecture is amazingly flexible, with a powerful Extension API.
-
-## Installation
-
-This repository contains Flarum's core code. If you want to set up a forum, visit the [Flarum skeleton repository](https://github.com/flarum/flarum).
+This repository contains Flarum's core code. If you want to set up a forum, visit the [main Flarum repository](https://github.com/flarum/flarum).
 
 ## Contributing
 
-Thank you for considering contributing to Flarum! Please read the **[Contributing guide](https://flarum.org/docs/contributing.html)** to learn how you can help.
+Flarum is open-source and we would love your help building it! Please read the [Contributing Guide](https://github.com/flarum/flarum/blob/master/CONTRIBUTING.md) to learn how you can help.
 
-## Security Vulnerabilities
+### Security Vulnerabilities
 
-If you discover a security vulnerability within Flarum, please send an e-mail to [security@flarum.org](mailto:security@flarum.org). All security vulnerabilities will be promptly addressed. More details can be found in our [security policy](https://github.com/flarum/core/security/policy).
-
-## License
-
-Flarum is open-source software licensed under the [MIT License](https://github.com/flarum/flarum/blob/master/LICENSE).
+If you discover a security vulnerability within Flarum, please send an email to [security@flarum.org](mailto:security@flarum.org).

composer.json

@@ -1,17 +1,17 @@
 {
     "name": "flarum/core",
     "description": "Delightfully simple forum software.",
-    "keywords": [
-        "forum",
-        "discussion"
-    ],
+    "keywords": ["forum", "discussion"],
     "homepage": "https://flarum.org/",
     "license": "MIT",
     "authors": [
         {
-            "name": "Flarum",
-            "email": "info@flarum.org",
-            "homepage": "https://flarum.org/team"
+            "name": "Toby Zerner",
+            "email": "toby.zerner@gmail.com"
+        },
+        {
+            "name": "Franz Liedke",
+            "email": "franz@develophp.org"
         }
     ],
     "support": {
@@ -20,57 +20,52 @@
         "docs": "https://flarum.org/docs/"
     },
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.1",
         "axy/sourcemap": "^0.1.4",
-        "components/font-awesome": "^5.14.0",
-        "dflydev/fig-cookies": "^3.0.0",
+        "components/font-awesome": "^5.0.6",
+        "dflydev/fig-cookies": "^1.0.2",
         "doctrine/dbal": "^2.7",
-        "dragonmantank/cron-expression": "^3.1.0",
-        "franzl/whoops-middleware": "^2.0.0",
-        "illuminate/bus": "^8.0",
-        "illuminate/cache": "^8.0",
-        "illuminate/config": "^8.0",
-        "illuminate/console": "^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": "^2.4.1",
-        "laminas/laminas-httphandlerrunner": "^1.2.0",
-        "laminas/laminas-stratigility": "^3.2.2",
+        "franzl/whoops-middleware": "^0.4.0",
+        "illuminate/bus": "5.5.*",
+        "illuminate/cache": "5.5.*",
+        "illuminate/config": "5.5.*",
+        "illuminate/container": "5.5.*",
+        "illuminate/contracts": "5.5.*",
+        "illuminate/database": "5.5.*",
+        "illuminate/events": "5.5.*",
+        "illuminate/filesystem": "5.5.*",
+        "illuminate/hashing": "5.5.*",
+        "illuminate/mail": "5.5.*",
+        "illuminate/session": "5.5.*",
+        "illuminate/support": "5.5.*",
+        "illuminate/validation": "5.5.*",
+        "illuminate/view": "5.5.*",
+        "intervention/image": "^2.3.0",
         "league/flysystem": "^1.0.11",
         "matthiasmullie/minify": "^1.3",
-        "middlewares/base-path": "^2.0.1",
-        "middlewares/base-path-router": "^2.0.1",
-        "middlewares/request-handler": "^2.0.1",
+        "middlewares/base-path": "^1.1",
+        "middlewares/base-path-router": "^0.2.1",
+        "middlewares/request-handler": "^1.2",
         "monolog/monolog": "^1.16.0",
-        "nesbot/carbon": "^2.0",
         "nikic/fast-route": "^0.6",
+        "oyejorge/less.php": "^1.7",
         "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": "^5.2.2",
-        "symfony/console": "^5.2.2",
-        "symfony/event-dispatcher": "^5.2.2",
-        "symfony/mime": "^5.2.0",
-        "symfony/polyfill-intl-messageformatter": "^1.22.0",
-        "symfony/translation": "^5.1.5",
-        "symfony/yaml": "^5.2.2",
+        "s9e/text-formatter": "^1.2.0",
+        "symfony/config": "^3.3",
+        "symfony/console": "^3.3",
+        "symfony/http-foundation": "^3.3",
+        "symfony/translation": "^3.3",
+        "symfony/yaml": "^3.3",
         "tobscure/json-api": "^0.3.0",
-        "wikimedia/less.php": "^3.0"
+        "zendframework/zend-diactoros": "^1.8.4",
+        "zendframework/zend-httphandlerrunner": "^1.0",
+        "zendframework/zend-stratigility": "^3.0"
     },
     "require-dev": {
-        "flarum/testing": "dev-main#81e25f034e2b6dceaea753ad7579b5c61d641993"
+        "mockery/mockery": "^0.9.4",
+        "phpunit/phpunit": "^6.0"
     },
     "autoload": {
         "psr-4": {
@@ -92,20 +87,5 @@
         "branch-alias": {
             "dev-master": "0.1.x-dev"
         }
-    },
-    "scripts": {
-        "test": [
-            "@test:unit",
-            "@test:integration"
-        ],
-        "test:unit": "phpunit -c tests/phpunit.unit.xml",
-        "test:integration": "phpunit -c tests/phpunit.integration.xml",
-        "test:setup": "@php tests/integration/setup.php"
-    },
-    "scripts-descriptions": {
-        "test": "Runs all tests.",
-        "test:unit": "Runs all unit tests.",
-        "test:integration": "Runs all integration tests.",
-        "test:setup": "Sets up a database for use with integration tests. Execute this only once."
     }
 }

js/.bundlewatch.config.json

@@ -1,8 +0,0 @@
-{
-    "files": [
-        {
-            "path": "./dist/*.js"
-        }
-    ],
-    "defaultCompression": "gzip"
-}

js/.prettierrc.json

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

js/package.json

@@ -1,49 +1,26 @@
 {
-  "private": true,
   "name": "@flarum/core",
+  "version": "0.0.0",
   "dependencies": {
-    "@askvortsov/rich-icu-message-formatter": "^0.1.0",
-    "@ultraq/icu-message-formatter": "^0.10.0",
-    "bootstrap": "^3.4.1",
-    "clsx": "^1.1.1",
+    "bootstrap": "^3.3.7",
+    "classnames": "^2.2.5",
     "color-thief-browser": "^2.0.2",
-    "dayjs": "^1.10.4",
-    "expose-loader": "^1.0.3",
-    "jquery": "^3.6.0",
+    "expose-loader": "^0.7.5",
+    "flarum-webpack-config": "^0.1.0-beta.9",
+    "jquery": "^3.3.1",
     "jquery.hotkeys": "^0.1.0",
-    "lodash-es": "^4.17.21",
-    "mithril": "^2.0.4",
+    "lodash-es": "^4.17.10",
+    "m.attrs.bidi": "github:tobscure/m.attrs.bidi",
+    "mithril": "^0.2.8",
+    "moment": "^2.22.2",
     "punycode": "^2.1.1",
     "spin.js": "^3.1.0",
-    "textarea-caret": "^3.1.0"
-  },
-  "devDependencies": {
-    "@babel/preset-typescript": "^7.13.0",
-    "@types/jquery": "^3.5.5",
-    "@types/lodash-es": "^4.17.4",
-    "@types/mithril": "^2.0.7",
-    "@types/punycode": "^2.1.0",
-    "@types/textarea-caret": "^3.0.0",
-    "bundlewatch": "^0.3.2",
-    "cross-env": "^7.0.3",
-    "flarum-webpack-config": "0.1.0-beta.10",
-    "husky": "^4.3.8",
-    "prettier": "^2.2.1",
-    "webpack": "^4.46.0",
-    "webpack-bundle-analyzer": "^4.4.0",
-    "webpack-cli": "^3.3.12",
-    "webpack-merge": "^4.2.2"
+    "webpack": "^4.17.1",
+    "webpack-cli": "^2.1.5",
+    "webpack-merge": "^4.1.4"
   },
   "scripts": {
-    "dev": "webpack --mode development --watch",
     "build": "webpack --mode production",
-    "analyze": "cross-env ANALYZER=true npm run build",
-    "format": "prettier --write src",
-    "format-check": "prettier --check src"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npm run format"
-    }
+    "watch": "webpack --mode development --watch"
   }
 }

js/shims.d.ts

@@ -1,44 +0,0 @@
-// 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 {
-  // $ is already defined by `@types/jquery`
-  const m: Mithril.Static;
-  const dayjs: typeof _dayjs;
-
-  // Extend JQuery with our custom functions, defined with $.fn
-  interface JQuery {
-    /**
-     * Creates a tooltip on a jQuery element reference.
-     *
-     * Optionally accepts placement and delay options.
-     *
-     * Returns the same reference to allow for method chaining.
-     */
-    tooltip: (tooltipOptions?: { placement?: 'top' | 'bottom' | 'left' | 'right'; delay?: number }) => JQuery;
-  }
-}
-
-/**
- * All global variables owned by flarum/core.
- */
-declare global {
-  const app: Application;
-}

js/src/admin/AdminApplication.js

@@ -4,24 +4,17 @@ 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,
-  };
+  extensionSettings = {};
 
   history = {
     canGoBack: () => true,
     getPrevious: () => {},
     backUrl: () => this.forum.attribute('baseUrl'),
-    back: function () {
+    back: function() {
       window.location = this.backUrl();
-    },
+    }
   };
 
   constructor() {
@@ -34,24 +27,22 @@ export default class AdminApplication extends Application {
    * @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.mount(document.getElementById('app-navigation'), Navigation.component({className: 'App-backControl', drawer: true}));
+    m.mount(document.getElementById('header-navigation'), Navigation.component());
+    m.mount(document.getElementById('header-primary'), HeaderPrimary.component());
+    m.mount(document.getElementById('header-secondary'), HeaderSecondary.component());
+    m.mount(document.getElementById('admin-navigation'), AdminNav.component());
 
-    m.route.prefix = '#';
+    m.route.mode = 'hash';
     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);
+    // 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) {
@@ -68,5 +59,5 @@ export default class AdminApplication extends Application {
     }
 
     return required;
-  }
+  };
 }

js/src/admin/app.ts

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

js/src/admin/compat.js

@@ -1,35 +1,30 @@
 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 Page from './components/Page';
 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 AddExtensionModal from './components/AddExtensionModal';
+import ExtensionsPage from './components/ExtensionsPage';
+import AdminLinkButton from './components/AdminLinkButton';
 import PermissionGrid from './components/PermissionGrid';
-import ExtensionPermissionGrid from './components/ExtensionPermissionGrid';
+import Widget from './components/Widget';
 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 UserListPage from './components/UserListPage';
 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';
@@ -37,37 +32,32 @@ 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/Page': Page,
   'components/StatusWidget': StatusWidget,
-  'components/ExtensionsWidget': ExtensionsWidget,
   'components/HeaderSecondary': HeaderSecondary,
   'components/SettingsModal': SettingsModal,
   'components/DashboardWidget': DashboardWidget,
-  'components/ExtensionPage': ExtensionPage,
-  'components/ExtensionLinkButton': ExtensionLinkButton,
+  'components/AddExtensionModal': AddExtensionModal,
+  'components/ExtensionsPage': ExtensionsPage,
+  'components/AdminLinkButton': AdminLinkButton,
   'components/PermissionGrid': PermissionGrid,
-  'components/ExtensionPermissionGrid': ExtensionPermissionGrid,
+  'components/Widget': Widget,
   'components/MailPage': MailPage,
   'components/UploadImageButton': UploadImageButton,
   'components/LoadingModal': LoadingModal,
   'components/DashboardPage': DashboardPage,
   'components/BasicsPage': BasicsPage,
-  'components/UserListPage': UserListPage,
   '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,
+  'routes': routes,
+  'AdminApplication': AdminApplication
 });

js/src/admin/components/AddExtensionModal.js

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

js/src/admin/components/AdminHeader.js

@@ -1,19 +0,0 @@
-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.js

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

js/src/admin/components/AdminNav.js

@@ -1,157 +1,77 @@
-import ExtensionLinkButton from './ExtensionLinkButton';
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 import Component from '../../common/Component';
-import LinkButton from '../../common/components/LinkButton';
+import AdminLinkButton from './AdminLinkButton';
 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
+        className="AdminNav App-titleControl"
+        buttonClassName="Button">
+        {this.items().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.
+   * Build an item list of 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', 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(
-      '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', 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(
-      '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', 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(
-      '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', 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(
-      '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', 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(
-      '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(
-      'userList',
-      <LinkButton href={app.route('users')} icon="fas fa-users" title={app.translator.trans('core.admin.nav.userlist_title')}>
-        {app.translator.trans('core.admin.nav.userlist_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 || '';
-        const description = extension.description || '';
-
-        if (!query || title.toUpperCase().includes(query) || description.toUpperCase().includes(query)) {
-          items.add(
-            `extension-${extension.id}`,
-            <ExtensionLinkButton
-              href={app.route('extension', { id: extension.id })}
-              extensionId={extension.id}
-              className="ExtensionNavButton"
-              title={description}
-            >
-              {title}
-            </ExtensionLinkButton>,
-            categories[category]
-          );
-        }
-      });
-    });
+    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

@@ -1,180 +0,0 @@
-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, help, ...componentAttrs } = entry;
-
-    delete componentAttrs.help;
-
-    const value = this.setting([setting])();
-    if (['bool', 'checkbox', 'switch', 'boolean'].includes(componentAttrs.type)) {
-      return (
-        <div className="Form-group">
-          <Switch state={!!value && value !== '0'} onchange={this.settings[setting]} {...componentAttrs}>
-            {componentAttrs.label}
-          </Switch>
-          <div className="helpText">{help}</div>
-        </div>
-      );
-    } else if (['select', 'dropdown', 'selectdropdown'].includes(componentAttrs.type)) {
-      return (
-        <div className="Form-group">
-          <label>{componentAttrs.label}</label>
-          <div className="helpText">{help}</div>
-          <Select
-            value={value || componentAttrs.default}
-            options={componentAttrs.options}
-            buttonClassName="Button"
-            onchange={this.settings[setting]}
-            {...componentAttrs}
-          />
-        </div>
-      );
-    } else {
-      componentAttrs.className = classList(['FormControl', componentAttrs.className]);
-      return (
-        <div className="Form-group">
-          {componentAttrs.label ? <label>{componentAttrs.label}</label> : ''}
-          <div className="helpText">{help}</div>
-          <input type={componentAttrs.type} bidi={this.setting(setting)} {...componentAttrs} />
-        </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

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

js/src/admin/components/BasicsPage.js

@@ -1,10 +1,31 @@
+import Page from './Page';
 import FieldSet from '../../common/components/FieldSet';
+import Select from '../../common/components/Select';
+import Button from '../../common/components/Button';
+import Alert from '../../common/components/Alert';
+import saveSettings from '../utils/saveSettings';
 import ItemList from '../../common/utils/ItemList';
-import AdminPage from './AdminPage';
+import Switch from '../../common/components/Switch';
 
-export default class BasicsPage extends AdminPage {
-  oninit(vnode) {
-    super.oninit(vnode);
+export default class BasicsPage extends Page {
+  init() {
+    super.init();
+
+    this.loading = false;
+
+    this.fields = [
+      'forum_title',
+      'forum_description',
+      'default_locale',
+      'show_language_selector',
+      'default_route',
+      'welcome_title',
+      'welcome_message'
+    ];
+    this.values = {};
+
+    const settings = app.data.settings;
+    this.fields.forEach(key => this.values[key] = m.prop(settings[key]));
 
     this.localeOptions = {};
     const locales = app.data.locales;
@@ -12,107 +33,94 @@ export default class BasicsPage extends AdminPage {
       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;
-      });
-    });
+    if (typeof this.values.show_language_selector() !== "number") this.values.show_language_selector(1);
   }
 
-  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'),
-    };
-  }
+  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)}/>
+              ]
+            })}
 
-  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'),
-        })}
+            {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
-          ? [
-              this.buildSettingComponent({
-                type: 'select',
-                setting: 'default_locale',
-                options: this.localeOptions,
+            {Object.keys(this.localeOptions).length > 1
+              ? FieldSet.component({
                 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'),
-              }),
-            ]
-          : ''}
+                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 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>
+            {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>
+                )
+              ]
+            })}
 
-        <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')} />
+            {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>
+    );
+  }
 
-        {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>,
-    ];
+  changed() {
+    return this.fields.some(key => this.values[key]() !== app.data.settings[key]);
   }
 
   /**
@@ -127,9 +135,32 @@ export default class BasicsPage extends AdminPage {
 
     items.add('allDiscussions', {
       path: '/all',
-      label: app.translator.trans('core.admin.basics.all_discussions_label'),
+      label: app.translator.trans('core.admin.basics.all_discussions_label')
     });
 
     return items;
   }
+
+  onsubmit(e) {
+    e.preventDefault();
+
+    if (this.loading) return;
+
+    this.loading = true;
+    app.alerts.dismiss(this.successAlert);
+
+    const settings = {};
+
+    this.fields.forEach(key => settings[key] = this.values[key]());
+
+    saveSettings(settings)
+      .then(() => {
+        app.alerts.show(this.successAlert = new Alert({type: 'success', children: app.translator.trans('core.admin.basics.saved_message')}));
+      })
+      .catch(() => {})
+      .then(() => {
+        this.loading = false;
+        m.redraw();
+      });
+  }
 }

js/src/admin/components/DashboardPage.js

@@ -1,29 +1,18 @@
+import Page from './Page';
 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();
+export default class DashboardPage extends Page {
+  view() {
+    return (
+      <div className="DashboardPage">
+        <div className="container">
+          {this.availableWidgets()}
+        </div>
+      </div>
+    );
   }
 
   availableWidgets() {
-    const items = new ItemList();
-
-    items.add('status', <StatusWidget />, 30);
-
-    items.add('extensions', <ExtensionsWidget />, 10);
-
-    return items;
+    return [<StatusWidget/>];
   }
 }

js/src/admin/components/DashboardWidget.js

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

js/src/admin/components/EditCustomCssModal.js

@@ -11,14 +11,10 @@ export default class EditCustomCssModal extends SettingsModal {
 
   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>,
+      <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>,
+        <textarea className="FormControl" rows="30" bidi={this.setting('custom_less')}/>
+      </div>
     ];
   }
 

js/src/admin/components/EditCustomFooterModal.js

@@ -13,8 +13,8 @@ export default class EditCustomFooterModal extends SettingsModal {
     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>,
+        <textarea className="FormControl" rows="30" bidi={this.setting('custom_footer')}/>
+      </div>
     ];
   }
 

js/src/admin/components/EditCustomHeaderModal.js

@@ -13,8 +13,8 @@ export default class EditCustomHeaderModal extends SettingsModal {
     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>,
+        <textarea className="FormControl" rows="30" bidi={this.setting('custom_header')}/>
+      </div>
     ];
   }
 

js/src/admin/components/EditGroupModal.js

@@ -3,24 +3,19 @@ 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);
+  init() {
+    this.group = this.props.group || app.store.createRecord('groups');
 
-    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);
+    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() {
@@ -29,21 +24,21 @@ export default class EditGroupModal extends Modal {
 
   title() {
     return [
-      this.color() || this.icon()
-        ? Badge.component({
-            icon: this.icon(),
-            style: { backgroundColor: this.color() },
-          })
-        : '',
+      this.color() || this.icon() ? Badge.component({
+        icon: this.icon(),
+        style: {backgroundColor: this.color()}
+      }) : '',
       ' ',
-      this.namePlural() || app.translator.trans('core.admin.edit_group.title'),
+      this.namePlural() || app.translator.trans('core.admin.edit_group.title')
     ];
   }
 
   content() {
     return (
       <div className="Modal-body">
-        <div className="Form">{this.fields().toArray()}</div>
+        <div className="Form">
+          {this.fields().toArray()}
+        </div>
       </div>
     );
   }
@@ -51,95 +46,55 @@ export default class EditGroupModal extends Modal {
   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('name', <div className="Form-group">
+      <label>{app.translator.trans('core.admin.edit_group.name_label')}</label>
+      <div className="EditGroupModal-name-input">
+        <input className="FormControl" placeholder={app.translator.trans('core.admin.edit_group.singular_placeholder')} value={this.nameSingular()} oninput={m.withAttr('value', this.nameSingular)}/>
+        <input className="FormControl" placeholder={app.translator.trans('core.admin.edit_group.plural_placeholder')} value={this.namePlural()} oninput={m.withAttr('value', this.namePlural)}/>
+      </div>
+    </div>, 30);
 
-    items.add(
-      'color',
-      <div className="Form-group">
-        <label>{app.translator.trans('core.admin.edit_group.color_label')}</label>
-        <input className="FormControl" placeholder="#aaaaaa" bidi={this.color} />
-      </div>,
-      20
-    );
+    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" bidi={this.icon} />
-      </div>,
-      10
-    );
+    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(
-      '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
-    );
+    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(),
-      isHidden: this.isHidden(),
-    };
-  }
-
   onsubmit(e) {
     e.preventDefault();
 
     this.loading = true;
 
-    this.group
-      .save(this.submitData(), { errorHandler: this.onerror.bind(this) })
+    this.group.save({
+      nameSingular: this.nameSingular(),
+      namePlural: this.namePlural(),
+      color: this.color(),
+      icon: this.icon()
+    }, {errorHandler: this.onerror.bind(this)})
       .then(this.hide.bind(this))
       .catch(() => {
         this.loading = false;

js/src/admin/components/ExtensionLinkButton.js

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

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

@@ -1,53 +0,0 @@
-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.js

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

js/src/admin/components/ExtensionsWidget.js

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

@@ -8,7 +8,11 @@ import listItems from '../../common/helpers/listItems';
  */
 export default class HeaderPrimary extends Component {
   view() {
-    return <ul className="Header-controls">{listItems(this.items().toArray())}</ul>;
+    return (
+      <ul className="Header-controls">
+        {listItems(this.items().toArray())}
+      </ul>
+    );
   }
 
   config(isInitialized, context) {

js/src/admin/components/HeaderSecondary.js

@@ -1,5 +1,4 @@
 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';
@@ -9,7 +8,18 @@ import listItems from '../../common/helpers/listItems';
  */
 export default class HeaderSecondary extends Component {
   view() {
-    return <ul className="Header-controls">{listItems(this.items().toArray())}</ul>;
+    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;
   }
 
   /**
@@ -20,13 +30,6 @@ export default class HeaderSecondary extends Component {
   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/LoadingModal.js

@@ -1,10 +1,9 @@
 import Modal from '../../common/components/Modal';
 
 export default class LoadingModal extends Modal {
-  /**
-   * @inheritdoc
-   */
-  static isDismissible = false;
+  isDismissible() {
+    return false;
+  }
 
   className() {
     return 'LoadingModal Modal--small';

js/src/admin/components/MailPage.js

@@ -1,136 +1,124 @@
+import Page from './Page';
 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';
+import saveSettings from '../utils/saveSettings';
 
-export default class MailPage extends AdminPage {
-  oninit(vnode) {
-    super.oninit(vnode);
+export default class MailPage extends Page {
+  init() {
+    super.init();
 
-    this.sendingTest = false;
-    this.refresh();
-  }
+    this.loading = false;
 
-  headerInfo() {
-    return {
-      className: 'MailPage',
-      icon: 'fas fa-envelope',
-      title: app.translator.trans('core.admin.email.title'),
-      description: app.translator.trans('core.admin.email.description'),
-    };
-  }
+    this.fields = [
+      'mail_driver',
+      'mail_host',
+      'mail_from',
+      'mail_port',
+      'mail_username',
+      'mail_password',
+      'mail_encryption'
+    ];
+    this.values = {};
 
-  refresh() {
-    this.loading = true;
+    const settings = app.data.settings;
+    this.fields.forEach(key => this.values[key] = m.prop(settings[key]));
 
-    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 />;
+    this.localeOptions = {};
+    const locales = app.locales;
+    for (const i in locales) {
+      this.localeOptions[i] = `${locales[i]} (${i})`;
     }
+  }
 
-    const fields = this.driverFields[this.setting('mail_driver')()];
-    const fieldKeys = Object.keys(fields);
-
+  view() {
     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 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>
-        )}
-        {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(
-            {
+            {FieldSet.component({
+              label: app.translator.trans('core.admin.email.server_heading'),
+              className: 'MailPage-MailSettings',
+              children: [
+                <div className="MailPage-MailSettings-input">
+                  <label>{app.translator.trans('core.admin.email.driver_label')}</label>
+                  <input className="FormControl" value={this.values.mail_driver() || ''} oninput={m.withAttr('value', this.values.mail_driver)} />
+                  <label>{app.translator.trans('core.admin.email.host_label')}</label>
+                  <input className="FormControl" value={this.values.mail_host() || ''} oninput={m.withAttr('value', this.values.mail_host)} />
+                  <label>{app.translator.trans('core.admin.email.port_label')}</label>
+                  <input className="FormControl" value={this.values.mail_port() || ''} oninput={m.withAttr('value', this.values.mail_port)} />
+                  <label>{app.translator.trans('core.admin.email.encryption_label')}</label>
+                  <input className="FormControl" value={this.values.mail_encryption() || ''} oninput={m.withAttr('value', this.values.mail_encryption)} />
+                </div>
+              ]
+            })}
+
+            {FieldSet.component({
+              label: app.translator.trans('core.admin.email.account_heading'),
+              className: 'MailPage-MailSettings',
+              children: [
+                <div className="MailPage-MailSettings-input">
+                  <label>{app.translator.trans('core.admin.email.username_label')}</label>
+                  <input className="FormControl" value={this.values.mail_username() || ''} oninput={m.withAttr('value', this.values.mail_username)} />
+                  <label>{app.translator.trans('core.admin.email.password_label')}</label>
+                  <input className="FormControl" value={this.values.mail_password() || ''} oninput={m.withAttr('value', this.values.mail_password)} />
+                </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')}</label>
+                  <input className="FormControl" value={this.values.mail_from() || ''} oninput={m.withAttr('value', this.values.mail_from)} />
+                </div>
+              ]
+            })}
+
+            {Button.component({
+              type: 'submit',
               className: 'Button Button--primary',
-              disabled: this.sendingTest || this.isChanged(),
-              onclick: () => this.sendTestEmail(),
-            },
-            app.translator.trans('core.admin.email.send_test_mail_button')
-          )}
-        </FieldSet>
+              children: app.translator.trans('core.admin.email.submit_button'),
+              loading: this.loading,
+              disabled: !this.changed()
+            })}
+          </form>
+        </div>
       </div>
     );
   }
 
-  sendTestEmail() {
-    if (this.saving || this.sendingTest) return;
+  changed() {
+    return this.fields.some(key => this.values[key]() !== app.data.settings[key]);
+  }
 
-    this.sendingTest = true;
-    app.alerts.dismiss(this.testEmailSuccessAlert);
+  onsubmit(e) {
+    e.preventDefault();
 
-    app
-      .request({
-        method: 'POST',
-        url: app.forum.attribute('apiUrl') + '/mail/test',
+    if (this.loading) return;
+
+    this.loading = true;
+    app.alerts.dismiss(this.successAlert);
+
+    const settings = {};
+
+    this.fields.forEach(key => settings[key] = this.values[key]());
+
+    saveSettings(settings)
+      .then(() => {
+        app.alerts.show(this.successAlert = new Alert({type: 'success', children: app.translator.trans('core.admin.basics.saved_message')}));
       })
-      .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;
+      .catch(() => {})
+      .then(() => {
+        this.loading = false;
         m.redraw();
-        throw error;
       });
   }
-
-  saveSettings(e) {
-    super.saveSettings(e).then(this.refresh());
-  }
 }

js/src/admin/components/Page.js

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

js/src/admin/components/PermissionDropdown.js

@@ -8,133 +8,126 @@ import GroupBadge from '../../common/components/GroupBadge';
 function badgeForId(id) {
   const group = app.store.getById('groups', id);
 
-  return group ? GroupBadge.component({ group, label: null }) : '';
+  return group ? GroupBadge.component({group, label: null}) : '';
 }
 
 function filterByRequiredPermissions(groupIds, permission) {
-  app.getRequiredPermissions(permission).forEach((required) => {
-    const restrictToGroupIds = app.data.permissions[required] || [];
+  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);
-    }
+      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);
-  });
+      groupIds = filterByRequiredPermissions(groupIds, required);
+    });
 
   return groupIds;
 }
 
 export default class PermissionDropdown extends Dropdown {
-  static initAttrs(attrs) {
-    super.initAttrs(attrs);
+  static initProps(props) {
+    super.initProps(props);
 
-    attrs.className = 'PermissionDropdown';
-    attrs.buttonClassName = 'Button Button--text';
+    props.className = 'PermissionDropdown';
+    props.buttonClassName = 'Button Button--text';
   }
 
-  view(vnode) {
-    const children = [];
+  view() {
+    this.props.children = [];
 
-    let groupIds = app.data.permissions[this.attrs.permission] || [];
+    let groupIds = app.data.permissions[this.props.permission] || [];
 
-    groupIds = filterByRequiredPermissions(groupIds, this.attrs.permission);
+    groupIds = filterByRequiredPermissions(groupIds, this.props.permission);
 
     const everyone = groupIds.indexOf(Group.GUEST_ID) !== -1;
     const members = groupIds.indexOf(Group.MEMBER_ID) !== -1;
     const adminGroup = app.store.getById('groups', Group.ADMINISTRATOR_ID);
 
     if (everyone) {
-      this.attrs.label = Badge.component({ icon: 'fas fa-globe' });
+      this.props.label = Badge.component({icon: 'fas fa-globe'});
     } else if (members) {
-      this.attrs.label = Badge.component({ icon: 'fas fa-user' });
+      this.props.label = Badge.component({icon: 'fas fa-user'});
     } else {
-      this.attrs.label = [badgeForId(Group.ADMINISTRATOR_ID), groupIds.map(badgeForId)];
+      this.props.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')]
-          )
+      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)
+          })
         );
       }
 
-      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')]
-        ),
+      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(
-          {
-            icon: !everyone && !members ? 'fas fa-check' : true,
-            disabled: !everyone && !members,
-            onclick: (e) => {
-              if (e.shiftKey) e.stopPropagation();
-              this.save([]);
-            },
-          },
-          [badgeForId(adminGroup.id()), ' ', adminGroup.namePlural()]
-        )
+        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(
-        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()]
-            )
-          )
+        this.props.children,
+        app.store.all('groups')
+          .filter(group => [Group.ADMINISTRATOR_ID, Group.GUEST_ID, Group.MEMBER_ID].indexOf(group.id()) === -1)
+          .map(group => Button.component({
+            children: [badgeForId(group.id()), ' ', group.namePlural()],
+            icon: groupIds.indexOf(group.id()) !== -1 ? 'fas fa-check' : true,
+            onclick: (e) => {
+              if (e.shiftKey) e.stopPropagation();
+              this.toggle(group.id());
+            },
+            disabled: this.isGroupDisabled(group.id()) && this.isGroupDisabled(Group.MEMBER_ID) && this.isGroupDisabled(Group.GUEST_ID)
+          }))
       );
     }
 
-    return super.view({ ...vnode, children });
+    return super.view();
   }
 
   save(groupIds) {
-    const permission = this.attrs.permission;
+    const permission = this.props.permission;
 
     app.data.permissions[permission] = groupIds;
 
     app.request({
       method: 'POST',
       url: app.forum.attribute('apiUrl') + '/permission',
-      body: { permission, groupIds },
+      data: {permission, groupIds}
     });
   }
 
   toggle(groupId) {
-    const permission = this.attrs.permission;
+    const permission = this.props.permission;
 
     let groupIds = app.data.permissions[permission] || [];
 
@@ -144,13 +137,13 @@ export default class PermissionDropdown extends Dropdown {
       groupIds.splice(index, 1);
     } else {
       groupIds.push(groupId);
-      groupIds = groupIds.filter((id) => [Group.GUEST_ID, Group.MEMBER_ID].indexOf(id) === -1);
+      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;
+    return filterByRequiredPermissions([id], this.props.permission).indexOf(id) === -1;
   }
 }

js/src/admin/components/PermissionGrid.js

@@ -6,11 +6,19 @@ import ItemList from '../../common/utils/ItemList';
 import icon from '../../common/helpers/icon';
 
 export default class PermissionGrid extends Component {
+  init() {
+    this.permissions = this.permissionItems().toArray();
+  }
+
   view() {
     const scopes = this.scopeItems().toArray();
 
-    const permissionCells = (permission) => {
-      return scopes.map((scope) => <td>{scope.render(permission)}</td>);
+    const permissionCells = permission => {
+      return scopes.map(scope => (
+        <td>
+          {scope.render(permission)}
+        </td>
+      ));
     };
 
     return (
@@ -18,38 +26,31 @@ export default class PermissionGrid extends Component {
         <thead>
           <tr>
             <td></td>
-            {scopes.map((scope) => (
+            {scopes.map(scope => (
               <th>
                 {scope.label}{' '}
-                {scope.onremove
-                  ? Button.component({ icon: 'fas fa-times', className: 'Button Button--text PermissionGrid-removeScope', onclick: scope.onremove })
-                  : ''}
+                {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 />
+        {this.permissions.map(section => (
+          <tbody>
+            <tr className="PermissionGrid-section">
+              <th>{section.label}</th>
+              {permissionCells(section)}
+              <td/>
+            </tr>
+            {section.children.map(child => (
+              <tr className="PermissionGrid-child">
+                <th>{icon(child.icon)}{child.label}</th>
+                {permissionCells(child)}
+                <td/>
               </tr>
-              {section.children.map((child) => (
-                <tr className="PermissionGrid-child">
-                  <th>
-                    {icon(child.icon)}
-                    {child.label}
-                  </th>
-                  {permissionCells(child)}
-                  <td />
-                </tr>
-              ))}
-            </tbody>
-          ))}
+            ))}
+          </tbody>
+        ))}
       </table>
     );
   }
@@ -57,41 +58,25 @@ export default class PermissionGrid extends Component {
   permissionItems() {
     const items = new ItemList();
 
-    items.add(
-      'view',
-      {
-        label: app.translator.trans('core.admin.permissions.read_heading'),
-        children: this.viewItems().toArray(),
-      },
-      100
-    );
+    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('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('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
-    );
+    items.add('moderate', {
+      label: app.translator.trans('core.admin.permissions.moderate_heading'),
+      children: this.moderateItems().toArray()
+    }, 70);
 
     return items;
   }
@@ -99,54 +84,31 @@ export default class PermissionGrid extends Component {
   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('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(
-      '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('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',
@@ -154,49 +116,37 @@ export default class PermissionGrid extends Component {
       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('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);
+    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.trans('core.admin.permissions_controls.allow_some_minutes_button', { 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 SettingDropdown.component({
+          defaultLabel: minutes
+            ? app.translator.transChoice('core.admin.permissions_controls.allow_some_minutes_button', minutes, {count: minutes})
+            : app.translator.trans('core.admin.permissions_controls.allow_indefinitely_button'),
+          key: 'allow_renaming',
+          options: [
+            {value: '-1', label: app.translator.trans('core.admin.permissions_controls.allow_indefinitely_button')},
+            {value: '10', label: app.translator.trans('core.admin.permissions_controls.allow_ten_minutes_button')},
+            {value: 'reply', label: app.translator.trans('core.admin.permissions_controls.allow_until_reply_button')}
+          ]
+        });
+      }
+    }, 90);
 
     return items;
   }
@@ -204,41 +154,31 @@ export default class PermissionGrid extends Component {
   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('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);
+    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.trans('core.admin.permissions_controls.allow_some_minutes_button', { 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 SettingDropdown.component({
+          defaultLabel: minutes
+            ? app.translator.transChoice('core.admin.permissions_controls.allow_some_minutes_button', minutes, {count: minutes})
+            : app.translator.trans('core.admin.permissions_controls.allow_indefinitely_button'),
+          key: 'allow_post_editing',
+          options: [
+            {value: '-1', label: app.translator.trans('core.admin.permissions_controls.allow_indefinitely_button')},
+            {value: '10', label: app.translator.trans('core.admin.permissions_controls.allow_ten_minutes_button')},
+            {value: 'reply', label: app.translator.trans('core.admin.permissions_controls.allow_until_reply_button')}
+          ]
+        });
+      }
+    }, 90);
 
     return items;
   }
@@ -246,117 +186,47 @@ export default class PermissionGrid extends Component {
   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('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('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('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('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(
-      '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(
-      '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'));
+    items.add('deletePosts', {
+      icon: 'fas fa-times',
+      label: app.translator.trans('core.admin.permissions.delete_posts_forever_label'),
+      permission: 'discussion.deletePosts'
+    }, 60);
 
     return items;
   }
@@ -364,25 +234,21 @@ export default class PermissionGrid extends Component {
   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,
-            });
-          }
+    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 '';
+      }
+    }, 100);
 
     return items;
   }

js/src/admin/components/PermissionsPage.js

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

js/src/admin/components/SessionDropdown.js

@@ -9,22 +9,27 @@ import ItemList from '../../common/utils/ItemList';
  * avatar/name, with a dropdown of session controls.
  */
 export default class SessionDropdown extends Dropdown {
-  static initAttrs(attrs) {
-    super.initAttrs(attrs);
+  static initProps(props) {
+    super.initProps(props);
 
-    attrs.className = 'SessionDropdown';
-    attrs.buttonClassName = 'Button Button--user Button--flat';
-    attrs.menuClassName = 'Dropdown-menu--right';
+    props.className = 'SessionDropdown';
+    props.buttonClassName = 'Button Button--user Button--flat';
+    props.menuClassName = 'Dropdown-menu--right';
   }
 
-  view(vnode) {
-    return super.view({ ...vnode, children: this.items().toArray() });
+  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>];
+    return [
+      avatar(user), ' ',
+      <span className="Button-label">{username(user)}</span>
+    ];
   }
 
   /**
@@ -35,15 +40,12 @@ export default class SessionDropdown extends Dropdown {
   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')
-      ),
+    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
     );
 

js/src/admin/components/SettingDropdown.js

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

js/src/admin/components/SettingsModal.js

@@ -1,12 +1,9 @@
 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);
-
+  init() {
     this.settings = {};
     this.loading = false;
   }
@@ -21,7 +18,9 @@ export default class SettingsModal extends Modal {
         <div className="Form">
           {this.form()}
 
-          <div className="Form-group">{this.submitButton()}</div>
+          <div className="Form-group">
+            {this.submitButton()}
+          </div>
         </div>
       </div>
     );
@@ -29,14 +28,18 @@ export default class SettingsModal extends Modal {
 
   submitButton() {
     return (
-      <Button type="submit" className="Button Button--primary" loading={this.loading} disabled={!this.changed()}>
+      <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);
+    this.settings[key] = this.settings[key] || m.prop(app.data.settings[key] || fallback);
 
     return this.settings[key];
   }
@@ -44,7 +47,7 @@ export default class SettingsModal extends Modal {
   dirty() {
     const dirty = {};
 
-    Object.keys(this.settings).forEach((key) => {
+    Object.keys(this.settings).forEach(key => {
       const value = this.settings[key]();
 
       if (value !== app.data.settings[key]) {
@@ -64,7 +67,10 @@ export default class SettingsModal extends Modal {
 
     this.loading = true;
 
-    saveSettings(this.dirty()).then(this.onsaved.bind(this), this.loaded.bind(this));
+    saveSettings(this.dirty()).then(
+      this.onsaved.bind(this),
+      this.loaded.bind(this)
+    );
   }
 
   onsaved() {

js/src/admin/components/StatusWidget.js

@@ -8,11 +8,9 @@
  */
 
 import DashboardWidget from './DashboardWidget';
+import icon from '../../common/helpers/icon';
 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() {
@@ -20,39 +18,24 @@ export default class StatusWidget extends DashboardWidget {
   }
 
   content() {
-    return <ul>{listItems(this.items().toArray())}</ul>;
+    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('help', (
+      <a href="http://flarum.org/docs/troubleshooting" target="_blank">
+        {icon('fas fa-question-circle')} {app.translator.trans('core.admin.dashboard.help_link')}
+      </a>
+    ));
 
-    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]);
+    items.add('version-flarum', [<strong>Flarum</strong>, <br/>, app.forum.attribute('version')]);
+    items.add('version-php', [<strong>PHP</strong>, <br/>, app.data.phpVersion]);
+    items.add('version-mysql', [<strong>MySQL</strong>, <br/>, app.data.mysqlVersion]);
 
     return items;
   }
-
-  handleClearCache(e) {
-    app.modal.show(LoadingModal);
-
-    app
-      .request({
-        method: 'DELETE',
-        url: app.forum.attribute('apiUrl') + '/cache',
-      })
-      .then(() => window.location.reload());
-  }
 }

js/src/admin/components/UploadImageButton.js

@@ -1,28 +1,30 @@
 import Button from '../../common/components/Button';
 
 export default class UploadImageButton extends Button {
-  loading = false;
+  init() {
+    this.loading = false;
+  }
 
-  view(vnode) {
-    this.attrs.loading = this.loading;
-    this.attrs.className = (this.attrs.className || '') + ' Button';
+  view() {
+    this.props.loading = this.loading;
+    this.props.className = (this.props.className || '') + ' Button';
 
-    if (app.data.settings[this.attrs.name + '_path']) {
-      this.attrs.onclick = this.remove.bind(this);
+    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.attrs.name + 'Url')} alt="" />
-          </p>
-          <p>{super.view({ ...vnode, children: app.translator.trans('core.admin.upload_image.remove_button') })}</p>
+          <p><img src={app.forum.attribute(this.props.name+'Url')} alt=""/></p>
+          <p>{super.view()}</p>
         </div>
       );
     } else {
-      this.attrs.onclick = this.upload.bind(this);
+      this.props.onclick = this.upload.bind(this);
+      this.props.children = app.translator.trans('core.admin.upload_image.upload_button');
     }
 
-    return super.view({ ...vnode, children: app.translator.trans('core.admin.upload_image.upload_button') });
+    return super.view();
   }
 
   /**
@@ -33,26 +35,23 @@ export default class UploadImageButton extends Button {
 
     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]);
+    $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();
+      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));
-      });
+      app.request({
+        method: 'POST',
+        url: this.resourceUrl(),
+        serialize: raw => raw,
+        data
+      }).then(
+        this.success.bind(this),
+        this.failure.bind(this)
+      );
+    });
   }
 
   /**
@@ -62,16 +61,17 @@ export default class UploadImageButton extends Button {
     this.loading = true;
     m.redraw();
 
-    app
-      .request({
-        method: 'DELETE',
-        url: this.resourceUrl(),
-      })
-      .then(this.success.bind(this), this.failure.bind(this));
+    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;
+    return app.forum.attribute('apiUrl') + '/' + this.props.name;
   }
 
   /**

js/src/admin/components/UserListPage.tsx

@@ -1,384 +0,0 @@
-import EditUserModal from '../../common/components/EditUserModal';
-import LoadingIndicator from '../../common/components/LoadingIndicator';
-import Button from '../../common/components/Button';
-
-import icon from '../../common/helpers/icon';
-import listItems from '../../common/helpers/listItems';
-
-import type User from '../../common/models/User';
-
-import ItemList from '../../common/utils/ItemList';
-import classList from '../../common/utils/classList';
-import extractText from '../../common/utils/extractText';
-
-import AdminPage from './AdminPage';
-
-type ColumnData = {
-  /**
-   * Column title
-   */
-  name: String;
-  /**
-   * Component(s) to show for this column.
-   */
-  content: (user: User) => JSX.Element;
-};
-
-type ApiPayload = {
-  data: Record<string, unknown>[];
-  included: Record<string, unknown>[];
-  links: {
-    first: string;
-    next?: string;
-  };
-};
-
-type UsersApiResponse = User[] & { payload: ApiPayload };
-
-/**
- * Admin page which displays a paginated list of all users on the forum.
- */
-export default class UserListPage extends AdminPage {
-  /**
-   * Number of users to load per page.
-   */
-  private numPerPage: number = 50;
-
-  /**
-   * Current page number. Zero-indexed.
-   */
-  private pageNumber: number = 0;
-
-  /**
-   * Total number of forum users.
-   *
-   * Fetched from the active `AdminApplication` (`app`), with
-   * data provided by `AdminPayload.php`, or `flarum/statistics`
-   * if installed.
-   */
-  readonly userCount: number = app.data.modelStatistics.users.total;
-
-  /**
-   * Get total number of user pages.
-   */
-  private getTotalPageCount(): number {
-    if (this.userCount === -1) return 0;
-
-    return Math.ceil(this.userCount / this.numPerPage);
-  }
-
-  /**
-   * This page's array of users.
-   *
-   * `undefined` when page loads as no data has been fetched.
-   */
-  private pageData: User[] | undefined = undefined;
-
-  /**
-   * Are there more users available?
-   */
-  private moreData: boolean = false;
-
-  private isLoadingPage: boolean = false;
-
-  /**
-   * Component to render.
-   */
-  content() {
-    if (typeof this.pageData === 'undefined') {
-      this.loadPage(0);
-
-      return [
-        <section class="UserListPage-grid UserListPage-grid--loading">
-          <LoadingIndicator containerClassName="LoadingIndicator--block" size="large" />
-        </section>,
-      ];
-    }
-
-    const columns: (ColumnData & { itemName: string })[] = this.columns().toArray();
-
-    return [
-      <p class="UserListPage-totalUsers">{app.translator.trans('core.admin.users.total_users', { count: this.userCount })}</p>,
-      <section
-        class={classList(['UserListPage-grid', this.isLoadingPage ? 'UserListPage-grid--loadingPage' : 'UserListPage-grid--loaded'])}
-        style={{ '--columns': columns.length }}
-        role="table"
-        // +1 to account for header
-        aria-rowcount={this.pageData.length + 1}
-        aria-colcount={columns.length}
-        aria-live="polite"
-        aria-busy={this.isLoadingPage ? 'true' : 'false'}
-      >
-        {/* Render columns */}
-        {columns.map((column, colIndex) => (
-          <div class="UserListPage-grid-header" role="columnheader" aria-colindex={colIndex + 1} aria-rowindex={1}>
-            {column.name}
-          </div>
-        ))}
-
-        {/* Render user data */}
-        {this.pageData.map((user, rowIndex) =>
-          columns.map((col, colIndex) => {
-            const columnContent = col.content && col.content(user);
-
-            return (
-              <div
-                class={classList(['UserListPage-grid-rowItem', rowIndex % 2 > 0 && 'UserListPage-grid-rowItem--shaded'])}
-                data-user-id={user.id()}
-                data-column-name={col.itemName}
-                aria-colindex={colIndex + 1}
-                // +2 to account for 0-based index, and for the header row
-                aria-rowindex={rowIndex + 2}
-                role="cell"
-              >
-                {columnContent || app.translator.trans('core.admin.users.grid.invalid_column_content')}
-              </div>
-            );
-          })
-        )}
-
-        {/* Loading spinner that shows when a new page is being loaded */}
-        {this.isLoadingPage && <LoadingIndicator size="large" />}
-      </section>,
-      <nav class="UserListPage-gridPagination">
-        <Button
-          disabled={this.pageNumber === 0}
-          title={app.translator.trans('core.admin.users.pagination.back_button')}
-          onclick={this.previousPage.bind(this)}
-          icon="fas fa-chevron-left"
-          className="Button Button--icon UserListPage-backBtn"
-        />
-        <span class="UserListPage-pageNumber">
-          {app.translator.trans('core.admin.users.pagination.page_counter', {
-            current: this.pageNumber + 1,
-            total: this.getTotalPageCount(),
-          })}
-        </span>
-        <Button
-          disabled={!this.moreData}
-          title={app.translator.trans('core.admin.users.pagination.next_button')}
-          onclick={this.nextPage.bind(this)}
-          icon="fas fa-chevron-right"
-          className="Button Button--icon UserListPage-nextBtn"
-        />
-      </nav>,
-    ];
-  }
-
-  /**
-   * Build an item list of columns to show for each user.
-   *
-   * Each column in the list should be an object with keys `name` and `content`.
-   *
-   * `name` is a string that will be used as the column name.
-   * `content` is a function with the User model passed as the first and only argument.
-   *
-   * See `UserListPage.tsx` for examples.
-   */
-  columns(): ItemList {
-    const columns = new ItemList();
-
-    columns.add(
-      'id',
-      {
-        name: app.translator.trans('core.admin.users.grid.columns.user_id.title'),
-        content: (user: User) => user.id(),
-      },
-      100
-    );
-
-    columns.add(
-      'username',
-      {
-        name: app.translator.trans('core.admin.users.grid.columns.username.title'),
-        content: (user: User) => {
-          const profileUrl = `${app.forum.attribute('baseUrl')}/u/${user.slug()}`;
-
-          return (
-            <a
-              target="_blank"
-              href={profileUrl}
-              title={extractText(app.translator.trans('core.admin.users.grid.columns.username.profile_link_tooltip', { username: user.username() }))}
-            >
-              {user.username()}
-            </a>
-          );
-        },
-      },
-      90
-    );
-
-    columns.add(
-      'joinDate',
-      {
-        name: app.translator.trans('core.admin.users.grid.columns.join_time.title'),
-        content: (user: User) => (
-          <span class="UserList-joinDate" title={user.joinTime()}>
-            {dayjs(user.joinTime()).format('LLL')}
-          </span>
-        ),
-      },
-      80
-    );
-
-    columns.add(
-      'groupBadges',
-      {
-        name: app.translator.trans('core.admin.users.grid.columns.group_badges.title'),
-        content: (user: User) => {
-          const badges = user.badges().toArray();
-
-          if (badges.length) {
-            return <ul className="DiscussionHero-badges badges">{listItems(badges)}</ul>;
-          } else {
-            return app.translator.trans('core.admin.users.grid.columns.group_badges.no_badges');
-          }
-        },
-      },
-      70
-    );
-
-    columns.add(
-      'emailAddress',
-      {
-        name: app.translator.trans('core.admin.users.grid.columns.email.title'),
-        content: (user: User) => {
-          function setEmailVisibility(visible: boolean) {
-            // Get needed jQuery element refs
-            const emailContainer = $(`[data-column-name=emailAddress][data-user-id=${user.id()}] .UserList-email`);
-            const emailAddress = emailContainer.find('.UserList-emailAddress');
-            const emailToggleButton = emailContainer.find('.UserList-emailIconBtn');
-            const emailToggleButtonIcon = emailToggleButton.find('.icon');
-
-            emailToggleButton.attr(
-              'title',
-              extractText(
-                visible
-                  ? app.translator.trans('core.admin.users.grid.columns.email.visibility_hide')
-                  : app.translator.trans('core.admin.users.grid.columns.email.visibility_show')
-              )
-            );
-
-            emailAddress.attr('aria-hidden', visible ? 'false' : 'true');
-
-            if (visible) {
-              emailToggleButtonIcon.addClass('fa-eye');
-              emailToggleButtonIcon.removeClass('fa-eye-slash');
-            } else {
-              emailToggleButtonIcon.removeClass('fa-eye');
-              emailToggleButtonIcon.addClass('fa-eye-slash');
-            }
-
-            // Need the string interpolation to prevent TS error.
-            emailContainer.attr('data-email-shown', `${visible}`);
-          }
-
-          function toggleEmailVisibility() {
-            const emailContainer = $(`[data-column-name=emailAddress][data-user-id=${user.id()}] .UserList-email`);
-            const emailShown = emailContainer.attr('data-email-shown') === 'true';
-
-            if (emailShown) {
-              setEmailVisibility(false);
-            } else {
-              setEmailVisibility(true);
-            }
-          }
-
-          return (
-            <div class="UserList-email" key={user.id()} data-email-shown="false">
-              <span class="UserList-emailAddress" aria-hidden onclick={() => setEmailVisibility(true)}>
-                {user.email()}
-              </span>
-              <button
-                onclick={toggleEmailVisibility}
-                class="Button Button--text UserList-emailIconBtn"
-                title={app.translator.trans('core.admin.users.grid.columns.email.visibility_show')}
-              >
-                {icon('far fa-eye-slash fa-fw', { className: 'icon' })}
-              </button>
-            </div>
-          );
-        },
-      },
-      70
-    );
-
-    columns.add(
-      'editUser',
-      {
-        name: app.translator.trans('core.admin.users.grid.columns.edit_user.title'),
-        content: (user: User) => (
-          <Button
-            className="Button UserList-editModalBtn"
-            title={app.translator.trans('core.admin.users.grid.columns.edit_user.tooltip', { username: user.username() })}
-            onclick={() => app.modal.show(EditUserModal, { user })}
-          >
-            {app.translator.trans('core.admin.users.grid.columns.edit_user.button')}
-          </Button>
-        ),
-      },
-      -90
-    );
-
-    return columns;
-  }
-
-  headerInfo() {
-    return {
-      className: 'UserListPage',
-      icon: 'fas fa-users',
-      title: app.translator.trans('core.admin.users.title'),
-      description: app.translator.trans('core.admin.users.description'),
-    };
-  }
-
-  /**
-   * Asynchronously fetch the next set of users to be rendered.
-   *
-   * Returns an array of Users, plus the raw API payload.
-   *
-   * Uses the `this.numPerPage` as the response limit, and automatically calculates the offset required from `pageNumber`.
-   *
-   * @param pageNumber The page number to load and display
-   */
-  async loadPage(pageNumber: number) {
-    if (pageNumber < 0) pageNumber = 0;
-
-    app.store
-      .find('users', {
-        page: {
-          limit: this.numPerPage,
-          offset: pageNumber * this.numPerPage,
-        },
-      })
-      .then((apiData: UsersApiResponse) => {
-        // Next link won't be present if there's no more data
-        this.moreData = !!apiData.payload.links.next;
-
-        let data = apiData;
-
-        // @ts-ignore
-        delete data.payload;
-
-        this.pageData = data;
-        this.pageNumber = pageNumber;
-        this.isLoadingPage = false;
-
-        m.redraw();
-      })
-      .catch((err: Error) => {
-        console.error(err);
-        this.pageData = [];
-      });
-  }
-
-  nextPage() {
-    this.isLoadingPage = true;
-    this.loadPage(this.pageNumber + 1);
-  }
-
-  previousPage() {
-    this.isLoadingPage = true;
-    this.loadPage(this.pageNumber - 1);
-  }
-}

js/src/admin/components/Widget.js

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

js/src/admin/index.js

@@ -1,13 +1,18 @@
-import app from './app';
+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';
+import compat from './compat';
 
-compatObj.app = app;
+compat.app = app;
 
-export const compat = proxifyCompat(compatObj, 'admin');
+export { compat };

js/src/admin/resolvers/ExtensionPageResolver.ts

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

@@ -2,24 +2,21 @@ import DashboardPage from './components/DashboardPage';
 import BasicsPage from './components/BasicsPage';
 import PermissionsPage from './components/PermissionsPage';
 import AppearancePage from './components/AppearancePage';
+import ExtensionsPage from './components/ExtensionsPage';
 import MailPage from './components/MailPage';
-import UserListPage from './components/UserListPage';
-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) {
+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 },
-    users: { path: '/users', component: UserListPage },
-    extension: { path: '/extension/:id', component: ExtensionPage, resolverClass: ExtensionPageResolver },
+    'dashboard': {path: '/', component: DashboardPage.component()},
+    'basics': {path: '/basics', component: BasicsPage.component()},
+    'permissions': {path: '/permissions', component: PermissionsPage.component()},
+    'appearance': {path: '/appearance', component: AppearancePage.component()},
+    'extensions': {path: '/extensions', component: ExtensionsPage.component()},
+    'mail': {path: '/mail', component: MailPage.component()}
   };
 }

js/src/admin/utils/ExtensionData.js

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

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

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

js/src/admin/utils/saveSettings.js

@@ -3,14 +3,12 @@ export default function saveSettings(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;
-    });
+  return app.request({
+    method: 'POST',
+    url: app.forum.attribute('apiUrl') + '/settings',
+    data: settings
+  }).catch(error => {
+    app.data.settings = oldSettings;
+    throw error;
+  });
 }

js/src/common/Application.js

@@ -1,8 +1,7 @@
 import ItemList from './utils/ItemList';
-import Button from './components/Button';
+import Alert from './components/Alert';
 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';
@@ -11,7 +10,6 @@ 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';
@@ -21,9 +19,6 @@ 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
@@ -89,7 +84,7 @@ export default class Application {
     discussions: Discussion,
     posts: Post,
     groups: Group,
-    notifications: Notification,
+    notifications: Notification
   });
 
   /**
@@ -110,80 +105,43 @@ export default class Application {
   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.
+   * 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}
+   * @type {null|Alert}
    * @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();
+  requestError = null;
 
   data;
 
   title = '';
   titleCount = 0;
 
-  initialRoute;
-
   load(payload) {
     this.data = payload;
-    this.translator.setLocale(payload.locale);
+    this.translator.locale = payload.locale;
   }
 
   boot() {
-    this.initializers.toArray().forEach((initializer) => initializer(this));
+    this.initializers.toArray().forEach(initializer => initializer(this));
 
-    this.store.pushPayload({ data: this.data.resources });
+    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.session = new Session(
+        this.store.getById('users', this.data.session.userId),
+        this.data.session.csrfToken
+    );
 
     this.mount();
-
-    this.initialRoute = window.location.href;
   }
 
   bootExtensions(extensions) {
-    Object.keys(extensions).forEach((name) => {
+    Object.keys(extensions).forEach(name => {
       const extension = extensions[name];
-
+      
       const extenders = flattenDeep(extension.extend);
 
       for (const extender of extenders) {
@@ -193,34 +151,31 @@ export default class Application {
   }
 
   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.modal = m.mount(document.getElementById('modal'), <ModalManager/>);
+    this.alerts = m.mount(document.getElementById('alerts'), <AlertManager/>);
 
     this.drawer = new Drawer();
 
-    m.route(document.getElementById('content'), basePath + '/', mapRoutes(this.routes, basePath));
+    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) => {
+    // down.
+    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();
+      $app
+        .toggleClass('affix', top >= offset)
+        .toggleClass('scrolled', top > offset);
+    }).start();
 
     $(() => {
       $('body').addClass('ontouchstart' in window ? 'touch' : 'no-touch');
     });
-
-    liveHumanTimes();
   }
 
   /**
@@ -230,8 +185,7 @@ export default class Application {
    * @public
    */
   preloadedApiDocument() {
-    // If the URL has changed, the preloaded Api document is invalid.
-    if (this.data.apiDocument && window.location.href === this.initialRoute) {
+    if (this.data.apiDocument) {
       const results = this.store.pushPayload(this.data.apiDocument);
 
       this.data.apiDocument = null;
@@ -242,16 +196,6 @@ export default class Application {
     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.
    *
@@ -274,16 +218,15 @@ export default class Application {
   }
 
   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;
+    document.title = (this.titleCount ? `(${this.titleCount}) ` : '') +
+      (this.title ? this.title + ' - ' : '') +
+      this.forum.attribute('title');
   }
 
   /**
    * Make an AJAX request, handling any low-level errors that may occur.
    *
-   * @see https://mithril.js.org/request.html
+   * @see https://lhorie.github.io/mithril/mithril.request.html
    * @param {Object} options
    * @return {Promise}
    * @public
@@ -311,19 +254,17 @@ export default class Application {
     // 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.deserialize = options.deserialize || (responseText => responseText);
 
-    options.errorHandler =
-      options.errorHandler ||
-      ((error) => {
-        throw error;
-      });
+    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) => {
+    options.extract = xhr => {
       let responseText;
 
       if (original) {
@@ -350,88 +291,58 @@ export default class Application {
       }
     };
 
-    if (this.requestErrorAlert) this.alerts.dismiss(this.requestErrorAlert);
+    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(
-      (response) => response,
-      (error) => {
-        let content;
+    const deferred = m.deferred();
 
-        switch (error.status) {
-          case 422:
-            content = error.response.errors
-              .map((error) => [error.detail, <br />])
-              .reduce((a, b) => a.concat(b), [])
-              .slice(0, -1);
-            break;
+    m.request(options).then(response => deferred.resolve(response), error => {
+      this.requestError = error;
 
-          case 401:
-          case 403:
-            content = app.translator.trans('core.lib.error.permission_denied_message');
-            break;
+      let children;
 
-          case 404:
-          case 410:
-            content = app.translator.trans('core.lib.error.not_found_message');
-            break;
+      switch (error.status) {
+        case 422:
+          children = error.response.errors
+            .map(error => [error.detail, <br/>])
+            .reduce((a, b) => a.concat(b), [])
+            .slice(0, -1);
+          break;
 
-          case 429:
-            content = app.translator.trans('core.lib.error.rate_limit_exceeded_message');
-            break;
+        case 401:
+        case 403:
+          children = app.translator.trans('core.lib.error.permission_denied_message');
+          break;
 
-          default:
-            content = app.translator.trans('core.lib.error.generic_message');
-        }
+        case 404:
+        case 410:
+          children = app.translator.trans('core.lib.error.not_found_message');
+          break;
 
-        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));
+        case 429:
+          children = app.translator.trans('core.lib.error.rate_limit_exceeded_message');
+          break;
 
-        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);
+        default:
+          children = app.translator.trans('core.lib.error.generic_message');
       }
-    );
-  }
 
-  /**
-   * @param {RequestError} error
-   * @param {string[]} [formattedError]
-   * @private
-   */
-  showDebug(error, formattedError) {
-    this.alerts.dismiss(this.requestErrorAlert);
+      error.alert = new Alert({
+        type: 'error',
+        children
+      });
 
-    this.modal.show(RequestErrorModal, { error, formattedError });
+      try {
+        options.errorHandler(error);
+      } catch (error) {
+        this.alerts.show(error.alert);
+      }
+
+      deferred.reject(error);
+    });
+
+    return deferred.promise;
   }
 
   /**
@@ -443,19 +354,9 @@ export default class Application {
    * @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') : '';
+    const url = this.routes[name].path.replace(/:([^\/]+)/g, (m, key) => extract(params, key));
+    const queryString = m.route.buildQueryString(params);
+    const prefix = m.route.mode === 'pathname' ? app.forum.attribute('basePath') : '';
 
     return prefix + url + (queryString ? '?' + queryString : '');
   }

js/src/common/Component.js

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

js/src/common/Component.ts

@@ -1,132 +0,0 @@
-import * as Mithril from 'mithril';
-
-export interface ComponentAttrs extends Mithril.Attributes {}
-
-/**
- * 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;
-
-  /**
-   * The attributes passed into the component.
-   *
-   * @see https://mithril.js.org/components.html#passing-data-to-components
-   */
-  protected attrs!: T;
-
-  /**
-   * @inheritdoc
-   */
-  abstract view(vnode: Mithril.Vnode<T, this>): Mithril.Children;
-
-  /**
-   * @inheritdoc
-   */
-  oninit(vnode: Mithril.Vnode<T, this>) {
-    this.setAttrs(vnode.attrs);
-  }
-
-  /**
-   * @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 [selector] a jQuery-compatible selector string
-   * @returns the jQuery object for the DOM node
-   * @final
-   */
-  protected $(selector: string): JQuery {
-    const $element = $(this.element) as JQuery<HTMLElement>;
-
-    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) as Record<string, unknown>;
-
-    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.`);
-      }
-    }
-
-    this.attrs = attrs;
-  }
-
-  /**
-   * 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

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

@@ -88,7 +88,7 @@ export default class Model {
         // relationship data object.
         for (const innerKey in data[key]) {
           if (data[key][innerKey] instanceof Model) {
-            data[key][innerKey] = { data: Model.getIdentifier(data[key][innerKey]) };
+            data[key][innerKey] = {data: Model.getIdentifier(data[key][innerKey])};
           }
           this.data[key][innerKey] = data[key][innerKey];
         }
@@ -109,7 +109,7 @@ export default class Model {
    * @public
    */
   pushAttributes(attributes) {
-    this.pushData({ attributes });
+    this.pushData({attributes});
   }
 
   /**
@@ -125,7 +125,7 @@ export default class Model {
     const data = {
       type: this.data.type,
       id: this.data.id,
-      attributes,
+      attributes
     };
 
     // If a 'relationships' key exists, extract it from the attributes hash and
@@ -138,7 +138,9 @@ export default class Model {
         const model = attributes.relationships[key];
 
         data.relationships[key] = {
-          data: model instanceof Array ? model.map(Model.getIdentifier) : Model.getIdentifier(model),
+          data: model instanceof Array
+            ? model.map(Model.getIdentifier)
+            : Model.getIdentifier(model)
         };
       }
 
@@ -152,66 +154,52 @@ export default class Model {
 
     this.pushData(data);
 
-    const request = { 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);
-        },
+    return app.request(Object.assign({
+      method: this.exists ? 'PATCH' : 'POST',
+      url: app.forum.attribute('apiUrl') + this.apiEndpoint(),
+      data: request
+    }, options)).then(
+      // If everything went well, we'll make sure the store knows that this
+      // model exists now (if it didn't already), and we'll push the data that
+      // the API returned into the store.
+      payload => {
+        this.store.data[payload.data.type] = this.store.data[payload.data.type] || {};
+        this.store.data[payload.data.type][payload.data.id] = this;
+        return this.store.pushPayload(payload);
+      },
 
-        // If something went wrong, though... good thing we backed up our model's
-        // old data! We'll revert to that and let others handle the error.
-        (response) => {
-          this.pushData(oldData);
-          m.redraw();
-          throw response;
-        }
-      );
+      // If something went wrong, though... good thing we backed up our model's
+      // old data! We'll revert to that and let others handle the error.
+      response => {
+        this.pushData(oldData);
+        m.lazyRedraw();
+        throw response;
+      }
+    );
   }
 
   /**
    * Send a request to delete the resource.
    *
-   * @param {Object} body Data to send along with the DELETE request.
+   * @param {Object} data Data to send along with the DELETE request.
    * @param {Object} [options]
    * @return {Promise}
    * @public
    */
-  delete(body, options = {}) {
-    if (!this.exists) return Promise.resolve();
+  delete(data, options = {}) {
+    if (!this.exists) return m.deferred.resolve().promise;
 
-    return app
-      .request(
-        Object.assign(
-          {
-            method: 'DELETE',
-            url: app.forum.attribute('apiUrl') + this.apiEndpoint(),
-            body,
-          },
-          options
-        )
-      )
-      .then(() => {
-        this.exists = false;
-        this.store.remove(this);
-      });
+    return app.request(Object.assign({
+      method: 'DELETE',
+      url: app.forum.attribute('apiUrl') + this.apiEndpoint(),
+      data
+    }, options)).then(() => {
+      this.exists = false;
+      this.store.remove(this);
+    });
   }
 
   /**
@@ -237,7 +225,7 @@ export default class Model {
    * @public
    */
   static attribute(name, transform) {
-    return function () {
+    return function() {
       const value = this.data.attributes && this.data.attributes[name];
 
       return transform ? transform(value) : value;
@@ -255,7 +243,7 @@ export default class Model {
    * @public
    */
   static hasOne(name) {
-    return function () {
+    return function() {
       if (this.data.relationships) {
         const relationship = this.data.relationships[name];
 
@@ -279,12 +267,12 @@ export default class Model {
    * @public
    */
   static hasMany(name) {
-    return function () {
+    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 relationship.data.map(data => app.store.getById(data.type, data.id));
         }
       }
 
@@ -313,7 +301,7 @@ export default class Model {
   static getIdentifier(model) {
     return {
       type: model.data.type,
-      id: model.data.id,
+      id: model.data.id
     };
   }
 }

js/src/common/Session.js

@@ -30,17 +30,12 @@ export default class Session {
    * @return {Promise}
    * @public
    */
-  login(body, options = {}) {
-    return app.request(
-      Object.assign(
-        {
-          method: 'POST',
-          url: `${app.forum.attribute('baseUrl')}/login`,
-          body,
-        },
-        options
-      )
-    );
+  login(data, options = {}) {
+    return app.request(Object.assign({
+      method: 'POST',
+      url: app.forum.attribute('baseUrl') + '/login',
+      data
+    }, options));
   }
 
   /**
@@ -49,6 +44,6 @@ export default class Session {
    * @public
    */
   logout() {
-    window.location = `${app.forum.attribute('baseUrl')}/logout?token=${this.csrfToken}`;
+    window.location = app.forum.attribute('baseUrl') + '/logout?token=' + this.csrfToken;
   }
 }

js/src/common/Store.js

@@ -34,7 +34,9 @@ export default class Store {
   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);
+    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
@@ -56,7 +58,7 @@ export default class Store {
   pushObject(data) {
     if (!this.models[data.type]) return null;
 
-    const type = (this.data[data.type] = this.data[data.type] || {});
+    const type = this.data[data.type] = this.data[data.type] || {};
 
     if (type[data.id]) {
       type[data.id].pushData(data);
@@ -82,29 +84,22 @@ export default class Store {
    * @public
    */
   find(type, id, query = {}, options = {}) {
-    let params = query;
+    let data = query;
     let url = app.forum.attribute('apiUrl') + '/' + type;
 
     if (id instanceof Array) {
       url += '?filter[id]=' + id.join(',');
     } else if (typeof id === 'object') {
-      params = id;
+      data = id;
     } else if (id) {
       url += '/' + id;
     }
 
-    return app
-      .request(
-        Object.assign(
-          {
-            method: 'GET',
-            url,
-            params,
-          },
-          options
-        )
-      )
-      .then(this.pushPayload.bind(this));
+    return app.request(Object.assign({
+      method: 'GET',
+      url,
+      data
+    }, options)).then(this.pushPayload.bind(this));
   }
 
   /**
@@ -129,7 +124,7 @@ export default class Store {
    * @public
    */
   getBy(type, key, value) {
-    return this.all(type).filter((model) => model[key]() === value)[0];
+    return this.all(type).filter(model => model[key]() === value)[0];
   }
 
   /**
@@ -142,7 +137,7 @@ export default class Store {
   all(type) {
     const records = this.data[type];
 
-    return records ? Object.keys(records).map((id) => records[id]) : [];
+    return records ? Object.keys(records).map(id => records[id]) : [];
   }
 
   /**
@@ -165,6 +160,6 @@ export default class Store {
   createRecord(type, data = {}) {
     data.type = data.type || type;
 
-    return new this.models[type](data, this);
+    return new (this.models[type])(data, this);
   }
 }

js/src/common/Translator.js

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

js/src/common/compat.js

@@ -1,7 +1,6 @@
 import * as extend from './extend';
 import Session from './Session';
 import Store from './Store';
-import BasicEditorDriver from './utils/BasicEditorDriver';
 import evented from './utils/evented';
 import liveHumanTimes from './utils/liveHumanTimes';
 import ItemList from './utils/ItemList';
@@ -13,20 +12,15 @@ import anchorScroll from './utils/anchorScroll';
 import RequestError from './utils/RequestError';
 import abbreviateNumber from './utils/abbreviateNumber';
 import * as string from './utils/string';
-import Stream from './utils/Stream';
 import SubtreeRetainer from './utils/SubtreeRetainer';
-import setRouteWithForcedRefresh from './utils/setRouteWithForcedRefresh';
 import extract from './utils/extract';
 import ScrollListener from './utils/ScrollListener';
 import stringToColor from './utils/stringToColor';
-import subclassOf from './utils/subclassOf';
 import patchMithril from './utils/patchMithril';
-import proxifyCompat from './utils/proxifyCompat';
 import classList from './utils/classList';
 import extractText from './utils/extractText';
 import formatNumber from './utils/formatNumber';
 import mapRoutes from './utils/mapRoutes';
-import withAttr from './utils/withAttr';
 import Notification from './models/Notification';
 import User from './models/User';
 import Post from './models/Post';
@@ -36,7 +30,6 @@ import Forum from './models/Forum';
 import Component from './Component';
 import Translator from './Translator';
 import AlertManager from './components/AlertManager';
-import Page from './components/Page';
 import Switch from './components/Switch';
 import Badge from './components/Badge';
 import LoadingIndicator from './components/LoadingIndicator';
@@ -44,12 +37,10 @@ import Placeholder from './components/Placeholder';
 import Separator from './components/Separator';
 import Dropdown from './components/Dropdown';
 import SplitDropdown from './components/SplitDropdown';
-import RequestErrorModal from './components/RequestErrorModal';
 import FieldSet from './components/FieldSet';
 import Select from './components/Select';
 import Navigation from './components/Navigation';
 import Alert from './components/Alert';
-import Link from './components/Link';
 import LinkButton from './components/LinkButton';
 import Checkbox from './components/Checkbox';
 import SelectDropdown from './components/SelectDropdown';
@@ -57,9 +48,6 @@ import ModalManager from './components/ModalManager';
 import Button from './components/Button';
 import Modal from './components/Modal';
 import GroupBadge from './components/GroupBadge';
-import TextEditor from './components/TextEditor';
-import TextEditorButton from './components/TextEditorButton';
-import EditUserModal from './components/EditUserModal';
 import Model from './Model';
 import Application from './Application';
 import fullTime from './helpers/fullTime';
@@ -71,14 +59,11 @@ import highlight from './helpers/highlight';
 import username from './helpers/username';
 import userOnline from './helpers/userOnline';
 import listItems from './helpers/listItems';
-import Fragment from './Fragment';
-import DefaultResolver from './resolvers/DefaultResolver';
 
 export default {
-  extend: extend,
-  Session: Session,
-  Store: Store,
-  'utils/BasicEditorDriver': BasicEditorDriver,
+  'extend': extend,
+  'Session': Session,
+  'Store': Store,
   'utils/evented': evented,
   'utils/liveHumanTimes': liveHumanTimes,
   'utils/ItemList': ItemList,
@@ -94,27 +79,20 @@ export default {
   'utils/extract': extract,
   'utils/ScrollListener': ScrollListener,
   'utils/stringToColor': stringToColor,
-  'utils/Stream': Stream,
-  'utils/subclassOf': subclassOf,
-  'utils/setRouteWithForcedRefresh': setRouteWithForcedRefresh,
   'utils/patchMithril': patchMithril,
-  'utils/proxifyCompat': proxifyCompat,
   'utils/classList': classList,
   'utils/extractText': extractText,
   'utils/formatNumber': formatNumber,
   'utils/mapRoutes': mapRoutes,
-  'utils/withAttr': withAttr,
   'models/Notification': Notification,
   'models/User': User,
   'models/Post': Post,
   'models/Discussion': Discussion,
   'models/Group': Group,
   'models/Forum': Forum,
-  Component: Component,
-  Fragment: Fragment,
-  Translator: Translator,
+  'Component': Component,
+  'Translator': Translator,
   'components/AlertManager': AlertManager,
-  'components/Page': Page,
   'components/Switch': Switch,
   'components/Badge': Badge,
   'components/LoadingIndicator': LoadingIndicator,
@@ -122,12 +100,10 @@ export default {
   'components/Separator': Separator,
   'components/Dropdown': Dropdown,
   'components/SplitDropdown': SplitDropdown,
-  'components/RequestErrorModal': RequestErrorModal,
   'components/FieldSet': FieldSet,
   'components/Select': Select,
   'components/Navigation': Navigation,
   'components/Alert': Alert,
-  'components/Link': Link,
   'components/LinkButton': LinkButton,
   'components/Checkbox': Checkbox,
   'components/SelectDropdown': SelectDropdown,
@@ -135,11 +111,8 @@ export default {
   'components/Button': Button,
   'components/Modal': Modal,
   'components/GroupBadge': GroupBadge,
-  'components/TextEditor': TextEditor,
-  'components/TextEditorButton': TextEditorButton,
-  'components/EditUserModal': EditUserModal,
-  Model: Model,
-  Application: Application,
+  'Model': Model,
+  'Application': Application,
   'helpers/fullTime': fullTime,
   'helpers/avatar': avatar,
   'helpers/icon': icon,
@@ -148,6 +121,5 @@ export default {
   'helpers/highlight': highlight,
   'helpers/username': username,
   'helpers/userOnline': userOnline,
-  'helpers/listItems': listItems,
-  'resolvers/DefaultResolver': DefaultResolver,
+  'helpers/listItems': listItems
 };

js/src/common/components/Alert.js

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

js/src/common/components/Alert.tsx

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

js/src/common/components/AlertManager.js

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

js/src/common/components/Badge.js

@@ -6,30 +6,34 @@ import extract from '../utils/extract';
  * The `Badge` component represents a user/discussion badge, indicating some
  * status (e.g. a discussion is stickied, a user is an admin).
  *
- * A badge may have the following special attrs:
+ * A badge may have the following special props:
  *
  * - `type` The type of badge this is. This will be used to give the badge a
  *   class name of `Badge--{type}`.
  * - `icon` The name of an icon to show inside the badge.
  * - `label`
  *
- * All other attrs will be assigned as attributes on the badge element.
+ * All other props will be assigned as attributes on the badge element.
  */
 export default class Badge extends Component {
   view() {
-    const attrs = Object.assign({}, this.attrs);
+    const attrs = Object.assign({}, this.props);
     const type = extract(attrs, 'type');
     const iconName = extract(attrs, 'icon');
 
     attrs.className = 'Badge ' + (type ? 'Badge--' + type : '') + ' ' + (attrs.className || '');
     attrs.title = extract(attrs, 'label') || '';
 
-    return <span {...attrs}>{iconName ? icon(iconName, { className: 'Badge-icon' }) : m.trust('&nbsp;')}</span>;
+    return (
+      <span {...attrs}>
+        {iconName ? icon(iconName, {className: 'Badge-icon'}) : m.trust('&nbsp;')}
+      </span>
+    );
   }
 
-  oncreate(vnode) {
-    super.oncreate(vnode);
+  config(isInitialized) {
+    if (isInitialized) return;
 
-    if (this.attrs.label) this.$().tooltip();
+    if (this.props.label) this.$().tooltip({container: 'body'});
   }
 }

js/src/common/components/Button.js

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

js/src/common/components/Checkbox.js

@@ -1,40 +1,44 @@
 import Component from '../Component';
 import LoadingIndicator from './LoadingIndicator';
 import icon from '../helpers/icon';
-import classList from '../utils/classList';
-import withAttr from '../utils/withAttr';
 
 /**
  * The `Checkbox` component defines a checkbox input.
  *
- * ### Attrs
+ * ### Props
  *
  * - `state` Whether or not the checkbox is checked.
  * - `className` The class name for the root element.
  * - `disabled` Whether or not the checkbox is disabled.
- * - `loading` Whether or not the checkbox is loading.
  * - `onchange` A callback to run when the checkbox is checked/unchecked.
  * - `children` A text label to display next to the checkbox.
  */
 export default class Checkbox extends Component {
-  view(vnode) {
-    // Sometimes, false is stored in the DB as '0'. This is a temporary
-    // conversion layer until a more robust settings encoding is introduced
-    if (this.attrs.state === '0') this.attrs.state = false;
+  init() {
+    /**
+     * Whether or not the checkbox's value is in the process of being saved.
+     *
+     * @type {Boolean}
+     * @public
+     */
+    this.loading = false;
+  }
 
-    const className = classList([
-      'Checkbox',
-      this.attrs.state ? 'on' : 'off',
-      this.attrs.className,
-      this.attrs.loading && 'loading',
-      this.attrs.disabled && 'disabled',
-    ]);
+  view() {
+    let className = 'Checkbox ' + (this.props.state ? 'on' : 'off') + ' ' + (this.props.className || '');
+    if (this.loading) className += ' loading';
+    if (this.props.disabled) className += ' disabled';
 
     return (
       <label className={className}>
-        <input type="checkbox" checked={this.attrs.state} disabled={this.attrs.disabled} onchange={withAttr('checked', this.onchange.bind(this))} />
-        <div className="Checkbox-display">{this.getDisplay()}</div>
-        {vnode.children}
+        <input type="checkbox"
+          checked={this.props.state}
+          disabled={this.props.disabled}
+          onchange={m.withAttr('checked', this.onchange.bind(this))}/>
+        <div className="Checkbox-display">
+          {this.getDisplay()}
+        </div>
+        {this.props.children}
       </label>
     );
   }
@@ -46,7 +50,9 @@ export default class Checkbox extends Component {
    * @protected
    */
   getDisplay() {
-    return this.attrs.loading ? <LoadingIndicator display="unset" size="small" /> : icon(this.attrs.state ? 'fas fa-check' : 'fas fa-times');
+    return this.loading
+      ? LoadingIndicator.component({size: 'tiny'})
+      : icon(this.props.state ? 'fas fa-check' : 'fas fa-times');
   }
 
   /**
@@ -56,6 +62,6 @@ export default class Checkbox extends Component {
    * @protected
    */
   onchange(checked) {
-    if (this.attrs.onchange) this.attrs.onchange(checked, this);
+    if (this.props.onchange) this.props.onchange(checked, this);
   }
 }

js/src/common/components/ConfirmDocumentUnload.js

@@ -1,40 +0,0 @@
-import Component from '../Component';
-
-/**
- * The `ConfirmDocumentUnload` component can be used to register a global
- * event handler that prevents closing the browser window/tab based on the
- * return value of a given callback prop.
- *
- * ### Attrs
- *
- * - `when` - a callback returning true when the browser should prompt for
- *            confirmation before closing the window/tab
- *
- * ### Children
- *
- * NOTE: Only the first child will be rendered. (Use this component to wrap
- * another component / DOM element.)
- *
- */
-export default class ConfirmDocumentUnload extends Component {
-  handler() {
-    return this.attrs.when() || undefined;
-  }
-
-  oncreate(vnode) {
-    super.oncreate(vnode);
-
-    this.boundHandler = this.handler.bind(this);
-    $(window).on('beforeunload', this.boundHandler);
-  }
-
-  onremove() {
-    $(window).off('beforeunload', this.boundHandler);
-  }
-
-  view(vnode) {
-    // To avoid having to render another wrapping <div> here, we assume that
-    // this component is only wrapped around a single element / component.
-    return vnode.children[0];
-  }
-}

js/src/common/components/Dropdown.js

@@ -6,48 +6,46 @@ import listItems from '../helpers/listItems';
  * The `Dropdown` component displays a button which, when clicked, shows a
  * dropdown menu beneath it.
  *
- * ### Attrs
+ * ### Props
  *
  * - `buttonClassName` A class name to apply to the dropdown toggle button.
  * - `menuClassName` A class name to apply to the dropdown menu.
  * - `icon` The name of an icon to show in the dropdown toggle button.
  * - `caretIcon` The name of an icon to show on the right of the button.
  * - `label` The label of the dropdown toggle button. Defaults to 'Controls'.
- * - `accessibleToggleLabel` The label used to describe the dropdown toggle button to assistive readers. Defaults to 'Toggle dropdown menu'.
  * - `onhide`
  * - `onshow`
  *
  * The children will be displayed as a list inside of the dropdown menu.
  */
 export default class Dropdown extends Component {
-  static initAttrs(attrs) {
-    attrs.className = attrs.className || '';
-    attrs.buttonClassName = attrs.buttonClassName || '';
-    attrs.menuClassName = attrs.menuClassName || '';
-    attrs.label = attrs.label || '';
-    attrs.caretIcon = typeof attrs.caretIcon !== 'undefined' ? attrs.caretIcon : 'fas fa-caret-down';
-    attrs.accessibleToggleLabel = attrs.accessibleToggleLabel || app.translator.trans('core.lib.dropdown.toggle_dropdown_accessible_label');
+  static initProps(props) {
+    super.initProps(props);
+
+    props.className = props.className || '';
+    props.buttonClassName = props.buttonClassName || '';
+    props.menuClassName = props.menuClassName || '';
+    props.label = props.label || '';
+    props.caretIcon = typeof props.caretIcon !== 'undefined' ? props.caretIcon : 'fas fa-caret-down';
   }
 
-  oninit(vnode) {
-    super.oninit(vnode);
-
+  init() {
     this.showing = false;
   }
 
-  view(vnode) {
-    const items = vnode.children ? listItems(vnode.children) : [];
+  view() {
+    const items = this.props.children ? listItems(this.props.children) : [];
 
     return (
-      <div className={'ButtonGroup Dropdown dropdown ' + this.attrs.className + ' itemCount' + items.length + (this.showing ? ' open' : '')}>
-        {this.getButton(vnode.children)}
+      <div className={'ButtonGroup Dropdown dropdown ' + this.props.className + ' itemCount' + items.length + (this.showing ? ' open' : '')}>
+        {this.getButton()}
         {this.getMenu(items)}
       </div>
     );
   }
 
-  oncreate(vnode) {
-    super.oncreate(vnode);
+  config(isInitialized) {
+    if (isInitialized) return;
 
     // When opening the dropdown menu, work out if the menu goes beyond the
     // bottom of the viewport. If it does, we will apply class to make it show
@@ -55,8 +53,8 @@ export default class Dropdown extends Component {
     this.$().on('shown.bs.dropdown', () => {
       this.showing = true;
 
-      if (this.attrs.onshow) {
-        this.attrs.onshow();
+      if (this.props.onshow) {
+        this.props.onshow();
       }
 
       m.redraw();
@@ -66,20 +64,26 @@ export default class Dropdown extends Component {
 
       $menu.removeClass('Dropdown-menu--top Dropdown-menu--right');
 
-      $menu.toggleClass('Dropdown-menu--top', $menu.offset().top + $menu.height() > $(window).scrollTop() + $(window).height());
+      $menu.toggleClass(
+        'Dropdown-menu--top',
+        $menu.offset().top + $menu.height() > $(window).scrollTop() + $(window).height()
+      );
 
       if ($menu.offset().top < 0) {
         $menu.removeClass('Dropdown-menu--top');
       }
 
-      $menu.toggleClass('Dropdown-menu--right', isRight || $menu.offset().left + $menu.width() > $(window).scrollLeft() + $(window).width());
+      $menu.toggleClass(
+        'Dropdown-menu--right',
+        isRight || $menu.offset().left + $menu.width() > $(window).scrollLeft() + $(window).width()
+      );
     });
 
     this.$().on('hidden.bs.dropdown', () => {
       this.showing = false;
 
-      if (this.attrs.onhide) {
-        this.attrs.onhide();
+      if (this.props.onhide) {
+        this.props.onhide();
       }
 
       m.redraw();
@@ -92,16 +96,13 @@ export default class Dropdown extends Component {
    * @return {*}
    * @protected
    */
-  getButton(children) {
+  getButton() {
     return (
       <button
-        className={'Dropdown-toggle ' + this.attrs.buttonClassName}
-        aria-haspopup="menu"
-        aria-label={this.attrs.accessibleToggleLabel}
+        className={'Dropdown-toggle ' + this.props.buttonClassName}
         data-toggle="dropdown"
-        onclick={this.attrs.onclick}
-      >
-        {this.getButtonContent(children)}
+        onclick={this.props.onclick}>
+        {this.getButtonContent()}
       </button>
     );
   }
@@ -112,15 +113,19 @@ export default class Dropdown extends Component {
    * @return {*}
    * @protected
    */
-  getButtonContent(children) {
+  getButtonContent() {
     return [
-      this.attrs.icon ? icon(this.attrs.icon, { className: 'Button-icon' }) : '',
-      <span className="Button-label">{this.attrs.label}</span>,
-      this.attrs.caretIcon ? icon(this.attrs.caretIcon, { className: 'Button-caret' }) : '',
+      this.props.icon ? icon(this.props.icon, {className: 'Button-icon'}) : '',
+      <span className="Button-label">{this.props.label}</span>,
+      this.props.caretIcon ? icon(this.props.caretIcon, {className: 'Button-caret'}) : ''
     ];
   }
 
   getMenu(items) {
-    return <ul className={'Dropdown-menu dropdown-menu ' + this.attrs.menuClassName}>{items}</ul>;
+    return (
+      <ul className={'Dropdown-menu dropdown-menu ' + this.props.menuClassName}>
+        {items}
+      </ul>
+    );
   }
 }

js/src/common/components/EditUserModal.js

@@ -1,246 +0,0 @@
-import Modal from './Modal';
-import Button from './Button';
-import GroupBadge from './GroupBadge';
-import Group from '../models/Group';
-import extractText from '../utils/extractText';
-import ItemList from '../utils/ItemList';
-import Stream from '../utils/Stream';
-
-/**
- * The `EditUserModal` component displays a modal dialog with a login form.
- */
-export default class EditUserModal extends Modal {
-  oninit(vnode) {
-    super.oninit(vnode);
-
-    const user = this.attrs.user;
-
-    this.username = Stream(user.username() || '');
-    this.email = Stream(user.email() || '');
-    this.isEmailConfirmed = Stream(user.isEmailConfirmed() || false);
-    this.setPassword = Stream(false);
-    this.password = Stream(user.password() || '');
-    this.groups = {};
-
-    app.store
-      .all('groups')
-      .filter((group) => [Group.GUEST_ID, Group.MEMBER_ID].indexOf(group.id()) === -1)
-      .forEach((group) => (this.groups[group.id()] = Stream(user.groups().indexOf(group) !== -1)));
-  }
-
-  className() {
-    return 'EditUserModal Modal--small';
-  }
-
-  title() {
-    return app.translator.trans('core.lib.edit_user.title');
-  }
-
-  content() {
-    const fields = this.fields().toArray();
-    return (
-      <div className="Modal-body">
-        {fields.length > 1 ? <div className="Form">{this.fields().toArray()}</div> : app.translator.trans('core.lib.edit_user.nothing_available')}
-      </div>
-    );
-  }
-
-  fields() {
-    const items = new ItemList();
-
-    if (app.session.user.canEditCredentials()) {
-      items.add(
-        'username',
-        <div className="Form-group">
-          <label>{app.translator.trans('core.lib.edit_user.username_heading')}</label>
-          <input
-            className="FormControl"
-            placeholder={extractText(app.translator.trans('core.lib.edit_user.username_label'))}
-            bidi={this.username}
-            disabled={this.nonAdminEditingAdmin()}
-          />
-        </div>,
-        40
-      );
-
-      if (app.session.user !== this.attrs.user) {
-        items.add(
-          'email',
-          <div className="Form-group">
-            <label>{app.translator.trans('core.lib.edit_user.email_heading')}</label>
-            <div>
-              <input
-                className="FormControl"
-                placeholder={extractText(app.translator.trans('core.lib.edit_user.email_label'))}
-                bidi={this.email}
-                disabled={this.nonAdminEditingAdmin()}
-              />
-            </div>
-            {!this.isEmailConfirmed() && this.userIsAdmin(app.session.user) ? (
-              <div>
-                {Button.component(
-                  {
-                    className: 'Button Button--block',
-                    loading: this.loading,
-                    onclick: this.activate.bind(this),
-                  },
-                  app.translator.trans('core.lib.edit_user.activate_button')
-                )}
-              </div>
-            ) : (
-              ''
-            )}
-          </div>,
-          30
-        );
-
-        items.add(
-          'password',
-          <div className="Form-group">
-            <label>{app.translator.trans('core.lib.edit_user.password_heading')}</label>
-            <div>
-              <label className="checkbox">
-                <input
-                  type="checkbox"
-                  onchange={(e) => {
-                    this.setPassword(e.target.checked);
-                    m.redraw.sync();
-                    if (e.target.checked) this.$('[name=password]').select();
-                    e.redraw = false;
-                  }}
-                  disabled={this.nonAdminEditingAdmin()}
-                />
-                {app.translator.trans('core.lib.edit_user.set_password_label')}
-              </label>
-              {this.setPassword() ? (
-                <input
-                  className="FormControl"
-                  type="password"
-                  name="password"
-                  placeholder={extractText(app.translator.trans('core.lib.edit_user.password_label'))}
-                  bidi={this.password}
-                  disabled={this.nonAdminEditingAdmin()}
-                />
-              ) : (
-                ''
-              )}
-            </div>
-          </div>,
-          20
-        );
-      }
-    }
-
-    if (app.session.user.canEditGroups()) {
-      items.add(
-        'groups',
-        <div className="Form-group EditUserModal-groups">
-          <label>{app.translator.trans('core.lib.edit_user.groups_heading')}</label>
-          <div>
-            {Object.keys(this.groups)
-              .map((id) => app.store.getById('groups', id))
-              .map((group) => (
-                <label className="checkbox">
-                  <input
-                    type="checkbox"
-                    bidi={this.groups[group.id()]}
-                    disabled={group.id() === Group.ADMINISTRATOR_ID && (this.attrs.user === app.session.user || !this.userIsAdmin(app.session.user))}
-                  />
-                  {GroupBadge.component({ group, label: '' })} {group.nameSingular()}
-                </label>
-              ))}
-          </div>
-        </div>,
-        10
-      );
-    }
-
-    items.add(
-      'submit',
-      <div className="Form-group">
-        {Button.component(
-          {
-            className: 'Button Button--primary',
-            type: 'submit',
-            loading: this.loading,
-          },
-          app.translator.trans('core.lib.edit_user.submit_button')
-        )}
-      </div>,
-      -10
-    );
-
-    return items;
-  }
-
-  activate() {
-    this.loading = true;
-    const data = {
-      username: this.username(),
-      isEmailConfirmed: true,
-    };
-    this.attrs.user
-      .save(data, { errorHandler: this.onerror.bind(this) })
-      .then(() => {
-        this.isEmailConfirmed(true);
-        this.loading = false;
-        m.redraw();
-      })
-      .catch(() => {
-        this.loading = false;
-        m.redraw();
-      });
-  }
-
-  data() {
-    const data = {
-      relationships: {},
-    };
-
-    if (this.attrs.user.canEditCredentials() && !this.nonAdminEditingAdmin()) {
-      data.username = this.username();
-
-      if (app.session.user !== this.attrs.user) {
-        data.email = this.email();
-      }
-
-      if (this.setPassword()) {
-        data.password = this.password();
-      }
-    }
-
-    if (this.attrs.user.canEditGroups()) {
-      data.relationships.groups = Object.keys(this.groups)
-        .filter((id) => this.groups[id]())
-        .map((id) => app.store.getById('groups', id));
-    }
-
-    return data;
-  }
-
-  onsubmit(e) {
-    e.preventDefault();
-
-    this.loading = true;
-
-    this.attrs.user
-      .save(this.data(), { errorHandler: this.onerror.bind(this) })
-      .then(this.hide.bind(this))
-      .catch(() => {
-        this.loading = false;
-        m.redraw();
-      });
-  }
-
-  nonAdminEditingAdmin() {
-    return this.userIsAdmin(this.attrs.user) && !this.userIsAdmin(app.session.user);
-  }
-
-  /**
-   * @internal
-   * @protected
-   */
-  userIsAdmin(user) {
-    return user.groups().some((g) => g.id() === Group.ADMINISTRATOR_ID);
-  }
-}

js/src/common/components/FieldSet.js

@@ -11,11 +11,11 @@ import listItems from '../helpers/listItems';
  * The children should be an array of items to show in the fieldset.
  */
 export default class FieldSet extends Component {
-  view(vnode) {
+  view() {
     return (
-      <fieldset className={this.attrs.className}>
-        <legend>{this.attrs.label}</legend>
-        <ul>{listItems(vnode.children)}</ul>
+      <fieldset className={this.props.className}>
+        <legend>{this.props.label}</legend>
+        <ul>{listItems(this.props.children)}</ul>
       </fieldset>
     );
   }

js/src/common/components/GroupBadge.js

@@ -1,16 +1,16 @@
 import Badge from './Badge';
 
 export default class GroupBadge extends Badge {
-  static initAttrs(attrs) {
-    super.initAttrs(attrs);
+  static initProps(props) {
+    super.initProps(props);
 
-    if (attrs.group) {
-      attrs.icon = attrs.group.icon();
-      attrs.style = { backgroundColor: attrs.group.color() };
-      attrs.label = typeof attrs.label === 'undefined' ? attrs.group.nameSingular() : attrs.label;
-      attrs.type = 'group--' + attrs.group.id();
+    if (props.group) {
+      props.icon = props.group.icon();
+      props.style = {backgroundColor: props.group.color()};
+      props.label = typeof props.label === 'undefined' ? props.group.nameSingular() : props.label;
+      props.type = 'group--' + props.group.id();
 
-      delete attrs.group;
+      delete props.group;
     }
   }
 }

js/src/common/components/Link.js

@@ -1,47 +0,0 @@
-import Component from '../Component';
-import extract from '../utils/extract';
-
-/**
- * The link component enables both internal and external links.
- * It will return a regular HTML link for any links to external sites,
- * and it will use Mithril's m.route.Link for any internal links.
- *
- * Links will default to internal; the 'external' attr must be set to
- * `true` for the link to be external.
- */
-export default class Link extends Component {
-  view(vnode) {
-    let { options = {}, ...attrs } = vnode.attrs;
-
-    attrs.href = attrs.href || '';
-
-    // For some reason, m.route.Link does not like vnode.text, so if present, we
-    // need to convert it to text vnodes and store it in children.
-    const children = vnode.children || { tag: '#', children: vnode.text };
-
-    if (attrs.external) {
-      return <a {...attrs}>{children}</a>;
-    }
-
-    // If the href URL of the link is the same as the current page path
-    // we will not add a new entry to the browser history.
-    // This allows us to still refresh the Page component
-    // without adding endless history entries.
-    if (attrs.href === m.route.get()) {
-      if (!('replace' in options)) options.replace = true;
-    }
-
-    // Mithril 2 does not completely rerender the page if a route change leads to the same route
-    // (or the same component handling a different route).
-    // Here, the `force` parameter will use Mithril's key system to force a full rerender
-    // see https://mithril.js.org/route.html#key-parameter
-    if (extract(attrs, 'force')) {
-      if (!('state' in options)) options.state = {};
-      if (!('key' in options.state)) options.state.key = Date.now();
-    }
-
-    attrs.options = options;
-
-    return <m.route.Link {...attrs}>{children}</m.route.Link>;
-  }
-}

js/src/common/components/LinkButton.js

@@ -1,43 +1,40 @@
 import Button from './Button';
-import Link from './Link';
 
 /**
  * The `LinkButton` component defines a `Button` which links to a route.
  *
- * ### Attrs
+ * ### Props
  *
- * All of the attrs accepted by `Button`, plus:
+ * All of the props accepted by `Button`, plus:
  *
  * - `active` Whether or not the page that this button links to is currently
  *   active.
  * - `href` The URL to link to. If the current URL `m.route()` matches this,
  *   the `active` prop will automatically be set to true.
- * - `force` Whether the page should be fully rerendered. Defaults to `true`.
  */
 export default class LinkButton extends Button {
-  static initAttrs(attrs) {
-    super.initAttrs(attrs);
-
-    attrs.active = this.isActive(attrs);
-    if (attrs.force === undefined) attrs.force = true;
+  static initProps(props) {
+    props.active = this.isActive(props);
+    props.config = props.config || m.route;
   }
 
-  view(vnode) {
-    const vdom = super.view(vnode);
+  view() {
+    const vdom = super.view();
 
-    vdom.tag = Link;
-    vdom.attrs.active = String(vdom.attrs.active);
+    vdom.tag = 'a';
 
     return vdom;
   }
 
   /**
-   * Determine whether a component with the given attrs is 'active'.
+   * Determine whether a component with the given props is 'active'.
    *
-   * @param {Object} attrs
+   * @param {Object} props
    * @return {Boolean}
    */
-  static isActive(attrs) {
-    return typeof attrs.active !== 'undefined' ? attrs.active : m.route.get() === attrs.href;
+  static isActive(props) {
+    return typeof props.active !== 'undefined'
+      ? props.active
+      : m.route() === props.href;
   }
 }

js/src/common/components/LoadingIndicator.js

@@ -0,0 +1,42 @@
+import Component from '../Component';
+import { Spinner } from 'spin.js';
+
+/**
+ * The `LoadingIndicator` component displays a loading spinner with spin.js. It
+ * may have the following special props:
+ *
+ * - `size` The spin.js size preset to use. Defaults to 'small'.
+ *
+ * All other props will be assigned as attributes on the element.
+ */
+export default class LoadingIndicator extends Component {
+  view() {
+    const attrs = Object.assign({}, this.props);
+
+    attrs.className = 'LoadingIndicator ' + (attrs.className || '');
+    delete attrs.size;
+
+    return <div {...attrs}>{m.trust('&nbsp;')}</div>;
+  }
+
+  config(isInitialized) {
+    if (isInitialized) return;
+
+    const options = { zIndex: 'auto', color: this.$().css('color') };
+
+    switch (this.props.size) {
+      case 'large':
+        Object.assign(options, { lines: 10, length: 8, width: 4, radius: 8 });
+        break;
+
+      case 'tiny':
+        Object.assign(options, { lines: 8, length: 2, width: 2, radius: 3 });
+        break;
+
+      default:
+        Object.assign(options, { lines: 8, length: 4, width: 3, radius: 5 });
+    }
+
+    new Spinner(options).spin(this.element);
+  }
+}

js/src/common/components/LoadingIndicator.tsx

@@ -1,80 +0,0 @@
-import Component, { ComponentAttrs } from '../Component';
-import classList from '../utils/classList';
-
-export interface LoadingIndicatorAttrs extends ComponentAttrs {
-  /**
-   * Custom classes fro the loading indicator's container.
-   */
-  className?: string;
-  /**
-   * Custom classes for the loading indicator's container.
-   */
-  containerClassName?: string;
-  /**
-   * Optional size to specify for the loading indicator.
-   */
-  size?: 'large' | 'medium' | 'small';
-  /**
-   * Optional attributes to apply to the loading indicator's container.
-   */
-  containerAttrs?: Partial<ComponentAttrs>;
-  /**
-   * Display type of the spinner.
-   *
-   * @default 'block'
-   */
-  display?: 'block' | 'inline' | 'unset';
-}
-
-/**
- * The `LoadingIndicator` component displays a simple CSS-based loading spinner.
- *
- * To set a custom color, use the CSS `color` property.
- *
- * To increase spacing around the spinner, use the CSS `height` property on the
- * spinner's **container**. Setting the `display` attribute to `block` will set
- * a height of `100px` by default.
- *
- * To apply a custom size to the loading indicator, set the `--size` and
- * `--thickness` CSS custom properties on the loading indicator container.
- *
- * If you *really* want to change how this looks as part of your custom theme,
- * you can override the `border-radius` and `border` then set either a
- * background image, or use `content: "\<glyph>"` (e.g. `content: "\f1ce"`)
- * and `font-family: 'Font Awesome 5 Free'` to set an FA icon if you'd rather.
- *
- * ### Attrs
- *
- * - `containerClassName` Class name(s) to apply to the indicator's parent
- * - `className` Class name(s) to apply to the indicator itself
- * - `display` Determines how the spinner should be displayed (`inline`, `block` (default) or `unset`)
- * - `size` Size of the loading indicator (`small`, `medium` or `large`)
- * - `containerAttrs` Optional attrs to be applied to the container DOM element
- *
- * All other attrs will be assigned as attributes on the DOM element.
- */
-export default class LoadingIndicator extends Component<LoadingIndicatorAttrs> {
-  view() {
-    const { display = 'block', size = 'medium', containerClassName, className, ...attrs } = this.attrs;
-
-    const completeClassName = classList('LoadingIndicator', className);
-    const completeContainerClassName = classList(
-      'LoadingIndicator-container',
-      display !== 'unset' && `LoadingIndicator-container--${display}`,
-      size && `LoadingIndicator-container--${size}`,
-      containerClassName
-    );
-
-    return (
-      <div
-        aria-label={app.translator.trans('core.lib.loading_indicator.accessible_label')}
-        role="status"
-        {...attrs.containerAttrs}
-        data-size={size}
-        className={completeContainerClassName}
-      >
-        <div aria-hidden className={completeClassName} {...attrs} />
-      </div>
-    );
-  }
-}

js/src/common/components/Modal.js

@@ -9,63 +9,39 @@ import Button from './Button';
  * @abstract
  */
 export default class Modal extends Component {
-  /**
-   * Determine whether or not the modal should be dismissible via an 'x' button.
-   */
-  static isDismissible = true;
-
-  /**
-   * Attributes for an alert component to show below the header.
-   *
-   * @type {object}
-   */
-  alertAttrs = null;
-
-  oncreate(vnode) {
-    super.oncreate(vnode);
-
-    this.attrs.animateShow(() => this.onready());
-  }
-
-  onbeforeremove() {
-    // If the global modal state currently contains a modal,
-    // we've just opened up a new one, and accordingly,
-    // we don't need to show a hide animation.
-    if (!this.attrs.state.modal) {
-      this.attrs.animateHide();
-      // Here, we ensure that the animation has time to complete.
-      // See https://mithril.js.org/lifecycle-methods.html#onbeforeremove
-      // Bootstrap's Modal.TRANSITION_DURATION is 300 ms.
-      return new Promise((resolve) => setTimeout(resolve, 300));
-    }
+  init() {
+    /**
+     * An alert component to show below the header.
+     *
+     * @type {Alert}
+     */
+    this.alert = null;
   }
 
   view() {
-    if (this.alertAttrs) {
-      this.alertAttrs.dismissible = false;
+    if (this.alert) {
+      this.alert.props.dismissible = false;
     }
 
     return (
       <div className={'Modal modal-dialog ' + this.className()}>
         <div className="Modal-content">
-          {this.constructor.isDismissible ? (
+          {this.isDismissible() ? (
             <div className="Modal-close App-backControl">
               {Button.component({
                 icon: 'fas fa-times',
                 onclick: this.hide.bind(this),
-                className: 'Button Button--icon Button--link',
+                className: 'Button Button--icon Button--link'
               })}
             </div>
-          ) : (
-            ''
-          )}
+          ) : ''}
 
           <form onsubmit={this.onsubmit.bind(this)}>
             <div className="Modal-header">
               <h3 className="App-titleControl App-titleControl--text">{this.title()}</h3>
             </div>
 
-            {this.alertAttrs ? <div className="Modal-alert">{Alert.component(this.alertAttrs)}</div> : ''}
+            {alert ? <div className="Modal-alert">{this.alert}</div> : ''}
 
             {this.content()}
           </form>
@@ -74,13 +50,23 @@ export default class Modal extends Component {
     );
   }
 
+  /**
+   * Determine whether or not the modal should be dismissible via an 'x' button.
+   *
+   * @return {Boolean}
+   */
+  isDismissible() {
+    return true;
+  }
+
   /**
    * Get the class name to apply to the modal.
    *
    * @return {String}
    * @abstract
    */
-  className() {}
+  className() {
+  }
 
   /**
    * Get the title of the modal dialog.
@@ -88,7 +74,8 @@ export default class Modal extends Component {
    * @return {String}
    * @abstract
    */
-  title() {}
+  title() {
+  }
 
   /**
    * Get the content of the modal.
@@ -96,14 +83,16 @@ export default class Modal extends Component {
    * @return {VirtualElement}
    * @abstract
    */
-  content() {}
+  content() {
+  }
 
   /**
    * Handle the modal form's submit event.
    *
    * @param {Event} e
    */
-  onsubmit() {}
+  onsubmit() {
+  }
 
   /**
    * Focus on the first input when the modal is ready to be used.
@@ -112,11 +101,14 @@ export default class Modal extends Component {
     this.$('form').find('input, select, textarea').first().focus().select();
   }
 
+  onhide() {
+  }
+
   /**
    * Hide the modal.
    */
   hide() {
-    this.attrs.state.close();
+    app.modal.close();
   }
 
   /**
@@ -134,7 +126,7 @@ export default class Modal extends Component {
    * @param {RequestError} error
    */
   onerror(error) {
-    this.alertAttrs = error.alert;
+    this.alert = error.alert;
 
     m.redraw();
 

js/src/common/components/ModalManager.js

@@ -1,4 +1,5 @@
 import Component from '../Component';
+import Modal from './Modal';
 
 /**
  * The `ModalManager` component manages a modal dialog. Only one modal dialog
@@ -6,53 +7,100 @@ import Component from '../Component';
  * overwrite the previous one.
  */
 export default class ModalManager extends Component {
-  view() {
-    const modal = this.attrs.state.modal;
+  init() {
+    this.showing = false;
+    this.component = null;
+  }
 
+  view() {
     return (
       <div className="ModalManager modal fade">
-        {modal
-          ? modal.componentClass.component({
-              ...modal.attrs,
-              animateShow: this.animateShow.bind(this),
-              animateHide: this.animateHide.bind(this),
-              state: this.attrs.state,
-            })
-          : ''}
+        {this.component && this.component.render()}
       </div>
     );
   }
 
-  oncreate(vnode) {
-    super.oncreate(vnode);
+  config(isInitialized, context) {
+    if (isInitialized) return;
 
-    // Ensure the modal state is notified about a closed modal, even when the
-    // DOM-based Bootstrap JavaScript code triggered the closing of the modal,
-    // e.g. via ESC key or a click on the modal backdrop.
-    this.$().on('hidden.bs.modal', this.attrs.state.close.bind(this.attrs.state));
-  }
-
-  animateShow(readyCallback) {
-    const dismissible = !!this.attrs.state.modal.componentClass.isDismissible;
-
-    // If we are opening this modal while another modal is already open,
-    // the shown event will not run, because the modal is already open.
-    // So, we need to manually trigger the readyCallback.
-    if (this.$().hasClass('in')) {
-      readyCallback();
-      return;
-    }
+    // 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;
 
     this.$()
-      .one('shown.bs.modal', readyCallback)
-      .modal({
-        backdrop: dismissible || 'static',
-        keyboard: dismissible,
-      })
-      .modal('show');
+      .on('hidden.bs.modal', this.clear.bind(this))
+      .on('shown.bs.modal', this.onready.bind(this));
   }
 
-  animateHide() {
-    this.$().modal('hide');
+  /**
+   * Show a modal dialog.
+   *
+   * @param {Modal} component
+   * @public
+   */
+  show(component) {
+    if (!(component instanceof Modal)) {
+      throw new Error('The ModalManager component can only show Modal components');
+    }
+
+    clearTimeout(this.hideTimeout);
+
+    this.showing = true;
+    this.component = component;
+
+    if (app.current) app.current.retain = true;
+
+    m.redraw(true);
+
+    this.$().modal({backdrop: this.component.isDismissible() ? true : 'static'}).modal('show');
+    this.onready();
+  }
+
+  /**
+   * Close the modal dialog.
+   *
+   * @public
+   */
+  close() {
+    if (!this.showing) return;
+
+    // Don't hide the modal immediately, because if the consumer happens to call
+    // the `show` method straight after to show another modal dialog, it will
+    // cause Bootstrap's modal JS to misbehave. Instead we will wait for a tiny
+    // bit to give the `show` method the opportunity to prevent this from going
+    // ahead.
+    this.hideTimeout = setTimeout(() => {
+      this.$().modal('hide');
+      this.showing = false;
+    });
+  }
+
+  /**
+   * Clear content from the modal area.
+   *
+   * @protected
+   */
+  clear() {
+    if (this.component) {
+      this.component.onhide();
+    }
+
+    this.component = null;
+
+    app.current.retain = false;
+
+    m.lazyRedraw();
+  }
+
+  /**
+   * When the modal dialog is ready to be used, tell it!
+   *
+   * @protected
+   */
+  onready() {
+    if (this.component && this.component.onready) {
+      this.component.onready(this.$());
+    }
   }
 }