Rename search query param for ordering

nolze · Sep 16, 2020 · 407e959 · 407e959
1 parent 169b1e3
commit 407e959
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/server/src/server.js b/server/src/server.js
@@ -80,7 +80,7 @@ const router = express.Router();
 app.use(BASEPATH, router);
 
 router.get('/api/search', (req, res) => {
- db.search(req.query.q, req.query.offset, req.query.limit, req.query.s)
+ db.search(req.query.q, req.query.offset, req.query.limit, req.query.ord)
  .then((pages) => {
  res.json({
  pages: pages,

diff --git a/view/src/components/Navbar.svelte b/view/src/components/Navbar.svelte
@@ -24,10 +24,10 @@
  <Link to="" class="underline">Top</Link>
  </div>
  <div class="text-sm mx-2">
- <Link to="search?q=*&s=updated" class="underline">Recent Changes</Link>
+ <Link to="search?q=*{'&'}ord=updated" class="underline">Recent Changes</Link>
  </div>
  <div class="text-sm mx-2">
- <Link to="search?q=*&s=alphabetical" class="underline">Index</Link>
+ <Link to="search?q=*{'&'}ord=alphabetical" class="underline">Index</Link>
  </div>
  <form on:submit|preventDefault={search}>
  <input

diff --git a/view/src/pages/Search.svelte b/view/src/pages/Search.svelte
@@ -6,12 +6,12 @@
 
  export let query;
  $: q = query.q;
- $: order = query.s || 'updated';
+ $: order = query.ord || 'updated';
  $: start = parseInt(query.start) || 0;
 
  $: fetchResults = async () => {
  return await api
- .get(`/search`, { params: { q, start, s: order } })
+ .get(`/search`, { params: { q, start, ord: order } })
  .then((resp) => resp.data)
  .catch(() => {});
  };
@@ -28,12 +28,12 @@
  <div class="mb-4 text-sm flex">
  <span class="mr-1">Sort:</span>
  <Link
- to="search?q={q}&s=updated"
+ to="search?q={q}{'&'}ord=updated"
  class={order === 'updated' ? 'font-bold' : ''}>
  Recently updated
  </Link><span class="mx-1">·</span>
  <Link
- to="search?q={q}&s=alphabetical"
+ to="search?q={q}{'&'}ord=alphabetical"
  class={order === 'alphabetical' ? 'font-bold' : ''}>
  Alphabetical
  </Link>
@@ -51,11 +51,11 @@
  {/await}
  <div class="text-sm mt-8 flex">
  <Link
- to="search?q={q}&s={order}&start=0"
+ to="search?q={q}{'&'}ord={order}&start=0"
  class={start === 0 ? 'text-gray-600' : ''}>
  Previous
  </Link><span class="mx-2" />
- <Link to="search?q={q}&s={order}&start=0">Next</Link>
+ <Link to="search?q={q}{'&'}ord={order}&start=0">Next</Link>
  </div>
  </main>
  </div>