Update Application version string to beta 9 (#1784)

Visit home page if previous route does not exist when going back in history

.editorconfig

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

.gitattributes

@@ -1,6 +1,8 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .gitmodules export-ignore
+.github export-ignore
+.travis export-ignore
 .travis.yml export-ignore
 .editorconfig export-ignore
 .styleci.yml export-ignore
@@ -8,4 +10,4 @@
 phpunit.xml export-ignore
 tests export-ignore
 
-js/*/dist/*.js -diff
+js/dist/* -diff

.github/CONTRIBUTING.md

@@ -1,3 +0,0 @@
-# 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/ISSUE_TEMPLATE.md

@@ -1,26 +0,0 @@
-> Issues on Github are meant for bug reporting. Please post feature requests on the [discussion forum](https://discuss.flarum.org/t/features).
----
-> Try to complete the below form as far as you are able and are willing to share. Add a screenshot of the issue if you can.
-
-## Bug report
-- Version of Flarum: x.y.z
-- Website URL where the bug is visible: http://example.com
-- The webserver you are running: apache, nginx or something else
-- PHP version: x.y.z
-- Hosted environment: shared or vps
-- Hosting provider: http://some-amazing-provider.com
-
-## Flarum info
-
-```
-Output of "php flarum info", run this in terminal in your Flarum directory.
-```
-
-## Additional comments
-Some additional information you'd like to share, eg what have you tried so far.
-
-## Log files
-
-```
-Put any relevant logs here.
-```

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,42 @@
+---
+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**
+A clear and concise description of the behavior.
+
+**Steps to Reproduce**
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected Behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment**
+- Flarum version: x.y.z
+- Website URL: http://example.com
+- Webserver: [e.g. apache, nginx]
+- Hosting environment: [e.g. shared, vps]
+- PHP version: x.y.z
+- Browser: [e.g. chrome 67, safari 11]
+
+```
+Output of "php flarum info", run this in terminal in your Flarum directory.
+```
+
+**Possible Solution**
+<!--- Only if you have suggestions or a fix for the bug -->
+
+**Additional Context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,26 @@
+---
+name: "🚀 Feature Request"
+about: "I have a suggestion (and may want to implement it!)"
+
+---
+
+<!--
+IMPORTANT: Feature requests on this GitHub issue tracker are only accepted in case they have been approved by a core developer or contain extensive argumentation and directions for implementation. For all other feature requests, ideas and feedback please post in the Flarum Community: https://discuss.flarum.org/t/feedback.
+-->
+
+## Feature Request
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. eg. I have an issue when [...]
+
+**Describe the solution you'd like**
+A detailed description of your proposed solution. Include:
+- How the feature would work/behave
+- Any potential drawbacks
+- Maybe a screenshot, design, or example code
+
+**Justify why this feature belongs in Flarum's core, rather than in a third-party extension**
+Consider who this change will be useful to – most Flarum forums, or just a few?
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.

.github/ISSUE_TEMPLATE/security-vulnerability.md

@@ -0,0 +1,8 @@
+---
+name: "🔒 Security Vulnerability"
+about: "When you discover a security issue"
+---
+
+If you discover a security vulnerability within Flarum, please send an email to [security@flarum.org](mailto:security@flarum.org) instead.
+**DO NOT open an issue on this repository.**
+We will address these with the utmost urgency and it will prevent vulnerabilities, which may be abused, from popping up on our issue tracker.

.github/ISSUE_TEMPLATE/support-question.md

@@ -0,0 +1,11 @@
+---
+name: "🙋‍ Support Question"
+about: "If you have a question, please check out our forum or Discord!"
+
+---
+
+We primarily use GitHub as an issue tracker; for usage and support questions, please check out these resources below. Thanks!
+
+* Flarum Community: https://discuss.flarum.org/
+* Discord Chat: https://flarum.org/discord/
+* Twitter: https://twitter.com/Flarum

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,24 @@
+<!--
+IMPORTANT: We applaud pull requests, they excite us every single time. As we have an obligation to maintain a healthy code standard and quality, we take sufficient time for reviews. Please do create a separate pull request per change/issue/feature; we will ask you to split bundled pull requests.
+-->
+
+**Fixes #0000**
+
+**Changes proposed in this pull request:**
+<!-- fill this out, mention the pages and/or components which have been impacted -->
+
+**Reviewers should focus on:**
+<!-- fill this out, ask for feedback on specific changes you are unsure about -->
+
+**Screenshot**
+<!-- include an image of the most relevant user-facing change, if any -->
+
+**Confirmed**
+
+- [ ] Frontend changes: tested on a local Flarum installation.
+- [ ] Backend changes: tests are green (run `php vendor/bin/phpunit`).
+
+**Required changes:**
+
+- [ ] Related documentation PR: (Remove if irrelevant)
+- [ ] Related core extension PRs: (Remove if irrelevant)

.github/SECURITY.md

@@ -0,0 +1,13 @@
+# 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).

.gitignore

@@ -1,9 +1,9 @@
 /vendor
+composer.lock
 composer.phar
+node_modules
 .DS_Store
 Thumbs.db
-tests/_output/*
+/tests/integration/tmp
 .vagrant
 .idea/*
-node_modules
-bower_components

.travis.yml

@@ -1,35 +1,55 @@
 language: php
 
-php:
+cache:
-  - 5.6
+  directories:
-  - 7.0
+    - $HOME/.composer/cache
-  - 7.1
+    - $HOME/.npm
-  - hhvm
 
-matrix:
+install:
-  allow_failures:
+  - composer install
-    - php: hhvm
+  - mysql -e 'CREATE DATABASE flarum_test;'
-  fast_finish: true
 
 before_script:
-  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;
+  - echo 'error_reporting = E_ALL' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-  - composer self-update
-  - composer install
 
 script:
-  - vendor/bin/phpunit --coverage-clover=coverage.xml
+  - composer test:setup
+  - composer test
 
-notifications:
+jobs:
-  email:
+  include:
-    on_failure: change
+    - php: 7.1
-  webhooks:
+      env: DB=mysql
-    urls:
-      - https://webhooks.gitter.im/e/7b9e9827a03b44a16588
-    on_success: always
-    on_failure: always
-    on_start: false
 
-after_success:
+    - php: 7.2
-  - bash <(curl -s https://codecov.io/bash)
+      env: DB=mysql
 
-sudo: false
+    - php: 7.3
+      env: DB=mysql
+
+    - php: 7.1
+      addons:
+        mariadb: '10.2'
+      env: DB=mariadb
+
+    - php: 7.2
+      addons:
+        mariadb: '10.2'
+      env: DB=mariadb
+
+    - php: 7.3
+      addons:
+        mariadb: '10.2'
+      env: DB=mariadb
+
+    - php: 7.2
+      env: DB=mysql PREFIX=forum_
+
+    - 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

@@ -0,0 +1,60 @@
+# Changelog
+
+## [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,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2017 Toby Zerner
+Copyright (c) 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,7 +1,35 @@
-# Flarum Core
+<p align="center"><img src="https://flarum.org/img/logo.png"></p>
 
-This repository contains Flarum's core code. If you want to set up a forum, visit the [main Flarum repository](http://github.com/flarum/flarum).
+<p align="center">
+<a href="https://travis-ci.org/flarum/core"><img src="https://travis-ci.org/flarum/core.svg" alt="Build Status"></a>
+<a href="https://packagist.org/packages/flarum/core"><img src="https://poser.pugx.org/flarum/core/d/total.svg" alt="Total Downloads"></a>
+<a href="https://packagist.org/packages/flarum/core"><img src="https://poser.pugx.org/flarum/core/v/stable.svg" alt="Latest Stable Version"></a>
+<a href="https://packagist.org/packages/flarum/core"><img src="https://poser.pugx.org/flarum/core/license.svg" alt="License"></a>
+</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).
 
 ## Contributing
 
-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.
+Thank you for considering contributing to Flarum! Please read the **[Contributing guide](https://flarum.org/docs/contributing.html)** to learn how you can help.
+
+## 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.
+
+## License
+
+Flarum is open-source software licensed under the [MIT License](https://github.com/flarum/flarum/blob/master/LICENSE).
+

composer.json

@@ -2,7 +2,7 @@
     "name": "flarum/core",
     "description": "Delightfully simple forum software.",
     "keywords": ["forum", "discussion"],
-    "homepage": "http://flarum.org",
+    "homepage": "https://flarum.org/",
     "license": "MIT",
     "authors": [
         {
@@ -17,47 +17,54 @@
     "support": {
         "issues": "https://github.com/flarum/core/issues",
         "source": "https://github.com/flarum/core",
-        "docs": "http://flarum.org/docs"
+        "docs": "https://flarum.org/docs/"
     },
     "require": {
-        "php": ">=5.6.0",
+        "php": ">=7.1",
+        "axy/sourcemap": "^0.1.4",
+        "components/font-awesome": "5.9.*",
         "dflydev/fig-cookies": "^1.0.2",
-        "doctrine/dbal": "^2.5",
+        "doctrine/dbal": "^2.7",
-        "components/font-awesome": "^4.6",
         "franzl/whoops-middleware": "^0.4.0",
-        "illuminate/bus": "5.1.*",
+        "illuminate/bus": "5.7.*",
-        "illuminate/cache": "5.1.*",
+        "illuminate/cache": "5.7.*",
-        "illuminate/config": "5.1.*",
+        "illuminate/config": "5.7.*",
-        "illuminate/container": "5.1.*",
+        "illuminate/container": "5.7.*",
-        "illuminate/contracts": "5.1.*",
+        "illuminate/contracts": "5.7.*",
-        "illuminate/database": "^5.1.31",
+        "illuminate/database": "5.7.*",
-        "illuminate/events": "5.1.*",
+        "illuminate/events": "5.7.*",
-        "illuminate/filesystem": "5.1.*",
+        "illuminate/filesystem": "5.7.*",
-        "illuminate/hashing": "5.1.*",
+        "illuminate/hashing": "5.7.*",
-        "illuminate/mail": "5.1.*",
+        "illuminate/mail": "5.7.*",
-        "illuminate/support": "5.1.*",
+        "illuminate/session": "5.7.*",
-        "illuminate/validation": "5.1.*",
+        "illuminate/support": "5.7.*",
-        "illuminate/view": "5.1.*",
+        "illuminate/validation": "5.7.*",
+        "illuminate/view": "5.7.*",
         "intervention/image": "^2.3.0",
         "league/flysystem": "^1.0.11",
-        "league/oauth2-client": "~1.0",
         "matthiasmullie/minify": "^1.3",
+        "middlewares/base-path": "^1.1",
+        "middlewares/base-path-router": "^0.2.1",
+        "middlewares/request-handler": "^1.2",
         "monolog/monolog": "^1.16.0",
         "nikic/fast-route": "^0.6",
-        "oyejorge/less.php": "~1.5",
+        "oyejorge/less.php": "^1.7",
         "psr/http-message": "^1.0",
-        "symfony/console": "^2.7",
+        "psr/http-server-handler": "^1.0",
-        "symfony/http-foundation": "^2.7",
+        "psr/http-server-middleware": "^1.0",
-        "symfony/translation": "^2.7",
+        "s9e/text-formatter": "^1.2.0",
-        "symfony/yaml": "^2.7",
+        "symfony/config": "^3.3",
-        "s9e/text-formatter": "^0.8.1",
+        "symfony/console": "^4.2",
+        "symfony/translation": "^3.3",
+        "symfony/yaml": "^3.3",
         "tobscure/json-api": "^0.3.0",
-        "zendframework/zend-diactoros": "^1.1",
+        "zendframework/zend-diactoros": "^1.8.4",
-        "zendframework/zend-stratigility": "^1.3"
+        "zendframework/zend-httphandlerrunner": "^1.0",
+        "zendframework/zend-stratigility": "^3.0"
     },
     "require-dev": {
         "mockery/mockery": "^0.9.4",
-        "phpunit/phpunit": "^4.8"
+        "phpunit/phpunit": "^6.0"
     },
     "autoload": {
         "psr-4": {
@@ -69,12 +76,24 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests/"
+            "Flarum\\Tests\\": "tests/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "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"
     }
 }

error/403.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head lang="en">
-    <meta charset="UTF-8">
-    <title></title>
-</head>
-<body>
-
-<h1>403 Forbidden</h1>
-<p>You do not have permissions to access this page.</p>
-
-</body>
-</html>

error/404.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head lang="en">
-  <meta charset="UTF-8">
-  <title></title>
-</head>
-<body>
-
-<h1>404 Not Found</h1>
-<p>Looks like this page could not be found.</p>
-
-</body>
-</html>

error/500.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head lang="en">
-  <meta charset="UTF-8">
-  <title></title>
-</head>
-<body>
-
-<h1>500 Internal Server Error</h1>
-<p>Something went wrong on our server.</p>
-
-</body>
-</html>

error/503.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head lang="en">
-  <meta charset="UTF-8">
-  <title></title>
-</head>
-<body>
-
-<h1>503 Service Unavailable</h1>
-<p>This forum is down for maintenance.</p>
-
-</body>
-</html>

js/admin.js

@@ -7,6 +7,5 @@
  * file that was distributed with this source code.
  */
 
-export default class Component {
+export * from './src/common';
-
+export * from './src/admin';
-}

js/admin/.gitignore

@@ -1 +0,0 @@
-dist

js/admin/src/AdminApplication.tsx

@@ -1,53 +0,0 @@
-import * as m from 'mithril';
-import Application from './lib/Application';
-import routes from './routes';
-import Nav from './components/Nav';
-
-export default class AdminApplication extends Application {
-  /**
-   * A map of extension names to their settings callbacks.
-   *
-   * @type {Object}
-   */
-  extensionSettings = {};
-
-  /**
-   * Construct a list of permissions required to have the given permission.
-   *
-   * @param {String} permission
-   * @return {Array}
-   */
-  getRequiredPermissions(permission) {
-    const required = [];
-
-    if (permission === 'startDiscussion' || permission.indexOf('discussion.') === 0) {
-      required.push('viewDiscussions');
-    }
-    if (permission === 'discussion.delete') {
-      required.push('discussion.hide');
-    }
-    if (permission === 'discussion.deletePosts') {
-      required.push('discussion.editPosts');
-    }
-
-    return required;
-  }
-
-  /**
-   * @inheritdoc
-   */
-  mount() {
-    m.route.prefix('#');
-
-    super.mount();
-
-    m.mount(document.getElementById('nav'), <Nav/>);
-  }
-
-  /**
-   * @inheritdoc
-   */
-  registerDefaultRoutes(router) {
-    routes(router);
-  }
-}

js/admin/src/components/AddExtensionModal.tsx

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

js/admin/src/components/AdminLinkButton.tsx

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

js/admin/src/components/AdminNav.tsx

@@ -1,52 +0,0 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-import Component from 'flarum/lib/Component';
-import ItemList from 'flarum/lib/utils/ItemList';
-import AdminLinkButton from 'flarum/components/AdminLinkButton';
-import SelectDropdown from 'flarum/components/SelectDropdown';
-
-function addLink(items, route, icon) {
-  items.add(route, <AdminLinkButton
-    href={flarum.router.to(route)}
-    icon={icon}
-    children={flarum.translator.trans(`admin.nav.${route}_button`)}
-    description={flarum.translator.trans(`admin.nav.${route}_text`)}/>);
-}
-
-/**
- *
- */
-export default class Nav extends Component {
-  /**
-   * @inheritdoc
-   */
-  view() {
-    return <SelectDropdown className="Nav" buttonClassName="Button" children={this.items().toArray()}/>;
-  }
-
-  /**
-   * Build an item list of links to show in the admin navigation.
-   *
-   * @return {ItemList}
-   * @public
-   */
-  items() {
-    const items = new ItemList();
-
-    addLink(items, 'dashboard', 'bar-chart'));
-    addLink(items, 'basics', 'pencil'));
-    addLink(items, 'mail', 'envelope'));
-    addLink(items, 'permissions', 'key'));
-    addLink(items, 'appearance', 'paint-brush'));
-    addLink(items, 'extensions', 'puzzle-piece'));
-
-    return items;
-  }
-}

