Skip to content

Commit

Permalink
Merge pull request #10 from jslirola/beta16
Browse files Browse the repository at this point in the history
Update for beta 16
  • Loading branch information
jslirola committed Mar 21, 2021
2 parents be57bf1 + f15ad4e commit e74a1ed
Show file tree
Hide file tree
Showing 15 changed files with 61 additions and 205 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"forum": "https://discuss.flarum.org/d/24193-login-2-see-plus"
},
"require": {
"flarum/core": "^0.1.0-beta.15"
"flarum/core": "^0.1.0-beta.16"
},
"extra": {
"flarum-extension": {
Expand Down
4 changes: 2 additions & 2 deletions extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
->serializeToForum('jslirola.login2seeplus.code', 'jslirola.login2seeplus.code'),

(new Extend\ApiSerializer(PostSerializer::class))
->mutate(HideContentInPosts::class),
->attributes(HideContentInPosts::class),

(new Extend\ApiSerializer(BasicPostSerializer::class))
->mutate(HideContentInPostPreviews::class),
->attributes(HideContentInPostPreviews::class),

];
2 changes: 1 addition & 1 deletion js/dist/admin.js

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

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

Large diffs are not rendered by default.

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

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

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

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
"private": true,
"name": "@jslirola/flarum-ext-login2seeplus",
"dependencies": {
"flarum-webpack-config": "0.1.0-beta.10",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11"
"flarum-webpack-config": "0.1.0-beta.10"
},
"scripts": {
"dev": "webpack --mode development --watch",
"build": "webpack --mode production"
},
"devDependencies": {
"flarum": "^0.1.0-beta.16",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12"
}
}
63 changes: 0 additions & 63 deletions js/src/admin/components/Login2SeePlusSettingsModal.js

This file was deleted.

33 changes: 26 additions & 7 deletions js/src/admin/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
import { extend } from 'flarum/extend';
import app from 'flarum/app';
import { extend } from 'flarum/common/extend';
import app from 'flarum/common/app';

import Login2SeePlusSettingsModal from './components/Login2SeePlusSettingsModal';

app.initializers.add('jslirola-login2seeplus', () =>
{
app.extensionSettings['jslirola-login2seeplus'] = () => app.modal.show(Login2SeePlusSettingsModal);
app.initializers.add('jslirola-login2seeplus', () => {
app.extensionData.for('jslirola-login2seeplus')
.registerSetting(() => <legend class="login2seeplus-lenght">{app.translator.trans('jslirola-login2seeplus.admin.post.title')}</legend>)
.registerSetting({
setting: 'jslirola.login2seeplus.post',
type: 'number',
min: -1
})
.registerSetting(() => <legend class="login2seeplus-hide">{app.translator.trans('jslirola-login2seeplus.admin.hide')}</legend>)
.registerSetting({
setting: 'jslirola.login2seeplus.link',
type: 'switch',
label: app.translator.trans('jslirola-login2seeplus.admin.link')
})
.registerSetting({
setting: 'jslirola.login2seeplus.image',
type: 'switch',
label: app.translator.trans('jslirola-login2seeplus.admin.image')
})
.registerSetting({
setting: 'jslirola.login2seeplus.code',
type: 'switch',
label: app.translator.trans('jslirola-login2seeplus.admin.code')
});
});
Loading

0 comments on commit e74a1ed

Please sign in to comment.