fixed merge issues#8
Closed
EricAzayev wants to merge 6 commits into
Closed
Conversation
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
Updates the static UI to resolve merge artifacts, improve visualization robustness (Plotly loading), and refine styling/layout; also loads environment variables from .env on server startup.
Changes:
- Refactored
static/index.htmlstyling and JS (responsive tweaks, Plotly script loading, visualization rendering guardrails). - Added a Plotly-unavailable message path and consolidated visualization rendering into
renderVisuals. - Loaded
.envvalues inangel_filter/server.pyviapython-dotenv.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| static/index.html | Cleans up CSS/JS, adds Plotly loading + fallback message, and adjusts visualization/UI behaviors. |
| angel_filter/server.py | Loads environment variables from .env during module import. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
62
to
63
| .history-wrap { position: relative; margin-bottom: 8px; } | ||
| .history-btn { background: none; border: 1px solid var(--border); color: var(--muted); font: inherit; font-size: 13px; border-radius: 8px; padding: 6px 14px; cursor: pointer; width: 100%; text-align: left; } | ||
| .history-btn:hover { border-color: var(--accent); color: var(--accent); } | ||
| .history-dropdown { display: none; position: absolute; top: calc(100% + 4px); left: 0; right: 0; background: var(--card); border: 1px solid var(--border); border-radius: 10px; z-index: 100; overflow: hidden; box-shadow: 0 8px 24px #00000055; } |
Comment on lines
+467
to
471
| dropdown.innerHTML = queries.map((q) => ` | ||
| <div class="history-item" onclick="loadHistory(${JSON.stringify(q)})"> | ||
| <span class="history-item-text">${esc(q)}</span> | ||
| <span class="history-cache-badge">cached</span> | ||
| </div>` |
Comment on lines
316
to
+324
| function render3D(results) { | ||
| const winnerTitle = results[0].title; | ||
| const xs = results.map(r => (r.axis_scores || {}).P1_price || 0.5); | ||
| const ys = results.map(r => (r.axis_scores || {}).P2_distance || 0.5); | ||
| const zs = results.map(r => (r.axis_scores || {}).P3_rating || 0.5); | ||
| const xs = results.map((r) => (r.axis_scores || {}).P1_price || 0.5); | ||
| const ys = results.map((r) => (r.axis_scores || {}).P2_distance || 0.5); | ||
| const zs = results.map((r) => (r.axis_scores || {}).P3_rating || 0.5); | ||
| const colors = results.map((r) => r.title === winnerTitle ? "#dc2626" : r.sponsored ? "#b45309" : (PROVIDER_COLORS[r.provider] || "#6aa9ff")); | ||
| const sizes = results.map((r) => r.title === winnerTitle ? 16 : 10); | ||
| const symbols = results.map((r) => r.title === winnerTitle ? "diamond" : r.sponsored ? "x" : "circle"); | ||
| const labels = results.map((r, i) => r.title === winnerTitle ? `Winner: ${r.title}` : `#${i + 1}: ${r.title}`); |
Comment on lines
+24
to
+25
| from dotenv import load_dotenv | ||
| load_dotenv() |
Removed the table containing the concept video link and replaced it with a direct URL.
Comment on lines
+24
to
+25
| from dotenv import load_dotenv | ||
| load_dotenv() |
Comment on lines
436
to
444
| function switchTab(name, tabEl) { | ||
| document.querySelectorAll(".viz-tab").forEach(t => t.classList.remove("active")); | ||
| document.querySelectorAll(".viz-panel").forEach(p => p.classList.remove("active")); | ||
| document.querySelectorAll(".viz-tab").forEach((tab) => tab.classList.remove("active")); | ||
| document.querySelectorAll(".viz-panel").forEach((panel) => panel.classList.remove("active")); | ||
| tabEl.classList.add("active"); | ||
| document.getElementById("panel-" + name).classList.add("active"); | ||
| if (!window.Plotly) return; | ||
| if (name === "3d") Plotly.Plots.resize("plot-3d"); | ||
| if (name === "radar") Plotly.Plots.resize("plot-radar"); | ||
| } |
Comment on lines
172
to
+173
| const data = await res.json(); | ||
| _maxScore = Math.max(...(data.results || []).map(r => r.score), 1); | ||
| _maxScore = Math.max(...(data.results || []).map((r) => r.score), 1); |
Comment on lines
306
to
314
| function scoreBar(score, color) { | ||
| const pct = Math.round((score / _maxScore) * 100); | ||
| const pct = Math.max(0, Math.round((score / _maxScore) * 100)); | ||
| return `<div class="score-bar-wrap"> | ||
| <div class="score-bar-label"><span>Score</span><span>${score}</span></div> | ||
| <div class="score-bar-label"><span>Score</span><span>${esc(String(score))}</span></div> | ||
| <div class="score-bar-track"> | ||
| <div class="score-bar-fill" style="width:${pct}%;background:${color}"></div> | ||
| </div> | ||
| </div>`; | ||
| } |
Comment on lines
+467
to
470
| dropdown.innerHTML = queries.map((q) => ` | ||
| <div class="history-item" onclick="loadHistory(${JSON.stringify(q)})"> | ||
| <span class="history-item-text">${esc(q)}</span> | ||
| <span class="history-cache-badge">cached</span> |
Comment on lines
316
to
317
| function render3D(results) { | ||
| const winnerTitle = results[0].title; |
Removed merge conflict markers from README.md.
Comment on lines
+467
to
471
| dropdown.innerHTML = queries.map((q) => ` | ||
| <div class="history-item" onclick="loadHistory(${JSON.stringify(q)})"> | ||
| <span class="history-item-text">${esc(q)}</span> | ||
| <span class="history-cache-badge">cached</span> | ||
| </div>` |
| <div class="best-label">Angel Filter's best answer</div> | ||
| <div class="best-title">${esc(best.title)}</div> | ||
| <div class="best-snippet">${esc(best.snippet || "")}</div> | ||
| ${best.url ? `<div class="best-snippet"><a href="${esc(best.url)}" target="_blank" rel="noopener">${esc(best.url)}</a></div>` : ""} |
Comment on lines
316
to
+324
| function render3D(results) { | ||
| const winnerTitle = results[0].title; | ||
| const xs = results.map(r => (r.axis_scores || {}).P1_price || 0.5); | ||
| const ys = results.map(r => (r.axis_scores || {}).P2_distance || 0.5); | ||
| const zs = results.map(r => (r.axis_scores || {}).P3_rating || 0.5); | ||
| const xs = results.map((r) => (r.axis_scores || {}).P1_price || 0.5); | ||
| const ys = results.map((r) => (r.axis_scores || {}).P2_distance || 0.5); | ||
| const zs = results.map((r) => (r.axis_scores || {}).P3_rating || 0.5); | ||
| const colors = results.map((r) => r.title === winnerTitle ? "#dc2626" : r.sponsored ? "#b45309" : (PROVIDER_COLORS[r.provider] || "#6aa9ff")); | ||
| const sizes = results.map((r) => r.title === winnerTitle ? 16 : 10); | ||
| const symbols = results.map((r) => r.title === winnerTitle ? "diamond" : r.sponsored ? "x" : "circle"); | ||
| const labels = results.map((r, i) => r.title === winnerTitle ? `Winner: ${r.title}` : `#${i + 1}: ${r.title}`); |
Comment on lines
+24
to
+25
| from dotenv import load_dotenv | ||
| load_dotenv() |
Owner
|
"Closing — Consensus_Filter/ was removed and its code fully integrated into angel_filter/. The XSS issues flagged here were addressed directly in static/index.html in the akkeem_branch PR." |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.