js/admin/src/components/DashboardPage.tsx

@@ -1,22 +0,0 @@
-import Page from 'flarum/components/Page';
-
-export default class DashboardPage extends Page {
-  view() {
-    return (
-      <div className="DashboardPage">
-        <div className="container">
-          <h2>{app.translator.trans('core.admin.dashboard.welcome_text')}</h2>
-          <p>{app.translator.trans('core.admin.dashboard.version_text', {version: <strong>{app.forum.attribute('version')}</strong>})}</p>
-          <p>{app.translator.trans('core.admin.dashboard.beta_warning_text', {strong: <strong/>})}</p>
-          <ul>
-            <li>{app.translator.trans('core.admin.dashboard.contributing_text', {a: <a href="http://flarum.org/docs/contributing" target="_blank"/>})}</li>
-            <li>{app.translator.trans('core.admin.dashboard.troubleshooting_text', {a: <a href="http://flarum.org/docs/troubleshooting" target="_blank"/>})}</li>
-            <li>{app.translator.trans('core.admin.dashboard.support_text', {a: <a href="http://discuss.flarum.org/t/support" target="_blank"/>})}</li>
-            <li>{app.translator.trans('core.admin.dashboard.features_text', {a: <a href="http://discuss.flarum.org/t/features" target="_blank"/>})}</li>
-            <li>{app.translator.trans('core.admin.dashboard.extension_text', {a: <a href="http://flarum.org/docs/extend" target="_blank"/>})}</li>
-          </ul>
-        </div>
-      </div>
-    );
-  }
-}

js/admin/src/components/EditGroupModal.tsx

@@ -1,102 +0,0 @@
-import Modal from 'flarum/components/Modal';
-import Button from 'flarum/components/Button';
-import Badge from 'flarum/components/Badge';
-import Group from 'flarum/models/Group';
-
-/**
- * The `EditGroupModal` component shows a modal dialog which allows the user
- * to create or edit a group.
- */
-export default class EditGroupModal extends Modal {
-  init() {
-    this.group = this.props.group || app.store.createRecord('groups');
-
-    this.nameSingular = m.prop(this.group.nameSingular() || '');
-    this.namePlural = m.prop(this.group.namePlural() || '');
-    this.icon = m.prop(this.group.icon() || '');
-    this.color = m.prop(this.group.color() || '');
-  }
-
-  className() {
-    return 'EditGroupModal Modal--small';
-  }
-
-  title() {
-    return [
-      this.color() || this.icon() ? Badge.component({
-        icon: this.icon(),
-        style: {backgroundColor: this.color()}
-      }) : '',
-      ' ',
-      this.namePlural() || app.translator.trans('core.admin.edit_group.title')
-    ];
-  }
-
-  content() {
-    return (
-      <div className="Modal-body">
-        <div className="Form">
-          <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>
-
-          <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>
-
-          <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="http://fortawesome.github.io/Font-Awesome/icons/" tabindex="-1"/>})}
-            </div>
-            <input className="FormControl" placeholder="bolt" value={this.icon()} oninput={m.withAttr('value', this.icon)}/>
-          </div>
-
-          <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>
-        </div>
-      </div>
-    );
-  }
-
-  onsubmit(e) {
-    e.preventDefault();
-
-    this.loading = true;
-
-    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;
-        m.redraw();
-      });
-  }
-
-  deleteGroup() {
-    if (confirm(app.translator.trans('core.admin.edit_group.delete_confirmation'))) {
-      this.group.delete().then(() => m.redraw());
-      this.hide();
-    }
-  }
-}

js/admin/src/components/Header.tsx

@@ -1,25 +0,0 @@
-import Component from 'flarum/Component';
-import ItemList from 'flarum/utils/ItemList';
-import SessionDropdown from './SessionDropdown';
-
-export default class Header extends Component {
-  /**
-   * @inheritdoc
-   */
-  view() {
-    return this.items().toVnodes();
-  }
-
-  /**
-   * Build an item list for the header contents.
-   *
-   * @return {ItemList}
-   */
-  items() {
-    const items = new ItemList();
-
-    items.add('session', <SessionDropdown/>);
-
-    return items;
-  }
-}

js/admin/src/index.ts

@@ -1,9 +0,0 @@
-import AdminApplication from './AdminApplication';
-
-export const app = new AdminApplication();
-
-export const extensions = [];
-
-// Export public API
-// export { default as Extend } from './Extend';
-// export { IndexPage, DicsussionList } from './components';

js/admin/src/lib

@@ -1 +0,0 @@
-/Users/toby/Projects/Flarum/app/packages/core/js/lib

js/admin/src/routes.ts

@@ -1,15 +0,0 @@
-import DashboardPage from './components/DashboardPage';
-import BasicsPage from './components/BasicsPage';
-import PermissionsPage from './components/PermissionsPage';
-import AppearancePage from './components/AppearancePage';
-import ExtensionsPage from './components/ExtensionsPage';
-import MailPage from './components/MailPage';
-
-export default function(router) {
-  router.add('dashboard', '/', DashboardPage);
-  router.add('basics', '/basics', BasicsPage);
-  router.add('permissions', '/permissions', PermissionsPage);
-  router.add('appearance', '/appearance', AppearancePage);
-  router.add('extensions', '/extensions', ExtensionsPage);
-  router.add('mail', '/mail', MailPage);
-}

js/admin/src/utils/saveSettings.tsx

@@ -1,22 +0,0 @@
-import flarum from 'flarum';
-
-/**
- * Make a request to save the given settings to the database.
- *
- * @param {Object} settings
- * @return {Promise}
- */
-export default function saveSettings(settings) {
-  const oldSettings = JSON.parse(JSON.stringify(flarum.data.settings));
-
-  Object.assign(flarum.data.settings, settings);
-
-  return flarum.ajax.request({
-    method: 'POST',
-    url: flarum.forum.apiUrl + '/settings',
-    data: settings
-  }).catch(error => {
-    flarum.data.settings = oldSettings;
-    throw error;
-  });
-}

js/admin/tsconfig.json

@@ -1,23 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "./dist/",
-    "sourceMap": true,
-    "noImplicitAny": false,
-    "module": "commonjs",
-    "target": "es5",
-    "jsx": "react",
-    "jsxFactory": "m",
-    "declaration": true,
-    "lib": ["dom", "es2015"],
-    "types": [
-      "mithril",
-      "classnames"
-    ]
-  },
-  "include": [
-    "./src/**/*"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
-}

js/admin/webpack.config.js

