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

added 'mini-menu' to result pages
Some checks failed
Run Integration Tests / test (push) Failing after 36s
Details

Browse source
This commit is contained in:
partisan 2024-12-07 23:07:19 +01:00
parent 7e573e6928
commit 287c7a7a1d
12 changed files with 266 additions and 189 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
static/css/style-menu.css
View file

@ -16,7 +16,7 @@
height: 420px; height: 420px;
width: 330px; width: 330px;
right: 0; right: 0;
margin-top: 60px; margin-top: 50px;
z-index: 9999; z-index: 9999;
margin-right: 20px; margin-right: 20px;
background-color: var(--html-bg); background-color: var(--html-bg);
@ -137,7 +137,6 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
right: 0; right: 0;
margin-top: 50;
margin-right: 0; margin-right: 0;
border-radius: 0; border-radius: 0;
} }

16
static/css/style-settings.css
View file

@ -1,5 +1,13 @@
.view-image-search {
/* settings.html */ border: 1px solid var(--snip-border);
margin: 0;
height: 100%;
width: 100%;
object-fit: cover;
object-position: center;
vertical-align: bottom;
border-radius: 4px;
}
.theme-link { .theme-link {
display: block; display: block;
@ -83,7 +91,7 @@
height: 40px; height: 40px;
} }
/* Ensure correct aligment */ /* Ensure correct alignment */
.settings-row { .settings-row {
display: flex; display: flex;
align-items: center; align-items: center;
@ -96,5 +104,3 @@
height: 40px; height: 40px;
box-sizing: border-box; box-sizing: border-box;
} }
/* --- */

167
static/css/style.css
View file

@ -483,7 +483,6 @@ hr {
} }
#theme, #theme,
#lang,
#safe, #safe,
#open-new-tab, #open-new-tab,
#domain, #domain,
@ -501,7 +500,6 @@ hr {
} }
#theme:hover, #theme:hover,
#lang:hover,
#safe:hover, #safe:hover,
#open-new-tab:hover, #open-new-tab:hover,
#domain:hover, #domain:hover,
@ -511,8 +509,7 @@ hr {
cursor: pointer; cursor: pointer;
} }
.domain, .domain {
.lang {
margin-top: 10px; margin-top: 10px;
border: 1px solid var(--button); border: 1px solid var(--button);
border-radius: 4px; border-radius: 4px;
@ -656,153 +653,6 @@ form.torrent-sort {
text-decoration: none; text-decoration: none;
} }
.settings-search-div {
position: absolute;
right: 90px;
top: 30px;
font-size: 14px;
display: flex;
}
.settings-search-div-search {
right: 20px;
top: 25px;
position: fixed;
z-index: 9999;
}
#settingsButton {
transition: all .3s ease;
/* width: 283px+6px;
height: 31px; */
}
.settings-icon-link {
font-size: 20px;
}
.settings-icon-link-search {
font-size: 25px;
background-color: inherit;
border: none;
}
.search-menu {
position: fixed;
height: 420px;
width: 330px;
right: 0;
margin-top: 60px;
z-index: 9999;
margin-right: 20px;
background-color: var(--html-bg);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
transition: all 0.3s cubic-bezier(.25, .8, .25, 1);
border: 1px solid var(--border);
border-radius: 10px;
top: 24px;
}
.search-menu h2 {
color: var(--fg);
display: flex;
justify-content: center;
font-size: 1.5rem;
margin: 14px;
}
.search-menu button {
color: var(--font-fg);
background-color: var(--button);
font-size: 14px;
border: 1px solid var(--border);
border-radius: 4px;
padding: 10px 10px 10px 10px;
width: 90%;
}
.search-menu button:hover {
border: 1px solid #5f6368;
cursor: pointer;
}
.search-menu select:hover {
border: 1px solid #5f6368;
cursor: pointer;
transition: all .3s ease;
}
.settings-content {
display: flex;
flex-direction: column;
align-items: center;
}
.settings-menu-hidden {
display: none;
}
.settings-menu-visible {
display: initial;
}
.themes-settings-menu {
background: var(--snip-background);
color: var(--fg);
border-radius: 4px;
height: 100%;
margin: 5px;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
.themes-settings-menu>div {
width: calc(50% - 10px);
margin: 5px;
}
.view-image-search {
border: 1px solid var(--snip-border);
margin: 0;
height: 100%;
width: 100%;
object-fit: cover;
object-position: center;
vertical-align: bottom;
border-radius: 4px;
}
.theme-settings {
margin-top: 10px;
width: 100%-4px;
border: 1px solid var(--snip-border);
background: var(--snip-background);
color: var(--fg);
border-radius: 4px;
height: 100%;
}
.theme-settings p {
margin: 0px;
padding-top: 5px;
margin-left: 3%;
}
.theme-mini-settings {
width: 90%;
}
.settings-search-div:hover p {
color: #8ab4f8;
}
.settings-search-div:hover a,
.settings-search-div:hover button {
transition: all .3s ease;
color: var(--font-fg);
}
.settings-results-link, .settings-results-link,
.settings-icon-link { .settings-icon-link {
color: var(--fg); color: var(--fg);
@ -1474,7 +1324,11 @@ body, h1, p, a, input, button {
} }
} }
@media only screen and (max-width: 750px) { @media only screen and (max-width: 880px) {
.settings-icon-link-search {
margin-top: -15px !important;
}
.snip, .snip,
.no-results-found { .no-results-found {
@ -1745,17 +1599,12 @@ body, h1, p, a, input, button {
left: 20px; left: 20px;
font-size: 13px; font-size: 13px;
margin-top: 140px; margin-top: 140px;
max-width: 355px;
} }
.video_title { .video_title {
font-size: 14px !important; font-size: 14px !important;
} }
select.results-settings {
width: 110px;
}
form.torrent-sort { form.torrent-sort {
left: 20px; left: 20px;
} }
@ -1764,10 +1613,6 @@ body, h1, p, a, input, button {
top: 5px; top: 5px;
} }
/* .settings-search-div {
display: none;
} */
.search-container h1 { .search-container h1 {
font-size: 55px; font-size: 55px;
margin-bottom: 70px; margin-bottom: 70px;

2
static/js/dynamicscrollingimages.js
View file

@ -194,6 +194,4 @@
} }
}); });
// Remove 'js-enabled' class from content
document.getElementById('content').classList.remove('js-enabled');
})(); })();

