reduce to one single template

Signed-off-by: dartcafe <github@dartcafe.de>

appinfo/routes.php

@@ -49,12 +49,13 @@
 		['name' => 'public#watch_poll', 'url' => '/s/{token}/watch', 'verb' => 'GET'],
 
 		['name' => 'admin#index', 'url' => '/administration', 'verb' => 'GET'],
+
 		['name' => 'admin#list', 'url' => '/administration/polls', 'verb' => 'GET'],
 		['name' => 'admin#takeover', 'url' => '/administration/poll/{pollId}/takeover', 'verb' => 'PUT'],
 
 		['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
 		['name' => 'page#index', 'url' => '/not-found', 'verb' => 'GET', 'postfix' => 'notfound'],
-		['name' => 'page#index', 'url' => '/list/{id}', 'verb' => 'GET', 'postfix' => 'list'],
+		['name' => 'page#index', 'url' => '/list/{category}', 'verb' => 'GET', 'postfix' => 'list', 'defaults' => array('category' => 'relevant')],
 		['name' => 'page#index', 'url' => '/combo', 'verb' => 'GET', 'postfix' => 'combo'],
 		['name' => 'page#vote', 'url' => '/vote/{id}', 'verb' => 'GET'],
 

lib/Controller/AdminController.php

@@ -27,17 +27,21 @@
 use OCA\Polls\Service\PollService;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\IURLGenerator;
+use OCP\Util;
 
 class AdminController extends BaseController {
 	public function __construct(
 		string $appName,
 		IRequest $request,
 		ISession $session,
 		private IURLGenerator $urlGenerator,
-		private PollService $pollService
+		private PollService $pollService,
+		private IEventDispatcher $eventDispatcher,
 	) {
 		parent::__construct($appName, $request, $session);
 	}
@@ -46,7 +50,9 @@ public function __construct(
 	 * @NoCSRFRequired
 	 */
 	public function index(): TemplateResponse {
-		return new TemplateResponse(AppConstants::APP_ID, 'polls.tmpl', ['urlGenerator' => $this->urlGenerator]);
+		Util::addScript(AppConstants::APP_ID, 'polls-main');
+		$this->eventDispatcher->dispatchTyped(new LoadAdditionalScriptsEvent());
+		return new TemplateResponse(AppConstants::APP_ID, 'main', ['urlGenerator' => $this->urlGenerator]);
 	}
 
 	/**

lib/Controller/PageController.php

@@ -29,15 +29,19 @@
 use OCP\AppFramework\Controller;
 
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IRequest;
 use OCP\IURLGenerator;
+use OCP\Util;
 
 class PageController extends Controller {
 	public function __construct(
 		string $appName,
 		IRequest $request,
 		private IURLGenerator $urlGenerator,
-		private NotificationService $notificationService
+		private NotificationService $notificationService,
+		private IEventDispatcher $eventDispatcher,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -47,7 +51,9 @@ public function __construct(
 	 * @NoCSRFRequired
 	 */
 	public function index(): TemplateResponse {
-		return new TemplateResponse(AppConstants::APP_ID, 'polls.tmpl', ['urlGenerator' => $this->urlGenerator]);
+		Util::addScript(AppConstants::APP_ID, 'polls-main');
+		$this->eventDispatcher->dispatchTyped(new LoadAdditionalScriptsEvent());
+		return new TemplateResponse(AppConstants::APP_ID, 'main');
 	}
 
 	/**
@@ -56,6 +62,7 @@ public function index(): TemplateResponse {
 	 */
 	public function vote(int $id): TemplateResponse {
 		$this->notificationService->removeNotification($id);
-		return new TemplateResponse(AppConstants::APP_ID, 'polls.tmpl', ['urlGenerator' => $this->urlGenerator]);
+		Util::addScript(AppConstants::APP_ID, 'polls-main');
+		return new TemplateResponse(AppConstants::APP_ID, 'main');
 	}
 }

lib/Controller/PublicController.php

@@ -41,6 +41,7 @@
 use OCP\ISession;
 use OCP\IURLGenerator;
 use OCP\IUserSession;
+use OCP\Util;
 
 class PublicController extends BaseController {
 	public function __construct(
@@ -69,10 +70,11 @@ public function __construct(
 	 * @return TemplateResponse|PublicTemplateResponse
 	 */
 	public function votePage(string $token) {
+		Util::addScript(AppConstants::APP_ID, 'polls-main');
 		if ($this->userSession->isLoggedIn()) {
-			return new TemplateResponse(AppConstants::APP_ID, 'polls.tmpl', ['urlGenerator' => $this->urlGenerator]);
+			return new TemplateResponse(AppConstants::APP_ID, 'main');
 		} else {
-			$template = new PublicTemplateResponse(AppConstants::APP_ID, 'polls.tmpl', ['urlGenerator' => $this->urlGenerator]);
+			$template = new PublicTemplateResponse(AppConstants::APP_ID, 'main');
 			$template->setFooterVisible(false);
 			return $template;
 		}

lib/Settings/AdminSettings.php

@@ -26,10 +26,12 @@
 use OCA\Polls\AppConstants;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Settings\ISettings;
+use OCP\Util;
 
 class AdminSettings implements ISettings {
 	public function getForm(): TemplateResponse {
-		return new TemplateResponse(AppConstants::APP_ID, 'admin', []);
+		Util::addScript(AppConstants::APP_ID, 'polls-adminSettings');
+		return new TemplateResponse(AppConstants::APP_ID, 'main', []);
 	}
 
 	public function getSection(): string {

lib/Settings/PersonalSettings.php

@@ -26,10 +26,12 @@
 use OCA\Polls\AppConstants;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Settings\ISettings;
+use OCP\Util;
 
 class PersonalSettings implements ISettings {
 	public function getForm(): TemplateResponse {
-		return new TemplateResponse(AppConstants::APP_ID, 'settings', []);
+		Util::addScript(AppConstants::APP_ID, 'polls-userSettings');
+		return new TemplateResponse(AppConstants::APP_ID, 'main', []);
 	}
 
 	public function getSection(): string {

src/js/adminSettings.js

@@ -51,7 +51,7 @@ const store = new Store({
 
 /* eslint-disable-next-line no-new */
 new Vue({
-	el: '#admin_settings',
+	el: '#content_polls',
 	store,
 	render: (h) => h(AdminSettingsPage),
 })

src/js/router.js

@@ -93,6 +93,15 @@ export default new Router({
 				},
 			},
 		},
+		{
+			path: '/list',
+			redirect: {
+				name: 'list',
+				params: {
+					type: 'relevant',
+				},
+			},
+		},
 		{
 			path: '/list/:type?',
 			components: {

src/js/userSettings.js

@@ -53,7 +53,7 @@ const store = new Store({
 
 /* eslint-disable-next-line no-new */
 new Vue({
-	el: '#user_settings',
+	el: '#content_polls',
 	store,
 	render: (h) => h(UserSettingsPage),
 })

templates/main.php

@@ -0,0 +1 @@
+<div id="content_polls" />