Skip to content

Commit

Permalink
Update for Beta 16
Browse files Browse the repository at this point in the history
  • Loading branch information
Ralkage committed Mar 22, 2021
1 parent 72d08c0 commit 836497a
Show file tree
Hide file tree
Showing 12 changed files with 10,570 additions and 737 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 FriendsOfFlarum
Copyright (c) 2019-2021 FriendsOfFlarum

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ A [Flarum](http://flarum.org) extension. Replace author avatars with the first i

### Installation

Use [Bazaar](https://discuss.flarum.org/d/5151-flagrow-bazaar-the-extension-marketplace) or install manually with composer:
Install manually with composer:

```sh
composer require fof/discussion-thumbnail
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
],
"require": {
"flarum/core": "^0.1.0-beta.15"
"flarum/core": "^0.1.0-beta.16"
},
"authors": [
{
Expand All @@ -35,7 +35,7 @@
"extra": {
"flarum-extension": {
"title": "FoF Discussion Thumbnail",
"category": "discussion",
"category": "feature",
"icon": {
"name": "fas fa-image",
"backgroundColor": "#e74c3c",
Expand Down
7 changes: 3 additions & 4 deletions extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/*
* This file is part of fof/discussion-thumbnail.
*
* Copyright (c) 2019 FriendsOfFlarum.
* Copyright (c) FriendsOfFlarum.
*
* For the full copyright and license information, please view the LICENSE.md
* file that was distributed with this source code.
Expand All @@ -16,9 +16,8 @@

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

(new Extend\ApiSerializer(BasicDiscussionSerializer::class))
->mutate(Listener\AddDiscussionThumbnail::class),
->attributes(Listener\AddDiscussionThumbnail::class),
];
4,007 changes: 4,006 additions & 1 deletion js/dist/forum.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/dist/forum.js.map

Large diffs are not rendered by default.

7,264 changes: 6,546 additions & 718 deletions js/package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@
"flarum-webpack-config": "^0.1.0-beta.10",
"intersection-observer": "^0.7.0",
"object.assign": "^4.1.0",
"webpack": "^4.26.0",
"webpack-cli": "^3.0.7"
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12"
},
"scripts": {
"dev": "webpack --mode development --watch",
"build": "webpack --mode production",
"lint": "prettier --single-quote --trailing-comma es5 --print-width 150 --tab-width 4 --write src"
},
"devDependencies": {
"flarum": "0.1.0-beta.16",
"prettier": "^2.1.2"
}
}
4 changes: 2 additions & 2 deletions js/src/forum/components/DiscussionThumbnail.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from 'flarum/Component';
import LoadingIndicator from 'flarum/components/LoadingIndicator';
import Component from 'flarum/common/Component';
import LoadingIndicator from 'flarum/common/components/LoadingIndicator';

import 'object.assign/auto';
import 'intersection-observer';
Expand Down
8 changes: 4 additions & 4 deletions js/src/forum/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import get from 'lodash/get';

import { extend } from 'flarum/extend';
import Model from 'flarum/Model';
import Discussion from 'flarum/models/Discussion';
import DiscussionListItem from 'flarum/components/DiscussionListItem';
import { extend } from 'flarum/common/extend';
import Model from 'flarum/common/Model';
import Discussion from 'flarum/common/models/Discussion';
import DiscussionListItem from 'flarum/forum/components/DiscussionListItem';

import DiscussionThumbnail from './components/DiscussionThumbnail';

Expand Down
Empty file removed less/forum.less
Empty file.
2 changes: 1 addition & 1 deletion src/Listener/AddDiscussionThumbnail.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/*
* This file is part of fof/discussion-thumbnail.
*
* Copyright (c) 2019 FriendsOfFlarum.
* Copyright (c) FriendsOfFlarum.
*
* For the full copyright and license information, please view the LICENSE.md
* file that was distributed with this source code.
Expand Down

0 comments on commit 836497a

Please sign in to comment.