github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-25 16:25:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Webpack ()

Browse Source 
See https://github.com/flarum/core/pull/1367

* Replace gulp with webpack and npm scripts for JS compilation
* Set up Travis CI to commit compiled JS
* Restructure `js` directory; only one instance of npm, forum/admin are "submodules"
* Restructure `less` directory
This commit is contained in:
Toby Zerner 2018-06-20 13:36:18 +09:30 committed by GitHub
parent 682995ef2f
commit 014864577d
24 changed files with 4757 additions and 303 deletions

BIN
extensions/suspend/.deploy.enc Normal file

Binary file not shown.

2
extensions/suspend/.gitattributes vendored

@ -2,4 +2,4 @@
.gitignore export-ignore
.travis.yml export-ignore
js/*/dist/*.js -diff
js/dist/* -diff

2
extensions/suspend/.gitignore vendored

@ -2,5 +2,5 @@
composer.phar
.DS_Store
Thumbs.db
bower_components
node_modules
js/dist/*

15
extensions/suspend/.travis.yml Normal file

@ -0,0 +1,15 @@
language: minimal
sudo: false
cache:
directories:
- $HOME/.npm
jobs:
include:
- stage: build
if: branch = master AND type = push
script: curl -s https://raw.githubusercontent.com/flarum/core/master/.travis/build.sh | bash -s -
-k $encrypted_81f08aa28eb8_key
-i $encrypted_81f08aa28eb8_iv

12
extensions/suspend/bootstrap.php

@ -16,13 +16,13 @@ use Illuminate\Contracts\Events\Dispatcher;
return [
(new Extend\Assets('forum'))
->asset(__DIR__.'/js/forum/dist/extension.js')
->asset(__DIR__.'/less/forum/extension.less')
->bootstrapper('flarum/suspend/main'),
->js(__DIR__.'/js/dist/forum.js')
->asset(__DIR__.'/less/forum.less'),
(new Extend\Assets('admin'))
->asset(__DIR__.'/js/admin/dist/extension.js')
->asset(__DIR__.'/less/admin/extension.less')
->bootstrapper('flarum/suspend/main'),
->js(__DIR__.'/js/dist/admin.js')
->asset(__DIR__.'/less/admin.less'),
function (Dispatcher $events) {
$events->subscribe(Listener\AddUserSuspendAttributes::class);
$events->subscribe(Listener\RevokeAccessFromSuspendedUsers::class);

10
extensions/suspend/js/admin.js Normal file

@ -0,0 +1,10 @@
/*
* 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/admin';

7
extensions/suspend/js/admin/Gulpfile.js

@ -1,7 +0,0 @@
var gulp = require('flarum-gulp');
gulp({
modules: {
'flarum/suspend': 'src/**/*.js'
}
});

28
extensions/suspend/js/admin/dist/extension.js vendored

@ -1,28 +0,0 @@
'use strict';
System.register('flarum/suspend/main', ['flarum/extend', 'flarum/app', 'flarum/components/PermissionGrid'], function (_export, _context) {
"use strict";
var extend, app, PermissionGrid;
return {
setters: [function (_flarumExtend) {
extend = _flarumExtend.extend;
}, function (_flarumApp) {
app = _flarumApp.default;
}, function (_flarumComponentsPermissionGrid) {
PermissionGrid = _flarumComponentsPermissionGrid.default;
}],
execute: function () {
app.initializers.add('suspend', function () {
extend(PermissionGrid.prototype, 'moderateItems', function (items) {
items.add('suspendUsers', {
icon: 'ban',
label: app.translator.trans('flarum-suspend.admin.permissions.suspend_users_label'),
permission: 'user.suspend'
});
});
});
}
};
});

7
extensions/suspend/js/admin/package.json

@ -1,7 +0,0 @@
{
"private": true,
"devDependencies": {
"gulp": "^3.9.1",
"flarum-gulp": "^0.2.0"
}
}

10
extensions/suspend/js/forum.js Normal file

@ -0,0 +1,10 @@
/*
* 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/forum';

7
extensions/suspend/js/forum/Gulpfile.js

@ -1,7 +0,0 @@
var gulp = require('flarum-gulp');
gulp({
modules: {
'flarum/suspend': 'src/**/*.js'
}
});

209
extensions/suspend/js/forum/dist/extension.js vendored