9
static/js/minimenu.js
View file

@ -24,10 +24,15 @@ document.addEventListener('DOMContentLoaded', function () {
// Theme change event listeners // Theme change event listeners
document.getElementById('dark_theme').addEventListener('click', function () { document.getElementById('dark_theme').addEventListener('click', function () {
window.location.href = '/search?theme=dark'; const currentUrl = new URL(window.location.href); // Get the current URL
currentUrl.searchParams.set('theme', 'dark'); // Add or update the 'theme' parameter
window.location.href = currentUrl.toString(); // Redirect to the updated URL
}); });
document.getElementById('light_theme').addEventListener('click', function () { document.getElementById('light_theme').addEventListener('click', function () {
window.location.href = '/search?theme=light'; const currentUrl = new URL(window.location.href); // Get the current URL
currentUrl.searchParams.set('theme', 'light'); // Add or update the 'theme' parameter
window.location.href = currentUrl.toString(); // Redirect to the updated URL
}); });
// Event listener for Safe Search Selection // Event listener for Safe Search Selection

42
templates/files.html
View file

@ -10,6 +10,7 @@
<link rel="stylesheet" href="/static/css/style.css"> <link rel="stylesheet" href="/static/css/style.css">
<link rel="stylesheet" href="/static/css/{{.Theme}}.css"> <link rel="stylesheet" href="/static/css/{{.Theme}}.css">
<link rel="stylesheet" href="/static/css/style-fonts.css"> <link rel="stylesheet" href="/static/css/style-fonts.css">
<link rel="stylesheet" href="/static/css/style-menu.css">
<link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml"> <link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml">
<!-- Icons --> <!-- Icons -->
<link rel="icon" href="{{ .IconPathSVG }}" type="image/svg+xml"> <link rel="icon" href="{{ .IconPathSVG }}" type="image/svg+xml">
@ -17,6 +18,41 @@
<link rel="apple-touch-icon" href="{{ .IconPathPNG }}"> <link rel="apple-touch-icon" href="{{ .IconPathPNG }}">
</head> </head>
<body> <body>
<!-- Menu Button -->
<div id="content" class="js-enabled">
<div class="settings-search-div settings-search-div-search">
<button class="material-icons-round clickable settings-icon-link settings-icon-link-search">&#xe5d2;</button>
</div>
<div class="search-menu settings-menu-hidden">
<h2>Settings</h2>
<div class="settings-content">
<button id="settingsButton" onclick="window.location.href='/settings'">All settings</button>
<div class="theme-settings">
<p><span class="highlight">Current theme: </span> <span id="theme_name">{{.Theme}}</span></p>
<div class="themes-settings-menu">
<div><img class="view-image-search clickable" id="dark_theme" alt="Dark Theme" src="/static/images/dark.webp"></div>
<div><img class="view-image-search clickable" id="light_theme" alt="Light Theme" src="/static/images/light.webp"></div>
</div>
</div>
<select class="lang" name="safe" id="safeSearchSelect">
<option value="disabled" {{if eq .Safe "disabled"}}selected{{end}}>Safe Search Off</option>
<option value="active" {{if eq .Safe "active"}}selected{{end}}>Safe Search On</option>
</select>
<select class="lang" name="lang" id="languageSelect">
{{range .LanguageOptions}}
<option value="{{.Code}}" {{if eq .Code $.CurrentLang}}selected{{end}}>{{.Name}}</option>
{{end}}
</select>
<!-- <button id="settingsButton" onclick="window.location.href='/about'">About QGato</button> -->
</div>
</div>
</div>
<noscript>
<div class="settings-search-div settings-search-div-search">
<a href="/settings" class="material-icons-round clickable settings-icon-link settings-icon-link-search">&#xe5d2;</a>
</div>
</noscript>
<form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off"> <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
<h1 class="logomobile"> <h1 class="logomobile">
<div class="logo-container" herf="/"> <div class="logo-container" herf="/">
@ -50,7 +86,7 @@
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="forum">&#xe0bf;</button> <!-- Forum icon --> <button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="forum">&#xe0bf;</button> <!-- Forum icon -->
<button name="t" value="forum" class="clickable">{{ translate "forums" }}</button> <button name="t" value="forum" class="clickable">{{ translate "forums" }}</button>
</div> </div>
<div id="content" class="js-enabled"> <div id="content2" class="js-enabled">
<div class="search-container-results-btn"> <div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="map">&#xe55b;</button> <!-- Map icon --> <button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="map">&#xe55b;</button> <!-- Map icon -->
<button name="t" value="map" class="clickable">{{ translate "maps" }}</button> <button name="t" value="map" class="clickable">{{ translate "maps" }}</button>
@ -123,9 +159,9 @@
</div> </div>
{{ end }} {{ end }}
<script defer src="/static/js/autocomplete.js"></script> <script defer src="/static/js/autocomplete.js"></script>
<script defer src="/static/js/minimenu.js"></script>
<script> <script>
// Check if JavaScript is enabled and modify the DOM accordingly document.querySelectorAll('.js-enabled').forEach(el => el.classList.remove('js-enabled'));
document.getElementById('content').classList.remove('js-enabled');
</script> </script>
</body> </body>
</html> </html>

42
templates/forums.html
View file

@ -10,6 +10,7 @@
<link rel="stylesheet" href="/static/css/style.css"> <link rel="stylesheet" href="/static/css/style.css">
<link rel="stylesheet" href="/static/css/{{.Theme}}.css"> <link rel="stylesheet" href="/static/css/{{.Theme}}.css">
<link rel="stylesheet" href="/static/css/style-fonts.css"> <link rel="stylesheet" href="/static/css/style-fonts.css">
<link rel="stylesheet" href="/static/css/style-menu.css">
<link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml"> <link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml">
<!-- Icons --> <!-- Icons -->
<link rel="icon" href="{{ .IconPathSVG }}" type="image/svg+xml"> <link rel="icon" href="{{ .IconPathSVG }}" type="image/svg+xml">
@ -17,6 +18,41 @@
<link rel="apple-touch-icon" href="{{ .IconPathPNG }}"> <link rel="apple-touch-icon" href="{{ .IconPathPNG }}">
</head> </head>
<body> <body>
<!-- Menu Button -->
<div id="content" class="js-enabled">
<div class="settings-search-div settings-search-div-search">
<button class="material-icons-round clickable settings-icon-link settings-icon-link-search">&#xe5d2;</button>
</div>
<div class="search-menu settings-menu-hidden">
<h2>Settings</h2>
<div class="settings-content">
<button id="settingsButton" onclick="window.location.href='/settings'">All settings</button>
<div class="theme-settings">
<p><span class="highlight">Current theme: </span> <span id="theme_name">{{.Theme}}</span></p>
<div class="themes-settings-menu">
<div><img class="view-image-search clickable" id="dark_theme" alt="Dark Theme" src="/static/images/dark.webp"></div>
<div><img class="view-image-search clickable" id="light_theme" alt="Light Theme" src="/static/images/light.webp"></div>
</div>
</div>
<select class="lang" name="safe" id="safeSearchSelect">
<option value="disabled" {{if eq .Safe "disabled"}}selected{{end}}>Safe Search Off</option>
<option value="active" {{if eq .Safe "active"}}selected{{end}}>Safe Search On</option>
</select>
<select class="lang" name="lang" id="languageSelect">
{{range .LanguageOptions}}
<option value="{{.Code}}" {{if eq .Code $.CurrentLang}}selected{{end}}>{{.Name}}</option>
{{end}}
</select>
<!-- <button id="settingsButton" onclick="window.location.href='/about'">About QGato</button> -->
</div>
</div>
</div>
<noscript>
<div class="settings-search-div settings-search-div-search">
<a href="/settings" class="material-icons-round clickable settings-icon-link settings-icon-link-search">&#xe5d2;</a>
</div>
</noscript>
<form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off"> <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
<h1 class="logomobile"> <h1 class="logomobile">
<div class="logo-container" herf="/"> <div class="logo-container" herf="/">
@ -50,7 +86,7 @@
<button id="sub-search-wrapper-ico" class="material-icons-round clickable search-active" name="t" value="forum">&#xe0bf;</button> <!-- Forum icon --> <button id="sub-search-wrapper-ico" class="material-icons-round clickable search-active" name="t" value="forum">&#xe0bf;</button> <!-- Forum icon -->
<button name="t" value="forum" class="clickable search-active">{{ translate "forums" }}</button> <button name="t" value="forum" class="clickable search-active">{{ translate "forums" }}</button>
</div> </div>
<div id="content" class="js-enabled"> <div id="content2" class="js-enabled">
<div class="search-container-results-btn"> <div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="map">&#xe55b;</button> <!-- Map icon --> <button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="map">&#xe55b;</button> <!-- Map icon -->
<button name="t" value="map" class="clickable">{{ translate "maps" }}</button> <button name="t" value="map" class="clickable">{{ translate "maps" }}</button>
@ -112,9 +148,9 @@
<div id="template-data" data-page="{{ .Page }}" data-query="{{ .Query }}" data-type="forum"></div> <div id="template-data" data-page="{{ .Page }}" data-query="{{ .Query }}" data-type="forum"></div>
<script defer src="/static/js/dynamicscrolling.js"></script> <script defer src="/static/js/dynamicscrolling.js"></script>
<script defer src="/static/js/autocomplete.js"></script> <script defer src="/static/js/autocomplete.js"></script>
<script defer src="/static/js/minimenu.js"></script>
<script> <script>
// Check if JavaScript is enabled and modify the DOM accordingly document.querySelectorAll('.js-enabled').forEach(el => el.classList.remove('js-enabled'));
document.getElementById('content').classList.remove('js-enabled');
</script> </script>
</body> </body>
</html> </html>

42
templates/images.html
View file

@ -17,6 +17,7 @@
</noscript> </noscript>
<link rel="stylesheet" href="/static/css/style-imageviewer.css"> <link rel="stylesheet" href="/static/css/style-imageviewer.css">
<link rel="stylesheet" href="/static/css/style-fixedwidth.css"> <link rel="stylesheet" href="/static/css/style-fixedwidth.css">
<link rel="stylesheet" href="/static/css/style-menu.css">
<link rel="stylesheet" href="/static/css/{{.Theme}}.css"> <link rel="stylesheet" href="/static/css/{{.Theme}}.css">
<link rel="stylesheet" href="/static/css/style-fonts.css"> <link rel="stylesheet" href="/static/css/style-fonts.css">
<link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml"> <link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml">
@ -26,6 +27,41 @@
<link rel="apple-touch-icon" href="{{ .IconPathPNG }}"> <link rel="apple-touch-icon" href="{{ .IconPathPNG }}">
</head> </head>
<body> <body>
<!-- Menu Button -->
<div id="content" class="js-enabled">
<div class="settings-search-div settings-search-div-search">
<button class="material-icons-round clickable settings-icon-link settings-icon-link-search">&#xe5d2;</button>
</div>
<div class="search-menu settings-menu-hidden">
<h2>Settings</h2>
<div class="settings-content">
<button id="settingsButton" onclick="window.location.href='/settings'">All settings</button>
<div class="theme-settings">
<p><span class="highlight">Current theme: </span> <span id="theme_name">{{.Theme}}</span></p>
<div class="themes-settings-menu">
<div><img class="view-image-search clickable" id="dark_theme" alt="Dark Theme" src="/static/images/dark.webp"></div>
<div><img class="view-image-search clickable" id="light_theme" alt="Light Theme" src="/static/images/light.webp"></div>
</div>
</div>
<select class="lang" name="safe" id="safeSearchSelect">
<option value="disabled" {{if eq .Safe "disabled"}}selected{{end}}>Safe Search Off</option>
<option value="active" {{if eq .Safe "active"}}selected{{end}}>Safe Search On</option>
</select>
<select class="lang" name="lang" id="languageSelect">
{{range .LanguageOptions}}
<option value="{{.Code}}" {{if eq .Code $.CurrentLang}}selected{{end}}>{{.Name}}</option>
{{end}}
</select>
<!-- <button id="settingsButton" onclick="window.location.href='/about'">About QGato</button> -->
</div>
</div>
</div>
<noscript>
<div class="settings-search-div settings-search-div-search">
<a href="/settings" class="material-icons-round clickable settings-icon-link settings-icon-link-search">&#xe5d2;</a>
</div>
</noscript>
<form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off"> <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
<h1 class="logomobile"> <h1 class="logomobile">
<div class="logo-container" herf="/"> <div class="logo-container" herf="/">
@ -60,7 +96,7 @@
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="forum">&#xe0bf;</button> <button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="forum">&#xe0bf;</button>
<button name="t" value="forum" class="clickable">{{ translate "forums" }}</button> <button name="t" value="forum" class="clickable">{{ translate "forums" }}</button>
</div> </div>
<div id="content" class="js-enabled"> <div id="content2" class="js-enabled">
<div class="search-container-results-btn"> <div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="map">&#xe55b;</button> <button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="map">&#xe55b;</button>
<button name="t" value="map" class="clickable">{{ translate "maps" }}</button> <button name="t" value="map" class="clickable">{{ translate "maps" }}</button>
@ -185,5 +221,9 @@
<script defer src="/static/js/imagetitletrim.js"></script> <script defer src="/static/js/imagetitletrim.js"></script>
<script defer src="/static/js/imageviewer.js"></script> <script defer src="/static/js/imageviewer.js"></script>
<script defer src="/static/js/dynamicscrollingimages.js"></script> <script defer src="/static/js/dynamicscrollingimages.js"></script>
<script defer src="/static/js/minimenu.js"></script>
<script>
document.querySelectorAll('.js-enabled').forEach(el => el.classList.remove('js-enabled'));
</script>
</body> </body>
</html> </html>

42
templates/map.html
View file

@ -10,6 +10,7 @@
<link rel="stylesheet" href="/static/css/style.css"> <link rel="stylesheet" href="/static/css/style.css">
<link rel="stylesheet" href="/static/css/{{.Theme}}.css"> <link rel="stylesheet" href="/static/css/{{.Theme}}.css">
<link rel="stylesheet" href="/static/css/style-fonts.css"> <link rel="stylesheet" href="/static/css/style-fonts.css">
<link rel="stylesheet" href="/static/css/style-menu.css">
<link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml"> <link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml">
<script src="https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist/leaflet.js"></script> <script src="https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist/leaflet.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist/leaflet.css" /> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist/leaflet.css" />
@ -32,6 +33,41 @@
</style> </style>
</head> </head>
<body> <body>
<!-- Menu Button -->
<div id="content" class="js-enabled">
<div class="settings-search-div settings-search-div-search">
<button class="material-icons-round clickable settings-icon-link settings-icon-link-search">&#xe5d2;</button>
</div>
<div class="search-menu settings-menu-hidden">
<h2>Settings</h2>
<div class="settings-content">
<button id="settingsButton" onclick="window.location.href='/settings'">All settings</button>
<div class="theme-settings">
<p><span class="highlight">Current theme: </span> <span id="theme_name">{{.Theme}}</span></p>
<div class="themes-settings-menu">
<div><img class="view-image-search clickable" id="dark_theme" alt="Dark Theme" src="/static/images/dark.webp"></div>
<div><img class="view-image-search clickable" id="light_theme" alt="Light Theme" src="/static/images/light.webp"></div>
</div>
</div>
<select class="lang" name="safe" id="safeSearchSelect">
<option value="disabled" {{if eq .Safe "disabled"}}selected{{end}}>Safe Search Off</option>
<option value="active" {{if eq .Safe "active"}}selected{{end}}>Safe Search On</option>
</select>
<select class="lang" name="lang" id="languageSelect">
{{range .LanguageOptions}}
<option value="{{.Code}}" {{if eq .Code $.CurrentLang}}selected{{end}}>{{.Name}}</option>
{{end}}
</select>
<!-- <button id="settingsButton" onclick="window.location.href='/about'">About QGato</button> -->
</div>
</div>
</div>
<noscript>
<div class="settings-search-div settings-search-div-search">
<a href="/settings" class="material-icons-round clickable settings-icon-link settings-icon-link-search">&#xe5d2;</a>
</div>
</noscript>
<form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off"> <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
<h1 class="logomobile"> <h1 class="logomobile">
<div class="logo-container" herf="/"> <div class="logo-container" herf="/">
@ -159,7 +195,11 @@
map.on('locationfound', onLocationFound); map.on('locationfound', onLocationFound);
map.on('locationerror', onLocationError); map.on('locationerror', onLocationError);
}); });
</script> </script>
<script defer src="/static/js/minimenu.js"></script>
<script>
document.querySelectorAll('.js-enabled').forEach(el => el.classList.remove('js-enabled'));
</script>
{{ end }} {{ end }}
</body> </body>
</html> </html>

