From 2f4500be5abfe1606e7ffe6dec2ada7d2cc40e57 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Sun, 12 Nov 2023 15:37:25 +0100 Subject: [PATCH] (search) New frontend look --- .../search-service/build.gradle | 8 +- .../nu/marginalia/search/SearchOperator.java | 6 + .../search/command/SearchParameters.java | 21 ++ .../search/model/DecoratedSearchResults.java | 2 +- .../search/model/SearchFilters.java | 95 +++++ .../search/model/SearchProfile.java | 14 +- .../search/svc/SearchQueryService.java | 30 +- .../main/resources/static/search/js/serp.js | 17 + .../resources/static/search/{ => js}/tts.js | 0 .../main/resources/static/search/serp.scss | 330 ++++++++++++++++++ .../templates/search/parts/search-filters.hdb | 15 + .../templates/search/parts/search-footer.hdb | 4 +- .../templates/search/parts/search-form.hdb | 51 +-- .../templates/search/parts/search-result.hdb | 21 ++ .../search/search-result-metadata.hdb | 8 - .../templates/search/search-result.hdb | 23 -- .../templates/search/search-results.hdb | 37 +- .../resources/templates/search/site-info.hdb | 2 +- run/env/service.env | 1 + 19 files changed, 558 insertions(+), 127 deletions(-) create mode 100644 code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchFilters.java create mode 100644 code/services-application/search-service/src/main/resources/static/search/js/serp.js rename code/services-application/search-service/src/main/resources/static/search/{ => js}/tts.js (100%) create mode 100644 code/services-application/search-service/src/main/resources/static/search/serp.scss create mode 100644 code/services-application/search-service/src/main/resources/templates/search/parts/search-filters.hdb create mode 100644 code/services-application/search-service/src/main/resources/templates/search/parts/search-result.hdb delete mode 100644 code/services-application/search-service/src/main/resources/templates/search/search-result-metadata.hdb delete mode 100644 code/services-application/search-service/src/main/resources/templates/search/search-result.hdb diff --git a/code/services-application/search-service/build.gradle b/code/services-application/search-service/build.gradle index b252789b..7c60a917 100644 --- a/code/services-application/search-service/build.gradle +++ b/code/services-application/search-service/build.gradle @@ -1,6 +1,7 @@ plugins { id 'java' - + id 'io.freefair.sass-base' version '8.4' + id 'io.freefair.sass-java' version '8.4' id 'com.palantir.docker' version '0.35.0' id 'application' id 'jvm-test-suite' @@ -20,6 +21,11 @@ java { languageVersion.set(JavaLanguageVersion.of(21)) } } +sass { + sourceMapEnabled = true + sourceMapEmbed = true + outputStyle = EXPANDED +} dependencies { implementation project(':code:common:db') implementation project(':code:common:model') diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchOperator.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchOperator.java index 61904fc3..371f1b77 100644 --- a/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchOperator.java +++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchOperator.java @@ -4,12 +4,14 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.schedulers.Schedulers; +import nu.marginalia.WebsiteUrl; import nu.marginalia.assistant.client.AssistantClient; import nu.marginalia.model.EdgeDomain; import nu.marginalia.db.DbDomainQueries; import nu.marginalia.query.client.QueryClient; import nu.marginalia.query.model.QueryResponse; import nu.marginalia.search.command.SearchParameters; +import nu.marginalia.search.model.SearchFilters; import nu.marginalia.search.model.SearchProfile; import nu.marginalia.search.model.UrlDetails; import nu.marginalia.client.Context; @@ -41,6 +43,7 @@ public class SearchOperator { private final QueryClient queryClient; private final SearchQueryIndexService searchQueryService; private final SearchQueryParamFactory paramFactory; + private final WebsiteUrl websiteUrl; private final SearchUnitConversionService searchUnitConversionService; @@ -50,6 +53,7 @@ public class SearchOperator { QueryClient queryClient, SearchQueryIndexService searchQueryService, SearchQueryParamFactory paramFactory, + WebsiteUrl websiteUrl, SearchUnitConversionService searchUnitConversionService) { @@ -59,6 +63,7 @@ public class SearchOperator { this.searchQueryService = searchQueryService; this.paramFactory = paramFactory; + this.websiteUrl = websiteUrl; this.searchUnitConversionService = searchUnitConversionService; } @@ -89,6 +94,7 @@ public class SearchOperator { .problems(getProblems(ctx, evalResult, queryResults, queryResponse)) .evalResult(evalResult) .results(queryResults) + .filters(new SearchFilters(websiteUrl, userParams)) .focusDomain(queryResponse.domain()) .focusDomainId(getDomainId(queryResponse.domain())) .build(); diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java index b222e0d4..e517d7e6 100644 --- a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java +++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java @@ -1,9 +1,30 @@ package nu.marginalia.search.command; +import nu.marginalia.WebsiteUrl; import nu.marginalia.search.model.SearchProfile; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; + public record SearchParameters(String query, SearchProfile profile, SearchJsParameter js) { public String profileStr() { return profile.name; } + + public SearchParameters withProfile(SearchProfile profile) { + return new SearchParameters(query, profile, js); + } + + public SearchParameters withJs(SearchJsParameter js) { + return new SearchParameters(query, profile, js); + } + + public String renderUrl(WebsiteUrl baseUrl) { + String path = String.format("/search?query=%s&profile=%s&js=%s", + URLEncoder.encode(query, StandardCharsets.UTF_8), + URLEncoder.encode(profile.name, StandardCharsets.UTF_8), + URLEncoder.encode(js.value, StandardCharsets.UTF_8)); + + return baseUrl.withPath(path); + } } diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java index c994e75b..fba9dbf3 100644 --- a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java +++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java @@ -17,7 +17,7 @@ public class DecoratedSearchResults { private final String focusDomain; private final int focusDomainId; - + private final SearchFilters filters; public String getQuery() { return params.query(); } diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchFilters.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchFilters.java new file mode 100644 index 00000000..b2fc210b --- /dev/null +++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchFilters.java @@ -0,0 +1,95 @@ +package nu.marginalia.search.model; + +import lombok.Getter; +import nu.marginalia.WebsiteUrl; +import nu.marginalia.search.command.SearchJsParameter; +import nu.marginalia.search.command.SearchParameters; + +import javax.annotation.Nullable; +import java.util.List; + +/** Models the search filters displayed next to the search results */ +public class SearchFilters { + private final WebsiteUrl url; + + // These are necessary for the renderer to access the data + @Getter + public final RemoveJsOption removeJsOption; + @Getter + public final List> filterGroups; + + public SearchFilters(WebsiteUrl url, SearchParameters parameters) { + this.url = url; + + removeJsOption = new RemoveJsOption(parameters); + + filterGroups = List.of( + List.of( + new Filter("No Filter", SearchProfile.NO_FILTER, parameters), + new Filter("Popular", SearchProfile.DEFAULT, parameters), + new Filter("Small Web", SearchProfile.SMALLWEB, parameters), + new Filter("Blogosphere", SearchProfile.BLOGOSPHERE, parameters), + new Filter("Academia", SearchProfile.ACADEMIA, parameters) + ), + List.of( + new Filter("Vintage", SearchProfile.VINTAGE, parameters), + new Filter("Plain Text", SearchProfile.PLAIN_TEXT, parameters), + new Filter("~tilde", SearchProfile.TILDE, parameters) + ), + List.of( + new Filter("Wiki", SearchProfile.WIKI, parameters), + new Filter("Forum", SearchProfile.FORUM, parameters), + new Filter("Docs", SearchProfile.DOCS, parameters), + new Filter("Recipes", SearchProfile.FOOD, parameters) + ) + ); + + } + + public class RemoveJsOption { + private final SearchJsParameter value; + + @Getter + public final String url; + + public boolean isSet() { + return value.equals(SearchJsParameter.DENY_JS); + } + + public String name() { + return "Remove Javascript"; + } + + public RemoveJsOption(SearchParameters parameters) { + this.value = parameters.js(); + + var toggledValue = switch (parameters.js()) { + case DENY_JS -> SearchJsParameter.DEFAULT; + default -> SearchJsParameter.DENY_JS; + }; + + this.url = parameters.withJs(toggledValue).renderUrl(SearchFilters.this.url); + } + } + + public class Filter { + @Getter + public final String displayName; + + public final SearchProfile profile; + + @Getter + public final boolean current; + @Getter + public final String url; + + public Filter(String displayName, SearchProfile profile, SearchParameters parameters) { + this.displayName = displayName; + this.profile = profile; + this.current = profile.equals(parameters.profile()); + + this.url = parameters.withProfile(profile).renderUrl(SearchFilters.this.url); + } + + } +} diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java index e3365bc8..974a5ece 100644 --- a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java +++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java @@ -9,9 +9,9 @@ import java.util.Objects; public enum SearchProfile { DEFAULT("default", SearchSetIdentifier.RETRO), - MODERN("modern", SearchSetIdentifier.SMALLWEB), + SMALLWEB("modern", SearchSetIdentifier.SMALLWEB), BLOGOSPHERE("blogosphere", SearchSetIdentifier.BLOGS), - CORPO("corpo", SearchSetIdentifier.NONE), + NO_FILTER("corpo", SearchSetIdentifier.NONE), YOLO("yolo", SearchSetIdentifier.NONE), VINTAGE("vintage", SearchSetIdentifier.NONE), TILDE("tilde", SearchSetIdentifier.NONE), @@ -38,7 +38,7 @@ public enum SearchProfile { private final static SearchProfile[] values = values(); public static SearchProfile getSearchProfile(String param) { if (null == param) { - return YOLO; + return NO_FILTER; } for (var profile : values) { @@ -47,7 +47,7 @@ public enum SearchProfile { } } - return YOLO; + return NO_FILTER; } public void addTacitTerms(SearchSubquery subquery) { @@ -82,7 +82,7 @@ public enum SearchProfile { } public SpecificationLimit getYearLimit() { - if (this == MODERN) { + if (this == SMALLWEB) { return SpecificationLimit.greaterThan(2015); } if (this == VINTAGE) { @@ -92,7 +92,7 @@ public enum SearchProfile { } public SpecificationLimit getSizeLimit() { - if (this == MODERN) { + if (this == SMALLWEB) { return SpecificationLimit.lessThan(500); } else return SpecificationLimit.none(); @@ -100,7 +100,7 @@ public enum SearchProfile { public SpecificationLimit getQualityLimit() { - if (this == MODERN) { + if (this == SMALLWEB) { return SpecificationLimit.lessThan(5); } else return SpecificationLimit.none(); diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java index e4accf0c..9a1a9a11 100644 --- a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java +++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java @@ -14,8 +14,6 @@ import org.slf4j.LoggerFactory; import spark.Request; import spark.Response; -import java.util.Optional; - public class SearchQueryService { private final WebsiteUrl websiteUrl; @@ -38,23 +36,8 @@ public class SearchQueryService { final var ctx = Context.fromRequest(request); - final String queryParam = request.queryParams("query"); - if (null == queryParam || queryParam.isBlank()) { - response.redirect(websiteUrl.url()); - return null; - } - - final String profileStr = Optional.ofNullable(request.queryParams("profile")).orElse(SearchProfile.YOLO.name); - final String humanQuery = queryParam.trim(); - - var params = new SearchParameters( - humanQuery, - SearchProfile.getSearchProfile(profileStr), - SearchJsParameter.parse(request.queryParams("js")) - ); - try { - return searchCommandEvaulator.eval(ctx, params); + return searchCommandEvaulator.eval(ctx, parseParameters(request)); } catch (RedirectException ex) { response.redirect(ex.newUrl); @@ -67,4 +50,15 @@ public class SearchQueryService { return ""; } + private SearchParameters parseParameters(Request request) { + final String queryParam = request.queryParams("query"); + + if (null == queryParam || queryParam.isBlank()) { + throw new RedirectException(websiteUrl.url()); + } + + return new SearchParameters(queryParam.trim(), + SearchProfile.getSearchProfile(request.queryParams("profile")), + SearchJsParameter.parse(request.queryParams("js"))); + } } diff --git a/code/services-application/search-service/src/main/resources/static/search/js/serp.js b/code/services-application/search-service/src/main/resources/static/search/js/serp.js new file mode 100644 index 00000000..c41e6917 --- /dev/null +++ b/code/services-application/search-service/src/main/resources/static/search/js/serp.js @@ -0,0 +1,17 @@ +document.getElementsByTagName('body')[0].setAttribute('data-has-js', 'true'); + +function setDisplay(element, value) { + element.style.display = value; +} + +document.getElementById('mcfeast').onclick = (event) => { + setDisplay(document.getElementById('filters'), 'block'); + event.stopPropagation(); + return false; +} + +document.getElementById('menu-close').onclick = (event) => { + setDisplay(document.getElementById('filters'), 'none'); + event.stopPropagation(); + return false; +} \ No newline at end of file diff --git a/code/services-application/search-service/src/main/resources/static/search/tts.js b/code/services-application/search-service/src/main/resources/static/search/js/tts.js similarity index 100% rename from code/services-application/search-service/src/main/resources/static/search/tts.js rename to code/services-application/search-service/src/main/resources/static/search/js/tts.js diff --git a/code/services-application/search-service/src/main/resources/static/search/serp.scss b/code/services-application/search-service/src/main/resources/static/search/serp.scss new file mode 100644 index 00000000..07d97a17 --- /dev/null +++ b/code/services-application/search-service/src/main/resources/static/search/serp.scss @@ -0,0 +1,330 @@ +$nicotine-dark: #acae89; +$nicotine-light: #f8f8ee; +$fg-dark: #000; +$fg-light: #fff; +$highlight-dark: #2f4858; +$highlight-light: #3F5F6F; +$highlight-light2: #eee; +$border-color: #ccc; +$heading-fonts: serif; +$visited: #fcc; + +* { + box-sizing: border-box; +} + +body { + background-color: $nicotine-light; + color: $fg-dark; + font-family: sans-serif; + font-size: 14px; + line-height: 1.6; + margin-left: 2ch; + margin-right: 4ch; + max-width: 120ch; + padding: 0; +} + +header { + background-color: $nicotine-dark; + color: #fff; + border-bottom: 1px solid $border-color; + margin-bottom: 1ch; + + nav { + a { + text-decoration: none; + color: #000; + + padding: .5ch; + display: inline-block; + } + + a.extra { + background: #ccc linear-gradient(45deg, + rgba(255,100,100,1) 0%, + rgba(100,255,100,1) 50%, + rgba(100,100,255,1) 100%); + color: black; + } + + a:hover, a:focus { + background: #2f4858; + color: #fff !important; + } + } +} + +.positions { + box-shadow: 0 0 2px #888; + background-color: #e4e4e4; + padding: 2px; + margin-right: -1ch; + margin-left: 1ch; +} + +footer { + clear: both; + + padding: 2ch; + margin: 16ch 0 0 0; + + font-size: 12pt; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; + + h1 { + font-weight: normal; + border-bottom: 4px solid $highlight-light; + } + + h2 { + font-size: 14pt; + font-weight: normal; + border-bottom: 2px solid $highlight-dark; + width: 80%; + } + + section { + line-height: 1.5; + flex-basis: 40ch; + flex-grow: 1.1; + + background-color: #fff; + border-left: 1px solid $border-color; + box-shadow: -1px -1px 5px $border-color; + + padding-left: 1ch; + padding-right: 1ch; + margin-left: 1ch; + padding-bottom: 1ch; + margin-bottom: 1ch; + } +} + +#mcfeast, #menu-close { + display: none; +} + +.shadowbox { + box-shadow: 0 0 1ch $border-color; + border: 1px solid $border-color; +} + +.heading { + margin: 0; + padding: 0.5ch; + background-color: $highlight-dark; + font-family: $heading-fonts; + font-weight: normal; + color: $fg-light; + font-size: 12pt; +} + +.sidebar-narrow { + display: grid; + grid-template-columns: auto max-content; + grid-gap: 1ch; + align-items: start; +} + +#search-box { + @extend .shadowbox; + + padding: 0.5ch; + background-color: $fg-light; + display: grid; + grid-template-columns: max-content auto max-content; + grid-gap: 0.5ch; + grid-auto-rows: minmax(1ch, auto); + width: 100%; + + h1 { + margin: 0; + padding: 0.5ch; + font-size: 14pt; + word-break: keep-all; + background-color: $highlight-dark; + color: $fg-light; + font-family: $heading-fonts; + font-weight: normal; + border: 1px solid; + text-align: center; + } + + input[type="text"] { + font-family: monospace; + font-size: 14pt; + padding: 0.5ch; + border: 1px solid $border-color; + } + + button[type="submit"] { + font-size: 14pt; + border: 1px solid $border-color; + } + +} + +.filter-toggle-on { + a:before { + content: '✓'; + margin-right: 1.5ch; + } +} +.filter-toggle-off { + a:before { + content: '✗'; + margin-right: 1.5ch; + } +} + +#filters { + @extend .shadowbox; + margin-top: 1ch; + background-color: $fg-light; + + h2 { + @extend .heading; + background-color: $highlight-light; + } + h3 { + @extend .heading; + background-color: $highlight-light2; + font-family: sans-serif; + color: #000; + border-bottom: 1px solid #000; + } + + hr { + border-top: 0.5px solid $border-color; + border-bottom: none; + } + ul { + list-style-type: none; + padding-left: 0; + + li { + padding: 1ch; + a { + color: $fg-dark; + text-decoration: none; + } + a:hover, a:focus { + border-bottom: 1px solid $highlight-light; + } + } + + li.current { + border-left: 4px solid $highlight-light; + background-color: $highlight-light2; + a { + margin-left: -4px; + } + } + } +} + +.search-result { + @extend .shadowbox; + margin: 1ch; + + .url { + background-color: $highlight-light; + padding-left: 0.5ch; + a { + font-family: monospace; + font-size: 8pt; + color: $fg-light; + } + a:visited { + color: $visited; + } + } + h2 { + a { + color: $fg-light; + text-decoration: none; + } + font-size: 12pt; + @extend .heading; + } + + .description { + background-color: $fg-light; + padding: 1ch; + margin: 0; + } + + .utils { + display: flex; + font-size: 10pt; + padding: 1ch; + background-color: #eee; + + > * { + margin-right: 1ch; + margin-left: 1ch; + } + .meta { + flex-grow: 2; + text-align: right; + } + .meta > * { + padding-left: 4px; + } + a { + color: #000; + } + + } +} + +@media (max-device-width: 624px) { + body[data-has-js="true"] { + margin: 0 !important; + padding: 0 0 0 0 !important; + max-width: 100%; + + #mcfeast { + display: inline; + float: right; + } + + #menu-close { + float: right; + display: inline; + } + + #filters { + display: none; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + margin: 0; + padding: 0; + z-index: 100; + } + + .sidebar-narrow { + grid-template-columns: auto; + } + + #search-box { + grid-template-columns: auto; + } + + #filters { + margin-top: 0; + } + + .search-result { + margin-left: 0; + margin-right: 0; + } + } +} diff --git a/code/services-application/search-service/src/main/resources/templates/search/parts/search-filters.hdb b/code/services-application/search-service/src/main/resources/templates/search/parts/search-filters.hdb new file mode 100644 index 00000000..f8d21b93 --- /dev/null +++ b/code/services-application/search-service/src/main/resources/templates/search/parts/search-filters.hdb @@ -0,0 +1,15 @@ +

Filters

+ +

Domains

+ \ No newline at end of file diff --git a/code/services-application/search-service/src/main/resources/templates/search/parts/search-footer.hdb b/code/services-application/search-service/src/main/resources/templates/search/parts/search-footer.hdb index cf9889f5..0f538c85 100644 --- a/code/services-application/search-service/src/main/resources/templates/search/parts/search-footer.hdb +++ b/code/services-application/search-service/src/main/resources/templates/search/parts/search-footer.hdb @@ -112,4 +112,6 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/code/services-application/search-service/src/main/resources/templates/search/parts/search-form.hdb b/code/services-application/search-service/src/main/resources/templates/search/parts/search-form.hdb index a1c9c0d3..e5a1187e 100644 --- a/code/services-application/search-service/src/main/resources/templates/search/parts/search-form.hdb +++ b/code/services-application/search-service/src/main/resources/templates/search/parts/search-form.hdb @@ -1,41 +1,12 @@ -
-
-

Search the Internet

-
- - -
-
- - -
-
+ +
\ No newline at end of file diff --git a/code/services-application/search-service/src/main/resources/templates/search/parts/search-result.hdb b/code/services-application/search-service/src/main/resources/templates/search/parts/search-result.hdb new file mode 100644 index 00000000..4ebb13e2 --- /dev/null +++ b/code/services-application/search-service/src/main/resources/templates/search/parts/search-result.hdb @@ -0,0 +1,21 @@ +
+
{{url}}
+

{{title}}

+

{{description}}

+ +
+ {{#unless focusDomain}} + Info + {{#if hasMoreResults}}{{resultsFromSameDomain}}+{{/if}} + {{/unless}} +
+ {{#if problems}} ⚠ {{problemCount}} {{/if}} + +
+
+
diff --git a/code/services-application/search-service/src/main/resources/templates/search/search-result-metadata.hdb b/code/services-application/search-service/src/main/resources/templates/search/search-result-metadata.hdb deleted file mode 100644 index a17d0864..00000000 --- a/code/services-application/search-service/src/main/resources/templates/search/search-result-metadata.hdb +++ /dev/null @@ -1,8 +0,0 @@ -{{#if problems}} ⚠ {{problemCount}} {{/if}} - - diff --git a/code/services-application/search-service/src/main/resources/templates/search/search-result.hdb b/code/services-application/search-service/src/main/resources/templates/search/search-result.hdb deleted file mode 100644 index f3cffe3f..00000000 --- a/code/services-application/search-service/src/main/resources/templates/search/search-result.hdb +++ /dev/null @@ -1,23 +0,0 @@ - - -
-
{{url}}
-

{{title}}

-

{{description}}

- -
- {{#unless focusDomain}} - Info - {{#if hasMoreResults}}{{resultsFromSameDomain}}+{{/if}} - {{/unless}} -
{{>search/search-result-metadata}}
-
-
-
diff --git a/code/services-application/search-service/src/main/resources/templates/search/search-results.hdb b/code/services-application/search-service/src/main/resources/templates/search/search-results.hdb index d6af3455..f0f34c97 100644 --- a/code/services-application/search-service/src/main/resources/templates/search/search-results.hdb +++ b/code/services-application/search-service/src/main/resources/templates/search/search-results.hdb @@ -4,7 +4,7 @@ Marginalia Search - {{query}} - + @@ -16,37 +16,20 @@ {{>search/parts/search-header}} -
{{>search/parts/search-form}} - -
-
- - {{#if maintenanceMessage}}

Maintenance

{{maintenanceMessage}}

{{/if}} - {{#if evalResult}}

Evaluation

{{query}} = {{evalResult}}

{{/if}} - {{#each wiki.entries}}

Encyclopedia

{{.}} Encyclopedia Page

{{/each}} - - {{#if focusDomain}} -
-

{{focusDomain}}

-

- Showing results from {{focusDomain}} -

-
- Info - Similar Domains -
+
+
+ {{#each results}}{{>search/parts/search-result}}{{/each}}
- {{/if}} - {{#unless evalResult}}{{#if problems}}

Suggestions

    {{#each problems}}
  • {{{.}}}
    • {{/each}}
{{/if}}{{/unless}} - - {{#each domainResults}}{{>search/browse-result}}{{/each}} - {{#each results}}{{>search/search-result}}{{/each}} + {{#with filters}} +
+ {{>search/parts/search-filters}} +
+ {{/with}}
-
- {{>search/parts/search-footer}} + \ No newline at end of file diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info.hdb b/code/services-application/search-service/src/main/resources/templates/search/site-info.hdb index 4e2ac7e2..85f10d48 100644 --- a/code/services-application/search-service/src/main/resources/templates/search/site-info.hdb +++ b/code/services-application/search-service/src/main/resources/templates/search/site-info.hdb @@ -27,7 +27,7 @@ {{>search/parts/site-info-index}} {{>search/parts/site-info-links}} - {{#each results}}{{>search/search-result}}{{/each}} + {{#each results}}{{>search/parts/search-result}}{{/each}} diff --git a/run/env/service.env b/run/env/service.env index 3f52c1e5..b20118b2 100644 --- a/run/env/service.env +++ b/run/env/service.env @@ -6,3 +6,4 @@ CONVERTER_PROCESS_OPTS="-Dservice-name=converter -Dservice-host=0.0.0.0" CRAWLER_PROCESS_OPTS="-Dservice-name=crawler -Dservice-host=0.0.0.0" LOADER_PROCESS_OPTS="-Dservice-name=loader -Dservice-host=0.0.0.0" INDEX_CONSTRUCTION_PROCESS_OPTS="-Dservice-name=index-constructor -Djava.util.concurrent.ForkJoinPool.common.parallelism=4" +SEARCH_SERVICE_OPTS="-Dwebsite-url=http://localhost:8080" \ No newline at end of file