@ -1,209 +0,0 @@
'use strict';
System.register('flarum/suspend/components/SuspendUserModal', ['flarum/components/Modal', 'flarum/components/Button'], function (_export, _context) {
"use strict";
var Modal, Button, SuspendUserModal;
return {
setters: [function (_flarumComponentsModal) {
Modal = _flarumComponentsModal.default;
}, function (_flarumComponentsButton) {
Button = _flarumComponentsButton.default;
}],
execute: function () {
SuspendUserModal = function (_Modal) {
babelHelpers.inherits(SuspendUserModal, _Modal);
function SuspendUserModal() {
babelHelpers.classCallCheck(this, SuspendUserModal);
return babelHelpers.possibleConstructorReturn(this, (SuspendUserModal.__proto__ || Object.getPrototypeOf(SuspendUserModal)).apply(this, arguments));
}
babelHelpers.createClass(SuspendUserModal, [{
key: 'init',
value: function init() {
babelHelpers.get(SuspendUserModal.prototype.__proto__ || Object.getPrototypeOf(SuspendUserModal.prototype), 'init', this).call(this);
var until = this.props.user.suspendUntil();
var status = null;
if (new Date() > until) until = null;
if (until) {
if (until.getFullYear() === 9999) status = 'indefinitely';else status = 'limited';
}
this.status = m.prop(status);
this.daysRemaining = m.prop(status === 'limited' && -moment().diff(until, 'days') + 1);
}
}, {
key: 'className',
value: function className() {
return 'SuspendUserModal Modal--small';
}
}, {
key: 'title',
value: function title() {
return app.translator.trans('flarum-suspend.forum.suspend_user.title', { user: this.props.user });
}
}, {
key: 'content',
value: function content() {
var _this2 = this;
return m(
'div',
{ className: 'Modal-body' },
m(
'div',
{ className: 'Form' },
m(
'div',
{ className: 'Form-group' },
m(
'label',
null,
app.translator.trans('flarum-suspend.forum.suspend_user.status_heading')
),
m(
'div',
null,
m(
'label',
{ className: 'checkbox' },
m('input', { type: 'radio', name: 'status', checked: !this.status(), value: '', onclick: m.withAttr('value', this.status) }),
app.translator.trans('flarum-suspend.forum.suspend_user.not_suspended_label')
),
m(
'label',
{ className: 'checkbox' },
m('input', { type: 'radio', name: 'status', checked: this.status() === 'indefinitely', value: 'indefinitely', onclick: m.withAttr('value', this.status) }),
app.translator.trans('flarum-suspend.forum.suspend_user.indefinitely_label')
),
m(
'label',
{ className: 'checkbox SuspendUserModal-days' },
m('input', { type: 'radio', name: 'status', checked: this.status() === 'limited', value: 'limited', onclick: function onclick(e) {
_this2.status(e.target.value);
m.redraw(true);
_this2.$('.SuspendUserModal-days-input input').select();
m.redraw.strategy('none');
} }),
app.translator.trans('flarum-suspend.forum.suspend_user.limited_time_label'),
this.status() === 'limited' ? m(
'div',
{ className: 'SuspendUserModal-days-input' },
m('input', { type: 'number',
min: '0',
value: this.daysRemaining(),
oninput: m.withAttr('value', this.daysRemaining),
className: 'FormControl' }),
app.translator.trans('flarum-suspend.forum.suspend_user.limited_time_days_text')
) : ''
)
)
),
m(
'div',
{ className: 'Form-group' },
m(
Button,
{ className: 'Button Button--primary', loading: this.loading, type: 'submit' },
app.translator.trans('flarum-suspend.forum.suspend_user.submit_button')
)
)
)
);
}
}, {
key: 'onsubmit',
value: function onsubmit(e) {
var _this3 = this;
e.preventDefault();
this.loading = true;
var suspendUntil = null;
switch (this.status()) {
case 'indefinitely':
suspendUntil = new Date('2038-01-01');
break;
case 'limited':
suspendUntil = moment().add(this.daysRemaining(), 'days').toDate();
break;
default:
// no default
}
this.props.user.save({ suspendUntil: suspendUntil }).then(function () {
return _this3.hide();
}, this.loaded.bind(this));
}
}]);
return SuspendUserModal;
}(Modal);
_export('default', SuspendUserModal);
}
};
});;
'use strict';
System.register('flarum/suspend/main', ['flarum/extend', 'flarum/app', 'flarum/utils/UserControls', 'flarum/components/Button', 'flarum/components/Badge', 'flarum/Model', 'flarum/models/User', 'flarum/suspend/components/SuspendUserModal'], function (_export, _context) {
"use strict";
var extend, app, UserControls, Button, Badge, Model, User, SuspendUserModal;
return {
setters: [function (_flarumExtend) {
extend = _flarumExtend.extend;
}, function (_flarumApp) {
app = _flarumApp.default;
}, function (_flarumUtilsUserControls) {
UserControls = _flarumUtilsUserControls.default;
}, function (_flarumComponentsButton) {
Button = _flarumComponentsButton.default;
}, function (_flarumComponentsBadge) {
Badge = _flarumComponentsBadge.default;
}, function (_flarumModel) {
Model = _flarumModel.default;
}, function (_flarumModelsUser) {
User = _flarumModelsUser.default;
}, function (_flarumSuspendComponentsSuspendUserModal) {
SuspendUserModal = _flarumSuspendComponentsSuspendUserModal.default;
}],
execute: function () {
app.initializers.add('flarum-suspend', function () {
User.prototype.canSuspend = Model.attribute('canSuspend');
User.prototype.suspendUntil = Model.attribute('suspendUntil', Model.transformDate);
extend(UserControls, 'moderationControls', function (items, user) {
if (user.canSuspend()) {
items.add('suspend', Button.component({
children: app.translator.trans('flarum-suspend.forum.user_controls.suspend_button'),
icon: 'ban',
onclick: function onclick() {
return app.modal.show(new SuspendUserModal({ user: user }));
}
}));
}
});
extend(User.prototype, 'badges', function (items) {
var until = this.suspendUntil();
if (new Date() < until) {
items.add('suspended', Badge.component({
icon: 'ban',
type: 'suspended',
label: app.translator.trans('flarum-suspend.forum.user_badge.suspended_tooltip')
}));
}
});
});
}
};
});

