redtea/2026-VK-EDU-Web-12-Istratov-D
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw 6-7 some fixes

Browse Source
This commit is contained in:
redtea committed 2026-05-28 17:51:07 +03:00
1 parent 34630657b8
commit 3080e5b5b6
8 files changed
+67 -65
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

questions/static/core/css/style.css
+5 -2
View File
@@ -221,15 +221,18 @@ a:hover {
.search-suggestions {
position: absolute;
top: calc(100% + 0.4rem);
left: 0;
right: 0;
background: #ffffff;
border: 1px solid #1f2d3a;
border-radius: 0.5rem;
width: calc(100% - 2rem);
width: 100%;
box-sizing: border-box;
max-height: 18rem;
overflow: auto;
display: none;
z-index: 100;
margin-top: 0.4rem;
}
.search-suggestion {
questions/static/core/js/script.js
+24 -28
View File
@@ -55,6 +55,30 @@ if (searchInput) {
});
}
function askItSearch(event) {
event.preventDefault();
const query = searchInput ? searchInput.value.trim() : '';
if (!query) {
return false;
}
fetch(`/search?q=${encodeURIComponent(query)}`)
.then(response => response.json())
.then(data => {
const results = data.results || [];
if (results.length) {
window.location.href = results[0].url;
} else {
window.location.href = `/ask?q=${encodeURIComponent(query)}`;
}
})
.catch(() => {
window.location.href = `/ask?q=${encodeURIComponent(query)}`;
});
return false;
}
function postReaction(url, data, onSuccess) {
$.ajax({
url,
@@ -167,31 +191,3 @@ $(document).on('click', '.correct-answer-btn', function () {
console.error('centrifuge init error', e);
}
})();
// Handle ASK IT button - transfer search text to ask page
function redirectToAsk(event) {
event.preventDefault();
const searchInput = document.getElementById('search-input');
const query = searchInput ? searchInput.value.trim() : '';
const url = query ? `/ask?q=${encodeURIComponent(query)}` : '/ask';
window.location.href = url;
}
// Populate title field from URL parameter on ask page
function initializeTitleFromQuery() {
const params = new URLSearchParams(window.location.search);
const query = params.get('q');
if (query) {
const titleField = document.querySelector('[name="title"]');
if (titleField) {
titleField.value = query;
titleField.focus();
}
}
}
// Run immediately (script.js loads at end of page, DOMContentLoaded may have already fired)
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', initializeTitleFromQuery);
} else {
initializeTitleFromQuery();
}
questions/templates/core/layout/base.html
+1 -1
View File
@@ -24,7 +24,7 @@
<form class="search" onsubmit="return false;">
<input id="search-input" type="text" placeholder="Search">
<div id="search-suggestions" class="search-suggestions"></div>
<a class="button button--ask" href="#" onclick="redirectToAsk(event)">ASK IT</a>
<a class="button button--ask" href="#" onclick="return askItSearch(event)">ASK IT</a>
</form>
<div class="user-block">
<div class="avatar-box small">
questions/templates/core/profile.html
+1 -1
View File
@@ -3,7 +3,7 @@
{% block content %}
<div class="main-title">
<h1>Profile: Dr. Pepper</h1>
<h1>Profile:</h1>
</div>
<form class="form" method="post" enctype="multipart/form-data">
questions/urls.py
+1
View File
@@ -7,6 +7,7 @@ from questions import views
urlpatterns = [
path('', views.index, name='index'),
path('login', views.login, name='login'),
path('login/', views.login),
path('ask', views.ask, name='ask'),
path('profile', views.profile, name='profile'),
path('question', views.question, name='question'),
questions/views.py
+6 -3
View File
@@ -112,11 +112,14 @@ def search(request):
if not query_text:
return JsonResponse({'results': []})
vector = SearchVector('title', 'body')
query = SearchQuery(query_text)
vector = (
SearchVector('title', weight='A') +
SearchVector('body', weight='B')
)
query = SearchQuery(query_text, search_type='websearch')
questions = Question.objects.annotate(
rank=SearchRank(vector, query)
).filter(rank__gte=0.1).order_by('-rank')[:10]
).filter(rank__gt=0).order_by('-rank')[:10]
results = [
{
static/core/css/style.css
+5 -2
View File
@@ -221,15 +221,18 @@ a:hover {
.search-suggestions {
position: absolute;
top: calc(100% + 0.4rem);
left: 0;
right: 0;
background: #ffffff;
border: 1px solid #1f2d3a;
border-radius: 0.5rem;
width: calc(100% - 2rem);
width: 100%;
box-sizing: border-box;
max-height: 18rem;
overflow: auto;
display: none;
z-index: 100;
margin-top: 0.4rem;
}
.search-suggestion {
static/core/js/script.js
+24 -28
View File
@@ -55,6 +55,30 @@ if (searchInput) {
});
}
function askItSearch(event) {
event.preventDefault();
const query = searchInput ? searchInput.value.trim() : '';
if (!query) {
return false;
}
fetch(`/search?q=${encodeURIComponent(query)}`)
.then(response => response.json())
.then(data => {
const results = data.results || [];
if (results.length) {
window.location.href = results[0].url;
} else {
window.location.href = `/ask?q=${encodeURIComponent(query)}`;
}
})
.catch(() => {
window.location.href = `/ask?q=${encodeURIComponent(query)}`;
});
return false;
}
function postReaction(url, data, onSuccess) {
$.ajax({
url,
@@ -167,31 +191,3 @@ $(document).on('click', '.correct-answer-btn', function () {
console.error('centrifuge init error', e);
}
})();
// Handle ASK IT button - transfer search text to ask page
function redirectToAsk(event) {
event.preventDefault();
const searchInput = document.getElementById('search-input');
const query = searchInput ? searchInput.value.trim() : '';
const url = query ? `/ask?q=${encodeURIComponent(query)}` : '/ask';
window.location.href = url;
}
// Populate title field from URL parameter on ask page
function initializeTitleFromQuery() {
const params = new URLSearchParams(window.location.search);
const query = params.get('q');
if (query) {
const titleField = document.querySelector('[name="title"]');
if (titleField) {
titleField.value = query;
titleField.focus();
}
}
}
// Run immediately (script.js loads at end of page, DOMContentLoaded may have already fired)
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', initializeTitleFromQuery);
} else {
initializeTitleFromQuery();
}