diff --git a/extend.php b/extend.php index 8d6a2dc9..1282d5d4 100755 --- a/extend.php +++ b/extend.php @@ -27,6 +27,7 @@ ->js(__DIR__.'/js/dist/forum.js') ->css(__DIR__.'/resources/less/forum.less') ->route('/polls', 'fof_polls_directory', Content\PollsDirectory::class) + //->route('/polls/{id}', 'fof.poll.view') ->route('/polls/composer', 'fof.polls.composer'), (new Extend\Frontend('admin')) diff --git a/js/src/forum/addNavItem.ts b/js/src/forum/addNavItem.ts index da75df08..7b6ccdbf 100644 --- a/js/src/forum/addNavItem.ts +++ b/js/src/forum/addNavItem.ts @@ -9,7 +9,7 @@ export default function addNavItem() { 'fof-polls-list', LinkButton.component( { - href: app.route('fof_polls_list'), + href: app.route('fof.polls.list'), icon: 'fas fa-poll', }, app.translator.trans('fof-polls.forum.page.nav') diff --git a/js/src/forum/components/Poll/PollListItem.tsx b/js/src/forum/components/Poll/PollListItem.tsx index 65977b49..dcde1499 100644 --- a/js/src/forum/components/Poll/PollListItem.tsx +++ b/js/src/forum/components/Poll/PollListItem.tsx @@ -117,7 +117,7 @@ export default class PollListItem +

{highlight(this.poll.question(), this.highlightRegExp)}

); diff --git a/js/src/forum/components/Poll.tsx b/js/src/forum/components/PollView.tsx similarity index 98% rename from js/src/forum/components/Poll.tsx rename to js/src/forum/components/PollView.tsx index 8b77665c..f0c367bb 100644 --- a/js/src/forum/components/Poll.tsx +++ b/js/src/forum/components/PollView.tsx @@ -16,7 +16,7 @@ interface PollAttrs extends ComponentAttrs { poll: PollModel; } -export default class Poll extends Component { +export default class PollView extends Component { oninit(vnode: Mithril.Vnode) { super.oninit(vnode); this.state = new PollState(this.attrs.poll); diff --git a/js/src/forum/components/PollsPage.tsx b/js/src/forum/components/PollsPage.tsx index 8c711e2e..b28a6e74 100644 --- a/js/src/forum/components/PollsPage.tsx +++ b/js/src/forum/components/PollsPage.tsx @@ -13,7 +13,7 @@ import SelectDropdown from 'flarum/common/components/SelectDropdown'; import Acl from '../../common/Acl'; import LoadingIndicator from 'flarum/common/components/LoadingIndicator'; import PollModel from '../models/Poll'; -import Poll from './Poll'; +import Poll from './PollView'; export default class PollsPage extends Page { loading: boolean = false; diff --git a/js/src/forum/extend.ts b/js/src/forum/extend.ts index 0e191782..ccccf65f 100644 --- a/js/src/forum/extend.ts +++ b/js/src/forum/extend.ts @@ -3,6 +3,7 @@ import Post from 'flarum/common/models/Post'; import Forum from 'flarum/common/models/Forum'; import Discussion from 'flarum/common/models/Discussion'; import Poll from './models/Poll'; +import PollView from './components/PollView'; import PollOption from './models/PollOption'; import PollVote from './models/PollVote'; import PollsPage from './components/PollsPage'; @@ -10,7 +11,8 @@ import ComposePollPage from './components/ComposePollPage'; export default [ new Extend.Routes() // - .add('fof_polls_list', '/polls', PollsPage) + .add('fof.polls.list', '/polls', PollsPage) + .add('fof.polls.view', '/polls/:id', PollView) .add('fof_polls_compose', '/polls/composer', ComposePollPage), new Extend.Store() // diff --git a/js/src/forum/utils/PollControls.tsx b/js/src/forum/utils/PollControls.tsx index a2c97adc..8f14be09 100644 --- a/js/src/forum/utils/PollControls.tsx +++ b/js/src/forum/utils/PollControls.tsx @@ -39,7 +39,7 @@ export default { items.add( 'view', - {app.translator.trans('fof-polls.forum.poll_controls.view_label')} + {app.translator.trans('fof-polls.forum.poll_controls.view_label')} ); return items;