create dedicated poll view route

FriendsOfFlarum · Feb 21, 2024 · 05c18eb · 05c18eb
1 parent 812745a
commit 05c18eb
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -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
@@ -117,7 +117,7 @@ export default class PollListItem<CustomAttrs extends IPollListItemAttrs = IPoll
 
   mainView(): Mithril.Children {
     return (
-      <Link href={app.route('fof_polls_list', { id: this.poll.id() })} className="PollListItem-main">
+      <Link href={app.route('fof.polls.view', { id: this.poll.id() })} className="PollListItem-main">
         <h2 className="PollListItem-title">{highlight(this.poll.question(), this.highlightRegExp)}</h2>
       </Link>
     );

diff --git a/js/src/forum/components/Poll.tsx → js/src/forum/components/PollView.tsx b/js/src/forum/components/Poll.tsx → js/src/forum/components/PollView.tsx
@@ -16,7 +16,7 @@ interface PollAttrs extends ComponentAttrs {
   poll: PollModel;
 }
 
-export default class Poll extends Component<PollAttrs, PollState> {
+export default class PollView extends Component<PollAttrs, PollState> {
   oninit(vnode: Mithril.Vnode<ComponentAttrs, this>) {
     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
@@ -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<IPageAttrs, PollListState> {
   loading: boolean = false;

diff --git a/js/src/forum/extend.ts b/js/src/forum/extend.ts
@@ -3,14 +3,16 @@ 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';
 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
@@ -39,7 +39,7 @@ export default {
 
     items.add(
       'view',
-      <Link href={app.route('fof_polls_list', { id: poll.id() })}>{app.translator.trans('fof-polls.forum.poll_controls.view_label')}</Link>
+      <Link href={app.route('fof.polls.view', { id: poll.id() })}>{app.translator.trans('fof-polls.forum.poll_controls.view_label')}</Link>
     );
 
     return items;