Skip to content

Commit

Permalink
Merge branch 'flarum-beta-8'
Browse files Browse the repository at this point in the history
closes #6
  • Loading branch information
MichaelBelgium committed Nov 30, 2018
2 parents adb82fa + 70ee912 commit e0c7218
Show file tree
Hide file tree
Showing 33 changed files with 102 additions and 412 deletions.
12 changes: 0 additions & 12 deletions bootstrap.php

This file was deleted.

7 changes: 5 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Add views to flarum discussions",
"type": "flarum-extension",
"require": {
"flarum/core": "^0.1.0-beta.7"
"flarum/core": "^0.1.0-beta.8"
},
"license": "MIT",
"authors": [
Expand All @@ -25,10 +25,13 @@
"flarum-extension": {
"title": "Discussion views",
"icon": {
"name": "eye",
"name": "far fa-eye",
"backgroundColor": "#88CC23",
"color": "#fff"
}
},
"flagrow": {
"discuss": "https://discuss.flarum.org/d/7339"
}
}
}
24 changes: 24 additions & 0 deletions extend.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

use michaelbelgium\views\listeners;
use Illuminate\Contracts\Events\Dispatcher;
use Flarum\Extend\Locales;
use Flarum\Extend\Frontend;

return [
(new Frontend('forum'))
->css(__DIR__ . '/less/extension.less')
->js(__DIR__. '/js/dist/forum.js'),

(new Frontend('admin'))
->js(__DIR__ . '/js/dist/admin.js'),

new Locales(__DIR__ . '/locale'),

function (Dispatcher $events) {
$events->subscribe(Listeners\AddDiscussionViewHandler::class);
$events->subscribe(Listeners\AddDiscussionApiAttributes::class);
$events->subscribe(Listeners\AddPopularSort::class);
$events->subscribe(Listeners\SaveDiscussionFromModal::class);
}
];
1 change: 1 addition & 0 deletions js/admin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/admin';
7 changes: 0 additions & 7 deletions js/admin/Gulpfile.js

This file was deleted.

28 changes: 0 additions & 28 deletions js/admin/dist/extension.js

This file was deleted.

7 changes: 0 additions & 7 deletions js/admin/package.json

This file was deleted.

2 changes: 2 additions & 0 deletions js/dist/admin.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions js/dist/admin.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions js/dist/forum.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e0c7218

Please sign in to comment.