mirrors/quetre
1
0
Fork 0
mirror of https://github.com/zyachel/quetre.git synced 2025-04-03 21:17:36 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(search): show search query along with results

Browse source
This commit is contained in:
zyachel 2023-11-05 15:31:33 +05:30
parent f77a1b15bf
commit 4cd551438b
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
controllers/apiController.js
View file

@ -67,7 +67,7 @@ export const search = catchAsyncErrors(async (req, res, next) => {
if (searchText)
searchData = await getOrSetCache(searchKey(urlObj), getSearch, urlObj.search, lang);
res.status(200).json({ status: 'success', data: searchData });
res.status(200).json({ status: 'success', data: {searchData, searchText} });
});
export const unimplemented = (req, res, next) => {

4
controllers/viewController.js
View file

@ -113,9 +113,9 @@ export const search = catchAsyncErrors(async (req, res, next) => {
searchData = await getOrSetCache(searchKey(urlObj), getSearch, urlObj.search, lang);
res.status(200).render('search', {
data: searchData,
data: { searchData, searchText },
meta: {
title: searchText || 'Search',
title: searchText ? `Results for '${searchText}'` : 'Search',
url: urlObj,
imageUrl: `${urlObj.origin}/icon.svg`,
description: searchText ? `results for '${searchText}'` : 'search page',

10
views/pug/pages/search.pug
View file

@ -14,7 +14,7 @@ include ../mixins/_metadata
//- MAIN CONTENT
//-//////////////////////////////////////////////////////
block content
main#main(class=`main search ${data ? '' :'search--no-results'}`)
main#main(class=`main search ${data.searchData ? '' :'search--no-results'}`)
-
const typesArr = [{key: 'question', text: 'Questions'}, {key: 'answer', text: 'Answers'}, {key: 'post', text: 'Posts'}, {key: 'profile', text: 'Profiles'}, {key: 'topic', text: 'Topics'}, {key: 'tribe', text: 'Spaces'}]
const timesArr = [{key: 'hour', text: 'Hour'}, {key: 'day', text: 'Day'}, {key: 'week', text: 'Week'}, {key: 'month', text: 'Month'}, {key: 'year', text: 'Year'}]
@ -47,14 +47,14 @@ block content
label.search-form__label(for=`lang--${lang}`)= lang.toUpperCase()
//- TODO: refactor 'profile', 'topic', and 'space' into resusable mixins.
- if (data?.results)
- if (data.searchData?.results)
section.search__results.search-results
h1.heading.heading__primary Results
- if (data.results.length === 0)
h1.heading.heading__primary= `Results for '${data.searchText}'`
- if (data.searchData.results.length === 0)
p No results found for the query. Try being less specific and/or removing filters.
- else
.search-results__container
each item in data.results
each item in data.searchData.results
.search-results__item
- if (item.type === 'answer')
+addAnswer(item, true)