46
templates/text.html
View file

@ -10,6 +10,7 @@
<link rel="stylesheet" href="/static/css/style.css"> <link rel="stylesheet" href="/static/css/style.css">
<link rel="stylesheet" href="/static/css/{{.Theme}}.css"> <link rel="stylesheet" href="/static/css/{{.Theme}}.css">
<link rel="stylesheet" href="/static/css/style-fonts.css"> <link rel="stylesheet" href="/static/css/style-fonts.css">
<link rel="stylesheet" href="/static/css/style-menu.css">
<link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml"> <link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml">
<!-- Icons --> <!-- Icons -->
<link rel="icon" href="{{ .IconPathSVG }}" type="image/svg+xml"> <link rel="icon" href="{{ .IconPathSVG }}" type="image/svg+xml">
@ -17,6 +18,41 @@
<link rel="apple-touch-icon" href="{{ .IconPathPNG }}"> <link rel="apple-touch-icon" href="{{ .IconPathPNG }}">
</head> </head>
<body> <body>
<!-- Menu Button -->
<div id="content" class="js-enabled">
<div class="settings-search-div settings-search-div-search">
<button class="material-icons-round clickable settings-icon-link settings-icon-link-search">&#xe5d2;</button>
</div>
<div class="search-menu settings-menu-hidden">
<h2>Settings</h2>
<div class="settings-content">
<button id="settingsButton" onclick="window.location.href='/settings'">All settings</button>
<div class="theme-settings">
<p><span class="highlight">Current theme: </span> <span id="theme_name">{{.Theme}}</span></p>
<div class="themes-settings-menu">
<div><img class="view-image-search clickable" id="dark_theme" alt="Dark Theme" src="/static/images/dark.webp"></div>
<div><img class="view-image-search clickable" id="light_theme" alt="Light Theme" src="/static/images/light.webp"></div>
</div>
</div>
<select class="lang" name="safe" id="safeSearchSelect">
<option value="disabled" {{if eq .Safe "disabled"}}selected{{end}}>Safe Search Off</option>
<option value="active" {{if eq .Safe "active"}}selected{{end}}>Safe Search On</option>
</select>
<select class="lang" name="lang" id="languageSelect">
{{range .LanguageOptions}}
<option value="{{.Code}}" {{if eq .Code $.CurrentLang}}selected{{end}}>{{.Name}}</option>
{{end}}
</select>
<!-- <button id="settingsButton" onclick="window.location.href='/about'">About QGato</button> -->
</div>
</div>
</div>
<noscript>
<div class="settings-search-div settings-search-div-search">
<a href="/settings" class="material-icons-round clickable settings-icon-link settings-icon-link-search">&#xe5d2;</a>
</div>
</noscript>
<form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off"> <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
<h1 class="logomobile"> <h1 class="logomobile">
<div class="logo-container" href="/"> <div class="logo-container" href="/">
@ -51,7 +87,7 @@
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="forum">&#xe0bf;</button> <button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="forum">&#xe0bf;</button>
<button name="t" value="forum" class="clickable">{{ translate "forums" }}</button> <button name="t" value="forum" class="clickable">{{ translate "forums" }}</button>
</div> </div>
<div id="content" class="js-enabled"> <div id="content2" class="js-enabled">
<div class="search-container-results-btn"> <div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="map">&#xe55b;</button> <button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="map">&#xe55b;</button>
<button name="t" value="map" class="clickable">{{ translate "maps" }}</button> <button name="t" value="map" class="clickable">{{ translate "maps" }}</button>
@ -99,22 +135,22 @@
<form action="/search" method="get"> <form action="/search" method="get">
<input type="hidden" name="q" value="{{ .Query }}"> <input type="hidden" name="q" value="{{ .Query }}">
<input type="hidden" name="t" value="text"> <input type="hidden" name="t" value="text">
<div id="content" class="js-enabled"> <noscript>
{{ if .HasPrevPage }} {{ if .HasPrevPage }}
<button type="submit" name="p" value="{{ sub .Page 1 }}">{{ translate "previous" }}</button> <button type="submit" name="p" value="{{ sub .Page 1 }}">{{ translate "previous" }}</button>
{{ end }} {{ end }}
{{ if .HasNextPage }} {{ if .HasNextPage }}
<button type="submit" name="p" value="{{ add .Page 1 }}">{{ translate "next" }}</button> <button type="submit" name="p" value="{{ add .Page 1 }}">{{ translate "next" }}</button>
{{ end }} {{ end }}
</div> </noscript>
</form> </form>
</div> </div>
<div id="template-data" data-page="{{ .Page }}" data-query="{{ .Query }}" data-type="text"></div> <div id="template-data" data-page="{{ .Page }}" data-query="{{ .Query }}" data-type="text"></div>
<script defer src="/static/js/dynamicscrolling.js"></script> <script defer src="/static/js/dynamicscrolling.js"></script>
<script defer src="/static/js/autocomplete.js"></script> <script defer src="/static/js/autocomplete.js"></script>
<script defer src="/static/js/minimenu.js"></script>
<script> <script>
// Check if JavaScript is enabled and modify the DOM accordingly document.querySelectorAll('.js-enabled').forEach(el => el.classList.remove('js-enabled'));
document.getElementById('content').classList.remove('js-enabled');
</script> </script>
</body> </body>
</html> </html>