@@ -1,30 +0,0 @@
-const path = require('path');
-const { CheckerPlugin } = require('awesome-typescript-loader');
-
-module.exports = {
-  entry: path.resolve(__dirname, 'src/index.tsx'),
-  resolve: {
-    extensions: ['.ts', '.tsx', '.js', '.jsx']
-  },
-  devtool: 'source-map',
-  output: {
-    filename: 'bundle.js',
-    path: path.resolve(__dirname, 'dist'),
-    library: 'flarum',
-    libraryTarget: 'var'
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.tsx?$/,
-        loader: 'awesome-typescript-loader'
-      }
-    ]
-  },
-  plugins: [
-    new CheckerPlugin()
-  ],
-  externals: {
-    mithril: 'm'
-  }
-};

js/forum.js

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

js/forum/.gitignore

@@ -1 +0,0 @@
-dist

js/forum/src/ForumApplication.tsx

@@ -1,86 +0,0 @@
-import Application from './lib/Application';
-import routes from './routes';
-import Search from './components/Search';
-
-export default class ForumApplication extends Application {
-  /**
-   * The page's search component instance.
-   *
-   * @type {SearchBox}
-   */
-  search = new Search();
-
-  /**
-   * A map of notification types to their components.
-   *
-   * @type {Object}
-   */
-  notificationComponents = {};
-
-  /**
-   * A map of post types to their components.
-   *
-   * @type {Object}
-   */
-  postComponents = {};
-
-  //app.postComponents.comment = CommentPost;
-  //app.postComponents.discussionRenamed = DiscussionRenamedPost;
-
-  // app.notificationComponents.discussionRenamed = DiscussionRenamedNotification;
-
-  /**
-   * @inheritdoc
-   */
-  registerDefaultRoutes(router) {
-    routes(router);
-  }
-
-  // TODO: work out where to put these helper functions
-  // /**
-  //  * Check whether or not the user is currently composing a reply to a
-  //  * discussion.
-  //  *
-  //  * @param {Discussion} discussion
-  //  * @return {Boolean}
-  //  */
-  // composingReplyTo(discussion) {
-  //   return this.composer.component instanceof ReplyComposer &&
-  //     this.composer.component.props.discussion === discussion &&
-  //     this.composer.position !== Composer.PositionEnum.HIDDEN;
-  // }
-//
-  // /**
-  //  * Check whether or not the user is currently viewing a discussion.
-  //  *
-  //  * @param {Discussion} discussion
-  //  * @return {Boolean}
-  //  */
-  // viewingDiscussion(discussion) {
-  //   return this.current instanceof DiscussionPage &&
-  //     this.current.discussion === discussion;
-  // }
-//
-  // /**
-  //  * Callback for when an external authenticator (social login) action has
-  //  * completed.
-  //  *
-  //  * If the payload indicates that the user has been logged in, then the page
-  //  * will be reloaded. Otherwise, a SignUpModal will be opened, prefilled
-  //  * with the provided details.
-  //  *
-  //  * @param {Object} payload A dictionary of props to pass into the sign up
-  //  *     modal. A truthy `authenticated` prop indicates that the user has logged
-  //  *     in, and thus the page is reloaded.
-  //  * @public
-  //  */
-  // authenticationComplete(payload) {
-  //   if (payload.authenticated) {
-  //     window.location.reload();
-  //   } else {
-  //     const modal = new SignUpModal(payload);
-  //     this.modal.show(modal);
-  //     modal.$('[name=password]').focus();
-  //   }
-  // }
-}

js/forum/src/components/EditUserModal.tsx

@@ -1,165 +0,0 @@
-import Modal from 'flarum/components/Modal';
-import Button from 'flarum/components/Button';
-import GroupBadge from 'flarum/components/GroupBadge';
-import Group from 'flarum/models/Group';
-import extractText from 'flarum/utils/extractText';
-
-/**
- * The `EditUserModal` component displays a modal dialog with a login form.
- */
-export default class EditUserModal extends Modal {
-  init() {
-    super.init();
-
-    const user = this.props.user;
-
-    this.username = m.prop(user.username() || '');
-    this.email = m.prop(user.email() || '');
-    this.isActivated = m.prop(user.isActivated() || false);
-    this.setPassword = m.prop(false);
-    this.password = m.prop(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()] = m.prop(user.groups().indexOf(group) !== -1));
-  }
-
-  className() {
-    return 'EditUserModal Modal--small';
-  }
-
-  title() {
-    return app.translator.trans('core.forum.edit_user.title');
-  }
-
-  content() {
-    return (
-      <div className="Modal-body">
-        <div className="Form">
-          <div className="Form-group">
-            <label>{app.translator.trans('core.forum.edit_user.username_heading')}</label>
-            <input className="FormControl" placeholder={extractText(app.translator.trans('core.forum.edit_user.username_label'))}
-              bidi={this.username} />
-          </div>
-
-          {app.session.user !== this.props.user ? [
-            <div className="Form-group">
-              <label>{app.translator.trans('core.forum.edit_user.email_heading')}</label>
-              <div>
-                <input className="FormControl" placeholder={extractText(app.translator.trans('core.forum.edit_user.email_label'))}
-                  bidi={this.email} />
-              </div>
-              {!this.isActivated() ? (
-                <div>
-                  {Button.component({
-                    className: 'Button Button--block',
-                    children: app.translator.trans('core.forum.edit_user.activate_button'),
-                    loading: this.loading,
-                    onclick: this.activate.bind(this)
-                  })}
-                </div>
-              ) : ''}
-            </div>,
-
-            <div className="Form-group">
-              <label>{app.translator.trans('core.forum.edit_user.password_heading')}</label>
-              <div>
-                <label className="checkbox">
-                  <input type="checkbox" checked={this.setPassword()} onchange={e => {
-                    this.setPassword(e.target.checked);
-                    m.redraw(true);
-                    if (e.target.checked) this.$('[name=password]').select();
-                    m.redraw.strategy('none');
-                  }}/>
-                  {app.translator.trans('core.forum.edit_user.set_password_label')}
-                </label>
-                {this.setPassword() ? (
-                  <input className="FormControl" type="password" name="password" placeholder={extractText(app.translator.trans('core.forum.edit_user.password_label'))}
-                    bidi={this.password} />
-                ) : ''}
-              </div>
-            </div>
-          ] : ''}
-
-          <div className="Form-group EditUserModal-groups">
-            <label>{app.translator.trans('core.forum.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={this.props.user.id() === '1' && group.id() === Group.ADMINISTRATOR_ID} />
-                    {GroupBadge.component({group, label: ''})} {group.nameSingular()}
-                  </label>
-                ))}
-            </div>
-          </div>
-
-          <div className="Form-group">
-            {Button.component({
-              className: 'Button Button--primary',
-              type: 'submit',
-              loading: this.loading,
-              children: app.translator.trans('core.forum.edit_user.submit_button')
-            })}
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  activate() {
-    this.loading = true;
-    const data = {
-      username: this.username(),
-      isActivated: true,
-    };
-    this.props.user.save(data, {errorHandler: this.onerror.bind(this)})
-      .then(() => {
-        this.isActivated(true);
-        this.loading = false;
-        m.redraw();
-      })
-      .catch(() => {
-        this.loading = false;
-        m.redraw();
-      });
-  }
-
-  data() {
-    const groups = Object.keys(this.groups)
-      .filter(id => this.groups[id]())
-      .map(id => app.store.getById('groups', id));
-
-    const data = {
-      username: this.username(),
-      relationships: {groups}
-    };
-
-    if (app.session.user !== this.props.user) {
-      data.email = this.email();
-    }
-
-    if (this.setPassword()) {
-      data.password = this.password();
-    }
-
-    return data;
-  }
-
-  onsubmit(e) {
-    e.preventDefault();
-
-    this.loading = true;
-
-    this.props.user.save(this.data(), {errorHandler: this.onerror.bind(this)})
-      .then(this.hide.bind(this))
-      .catch(() => {
-        this.loading = false;
-        m.redraw();
-      });
-  }
-}

js/forum/src/components/LogInModal.tsx

@@ -1,157 +0,0 @@
-import Modal from 'flarum/components/Modal';
-import ForgotPasswordModal from 'flarum/components/ForgotPasswordModal';
-import SignUpModal from 'flarum/components/SignUpModal';
-import Alert from 'flarum/components/Alert';
-import Button from 'flarum/components/Button';
-import LogInButtons from 'flarum/components/LogInButtons';
-import Switch from 'flarum/components/Switch';
-import extractText from 'flarum/utils/extractText';
-
-/**
- * The `LogInModal` component displays a modal dialog with a login form.
- *
- * ### Props
- *
- * - `identification`
- * - `password`
- */
-export default class LogInModal extends Modal {
-  init() {
-    super.init();
-
-    /**
-     * The value of the identification input.
-     *
-     * @type {Function}
-     */
-    this.identification = m.prop(this.props.identification || '');
-
-    /**
-     * The value of the password input.
-     *
-     * @type {Function}
-     */
-    this.password = m.prop(this.props.password || '');
-
-    /**
-     * The value of the remember me input.
-     *
-     * @type {Function}
-     */
-    this.remember = m.prop(this.props.remember && true);
-  }
-
-  className() {
-    return 'LogInModal Modal--small';
-  }
-
-  title() {
-    return app.translator.trans('core.forum.log_in.title');
-  }
-
-  content() {
-    return [
-      <div className="Modal-body">
-        <LogInButtons/>
-
-        <div className="Form Form--centered">
-          <div className="Form-group">
-            <input className="FormControl" name="identification" type="text" placeholder={extractText(app.translator.trans('core.forum.log_in.username_or_email_placeholder'))}
-              bidi={this.identification}
-              disabled={this.loading} />
-          </div>
-
-          <div className="Form-group">
-            <input className="FormControl" name="password" type="password" placeholder={extractText(app.translator.trans('core.forum.log_in.password_placeholder'))}
-              bidi={this.password}
-              disabled={this.loading} />
-          </div>
-      
-          <div className="Form-group">
-            {Switch.component({
-             children: app.translator.trans('core.forum.log_in.remember_me_label'),
-             disabled: this.loading,
-             onchange: this.remember,
-             state: this.remember()
-            })}
-          </div>
-
-          <div className="Form-group">
-            {Button.component({
-              className: 'Button Button--primary Button--block',
-              type: 'submit',
-              loading: this.loading,
-              children: app.translator.trans('core.forum.log_in.submit_button')
-            })}
-          </div>
-        </div>
-      </div>,
-      <div className="Modal-footer">
-        <p className="LogInModal-forgotPassword">
-          <a onclick={this.forgotPassword.bind(this)}>{app.translator.trans('core.forum.log_in.forgot_password_link')}</a>
-        </p>
-
-        {app.forum.attribute('allowSignUp') ? (
-          <p className="LogInModal-signUp">
-            {app.translator.trans('core.forum.log_in.sign_up_text', {a: <a onclick={this.signUp.bind(this)}/>})}
-          </p>
-        ) : ''}
-      </div>
-    ];
-  }
-
-  /**
-   * Open the forgot password modal, prefilling it with an email if the user has
-   * entered one.
-   *
-   * @public
-   */
-  forgotPassword() {
-    const email = this.identification();
-    const props = email.indexOf('@') !== -1 ? {email} : undefined;
-
-    app.modal.show(new ForgotPasswordModal(props));
-  }
-
-  /**
-   * Open the sign up modal, prefilling it with an email/username/password if
-   * the user has entered one.
-   *
-   * @public
-   */
-  signUp() {
-    const props = {password: this.password()};
-    const identification = this.identification();
-    props[identification.indexOf('@') !== -1 ? 'email' : 'username'] = identification;
-
-    app.modal.show(new SignUpModal(props));
-  }
-
-  onready() {
-    this.$('[name=' + (this.identification() ? 'password' : 'identification') + ']').select();
-  }
-
-  onsubmit(e) {
-    e.preventDefault();
-
-    this.loading = true;
-
-    const identification = this.identification();
-    const password = this.password();
-    const remember = this.remember();
-
-    app.session.login({identification, password, remember}, {errorHandler: this.onerror.bind(this)})
-      .then(
-        () => window.location.reload(),
-        this.loaded.bind(this)
-      );
-  }
-
-  onerror(error) {
-    if (error.status === 401) {
-      error.alert.props.children = app.translator.trans('core.forum.log_in.invalid_login_message');
-    }
-
-    super.onerror(error);
-  }
-}

