Merge pull request #12 from sampoyigi/master

Update to v0.1.0-beta.8.1
fabwu · Jan 19, 2019 · 0bcbe5c · 0bcbe5c
2 parents d3270ba + b62d881
commit 0bcbe5c
Show file tree

Hide file tree

Showing 23 changed files with 57 additions and 217 deletions.
diff --git a/bootstrap.php b/bootstrap.php
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
  "source": "https://github.com/wuethrich44/flarum-ext-sso"
  },
  "require": {
- "flarum/core": "^0.1.0-beta.7"
+ "flarum/core": "^0.1.0-beta.8.1"
  },
  "autoload": {
  "psr-4": {

diff --git a/extend.php b/extend.php
@@ -0,0 +1,21 @@
+<?php
+
+use Flarum\Extend;
+use Illuminate\Contracts\Events\Dispatcher;
+use Wuethrich44\SSO\Listener;
+
+return [
+ (new Extend\Frontend('forum'))
+ ->js(__DIR__ . '/js/dist/forum.js'),
+
+ (new Extend\Frontend('admin'))
+ ->js(__DIR__ . '/js/dist/admin.js'),
+
+ function (Dispatcher $events) {
+ $events->subscribe(Listener\AddLogoutRedirect::class);
+ $events->subscribe(Listener\ActivateUser::class);
+ $events->subscribe(Listener\LoadSettingsFromDatabase::class);
+ },
+
+ new Extend\Locales(__DIR__ . '/locale'),
+];
diff --git a/js/admin.js b/js/admin.js
@@ -0,0 +1 @@
+export * from './src/admin';
diff --git a/js/admin/Gulpfile.js b/js/admin/Gulpfile.js
diff --git a/js/admin/dist/extension.js b/js/admin/dist/extension.js
diff --git a/js/admin/package.json b/js/admin/package.json
diff --git a/js/dist/admin.js b/js/dist/admin.js
diff --git a/js/dist/admin.js.map b/js/dist/admin.js.map
diff --git a/js/dist/forum.js b/js/dist/forum.js