Skip to content

Commit

Permalink
Merge branch 'main' into world-news
Browse files Browse the repository at this point in the history
  • Loading branch information
garamb1 committed Apr 10, 2024
2 parents bea06bc + 2795950 commit da58c8f
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 11 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.jsoup:jsoup:1.16.2'
implementation 'commons-validator:commons-validator:1.7'
implementation 'commons-validator:commons-validator:1.8.0'
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
implementation 'net.dankito.readability4j:readability4j:1.0.8'
compileOnly 'org.projectlombok:lombok'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ public class RetroSearchController {
@Autowired private UrlValidator urlValidator;
@Autowired private ModernHtmlParser htmlParser;

@GetMapping("/")
public String home() {
return "home";
}

@GetMapping("/search")
public String search(
@RequestParam() Optional<String> query, @RequestParam Optional<String> locale, Model model) {
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
management.server.port=3000
server.compression.enabled=true
server.error.whitelabel.enabled=false
retrosearch.encoding=UTF-8
retrosearch.html.version=3.2
Expand Down
24 changes: 14 additions & 10 deletions src/main/resources/templates/fragments/footer.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<br>
<hr>
<p>
<a href="/about"><b>RetroSearch</b></a> is an open source project built by <a href="/browse?url=https://garambo.it/about">@garambo</a>
| Open a <a href="https://github.com/garamb1/retrosearch/issues">GitHub Issue</a>
</p>
<p><b>Search</b> and <b>Browse</b> the WWW <em>like it's 1997</em> | Search results from <a href="https://duckduckgo.com">DuckDuckGo</a> </p>
<code>
HTML:
<th:block th:utext="${__${@applicationSettings.htmlVersion.id}__}"></th:block>
| Encoding:
<th:block th:utext="@{__${@applicationSettings.encoding}__}"></th:block>
| Version:
<th:block th:utext="@{__${@buildProperties.version}__}"></th:block>
</code>
<p>
<b>Search</b> and <b>Browse</b> the WWW like it's 1997 | Search results from <a href="https://duckduckgo.com">DuckDuckGo</a>
</p>
<p>
<code>
HTML:
<th:block th:utext="${__${@applicationSettings.htmlVersion.id}__}"></th:block>
| Encoding:
<th:block th:utext="@{__${@applicationSettings.encoding}__}"></th:block>
| Version:
<th:block th:utext="@{__${@buildProperties.version}__}"></th:block>
</code>
</p>
File renamed without changes.

0 comments on commit da58c8f

Please sign in to comment.