js/forum/src/components/NotificationList.tsx

@@ -1,145 +0,0 @@
-import Component from 'flarum/Component';
-import listItems from 'flarum/helpers/listItems';
-import Button from 'flarum/components/Button';
-import LoadingIndicator from 'flarum/components/LoadingIndicator';
-import Discussion from 'flarum/models/Discussion';
-
-/**
- * The `NotificationList` component displays a list of the logged-in user's
- * notifications, grouped by discussion.
- */
-export default class NotificationList extends Component {
-  init() {
-    /**
-     * Whether or not the notifications are loading.
-     *
-     * @type {Boolean}
-     */
-    this.loading = false;
-  }
-
-  view() {
-    const groups = [];
-
-    if (app.cache.notifications) {
-      const discussions = {};
-
-      // Build an array of discussions which the notifications are related to,
-      // and add the notifications as children.
-      app.cache.notifications.forEach(notification => {
-        const subject = notification.subject();
-
-        if (typeof subject === 'undefined') return;
-
-        // Get the discussion that this notification is related to. If it's not
-        // directly related to a discussion, it may be related to a post or
-        // other entity which is related to a discussion.
-        let discussion = false;
-        if (subject instanceof Discussion) discussion = subject;
-        else if (subject && subject.discussion) discussion = subject.discussion();
-
-        // If the notification is not related to a discussion directly or
-        // indirectly, then we will assign it to a neutral group.
-        const key = discussion ? discussion.id() : 0;
-        discussions[key] = discussions[key] || {discussion: discussion, notifications: []};
-        discussions[key].notifications.push(notification);
-
-        if (groups.indexOf(discussions[key]) === -1) {
-          groups.push(discussions[key]);
-        }
-      });
-    }
-
-    return (
-      <div className="NotificationList">
-        <div className="NotificationList-header">
-          <div className="App-primaryControl">
-            {Button.component({
-              className: 'Button Button--icon Button--link',
-              icon: 'check',
-              title: app.translator.trans('core.forum.notifications.mark_all_as_read_tooltip'),
-              onclick: this.markAllAsRead.bind(this)
-            })}
-          </div>
-
-          <h4 className="App-titleControl App-titleControl--text">{app.translator.trans('core.forum.notifications.title')}</h4>
-        </div>
-
-        <div className="NotificationList-content">
-          {groups.length
-            ? groups.map(group => {
-              const badges = group.discussion && group.discussion.badges().toArray();
-
-              return (
-                <div className="NotificationGroup">
-                  {group.discussion
-                    ? (
-                      <a className="NotificationGroup-header"
-                        href={app.route.discussion(group.discussion)}
-                        config={m.route}>
-                        {badges && badges.length ? <ul className="NotificationGroup-badges badges">{listItems(badges)}</ul> : ''}
-                        {group.discussion.title()}
-                      </a>
-                    ) : (
-                      <div className="NotificationGroup-header">
-                        {app.forum.attribute('title')}
-                      </div>
-                    )}
-
-                  <ul className="NotificationGroup-content">
-                    {group.notifications.map(notification => {
-                      const NotificationComponent = app.notificationComponents[notification.contentType()];
-                      return NotificationComponent ? <li>{NotificationComponent.component({notification})}</li> : '';
-                    })}
-                  </ul>
-                </div>
-              );
-            })
-            : !this.loading
-              ? <div className="NotificationList-empty">{app.translator.trans('core.forum.notifications.empty_text')}</div>
-              : LoadingIndicator.component({className: 'LoadingIndicator--block'})}
-        </div>
-      </div>
-    );
-  }
-
-  /**
-   * Load notifications into the application's cache if they haven't already
-   * been loaded.
-   */
-  load() {
-    if (app.cache.notifications && !app.session.user.newNotificationsCount()) {
-      return;
-    }
-
-    this.loading = true;
-    m.redraw();
-
-    app.store.find('notifications')
-      .then(notifications => {
-        app.session.user.pushAttributes({newNotificationsCount: 0});
-        app.cache.notifications = notifications.sort((a, b) => b.time() - a.time());
-      })
-      .catch(() => {})
-      .then(() => {
-        this.loading = false;
-        m.redraw();
-      });
-  }
-
-  /**
-   * Mark all of the notifications as read.
-   */
-  markAllAsRead() {
-    if (!app.cache.notifications) return;
-
-    app.session.user.pushAttributes({unreadNotificationsCount: 0});
-
-    app.cache.notifications.forEach(notification => notification.pushAttributes({isRead: true}));
-
-    app.request({
-      url: app.forum.attribute('apiUrl') + '/notifications/read',
-      method: 'POST'
-    });
-  }
-}

js/forum/src/components/UserBio.tsx

@@ -1,104 +0,0 @@
-import Component from 'flarum/Component';
-import LoadingIndicator from 'flarum/components/LoadingIndicator';
-import classList from 'flarum/utils/classList';
-import extractText from 'flarum/utils/extractText';
-
-/**
- * The `UserBio` component displays a user's bio, optionally letting the user
- * edit it.
- */
-export default class UserBio extends Component {
-  init() {
-    /**
-     * Whether or not the bio is currently being edited.
-     *
-     * @type {Boolean}
-     */
-    this.editing = false;
-
-    /**
-     * Whether or not the bio is currently being saved.
-     *
-     * @type {Boolean}
-     */
-    this.loading = false;
-  }
-
-  view() {
-    const user = this.props.user;
-    let content;
-
-    if (this.editing) {
-      content = <textarea className="FormControl" placeholder={extractText(app.translator.trans('core.forum.user.bio_placeholder'))} rows="3" value={user.bio()}/>;
-    } else {
-      let subContent;
-
-      if (this.loading) {
-        subContent = <p className="UserBio-placeholder">{LoadingIndicator.component({size: 'tiny'})}</p>;
-      } else {
-        const bioHtml = user.bioHtml();
-
-        if (bioHtml) {
-          subContent = m.trust(bioHtml);
-        } else if (this.props.editable) {
-          subContent = <p className="UserBio-placeholder">{app.translator.trans('core.forum.user.bio_placeholder')}</p>;
-        }
-      }
-
-      content = <div className="UserBio-content" onclick={this.edit.bind(this)}>{subContent}</div>;
-    }
-
-    return (
-      <div className={'UserBio ' + classList({
-          editable: this.props.editable,
-          editing: this.editing
-        })}>
-        {content}
-      </div>
-    );
-  }
-
-  /**
-   * Edit the bio.
-   */
-  edit() {
-    if (!this.props.editable) return;
-
-    this.editing = true;
-    m.redraw();
-
-    const bio = this;
-    const save = function(e) {
-      if (e.shiftKey) return;
-      e.preventDefault();
-      bio.save($(this).val());
-    };
-
-    this.$('textarea').focus()
-      .blur(save)
-      .keydown('return', save);
-  }
-
-  /**
-   * Save the bio.
-   *
-   * @param {String} value
-   */
-  save(value) {
-    const user = this.props.user;
-
-    if (user.bio() !== value) {
-      this.loading = true;
-
-      user.save({bio: value})
-        .catch(() => {})
-        .then(() => {
-          this.loading = false;
-          m.redraw();
-        });
-    }
-
-    this.editing = false;
-    m.redraw();
-  }
-}

js/forum/src/index.ts

@@ -1,9 +0,0 @@
-import ForumApplication from './ForumApplication';
-
-export const app = new ForumApplication();
-
-export const extensions = [];
-
-// Export public API
-// export { default as Extend } from './Extend';
-// export { IndexPage, DicsussionList } from './components';

js/forum/src/initializers/boot.ts

@@ -1,91 +0,0 @@
-/*global FastClick*/
-
-import ScrollListener from 'flarum/utils/ScrollListener';
-import Pane from 'flarum/utils/Pane';
-import Drawer from 'flarum/utils/Drawer';
-import mapRoutes from 'flarum/utils/mapRoutes';
-import icon from 'flarum/helpers/icon';
-import Navigation from 'flarum/components/Navigation';
-import HeaderPrimary from 'flarum/components/HeaderPrimary';
-import HeaderSecondary from 'flarum/components/HeaderSecondary';
-import Composer from 'flarum/components/Composer';
-import ModalManager from 'flarum/components/ModalManager';
-import AlertManager from 'flarum/components/AlertManager';
-
-/**
- * The `boot` initializer boots up the forum app. It initializes some app
- * globals, mounts components to the page, and begins routing.
- *
- * @param {ForumApp} app
- */
-export default function boot(app) {
-  // Get the configured default route and update that route's path to be '/'.
-  // Push the homepage as the first route, so that the user will always be
-  // able to click on the 'back' button to go home, regardless of which page
-  // they started on.
-  const defaultRoute = app.forum.attribute('defaultRoute');
-  let defaultAction = 'index';
-
-  for (const i in app.routes) {
-    if (app.routes[i].path === defaultRoute) defaultAction = i;
-  }
-
-  app.routes[defaultAction].path = '/';
-  app.history.push(defaultAction, icon('bars'), '/');
-
-  m.startComputation();
-
-  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());
-
-  app.pane = new Pane(document.getElementById('app'));
-  app.drawer = new Drawer();
-  app.composer = m.mount(document.getElementById('composer'), Composer.component());
-  app.modal = m.mount(document.getElementById('modal'), ModalManager.component());
-  app.alerts = m.mount(document.getElementById('alerts'), AlertManager.component());
-
-  const basePath = app.forum.attribute('basePath');
-  m.route.mode = 'pathname';
-  m.route(
-    document.getElementById('content'),
-    basePath + '/',
-    mapRoutes(app.routes, basePath)
-  );
-
-  m.endComputation();
-
-  // Route the home link back home when clicked. We do not want it to register
-  // if the user is opening it in a new tab, however.
-  $('#home-link').click(e => {
-    if (e.ctrlKey || e.metaKey || e.which === 2) return;
-    e.preventDefault();
-    app.history.home();
-    if (app.session.user) {
-      app.store.find('users', app.session.user.id());
-      m.redraw();
-    }
-  });
-
-  // Add a class to the body which indicates that the page has been scrolled
-  // down.
-  new ScrollListener(top => {
-    const $app = $('#app');
-    const offset = $app.offset().top;
-
-    $app
-      .toggleClass('affix', top >= offset)
-      .toggleClass('scrolled', top > offset);
-  }).start();
-
-  // Initialize FastClick, which makes links and buttons much more responsive on
-  // touch devices.
-  $(() => {
-    FastClick.attach(document.body);
-
-    $('body').addClass('ontouchstart' in window ? 'touch' : 'no-touch');
-  });
-
-  app.booted = true;
-}

