Skip to content

update to nbb 3.x #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update to nbb 3.x #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24e67c9
update for nbb3.x
barisusakli Oct 10, 2023
360c0ab
update compat string
barisusakli Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions client/acp/view/rule-create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ export const RuleCreate = props => {
let valid = isRuleValid(props.rule.name, props.rule.displayName, props.rule.regex, props.rule.replacement);

return (
<div className="panel panel-default">
<div className="panel-heading">Create Rule</div>
<div className="panel-body">
<div className="card">
<div className="card-header">Create Rule</div>
<div className="card-body">
<RuleForm
propDidChange={(property, value) => props.newRuleFieldWillChange(property, value)}
{...props}/>
Expand Down
6 changes: 3 additions & 3 deletions client/acp/view/rule-details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ export const RuleDetails = props => {
let name = 'Rule: ' + props.rule.displayName;

return (
<div className="panel panel-default">
<div className="panel-heading">{name}</div>
<div className="panel-body">
<div className="card">
<div className="card-header">{name}</div>
<div className="card-body">
<RuleForm
propDidChange={(property, value) => props.fieldWillChange(props.rule, property, value)}
{...props}/>
Expand Down
16 changes: 8 additions & 8 deletions client/acp/view/rule-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ export const RuleForm = props => {
<div>
<div className="row">
<div className="col-md-6">
<div className="form-group">
<label htmlFor="labelName">Name</label>
<div className="mb-3">
<label className="form-label" htmlFor="labelName">Name</label>
<input
id="labelName"
type="text"
Expand All @@ -17,8 +17,8 @@ export const RuleForm = props => {
</div>
</div>
<div className="col-md-6">
<div className="form-group">
<label htmlFor="labelDisplayName">Display Name</label>
<div className="mb-3">
<label className="form-label" htmlFor="labelDisplayName">Display Name</label>
<input
id="labelDisplayName"
type="text"
Expand All @@ -32,8 +32,8 @@ export const RuleForm = props => {

<div className="row">
<div className="col-md-12">
<div className="form-group">
<label htmlFor="labelWatch">Watch</label>
<div className="mb-3">
<label className="form-label" htmlFor="labelWatch">Watch</label>
<input
id="labelWatch"
type="text"
Expand All @@ -47,8 +47,8 @@ export const RuleForm = props => {

<div className="row">
<div className="col-md-12">
<div className="form-group">
<label htmlFor="labelReplace">Replace</label>
<div className="mb-3">
<label className="form-label" htmlFor="labelReplace">Replace</label>
<textarea
id="labelReplace"
className="form-control"
Expand Down
6 changes: 3 additions & 3 deletions client/acp/view/rules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ export const Rules = () => {
}

return (
<div className="panel panel-default">
<div className="panel-heading">Installed Rules</div>
<div className="panel-body">
<div className="card">
<div className="card-header">Installed Rules</div>
<div className="card-body">
<div className="rules">
{renderRules(rules)}
</div>
Expand Down
8 changes: 4 additions & 4 deletions client/acp/view/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import React from 'react';

export const Utils = props => {
return (
<div className="panel panel-default">
<div className="panel-heading">Utils</div>
<div className="panel-body">
<div className="card">
<div className="card-header">Utils</div>
<div className="card-body">
<p className="utils-info">
Install rules that are shipped with plugin: Youtube, Vimeo, etc. Please,
check plugin documentation for the full list. If rule with the same name is installed already,
rule from default pack will be skipped.
</p>

<button
className="btn btn-default btn-block"
className="btn btn-outline-secondary btn-block"
onClick={() => props.installDefaultRules()}
type="button">
Install Default Rules
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
"sass": "^1.34.0"
},
"nbbpm": {
"compatibility": "~2.2.x"
"compatibility": "^3.0.0"
}
}
4 changes: 2 additions & 2 deletions plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"method": "hooks.filters.sanitizeConfig"
}
],
"less": [
"style/forum.less"
"scss": [
"style/forum.scss"
],
"modules": {
"../admin/plugins/embed.js": "./public/js/acp.js"
Expand Down
4 changes: 3 additions & 1 deletion plugin/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
apiUri = '/api' + pluginUri,
renderAdmin = function (req, res, next) {
res.render(
'admin/plugins/embed', {}
'admin/plugins/embed', {
title:'Embed',
}
);
};

Expand Down
0 style/forum.less → style/forum.scss
View file
Open in desktop
File renamed without changes.