From afa4f0cc726574f93f5b689f02bd23a1ead09cdc Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 29 Oct 2022 11:09:38 -0700
Subject: [PATCH] Refactor page routes

---
 appinfo/routes.php                | 32 ++++++++++++++-----------------
 lib/Controller/DaysController.php | 30 ++++++++++++++---------------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index eef548ec..a51fa419 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -1,28 +1,24 @@
 <?php
+
+function getWildcard($param) {
+    return [
+        'requirements' => [ $param => '.*' ],
+        'defaults' => [ $param => '' ]
+    ];
+}
+
 return [
     'routes' => [
-        // Days and folder API
+        // Vue routes for deep links
         ['name' => 'page#main', 'url' => '/', 'verb' => 'GET'],
-        ['name' => 'page#folder', 'url' => '/folders/{path}', 'verb' => 'GET',
-            'requirements' => [ 'path' => '.*' ],
-            'defaults' => [ 'path' => '' ]
-        ],
+        ['name' => 'page#folder', 'url' => '/folders/{path}', 'verb' => 'GET', ...getWildcard('path')],
         ['name' => 'page#favorites', 'url' => '/favorites', 'verb' => 'GET'],
         ['name' => 'page#videos', 'url' => '/videos', 'verb' => 'GET'],
-        ['name' => 'page#albums', 'url' => '/albums/{id}', 'verb' => 'GET',
-            'requirements' => [ 'id' => '.*' ],
-            'defaults' => [ 'id' => '' ]
-        ],
+        ['name' => 'page#albums', 'url' => '/albums/{id}', 'verb' => 'GET', ...getWildcard('id')],
         ['name' => 'page#archive', 'url' => '/archive', 'verb' => 'GET'],
         ['name' => 'page#thisday', 'url' => '/thisday', 'verb' => 'GET'],
-        ['name' => 'page#people', 'url' => '/people/{name}', 'verb' => 'GET',
-            'requirements' => [ 'name' => '.*' ],
-            'defaults' => [ 'name' => '' ]
-        ],
-        ['name' => 'page#tags', 'url' => '/tags/{name}', 'verb' => 'GET',
-            'requirements' => [ 'name' => '.*' ],
-            'defaults' => [ 'name' => '' ]
-        ],
+        ['name' => 'page#people', 'url' => '/people/{name}', 'verb' => 'GET', ...getWildcard('name')],
+        ['name' => 'page#tags', 'url' => '/tags/{name}', 'verb' => 'GET', ...getWildcard('name')],
 
         // Public pages
         ['name' => 'page#sharedfolder', 'url' => '/s/{token}', 'verb' => 'GET'],
@@ -30,8 +26,8 @@ return [
         // API Routes
 
         ['name' => 'days#days', 'url' => '/api/days', 'verb' => 'GET'],
-        ['name' => 'days#dayPost', 'url' => '/api/days', 'verb' => 'POST'],
         ['name' => 'days#day', 'url' => '/api/days/{id}', 'verb' => 'GET'],
+        ['name' => 'days#dayPost', 'url' => '/api/days', 'verb' => 'POST'],
 
         ['name' => 'tags#tags', 'url' => '/api/tags', 'verb' => 'GET'],
         ['name' => 'tags#previews', 'url' => '/api/tag-previews', 'verb' => 'GET'],
diff --git a/lib/Controller/DaysController.php b/lib/Controller/DaysController.php
index d0b3a67b..7f4245a2 100644
--- a/lib/Controller/DaysController.php
+++ b/lib/Controller/DaysController.php
@@ -77,21 +77,6 @@ class DaysController extends ApiBase
         }
     }
 
-    /**
-     * @NoAdminRequired
-     *
-     * @PublicPage
-     */
-    public function dayPost(): JSONResponse
-    {
-        $id = $this->request->getParam('body_ids');
-        if (null === $id) {
-            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-        }
-
-        return $this->day($id);
-    }
-
     /**
      * @NoAdminRequired
      *
@@ -148,6 +133,21 @@ class DaysController extends ApiBase
         }
     }
 
+    /**
+     * @NoAdminRequired
+     *
+     * @PublicPage
+     */
+    public function dayPost(): JSONResponse
+    {
+        $id = $this->request->getParam('body_ids');
+        if (null === $id) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        return $this->day($id);
+    }
+
     /**
      * Get subfolders entry for days response.
      */