js/forum/src/lib

@@ -1 +0,0 @@
-/Users/toby/Projects/Flarum/app/packages/core/js/lib

js/forum/src/routes.ts

@@ -1,58 +0,0 @@
-import IndexPage from './components/IndexPage';
-import DiscussionPage from './components/DiscussionPage';
-import PostsUserPage from './components/PostsUserPage';
-import DiscussionsUserPage from './components/DiscussionsUserPage';
-import SettingsPage from './components/SettingsPage';
-import NotificationsPage from './components/NotificationsPage';
-
-export default function(router) {
-  router.add('index', '/all', IndexPage);
-  router.add('index.filter', '/:filter', IndexPage);
-
-  router.add('discussion', '/d/:id', DiscussionPage);
-  router.add('discussion.near', '/d/:id/:near', DiscussionPage);
-
-  router.add('user', '/u/:username', PostsUserPage);
-  router.add('user.posts', '/u/:username', PostsUserPage);
-  router.add('user.discussions', '/u/:username/discussions', DiscussionsUserPage);
-
-  router.add('settings', '/settings', SettingsPage);
-  router.add('notifications', '/notifications', NotificationsPage);
-
-  // TODO: work out where to put these shortcut functions
-  // /**
-  //  * Generate a URL to a discussion.
-  //  *
-  //  * @param {Discussion} discussion
-  //  * @param {Integer} [near]
-  //  * @return {String}
-  //  */
-  // app.route.discussion = (discussion, near) => {
-  //   return app.route(near && near !== 1 ? 'discussion.near' : 'discussion', {
-  //     id: discussion.id() + '-' + discussion.slug(),
-  //     near: near && near !== 1 ? near : undefined
-  //   });
-  // };
-
-  // /**
-  //  * Generate a URL to a post.
-  //  *
-  //  * @param {Post} post
-  //  * @return {String}
-  //  */
-  // app.route.post = post => {
-  //   return app.route.discussion(post.discussion(), post.number());
-  // };
-
-  // /**
-  //  * Generate a URL to a user.
-  //  *
-  //  * @param {User} user
-  //  * @return {String}
-  //  */
-  // app.route.user = user => {
-  //   return app.route('user', {
-  //     username: user.username()
-  //   });
-  // };
-}

js/forum/tsconfig.json

@@ -1,23 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "./dist/",
-    "sourceMap": true,
-    "noImplicitAny": false,
-    "module": "commonjs",
-    "target": "es5",
-    "jsx": "react",
-    "jsxFactory": "m",
-    "declaration": true,
-    "lib": ["dom", "es2015"],
-    "types": [
-      "mithril",
-      "classnames"
-    ]
-  },
-  "include": [
-    "./src/**/*"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
-}

js/forum/webpack.config.js

@@ -1,30 +0,0 @@
-const path = require('path');
-const { CheckerPlugin } = require('awesome-typescript-loader');
-
-module.exports = {
-  entry: path.resolve(__dirname, 'src/index.tsx'),
-  resolve: {
-    extensions: ['.ts', '.tsx', '.js', '.jsx']
-  },
-  devtool: 'source-map',
-  output: {
-    filename: 'bundle.js',
-    path: path.resolve(__dirname, 'dist'),
-    library: 'flarum',
-    libraryTarget: 'var'
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.tsx?$/,
-        loader: 'awesome-typescript-loader'
-      }
-    ]
-  },
-  plugins: [
-    new CheckerPlugin()
-  ],
-  externals: {
-    mithril: 'm'
-  }
-};

js/lib/Ajax.tsx

@@ -1,148 +0,0 @@
-import { app } from 'flarum';
-import ItemList from 'flarum/utils/ItemList';
-import Alert from 'flarum/components/Alert';
-import Button from 'flarum/components/Button';
-import RequestErrorModal from 'flarum/components/RequestErrorModal';
-import ConfirmPasswordModal from 'flarum/components/ConfirmPasswordModal';
-import Translator from 'flarum/Translator';
-import extract from 'flarum/utils/extract';
-import patchMithril from 'flarum/utils/patchMithril';
-import RequestError from 'flarum/utils/RequestError';
-import { extend } from 'flarum/extend';
-
-export default class Ajax {
-  /**
-   * Make an AJAX request, handling any low-level errors that may occur.
-   *
-   * @see https://lhorie.github.io/mithril/mithril.request.html
-   * @param {Object} options
-   * @return {Promise}
-   * @public
-   */
-  request(originalOptions) {
-    const options = Object.assign({}, originalOptions);
-
-    // Set some default options if they haven't been overridden. We want to
-    // authenticate all requests with the session token. We also want all
-    // requests to run asynchronously in the background, so that they don't
-    // prevent redraws from occurring.
-    options.background = options.background || true;
-
-    extend(options, 'config', (result, xhr) => xhr.setRequestHeader('X-CSRF-Token', this.session.csrfToken));
-
-    // If the method is something like PATCH or DELETE, which not all servers
-    // and clients support, then we'll send it as a POST request with the
-    // intended method specified in the X-HTTP-Method-Override header.
-    if (options.method !== 'GET' && options.method !== 'POST') {
-      const method = options.method;
-      extend(options, 'config', (result, xhr) => xhr.setRequestHeader('X-HTTP-Method-Override', method));
-      options.method = 'POST';
-    }
-
-    // When we deserialize JSON data, if for some reason the server has provided
-    // a dud response, we don't want the application to crash. We'll show an
-    // error message to the user instead.
-    options.deserialize = options.deserialize || (responseText => responseText);
-
-    options.errorHandler = options.errorHandler || (error => {
-      throw error;
-    });
-
-    // When extracting the data from the response, we can check the server
-    // response code and show an error message to the user if something's gone
-    // awry.
-    const original = options.extract;
-    options.extract = xhr => {
-      let responseText;
-
-      if (original) {
-        responseText = original(xhr.responseText);
-      } else {
-        responseText = xhr.responseText || null;
-      }
-
-      const status = xhr.status;
-
-      if (status < 200 || status > 299) {
-        throw new RequestError(status, responseText, options, xhr);
-      }
-
-      if (xhr.getResponseHeader) {
-        const csrfToken = xhr.getResponseHeader('X-CSRF-Token');
-        if (csrfToken) app.session.csrfToken = csrfToken;
-      }
-
-      try {
-        return JSON.parse(responseText);
-      } catch (e) {
-        throw new RequestError(500, responseText, options, xhr);
-      }
-    };
-
-    if (this.requestError) this.alerts.dismiss(this.requestError.alert);
-
-    // Now make the request. If it's a failure, inspect the error that was
-    // returned and show an alert containing its contents.
-    const deferred = m.deferred();
-
-    m.request(options).then(response => deferred.resolve(response), error => {
-      this.requestError = error;
-
-      let children;
-
-      switch (error.status) {
-        case 422:
-          children = error.response.errors
-            .map(error => [error.detail, <br/>])
-            .reduce((a, b) => a.concat(b), [])
-            .slice(0, -1);
-          break;
-
-        case 401:
-        case 403:
-          children = app.translator.trans('core.lib.error.permission_denied_message');
-          break;
-
-        case 404:
-        case 410:
-          children = app.translator.trans('core.lib.error.not_found_message');
-          break;
-
-        case 429:
-          children = app.translator.trans('core.lib.error.rate_limit_exceeded_message');
-          break;
-
-        default:
-          children = app.translator.trans('core.lib.error.generic_message');
-      }
-
-      error.alert = new Alert({
-        type: 'error',
-        children,
-        controls: app.forum.attribute('debug') ? [
-          <Button className="Button Button--link" onclick={this.showDebug.bind(this, error)}>Debug</Button>
-        ] : undefined
-      });
-
-      try {
-        options.errorHandler(error);
-      } catch (error) {
-        this.alerts.show(error.alert);
-      }
-
-      deferred.reject(error);
-    });
-
-    return deferred.promise;
-  }
-
-  /**
-   * @param {RequestError} error
-   * @private
-   */
-  showDebug(error) {
-    this.alerts.dismiss(this.requestErrorAlert);
-
-    this.modal.show(new RequestErrorModal({error}));
-  }
-}

js/lib/Application.tsx

@@ -1,168 +0,0 @@
-import * as m from 'mithril';
-import ItemList from 'flarum/utils/ItemList';
-import Alert from 'flarum/components/Alert';
-import Button from 'flarum/components/Button';
-import RequestErrorModal from 'flarum/components/RequestErrorModal';
-import ConfirmPasswordModal from 'flarum/components/ConfirmPasswordModal';
-import Translator from 'flarum/Translator';
-import extract from 'flarum/utils/extract';
-import patchMithril from 'flarum/utils/patchMithril';
-import RequestError from 'flarum/utils/RequestError';
-import { extend } from 'flarum/extend';
-import routes from 'flarum/routes';
-import Header from 'flarum/components/Header';
-
-/**
- * The `App` class provides a container for an application, as well as various
- * utilities for the rest of the app to use.
- */
-export default class Application {
-  constructor() {
-    /**
-     * [data description]
-     *
-     * @type {[type]}
-     */
-    this.data = null;
-
-    /**
-     * The forum model for this application.
-     *
-     * @type {Forum}
-     * @public
-     */
-    this.forum = null;
-
-    /**
-     * [router description]
-     *
-     * @type {Router}
-     */
-    this.router = new Router();
-
-    /**
-     * The app's session.
-     *
-     * @type {Session}
-     * @public
-     */
-    this.user = null;
-
-    /**
-     * The app's translator.
-     *
-     * @type {Translator}
-     * @public
-     */
-    this.translator = new Translator();
-
-    /**
-     * The app's data store.
-     *
-     * @type {Store}
-     * @public
-     */
-    this.store = new Store();
-
-    /**
-     * A local cache that can be used to store data at the application level, so
-     * that it persists between different routes.
-     *
-     * @type {Object}
-     * @public
-     */
-    this.cache = {};
-
-    /**
-     * [title description]
-     *
-     * @type {DocumentTitle}
-     */
-    this.title = new DocumentTitle();
-
-    /**
-     * [ajax description]
-     *
-     * @type {Ajax}
-     */
-    this.ajax = new Ajax();
-  }
-
-  /**
-   *
-   */
-  registerDefaultRoutes(router) {
-  }
-
-  /**
-   * [loadModules description]
-   *
-   * @param {[type]} modules [description]
-   * @return {[type]}
-   */
-  loadModules(modules) {
-
-  }
-
-  /**
-   * Boot the application by running all of the registered initializers.
-   *
-   * @public
-   */
-  boot(data) {
-    this.data = data;
-
-    this.translator.addMessages(data.locale);
-
-    this.store.push(data.resources);
-
-    this.forum = new Forum(data.forum);
-
-    this.user = this.store.find('users', data.userId);
-
-    this.mount();
-  }
-
-  /**
-   * Mount Flarum's interface onto the page.
-   *
-   * @return {[type]}
-   * @protected
-   */
-  mount() {
-    this.modal = m.mount(document.getElementById('modal'), <ModalManager/>);
-    this.alerts = m.mount(document.getElementById('alerts'), <AlertManager/>);
-
-    m.mount(document.getElementById('header'), <Header/>);
-    m.route(document.getElementById('content'), '/', this.router.build());
-
-    // Add a class to the body which indicates that the page has been scrolled
-    // down.
-    new ScrollListener(top => {
-      const $app = $('#app');
-      const offset = $app.offset().top;
-
-      $app
-        .toggleClass('affix', top >= offset)
-        .toggleClass('scrolled', top > offset);
-    }).start();
-  }
-
-  /**
-   * Get the API response document that has been preloaded into the application.
-   *
-   * @return {Object|null}
-   * @public
-   */
-  preloadedDocument() {
-    if (this.data.document) {
-      const results = this.store.sync(this.data.document);
-
-      this.data.document = null;
-
-      return results;
-    }
-
-    return null;
-  }
-}