42
templates/videos.html
View file

@ -10,6 +10,7 @@
<link rel="stylesheet" href="/static/css/style.css"> <link rel="stylesheet" href="/static/css/style.css">
<link rel="stylesheet" href="/static/css/{{.Theme}}.css"> <link rel="stylesheet" href="/static/css/{{.Theme}}.css">
<link rel="stylesheet" href="/static/css/style-fonts.css"> <link rel="stylesheet" href="/static/css/style-fonts.css">
<link rel="stylesheet" href="/static/css/style-menu.css">
<link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml"> <link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml">
<!-- Icons --> <!-- Icons -->
<link rel="icon" href="{{ .IconPathSVG }}" type="image/svg+xml"> <link rel="icon" href="{{ .IconPathSVG }}" type="image/svg+xml">
@ -17,6 +18,41 @@
<link rel="apple-touch-icon" href="{{ .IconPathPNG }}"> <link rel="apple-touch-icon" href="{{ .IconPathPNG }}">
</head> </head>
<body> <body>
<!-- Menu Button -->
<div id="content" class="js-enabled">
<div class="settings-search-div settings-search-div-search">
<button class="material-icons-round clickable settings-icon-link settings-icon-link-search">&#xe5d2;</button>
</div>
<div class="search-menu settings-menu-hidden">
<h2>Settings</h2>
<div class="settings-content">
<button id="settingsButton" onclick="window.location.href='/settings'">All settings</button>
<div class="theme-settings">
<p><span class="highlight">Current theme: </span> <span id="theme_name">{{.Theme}}</span></p>
<div class="themes-settings-menu">
<div><img class="view-image-search clickable" id="dark_theme" alt="Dark Theme" src="/static/images/dark.webp"></div>
<div><img class="view-image-search clickable" id="light_theme" alt="Light Theme" src="/static/images/light.webp"></div>
</div>
</div>
<select class="lang" name="safe" id="safeSearchSelect">
<option value="disabled" {{if eq .Safe "disabled"}}selected{{end}}>Safe Search Off</option>
<option value="active" {{if eq .Safe "active"}}selected{{end}}>Safe Search On</option>
</select>
<select class="lang" name="lang" id="languageSelect">
{{range .LanguageOptions}}
<option value="{{.Code}}" {{if eq .Code $.CurrentLang}}selected{{end}}>{{.Name}}</option>
{{end}}
</select>
<!-- <button id="settingsButton" onclick="window.location.href='/about'">About QGato</button> -->
</div>
</div>
</div>
<noscript>
<div class="settings-search-div settings-search-div-search">
<a href="/settings" class="material-icons-round clickable settings-icon-link settings-icon-link-search">&#xe5d2;</a>
</div>
</noscript>
<form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off"> <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
<h1 class="logomobile"> <h1 class="logomobile">
<div class="logo-container" herf="/"> <div class="logo-container" herf="/">
@ -50,7 +86,7 @@
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="forum">&#xe0bf;</button> <button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="forum">&#xe0bf;</button>
<button name="t" value="forum" class="clickable">{{ translate "forums" }}</button> <button name="t" value="forum" class="clickable">{{ translate "forums" }}</button>
</div> </div>
<div id="content" class="js-enabled"> <div id="content2" class="js-enabled">
<div class="search-container-results-btn"> <div class="search-container-results-btn">
<button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="map">&#xe55b;</button> <button id="sub-search-wrapper-ico" class="material-icons-round clickable" name="t" value="map">&#xe55b;</button>
<button name="t" value="map" class="clickable">{{ translate "maps" }}</button> <button name="t" value="map" class="clickable">{{ translate "maps" }}</button>
@ -100,9 +136,9 @@
</form> </form>
</div> </div>
<script defer src="/static/js/autocomplete.js"></script> <script defer src="/static/js/autocomplete.js"></script>
<script defer src="/static/js/minimenu.js"></script>
<script> <script>
// Check if JavaScript is enabled and modify the DOM accordingly document.querySelectorAll('.js-enabled').forEach(el => el.classList.remove('js-enabled'));
document.getElementById('content').classList.remove('js-enabled');
</script> </script>
</body> </body>
</html> </html>

2
tests/integration_test.go
View file

@ -157,10 +157,10 @@ func TestApplication(t *testing.T) {
runTest(t, summary, "Test Concurrent Random Requests", func(t *testing.T) { runTest(t, summary, "Test Concurrent Random Requests", func(t *testing.T) {
testConcurrentRandomRequests(t, summary) testConcurrentRandomRequests(t, summary)
}) })
runTest(t, summary, "Test Suggestions API", testSuggestionsAPI)
runTest(t, summary, "Check Resource Usage After Tests", func(t *testing.T) { runTest(t, summary, "Check Resource Usage After Tests", func(t *testing.T) {
checkResourceUsage(t, summary, appProcess) checkResourceUsage(t, summary, appProcess)
}) })
runTest(t, summary, "Test Suggestions API", testSuggestionsAPI)
} }
func runTest(t *testing.T, summary *TestSummary, name string, testFunc func(t *testing.T)) { func runTest(t *testing.T, summary *TestSummary, name string, testFunc func(t *testing.T)) {