-
+
{this.flagReasons().toArray()}
-
@@ -98,20 +57,114 @@ export default class FlagPostModal extends Modal {
);
}
+ flagReasons() {
+ const items = new ItemList();
+ const guidelinesUrl = app.forum.attribute('guidelinesUrl');
+
+ items.add(
+ 'off-topic',
+
,
+ 70
+ );
+
+ items.add(
+ 'inappropriate',
+
,
+ 60
+ );
+
+ items.add(
+ 'spam',
+
,
+ 50
+ );
+
+ items.add(
+ 'other',
+
,
+ 10
+ );
+
+ return items;
+ }
+
onsubmit(e) {
e.preventDefault();
this.loading = true;
- app.store.createRecord('flags').save({
- reason: this.reason() === 'other' ? null : this.reason(),
- reasonDetail: this.reasonDetail(),
- relationships: {
- user: app.session.user,
- post: this.attrs.post
- }
- }, {errorHandler: this.onerror.bind(this)})
- .then(() => this.success = true)
+ app.store
+ .createRecord('flags')
+ .save(
+ {
+ reason: this.reason() === 'other' ? null : this.reason(),
+ reasonDetail: this.reasonDetail(),
+ relationships: {
+ user: app.session.user,
+ post: this.attrs.post,
+ },
+ },
+ { errorHandler: this.onerror.bind(this) }
+ )
+ .then(() => (this.success = true))
.catch(() => {})
.then(this.loaded.bind(this));
}
diff --git a/extensions/flags/js/src/forum/components/FlagsPage.js b/extensions/flags/js/src/forum/components/FlagsPage.js
index 8ad044f39..e597b2860 100644
--- a/extensions/flags/js/src/forum/components/FlagsPage.js
+++ b/extensions/flags/js/src/forum/components/FlagsPage.js
@@ -18,6 +18,10 @@ export default class FlagsPage extends Page {
}
view() {
- return
;
+ return (
+
+
+
+ );
}
}
diff --git a/extensions/flags/js/src/forum/models/Flag.js b/extensions/flags/js/src/forum/models/Flag.js
index e89cac078..25b7af008 100644
--- a/extensions/flags/js/src/forum/models/Flag.js
+++ b/extensions/flags/js/src/forum/models/Flag.js
@@ -9,7 +9,7 @@ Object.assign(Flag.prototype, {
createdAt: Model.attribute('createdAt', Model.transformDate),
post: Model.hasOne('post'),
- user: Model.hasOne('user')
+ user: Model.hasOne('user'),
});
export default Flag;
diff --git a/extensions/flags/js/src/forum/states/FlagListState.js b/extensions/flags/js/src/forum/states/FlagListState.js
index 04e0d48e3..94c011b4e 100644
--- a/extensions/flags/js/src/forum/states/FlagListState.js
+++ b/extensions/flags/js/src/forum/states/FlagListState.js
@@ -22,12 +22,13 @@ export default class FlagListState {
this.loading = true;
m.redraw();
- this.app.store.find('flags')
- .then(flags => {
+ this.app.store
+ .find('flags')
+ .then((flags) => {
this.app.session.user.pushAttributes({ newFlagCount: 0 });
this.cache = flags.sort((a, b) => b.createdAt() - a.createdAt());
})
- .catch(() => { })
+ .catch(() => {})
.then(() => {
this.loading = false;
m.redraw();
diff --git a/extensions/flags/js/tsconfig.json b/extensions/flags/js/tsconfig.json
new file mode 100644
index 000000000..207c5b382
--- /dev/null
+++ b/extensions/flags/js/tsconfig.json
@@ -0,0 +1,16 @@
+{
+ // Use Flarum's tsconfig as a starting point
+ "extends": "flarum-tsconfig",
+ // This will match all .ts, .tsx, .d.ts, .js, .jsx files in your `src` folder
+ // and also tells your Typescript server to read core's global typings for
+ // access to `dayjs` and `$` in the global namespace.
+ "include": ["src/**/*", "../vendor/flarum/core/js/dist-typings/@types/**/*"],
+ "compilerOptions": {
+ // This will output typings to `dist-typings`
+ "declarationDir": "./dist-typings",
+ "baseUrl": ".",
+ "paths": {
+ "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"]
+ }
+ }
+}