js/lib/DocumentTitle.tsx

@@ -1,3 +0,0 @@
-export default class DocumentTitle {
-
-}

js/lib/components/Icon.tsx

@@ -1,12 +0,0 @@
-/**
- * The `icon` helper displays a FontAwesome icon. The fa-fw class is applied.
- *
- * @param {String} name The name of the icon class, without the `fa-` prefix.
- * @param {Object} attrs Any other attributes to apply.
- * @return {Object}
- */
-export default function icon(name, attrs = {}) {
-  attrs.className = 'icon fa fa-fw fa-' + name + ' ' + (attrs.className || '');
-
-  return <i {...attrs}/>;
-}

js/lib/components/LoadingIndicator.tsx

@@ -1,27 +0,0 @@
-import Component from 'flarum/Component';
-
-/**
- * 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() {
-    const size = this.props.size || 'small';
-
-    $.fn.spin.presets[size].zIndex = 'auto';
-    this.$().spin(size);
-  }
-}

js/lib/components/RequestErrorModal.tsx

@@ -1,30 +0,0 @@
-import Modal from 'flarum/components/Modal';
-
-export default class RequestErrorModal extends Modal {
-  className() {
-    return 'RequestErrorModal Modal--large';
-  }
-
-  title() {
-    return this.props.error.xhr
-      ? this.props.error.xhr.status+' '+this.props.error.xhr.statusText
-      : '';
-  }
-
-  content() {
-    let responseText;
-
-    try {
-      responseText = JSON.stringify(JSON.parse(this.props.error.responseText), null, 2);
-    } catch (e) {
-      responseText = this.props.error.responseText;
-    }
-
-    return <div className="Modal-body">
-      <pre>
-        {this.props.error.options.method} {this.props.error.options.url}<br/><br/>
-        {responseText}
-      </pre>
-    </div>;
-  }
-}

js/lib/models/Notification.ts

@@ -1,19 +0,0 @@
-import Model from 'flarum/Model';
-import computed from 'flarum/utils/computed';
-
-export default class Notification extends Model {}
-
-Object.assign(Notification.prototype, {
-  contentType: Model.attribute('contentType'),
-  subjectId: Model.attribute('subjectId'),
-  content: Model.attribute('content'),
-  time: Model.attribute('time', Model.date),
-
-  isRead: Model.attribute('isRead'),
-  unreadCount: Model.attribute('unreadCount'),
-  additionalUnreadCount: computed('unreadCount', unreadCount => Math.max(0, unreadCount - 1)),
-
-  user: Model.hasOne('user'),
-  sender: Model.hasOne('sender'),
-  subject: Model.hasOne('subject')
-});

js/lib/models/Post.ts

@@ -1,28 +0,0 @@
-import Model from 'flarum/Model';
-import computed from 'flarum/utils/computed';
-import { getPlainContent } from 'flarum/utils/string';
-
-export default class Post extends Model {}
-
-Object.assign(Post.prototype, {
-  number: Model.attribute('number'),
-  discussion: Model.hasOne('discussion'),
-
-  time: Model.attribute('time', Model.transformDate),
-  user: Model.hasOne('user'),
-  contentType: Model.attribute('contentType'),
-  content: Model.attribute('content'),
-  contentHtml: Model.attribute('contentHtml'),
-  contentPlain: computed('contentHtml', getPlainContent),
-
-  editTime: Model.attribute('editTime', Model.transformDate),
-  editUser: Model.hasOne('editUser'),
-  isEdited: computed('editTime', editTime => !!editTime),
-
-  hideTime: Model.attribute('hideTime', Model.transformDate),
-  hideUser: Model.hasOne('hideUser'),
-  isHidden: computed('hideTime', hideTime => !!hideTime),
-
-  canEdit: Model.attribute('canEdit'),
-  canDelete: Model.attribute('canDelete')
-});

js/package.json

@@ -0,0 +1,26 @@
+{
+  "private": true,
+  "name": "@flarum/core",
+  "dependencies": {
+    "bootstrap": "^3.4.1",
+    "classnames": "^2.2.5",
+    "color-thief-browser": "^2.0.2",
+    "expose-loader": "^0.7.5",
+    "flarum-webpack-config": "0.1.0-beta.10",
+    "jquery": "^3.4.1",
+    "jquery.hotkeys": "^0.1.0",
+    "lodash-es": "^4.17.11",
+    "m.attrs.bidi": "github:tobscure/m.attrs.bidi",
+    "mithril": "^0.2.8",
+    "moment": "^2.22.2",
+    "punycode": "^2.1.1",
+    "spin.js": "^3.1.0",
+    "webpack": "^4.26.0",
+    "webpack-cli": "^3.1.2",
+    "webpack-merge": "^4.1.4"
+  },
+  "scripts": {
+    "dev": "webpack --mode development --watch",
+    "build": "webpack --mode production"
+  }
+}

js/src/admin/AdminApplication.js

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

js/src/admin/compat.js

@@ -0,0 +1,63 @@
+import compat from '../common/compat';
+
+import saveSettings from './utils/saveSettings';
+import SettingDropdown from './components/SettingDropdown';
+import EditCustomFooterModal from './components/EditCustomFooterModal';
+import SessionDropdown from './components/SessionDropdown';
+import HeaderPrimary from './components/HeaderPrimary';
+import AppearancePage from './components/AppearancePage';
+import Page from './components/Page';
+import StatusWidget from './components/StatusWidget';
+import HeaderSecondary from './components/HeaderSecondary';
+import SettingsModal from './components/SettingsModal';
+import DashboardWidget from './components/DashboardWidget';
+import AddExtensionModal from './components/AddExtensionModal';
+import ExtensionsPage from './components/ExtensionsPage';
+import AdminLinkButton from './components/AdminLinkButton';
+import PermissionGrid from './components/PermissionGrid';
+import 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 EditCustomHeaderModal from './components/EditCustomHeaderModal';
+import PermissionsPage from './components/PermissionsPage';
+import PermissionDropdown from './components/PermissionDropdown';
+import AdminNav from './components/AdminNav';
+import EditCustomCssModal from './components/EditCustomCssModal';
+import EditGroupModal from './components/EditGroupModal';
+import routes from './routes';
+import AdminApplication from './AdminApplication';
+
+export default Object.assign(compat, {
+  'utils/saveSettings': saveSettings,
+  'components/SettingDropdown': SettingDropdown,
+  'components/EditCustomFooterModal': EditCustomFooterModal,
+  'components/SessionDropdown': SessionDropdown,
+  'components/HeaderPrimary': HeaderPrimary,
+  'components/AppearancePage': AppearancePage,
+  'components/Page': Page,
+  'components/StatusWidget': StatusWidget,
+  'components/HeaderSecondary': HeaderSecondary,
+  'components/SettingsModal': SettingsModal,
+  'components/DashboardWidget': DashboardWidget,
+  'components/AddExtensionModal': AddExtensionModal,
+  'components/ExtensionsPage': ExtensionsPage,
+  'components/AdminLinkButton': AdminLinkButton,
+  'components/PermissionGrid': PermissionGrid,
+  'components/Widget': Widget,
+  'components/MailPage': MailPage,
+  'components/UploadImageButton': UploadImageButton,
+  'components/LoadingModal': LoadingModal,
+  'components/DashboardPage': DashboardPage,
+  'components/BasicsPage': BasicsPage,
+  'components/EditCustomHeaderModal': EditCustomHeaderModal,
+  'components/PermissionsPage': PermissionsPage,
+  'components/PermissionDropdown': PermissionDropdown,
+  'components/AdminNav': AdminNav,
+  'components/EditCustomCssModal': EditCustomCssModal,
+  'components/EditGroupModal': EditGroupModal,
+  'routes': routes,
+  'AdminApplication': AdminApplication
+});

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/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

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

js/src/admin/components/AppearancePage.js

@@ -1,10 +1,11 @@
-import Page from 'flarum/components/Page';
+import Page from './Page';
-import Button from 'flarum/components/Button';
+import Button from '../../common/components/Button';
-import Switch from 'flarum/components/Switch';
+import Switch from '../../common/components/Switch';
-import EditCustomCssModal from 'flarum/components/EditCustomCssModal';
+import EditCustomCssModal from './EditCustomCssModal';
-import EditCustomHeaderModal from 'flarum/components/EditCustomHeaderModal';
+import EditCustomHeaderModal from './EditCustomHeaderModal';
-import UploadImageButton from 'flarum/components/UploadImageButton';
+import EditCustomFooterModal from './EditCustomFooterModal';
-import saveSettings from 'flarum/utils/saveSettings';
+import UploadImageButton from './UploadImageButton';
+import saveSettings from '../utils/saveSettings';
 
 export default class AppearancePage extends Page {
   init() {
@@ -28,8 +29,8 @@ export default class AppearancePage extends Page {
               </div>
 
               <div className="AppearancePage-colors-input">
-                <input className="FormControl" type="color" placeholder="#aaaaaa" value={this.primaryColor()} onchange={m.withAttr('value', this.primaryColor)}/>
+                <input className="FormControl" type="text" placeholder="#aaaaaa" value={this.primaryColor()} onchange={m.withAttr('value', this.primaryColor)}/>
-                <input className="FormControl" type="color" placeholder="#aaaaaa" value={this.secondaryColor()} onchange={m.withAttr('value', this.secondaryColor)}/>
+                <input className="FormControl" type="text" placeholder="#aaaaaa" value={this.secondaryColor()} onchange={m.withAttr('value', this.secondaryColor)}/>
               </div>
 
               {Switch.component({
@@ -81,6 +82,18 @@ export default class AppearancePage extends Page {
             })}
           </fieldset>
 
+          <fieldset>
+            <legend>{app.translator.trans('core.admin.appearance.custom_footer_heading')}</legend>
+            <div className="helpText">
+              {app.translator.trans('core.admin.appearance.custom_footer_text')}
+            </div>
+            {Button.component({
+              className: 'Button',
+              children: app.translator.trans('core.admin.appearance.edit_footer_button'),
+              onclick: () => app.modal.show(new EditCustomFooterModal())
+            })}
+          </fieldset>
+
           <fieldset>
             <legend>{app.translator.trans('core.admin.appearance.custom_styles_heading')}</legend>
             <div className="helpText">

js/src/admin/components/BasicsPage.js

@@ -1,11 +1,11 @@
-import Page from 'flarum/components/Page';
+import Page from './Page';
-import FieldSet from 'flarum/components/FieldSet';
+import FieldSet from '../../common/components/FieldSet';
-import Select from 'flarum/components/Select';
+import Select from '../../common/components/Select';
-import Button from 'flarum/components/Button';
+import Button from '../../common/components/Button';
-import Alert from 'flarum/components/Alert';
+import Alert from '../../common/components/Alert';
-import saveSettings from 'flarum/utils/saveSettings';
+import saveSettings from '../utils/saveSettings';
-import ItemList from 'flarum/utils/ItemList';
+import ItemList from '../../common/utils/ItemList';
-import Switch from 'flarum/components/Switch';
+import Switch from '../../common/components/Switch';
 
 export default class BasicsPage extends Page {
   init() {
@@ -25,7 +25,7 @@ export default class BasicsPage extends Page {
     this.values = {};
 
     const settings = app.data.settings;
-    this.fields.forEach(key => this.values[key] = m.prop(settings[key] || false));
+    this.fields.forEach(key => this.values[key] = m.prop(settings[key]));
 
     this.localeOptions = {};
     const locales = app.data.locales;
@@ -66,19 +66,16 @@ export default class BasicsPage extends Page {
                     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'),
                   })
                 ]
               })
               : ''}
 
-            {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'),
-            })}
-
-            <br/>
-
             {FieldSet.component({
               label: app.translator.trans('core.admin.basics.home_page_heading'),
               className: 'BasicsPage-homePage',

js/src/admin/components/DashboardPage.js

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

js/src/admin/components/DashboardWidget.js

@@ -0,0 +1,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 Widget extends Component {
+  view() {
+    return (
+      <div className={"Widget "+this.className()}>
+        {this.content()}
+      </div>
+    );
+  }
+
+  /**
+   * Get the class name to apply to the widget.
+   *
+   * @return {String}
+   */
+  className() {
+    return '';
+  }
+
+  /**
+   * Get the content of the widget.
+   *
+   * @return {VirtualElement}
+   */
+  content() {
+    return [];
+  }
+}

