Spitfire/Search
Spitfire/Search
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions

reformatting html

Browse source
This commit is contained in:
dez 2024-04-08 13:15:23 +02:00
parent fbbf5ad5ff
commit 707cc9f895
7 changed files with 96 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -1,6 +1,6 @@
module searchengine module searchengine
go 1.23 go 1.18
require ( require (
github.com/PuerkitoBio/goquery v1.9.1 // indirect github.com/PuerkitoBio/goquery v1.9.1 // indirect

28
images.go
View file

@ -131,19 +131,23 @@ func handleImageSearch(w http.ResponseWriter, query, safe, lang string, page int
} }
data := struct { data := struct {
Results []ImageSearchResult Results []ImageSearchResult
Query string Query string
Page int Page int
Fetched string Fetched string
HasPrevPage bool LanguageOptions []LanguageOption
HasNextPage bool CurrentLang string
HasPrevPage bool
HasNextPage bool
}{ }{
Results: results, Results: results,
Query: query, Query: query,
Page: page, Page: page,
Fetched: fmt.Sprintf("%.2f seconds", time.Since(time.Now()).Seconds()), Fetched: fmt.Sprintf("%.2f seconds", time.Since(time.Now()).Seconds()),
HasPrevPage: page > 1, LanguageOptions: languageOptions,
HasNextPage: len(results) >= 50, CurrentLang: lang,
HasPrevPage: page > 1,
HasNextPage: len(results) >= 50,
} }
err = tmpl.Execute(w, data) err = tmpl.Execute(w, data)

2
main.go
View file

@ -108,7 +108,7 @@ func handleSearch(w http.ResponseWriter, r *http.Request) {
switch searchType { switch searchType {
case "text": case "text":
handleTextSearch(w, r, query, safe, lang) // Handles fetching and rendering text search results handleTextSearch(w, query, safe, lang) // Handles fetching and rendering text search results
case "image": case "image":
handleImageSearch(w, query, safe, lang, page) // Adjusted: Pass *http.Request to match the function signature handleImageSearch(w, query, safe, lang, page) // Adjusted: Pass *http.Request to match the function signature
default: default:

1
static/search.html
View file

@ -18,6 +18,7 @@
<a id="clearSearch" class="material-icons-round">close</a> <a id="clearSearch" class="material-icons-round">close</a>
</div> </div>
<div class="search-button-wrapper"> <div class="search-button-wrapper">
<input type="hidden" name="p" value="1">
<button name="t" value="text" type="submit">Search Text</button> <button name="t" value="text" type="submit">Search Text</button>
<button name="t" value="image" type="submit">Search Images</button> <button name="t" value="image" type="submit">Search Images</button>
</div> </div>

56
templates/images.html
View file

@ -3,21 +3,55 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{.Query}} - Spitfire Search</title> <title>{{.Query}} - Ocásek</title>
<link rel="stylesheet" href="/static/css/style.css"> <link rel="stylesheet" type="text/css" href="/static/css/style.css">
</head> </head>
<body> <body>
<div class="header"> <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
<h1>Ocásek</h1> <h1 class="logomobile"><a class="no-decoration" href="./">Ocásek</a></h1>
<form action="/search" method="post" class="search-form" autocomplete="off"> <div class="wrapper-results">
<div class="search-bar"> <input type="text" name="q" value="{{ .Query }}" id="search-input" placeholder="Type to search..." />
<input type="text" name="q" value="{{ .Query }}" autofocus id="search-input" placeholder="Type to search..." /> <button id="search-wrapper-ico" class="material-icons-round" name="t" value="image">search</button>
<button type="submit" id="search-btn">Search</button> <input type="submit" class="hide" name="t" value="image" />
</div>
</form>
</div> </div>
<div class="sub-search-button-wrapper">
<div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="text">search</button>
<button name="t" value="text" class="clickable">Web</button>
</div>
<div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable search-active" name="t" value="image">image</button>
<button name="t" value="image" class="clickable search-active">Images</button>
</div>
<div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="video">movie</button>
<button name="t" value="video" class="clickable">Videos</button>
</div>
<div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="reddit">forum</button>
<button name="t" value="forum" class="clickable">Forums</button>
</div>
<div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="torrent">share</button>
<button name="t" value="torrent" class="clickable">Torrents</button>
</div>
</div>
</div>
</form>
<form class="results_settings" action="/search" method="get">
<input type="hidden" name="q" value="{{ .Query }}">
<select class="results-settings" name="safe" id="safeSearchSelect">
<option value="">Safe Search Off</option>
<option value="active">Safe Search On</option>
</select>
<select class="results-settings" name="lang" id="languageSelect">
{{range .LanguageOptions}}
<option value="{{.Code}}" {{if eq .Code $.CurrentLang}}selected{{end}}>{{.Name}}</option>
{{end}}
</select>
<button class="results-save" type="submit">Apply settings</button>
</form>
<div class="search-results"> <div class="search-results">
<h1>Image Search Results</h1>
{{ if .Results }} {{ if .Results }}
<div class="images images_viewer_hidden"> <div class="images images_viewer_hidden">
<!-- Image Viewer Placeholder - Adapt as necessary --> <!-- Image Viewer Placeholder - Adapt as necessary -->

40
templates/results.html
View file

@ -3,19 +3,41 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{.Query}} - Spitfire Search</title> <title>{{.Query}} - Ocásek</title>
<link rel="stylesheet" type="text/css" href="/static/css/style.css"> <link rel="stylesheet" type="text/css" href="/static/css/style.css">
</head> </head>
<body> <body>
<div class="header"> <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
<h1>Ocásek</h1> <h1 class="logomobile"><a class="no-decoration" href="./">Ocásek</a></h1>
<form action="/search" method="post" class="search-form" autocomplete="off"> <div class="wrapper-results">
<div class="search-bar"> <input type="text" name="q" value="{{ .Query }}" id="search-input" placeholder="Type to search..." />
<input type="text" name="q" value="{{ .Query }}" autofocus id="search-input" placeholder="Type to search..." /> <button id="search-wrapper-ico" class="material-icons-round" name="t" value="text">search</button>
<button type="submit" id="search-btn">Search</button> <input type="submit" class="hide" name="t" value="text" />
</div>
</form>
</div> </div>
<div class="sub-search-button-wrapper">
<div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable search-active" name="t" value="text">search</button>
<button name="t" value="text" class="clickable search-active">Web</button>
</div>
<div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="image">image</button>
<button name="t" value="image" class="clickable">Images</button>
</div>
<div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="video">movie</button>
<button name="t" value="video" class="clickable">Videos</button>
</div>
<div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="reddit">forum</button>
<button name="t" value="forum" class="clickable">Forums</button>
</div>
<div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="torrent">share</button>
<button name="t" value="torrent" class="clickable">Torrents</button>
</div>
</div>
</div>
</form>
<form class="results_settings" action="/search" method="get"> <form class="results_settings" action="/search" method="get">
<input type="hidden" name="q" value="{{ .Query }}"> <input type="hidden" name="q" value="{{ .Query }}">
<select class="results-settings" name="safe" id="safeSearchSelect"> <select class="results-settings" name="safe" id="safeSearchSelect">

2
text.go
View file

@ -74,7 +74,7 @@ func PerformTextSearch(query, safe, lang string) ([]TextSearchResult, error) {
return results, nil return results, nil
} }
func handleTextSearch(w http.ResponseWriter, r *http.Request, query, safe, lang string) { func handleTextSearch(w http.ResponseWriter, query, safe, lang string) {
// Perform the text search // Perform the text search
results, err := PerformTextSearch(query, safe, lang) results, err := PerformTextSearch(query, safe, lang)
if err != nil { if err != nil {