7
extensions/suspend/js/forum/package.json

@ -1,7 +0,0 @@
{
"private": true,
"devDependencies": {
"gulp": "^3.9.1",
"flarum-gulp": "^0.2.0"
}
}

4695
extensions/suspend/js/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

13
extensions/suspend/js/package.json Normal file

@ -0,0 +1,13 @@
{
"name": "@flarum/flarum-ext-suspend",
"version": "0.0.0",
"dependencies": {
"flarum-webpack-config": "^0.1.0-beta.8",
"webpack": "^4.0.0",
"webpack-cli": "^3.0.7"
},
"scripts": {
"build": "webpack --mode production --progress",
"watch": "webpack --mode development --watch"
}
}

0
extensions/suspend/js/admin/src/main.js → extensions/suspend/js/src/admin/index.js

0
extensions/suspend/js/forum/src/components/SuspendUserModal.js → extensions/suspend/js/src/forum/components/SuspendUserModal.js

0
extensions/suspend/js/forum/src/components/UserSuspendedNotification.js → extensions/suspend/js/src/forum/components/UserSuspendedNotification.js

0
extensions/suspend/js/forum/src/components/UserUnsuspendedNotification.js → extensions/suspend/js/src/forum/components/UserUnsuspendedNotification.js

6
extensions/suspend/js/forum/src/main.js → extensions/suspend/js/src/forum/index.js

@ -6,9 +6,9 @@ import Badge from 'flarum/components/Badge';
import Model from 'flarum/Model';
import User from 'flarum/models/User';
import SuspendUserModal from 'flarum/suspend/components/SuspendUserModal';
import UserSuspendedNotification from 'flarum/suspend/components/UserSuspendedNotification';
import UserUnsuspendedNotification from 'flarum/suspend/components/UserUnsuspendedNotification';
import SuspendUserModal from './components/SuspendUserModal';
import UserSuspendedNotification from './components/UserSuspendedNotification';
import UserUnsuspendedNotification from './components/UserUnsuspendedNotification';
app.initializers.add('flarum-suspend', () => {
app.notificationComponents.userSuspended = UserSuspendedNotification;

3
extensions/suspend/js/webpack.config.js Executable file

@ -0,0 +1,3 @@
const config = require('flarum-webpack-config');
module.exports = config();

0
extensions/suspend/less/admin/extension.less → extensions/suspend/less/admin.less

0
extensions/suspend/less/forum/extension.less → extensions/suspend/less/forum.less

27
extensions/suspend/scripts/compile.sh

@ -1,27 +0,0 @@
#!/usr/bin/env bash
# This script compiles the extension so that it can be used in a Flarum
# installation. It should be run from the root directory of the extension.
base=$PWD
cd "${base}/js"
if [ -f bower.json ]; then
bower install
fi
for app in forum admin; do
cd "${base}/js"
if [ -d $app ]; then
cd $app
if [ -f bower.json ]; then
bower install
fi
npm install
gulp --production
fi
done