js/src/admin/components/EditCustomCssModal.js

@@ -1,4 +1,4 @@
-import SettingsModal from 'flarum/components/SettingsModal';
+import SettingsModal from './SettingsModal';
 
 export default class EditCustomCssModal extends SettingsModal {
   className() {

js/src/admin/components/EditCustomFooterModal.js

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

js/src/admin/components/EditCustomHeaderModal.js

@@ -1,4 +1,4 @@
-import SettingsModal from 'flarum/components/SettingsModal';
+import SettingsModal from './SettingsModal';
 
 export default class EditCustomHeaderModal extends SettingsModal {
   className() {

js/src/admin/components/EditGroupModal.js

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

js/src/admin/components/ExtensionsPage.js

@@ -1,13 +1,13 @@
-import Page from 'flarum/components/Page';
+import Page from './Page';
-import LinkButton from 'flarum/components/LinkButton';
+import LinkButton from '../../common/components/LinkButton';
-import Button from 'flarum/components/Button';
+import Button from '../../common/components/Button';
-import Dropdown from 'flarum/components/Dropdown';
+import Dropdown from '../../common/components/Dropdown';
-import Separator from 'flarum/components/Separator';
+import Separator from '../../common/components/Separator';
-import AddExtensionModal from 'flarum/components/AddExtensionModal';
+import AddExtensionModal from './AddExtensionModal';
-import LoadingModal from 'flarum/components/LoadingModal';
+import LoadingModal from './LoadingModal';
-import ItemList from 'flarum/utils/ItemList';
+import ItemList from '../../common/utils/ItemList';
-import icon from 'flarum/helpers/icon';
+import icon from '../../common/helpers/icon';
-import listItems from 'flarum/helpers/listItems';
+import listItems from '../../common/helpers/listItems';
 
 export default class ExtensionsPage extends Page {
   view() {
@@ -17,7 +17,7 @@ export default class ExtensionsPage extends Page {
           <div className="container">
             {Button.component({
               children: app.translator.trans('core.admin.extensions.add_button'),
-              icon: 'plus',
+              icon: 'fas fa-plus',
               className: 'Button Button--primary',
               onclick: () => app.modal.show(new AddExtensionModal())
             })}
@@ -42,15 +42,18 @@ export default class ExtensionsPage extends Page {
                           className="ExtensionListItem-controls"
                           buttonClassName="Button Button--icon Button--flat"
                           menuClassName="Dropdown-menu--right"
-                          icon="ellipsis-h">
+                          icon="fas fa-ellipsis-h">
                           {controls}
                         </Dropdown>
                       ) : ''}
-                      <label className="ExtensionListItem-title">
+                      <div className="ExtensionListItem-main">
-                        <input type="checkbox" checked={this.isEnabled(extension.id)} onclick={this.toggle.bind(this, extension.id)}/> {' '}
+                        <label className="ExtensionListItem-title">
-                        {extension.extra['flarum-extension'].title}
+                          <input type="checkbox" checked={this.isEnabled(extension.id)} onclick={this.toggle.bind(this, extension.id)}/> {' '}
-                      </label>
+                            {extension.extra['flarum-extension'].title}
-                      <div className="ExtensionListItem-version">{extension.version}</div>
+                        </label>
+                        <div className="ExtensionListItem-version">{extension.version}</div>
+                        <div className="ExtensionListItem-description">{extension.description}</div>
+                      </div>
                     </div>
                   </li>;
                 })}
@@ -67,7 +70,7 @@ export default class ExtensionsPage extends Page {
 
     if (app.extensionSettings[name]) {
       items.add('settings', Button.component({
-        icon: 'cog',
+        icon: 'fas fa-cog',
         children: app.translator.trans('core.admin.extensions.settings_button'),
         onclick: app.extensionSettings[name]
       }));
@@ -75,7 +78,7 @@ export default class ExtensionsPage extends Page {
 
     if (!enabled) {
       items.add('uninstall', Button.component({
-        icon: 'trash-o',
+        icon: 'far fa-trash-alt',
         children: app.translator.trans('core.admin.extensions.uninstall_button'),
         onclick: () => {
           app.request({

js/src/admin/components/HeaderPrimary.js

@@ -1,6 +1,6 @@
-import Component from 'flarum/Component';
+import Component from '../../common/Component';
-import ItemList from 'flarum/utils/ItemList';
+import ItemList from '../../common/utils/ItemList';
-import listItems from 'flarum/helpers/listItems';
+import listItems from '../../common/helpers/listItems';
 
 /**
  * The `HeaderPrimary` component displays primary header controls. On the

js/src/admin/components/HeaderSecondary.js

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

js/src/admin/components/LoadingModal.js

@@ -1,4 +1,4 @@
-import Modal from 'flarum/components/Modal';
+import Modal from '../../common/components/Modal';
 
 export default class LoadingModal extends Modal {
   isDismissible() {

js/src/admin/components/MailPage.js

@@ -1,37 +1,56 @@
-import Page from 'flarum/components/Page';
+import Page from './Page';
-import FieldSet from 'flarum/components/FieldSet';
+import FieldSet from '../../common/components/FieldSet';
-import Button from 'flarum/components/Button';
+import Button from '../../common/components/Button';
-import Alert from 'flarum/components/Alert';
+import Alert from '../../common/components/Alert';
-import saveSettings from 'flarum/utils/saveSettings';
+import Select from '../../common/components/Select';
+import LoadingIndicator from '../../common/components/LoadingIndicator';
+import saveSettings from '../utils/saveSettings';
 
 export default class MailPage extends Page {
   init() {
     super.init();
 
-    this.loading = false;
+    this.loading = true;
+    this.saving = false;
 
-    this.fields = [
+    this.driverFields = {};
-      'mail_driver',
+    this.fields = ['mail_driver', 'mail_from'];
-      'mail_host',
-      'mail_from',
-      'mail_port',
-      'mail_username',
-      'mail_password',
-      'mail_encryption'
-    ];
     this.values = {};
 
     const settings = app.data.settings;
     this.fields.forEach(key => this.values[key] = m.prop(settings[key]));
 
-    this.localeOptions = {};
+    app.request({
-    const locales = app.locales;
+      method: 'GET',
-    for (const i in locales) {
+      url: app.forum.attribute('apiUrl') + '/mail-drivers'
-      this.localeOptions[i] = `${locales[i]} (${i})`;
+    }).then(response => {
-    }
+      this.driverFields = response['data'].reduce(
+        (hash, driver) => ({...hash, [driver['id']]: driver['attributes']['fields']}),
+        {}
+      );
+
+      Object.keys(this.driverFields).flatMap(key => this.driverFields[key]).forEach(
+        key => {
+          this.fields.push(key);
+          this.values[key] = m.prop(settings[key]);
+        }
+      );
+      this.loading = false;
+      m.redraw();
+    });
   }
 
   view() {
+    if (this.loading) {
+      return (
+        <div className="MailPage">
+          <div className="container">
+            <LoadingIndicator />
+          </div>
+        </div>
+      );
+    }
+
     return (
       <div className="MailPage">
         <div className="container">
@@ -41,36 +60,6 @@ export default class MailPage extends Page {
               {app.translator.trans('core.admin.email.text')}
             </div>
 
-            {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',
@@ -82,11 +71,35 @@ export default class MailPage extends Page {
               ]
             })}
 
+            {FieldSet.component({
+              label: app.translator.trans('core.admin.email.driver_heading'),
+              className: 'MailPage-MailSettings',
+              children: [
+                <div className="MailPage-MailSettings-input">
+                  <label>{app.translator.trans('core.admin.email.driver_label')}</label>
+                  <Select value={this.values.mail_driver()} options={Object.keys(this.driverFields).reduce((memo, val) => ({...memo, [val]: val}), {})} onchange={this.values.mail_driver} />
+                </div>
+              ]
+            })}
+
+            {Object.keys(this.driverFields[this.values.mail_driver()]).length > 0 && FieldSet.component({
+              label: app.translator.trans(`core.admin.email.${this.values.mail_driver()}_heading`),
+              className: 'MailPage-MailSettings',
+              children: [
+                <div className="MailPage-MailSettings-input">
+                  {this.driverFields[this.values.mail_driver()].flatMap(field => [
+                    <label>{app.translator.trans(`core.admin.email.${field}_label`)}</label>,
+                    <input className="FormControl" value={this.values[field]() || ''} oninput={m.withAttr('value', this.values[field])} />
+                  ])}
+                </div>
+              ]
+            })}
+
             {Button.component({
               type: 'submit',
               className: 'Button Button--primary',
               children: app.translator.trans('core.admin.email.submit_button'),
-              loading: this.loading,
+              loading: this.saving,
               disabled: !this.changed()
             })}
           </form>
@@ -102,9 +115,9 @@ export default class MailPage extends Page {
   onsubmit(e) {
     e.preventDefault();
 
-    if (this.loading) return;
+    if (this.saving) return;
 
-    this.loading = true;
+    this.saving = true;
     app.alerts.dismiss(this.successAlert);
 
     const settings = {};
@@ -117,7 +130,7 @@ export default class MailPage extends Page {
       })
       .catch(() => {})
       .then(() => {
-        this.loading = false;
+        this.saving = false;
         m.redraw();
       });
   }

js/src/admin/components/Page.js

@@ -1,4 +1,4 @@
-import Component from 'flarum/Component';
+import Component from '../../common/Component';
 
 /**
  * The `Page` component

js/src/admin/components/PermissionDropdown.js

@@ -1,9 +1,9 @@
-import Dropdown from 'flarum/components/Dropdown';
+import Dropdown from '../../common/components/Dropdown';
-import Button from 'flarum/components/Button';
+import Button from '../../common/components/Button';
-import Separator from 'flarum/components/Separator';
+import Separator from '../../common/components/Separator';
-import Group from 'flarum/models/Group';
+import Group from '../../common/models/Group';
-import Badge from 'flarum/components/Badge';
+import Badge from '../../common/components/Badge';
-import GroupBadge from 'flarum/components/GroupBadge';
+import GroupBadge from '../../common/components/GroupBadge';
 
 function badgeForId(id) {
   const group = app.store.getById('groups', id);
@@ -52,9 +52,9 @@ export default class PermissionDropdown extends Dropdown {
     const adminGroup = app.store.getById('groups', Group.ADMINISTRATOR_ID);
 
     if (everyone) {
-      this.props.label = Badge.component({icon: 'globe'});
+      this.props.label = Badge.component({icon: 'fas fa-globe'});
     } else if (members) {
-      this.props.label = Badge.component({icon: 'user'});
+      this.props.label = Badge.component({icon: 'fas fa-user'});
     } else {
       this.props.label = [
         badgeForId(Group.ADMINISTRATOR_ID),
@@ -66,8 +66,8 @@ export default class PermissionDropdown extends Dropdown {
       if (this.props.allowGuest) {
         this.props.children.push(
           Button.component({
-            children: [Badge.component({icon: 'globe'}), ' ', app.translator.trans('core.admin.permissions_controls.everyone_button')],
+            children: [Badge.component({icon: 'fas fa-globe'}), ' ', app.translator.trans('core.admin.permissions_controls.everyone_button')],
-            icon: everyone ? 'check' : true,
+            icon: everyone ? 'fas fa-check' : true,
             onclick: () => this.save([Group.GUEST_ID]),
             disabled: this.isGroupDisabled(Group.GUEST_ID)
           })
@@ -76,8 +76,8 @@ export default class PermissionDropdown extends Dropdown {
 
       this.props.children.push(
         Button.component({
-          children: [Badge.component({icon: 'user'}), ' ', app.translator.trans('core.admin.permissions_controls.members_button')],
+          children: [Badge.component({icon: 'fas fa-user'}), ' ', app.translator.trans('core.admin.permissions_controls.members_button')],
-          icon: members ? 'check' : true,
+          icon: members ? 'fas fa-check' : true,
           onclick: () => this.save([Group.MEMBER_ID]),
           disabled: this.isGroupDisabled(Group.MEMBER_ID)
         }),
@@ -86,7 +86,7 @@ export default class PermissionDropdown extends Dropdown {
 
         Button.component({
           children: [badgeForId(adminGroup.id()), ' ', adminGroup.namePlural()],
-          icon: !everyone && !members ? 'check' : true,
+          icon: !everyone && !members ? 'fas fa-check' : true,
           disabled: !everyone && !members,
           onclick: e => {
             if (e.shiftKey) e.stopPropagation();
@@ -101,7 +101,7 @@ export default class PermissionDropdown extends Dropdown {
           .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 ? 'check' : true,
+            icon: groupIds.indexOf(group.id()) !== -1 ? 'fas fa-check' : true,
             onclick: (e) => {
               if (e.shiftKey) e.stopPropagation();
               this.toggle(group.id());

js/src/admin/components/PermissionGrid.js

@@ -1,9 +1,9 @@
-import Component from 'flarum/Component';
+import Component from '../../common/Component';
-import PermissionDropdown from 'flarum/components/PermissionDropdown';
+import PermissionDropdown from './PermissionDropdown';
-import SettingDropdown from 'flarum/components/SettingDropdown';
+import SettingDropdown from './SettingDropdown';
-import Button from 'flarum/components/Button';
+import Button from '../../common/components/Button';
-import ItemList from 'flarum/utils/ItemList';
+import ItemList from '../../common/utils/ItemList';
-import icon from 'flarum/helpers/icon';
+import icon from '../../common/helpers/icon';
 
 export default class PermissionGrid extends Component {
   init() {
@@ -29,7 +29,7 @@ export default class PermissionGrid extends Component {
             {scopes.map(scope => (
               <th>
                 {scope.label}{' '}
-                {scope.onremove ? Button.component({icon: '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>
@@ -85,21 +85,21 @@ export default class PermissionGrid extends Component {
     const items = new ItemList();
 
     items.add('viewDiscussions', {
-      icon: 'eye',
+      icon: 'fas fa-eye',
       label: app.translator.trans('core.admin.permissions.view_discussions_label'),
       permission: 'viewDiscussions',
       allowGuest: true
     }, 100);
 
     items.add('viewUserList', {
-      icon: 'users',
+      icon: 'fas fa-users',
       label: app.translator.trans('core.admin.permissions.view_user_list_label'),
       permission: 'viewUserList',
       allowGuest: true
     }, 100);
 
     items.add('signUp', {
-      icon: 'user-plus',
+      icon: 'fas fa-user-plus',
       label: app.translator.trans('core.admin.permissions.sign_up_label'),
       setting: () => SettingDropdown.component({
         key: 'allow_sign_up',
@@ -110,6 +110,12 @@ export default class PermissionGrid extends Component {
       })
     }, 90);
 
+    items.add('viewLastSeenAt', {
+      icon: 'far fa-clock',
+      label: app.translator.trans('core.admin.permissions.view_last_seen_at_label'),
+      permission: 'user.viewLastSeenAt',
+    });
+
     return items;
   }
 
@@ -117,13 +123,13 @@ export default class PermissionGrid extends Component {
     const items = new ItemList();
 
     items.add('start', {
-      icon: 'edit',
+      icon: 'fas fa-edit',
       label: app.translator.trans('core.admin.permissions.start_discussions_label'),
       permission: 'startDiscussion'
     }, 100);
 
     items.add('allowRenaming', {
-      icon: 'i-cursor',
+      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);
@@ -149,13 +155,13 @@ export default class PermissionGrid extends Component {
     const items = new ItemList();
 
     items.add('reply', {
-      icon: 'reply',
+      icon: 'fas fa-reply',
       label: app.translator.trans('core.admin.permissions.reply_to_discussions_label'),
       permission: 'discussion.reply'
     }, 100);
 
     items.add('allowPostEditing', {
-      icon: 'pencil',
+      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);
@@ -181,37 +187,43 @@ export default class PermissionGrid extends Component {
     const items = new ItemList();
 
     items.add('viewIpsPosts', {
-      icon: 'bullseye',
+      icon: 'fas fa-bullseye',
       label: app.translator.trans('core.admin.permissions.view_post_ips_label'),
       permission: 'discussion.viewIpsPosts'
     }, 110);
 
     items.add('renameDiscussions', {
-      icon: 'i-cursor',
+      icon: 'fas fa-i-cursor',
       label: app.translator.trans('core.admin.permissions.rename_discussions_label'),
       permission: 'discussion.rename'
     }, 100);
 
     items.add('hideDiscussions', {
-      icon: 'trash-o',
+      icon: 'far fa-trash-alt',
       label: app.translator.trans('core.admin.permissions.delete_discussions_label'),
       permission: 'discussion.hide'
     }, 90);
 
     items.add('deleteDiscussions', {
-      icon: 'times',
+      icon: 'fas fa-times',
       label: app.translator.trans('core.admin.permissions.delete_discussions_forever_label'),
       permission: 'discussion.delete'
     }, 80);
 
     items.add('editPosts', {
-      icon: 'pencil',
+      icon: 'fas fa-pencil-alt',
-      label: app.translator.trans('core.admin.permissions.edit_and_delete_posts_label'),
+      label: app.translator.trans('core.admin.permissions.edit_posts_label'),
       permission: 'discussion.editPosts'
     }, 70);
 
+    items.add('hidePosts', {
+      icon: 'far fa-trash-alt',
+      label: app.translator.trans('core.admin.permissions.delete_posts_label'),
+      permission: 'discussion.hidePosts'
+    }, 60);
+
     items.add('deletePosts', {
-      icon: 'times',
+      icon: 'fas fa-times',
       label: app.translator.trans('core.admin.permissions.delete_posts_forever_label'),
       permission: 'discussion.deletePosts'
     }, 60);

js/src/admin/components/PermissionsPage.js

@@ -1,9 +1,9 @@
-import Page from 'flarum/components/Page';
+import Page from './Page';
-import GroupBadge from 'flarum/components/GroupBadge';
+import GroupBadge from '../../common/components/GroupBadge';
-import EditGroupModal from 'flarum/components/EditGroupModal';
+import EditGroupModal from './EditGroupModal';
-import Group from 'flarum/models/Group';
+import Group from '../../common/models/Group';
-import icon from 'flarum/helpers/icon';
+import icon from '../../common/helpers/icon';
-import PermissionGrid from 'flarum/components/PermissionGrid';
+import PermissionGrid from './PermissionGrid';
 
 export default class PermissionsPage extends Page {
   view() {
@@ -24,7 +24,7 @@ export default class PermissionsPage extends Page {
                 </button>
               ))}
             <button className="Button Group Group--add" onclick={() => app.modal.show(new EditGroupModal())}>
-              {icon('plus', {className: 'Group-icon'})}
+              {icon('fas fa-plus', {className: 'Group-icon'})}
               <span className="Group-name">{app.translator.trans('core.admin.permissions.new_group_button')}</span>
             </button>
           </div>

js/src/admin/components/SessionDropdown.js

@@ -1,8 +1,8 @@
-import avatar from 'flarum/helpers/avatar';
+import avatar from '../../common/helpers/avatar';
-import username from 'flarum/helpers/username';
+import username from '../../common/helpers/username';
-import Dropdown from 'flarum/components/Dropdown';
+import Dropdown from '../../common/components/Dropdown';
-import Button from 'flarum/components/Button';
+import Button from '../../common/components/Button';
-import ItemList from 'flarum/utils/ItemList';
+import ItemList from '../../common/utils/ItemList';
 
 /**
  * The `SessionDropdown` component shows a button with the current user's
@@ -42,7 +42,7 @@ export default class SessionDropdown extends Dropdown {
 
     items.add('logOut',
       Button.component({
-        icon: 'sign-out',
+        icon: 'fas fa-sign-out-alt',
         children: app.translator.trans('core.admin.header.log_out_button'),
         onclick: app.session.logout.bind(app.session)
       }),

js/src/admin/components/SettingDropdown.js

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

js/src/admin/components/SettingsModal.js

@@ -1,6 +1,6 @@
-import Modal from 'flarum/components/Modal';
+import Modal from '../../common/components/Modal';
-import Button from 'flarum/components/Button';
+import Button from '../../common/components/Button';
-import saveSettings from 'flarum/utils/saveSettings';
+import saveSettings from '../utils/saveSettings';
 
 export default class SettingsModal extends Modal {
   init() {

js/src/admin/components/StatusWidget.js

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

js/src/admin/components/UploadImageButton.js

@@ -1,4 +1,4 @@
-import Button from 'flarum/components/Button';
+import Button from '../../common/components/Button';
 
 export default class UploadImageButton extends Button {
   init() {

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

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

js/src/admin/routes.js

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

js/src/admin/utils/saveSettings.js

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

js/src/common/Application.js

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

js/src/common/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/Session.js

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

js/src/common/Store.js

@@ -75,7 +75,7 @@ export default class Store {
    * Make a request to the API to find record(s) of a specific type.
    *
    * @param {String} type The resource type.
-   * @param {Integer|Integer[]|Object} [id] The ID(s) of the model(s) to retreive.
+   * @param {Integer|Integer[]|Object} [id] The ID(s) of the model(s) to retrieve.
    *     Alternatively, if an object is passed, it will be handled as the
    *     `query` parameter.
    * @param {Object} [query]