From 3364f2c68d1ee754725d71b5481e3ae8021b4d29 Mon Sep 17 00:00:00 2001 From: Ziya Yesilbahce Date: Tue, 17 Nov 2026 15:20:46 +0300 Subject: [PATCH] =?UTF-8?q?feat(ui):=206=20dosya=20(app.js,=20index.html..?= =?UTF-8?q?.)=20g=C3=BCncellemeleri=20ve=20iyile=C5=9Ftirmeler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/app.js | 7 ++ web/index.html | 48 +++++--------- web/modules/canvas.js | 140 ++++++++++----------------------------- web/modules/inspector.js | 33 +++++++-- web/modules/state.js | 17 ++--- web/tasarim.css | 125 ++++++++++++++++++++++++++++++---- 6 files changed, 206 insertions(+), 164 deletions(-) diff --git a/web/app.js b/web/app.js index be22e2b..b23862a 100644 --- a/web/app.js +++ b/web/app.js @@ -444,6 +444,13 @@ async function bootstrap() { // Global Keyboard Shortcuts window.addEventListener('keydown', (ev) => { if (ev.key === 'Escape') { + if (el.canvasInspector && !el.canvasInspector.hidden) { + state.selectedBranchId = null; + state.selectedNodeSha = null; + el.canvasInspector.hidden = true; + renderSVG(getActionCallbacks()); + } + closeDiffViewer(); if (el.modal && !el.modal.hidden) el.modal.hidden = true; if (el.conflictStudioModal && !el.conflictStudioModal.hidden) closeConflictStudio(); if (el.securityUpdateModal && !el.securityUpdateModal.hidden) el.securityUpdateModal.hidden = true; diff --git a/web/index.html b/web/index.html index 759170d..231575e 100644 --- a/web/index.html +++ b/web/index.html @@ -66,16 +66,9 @@
-
- - -
+
-
-
- -
- - diff --git a/web/modules/canvas.js b/web/modules/canvas.js index 07ec320..49fbaa6 100644 --- a/web/modules/canvas.js +++ b/web/modules/canvas.js @@ -544,9 +544,25 @@ export function renderSVG(callbacks = {}) { `; el.svg.appendChild(defs); - // 2. Background horizontal dashed guide rails + // 2. Background horizontal dashed guide rails & Ray Track Labels el.svg.appendChild(svgEl('line', { x1: 40, y1: MAIN_Y - LANE_BASE_OFFSET, x2: sceneW - 40, y2: MAIN_Y - LANE_BASE_OFFSET, class: 'svg-guide-line' })); + el.svg.appendChild(svgEl('text', { + x: 45, + y: MAIN_Y - LANE_BASE_OFFSET - 8, + class: 'svg-ray-label upper', + }, '☁️ ÜST RAY · GITHUB REMOTE & PR HATLARI')); + el.svg.appendChild(svgEl('line', { x1: 40, y1: MAIN_Y + LANE_BASE_OFFSET, x2: sceneW - 40, y2: MAIN_Y + LANE_BASE_OFFSET, class: 'svg-guide-line' })); + el.svg.appendChild(svgEl('text', { + x: 45, + y: MAIN_Y + LANE_BASE_OFFSET + 18, + class: 'svg-ray-label lower', + }, '💻 ALT RAY · YEREL ÇALIŞMA & TASLAK HATLARI')); + + const upperCount = branches.filter((b) => b.hemisphere === 'upper' && b.state === 'open').length; + const lowerCount = branches.filter((b) => b.hemisphere === 'lower' && b.state === 'open').length; + if (el.upperRayCount) el.upperRayCount.textContent = upperCount > 0 ? String(upperCount) : ''; + if (el.lowerRayCount) el.lowerRayCount.textContent = lowerCount > 0 ? String(lowerCount) : ''; // 3. Parabolic Curves Layer const arcLayer = svgEl('g', { id: 'arc-layer' }); @@ -797,130 +813,44 @@ export function setupCanvasInteractions(onRenderSVG = null) { }); } - // Upper & Lower Ray Interactive Popovers + // Upper & Lower Ray Interactive Track Focus & Filter el.btnUpperRay?.addEventListener('click', (ev) => { ev.stopPropagation(); - if (el.popoverLowerRay) el.popoverLowerRay.hidden = true; - if (el.popoverUpperRay) { - el.popoverUpperRay.hidden = !el.popoverUpperRay.hidden; - if (!el.popoverUpperRay.hidden) renderRayPopovers(); - } - }); - - el.closeUpperRay?.addEventListener('click', (ev) => { - ev.stopPropagation(); - if (el.popoverUpperRay) el.popoverUpperRay.hidden = true; + state.filter = (state.filter === 'upper' ? 'all' : 'upper'); + renderKPIs(); + if (onRenderSVG) onRenderSVG(); }); el.btnLowerRay?.addEventListener('click', (ev) => { ev.stopPropagation(); - if (el.popoverUpperRay) el.popoverUpperRay.hidden = true; - if (el.popoverLowerRay) { - el.popoverLowerRay.hidden = !el.popoverLowerRay.hidden; - if (!el.popoverLowerRay.hidden) renderRayPopovers(); - } - }); - - el.closeLowerRay?.addEventListener('click', (ev) => { - ev.stopPropagation(); - if (el.popoverLowerRay) el.popoverLowerRay.hidden = true; + state.filter = (state.filter === 'lower' ? 'all' : 'lower'); + renderKPIs(); + if (onRenderSVG) onRenderSVG(); }); - window.addEventListener('click', (ev) => { - if (!ev.target.closest('#btn-upper-ray') && !ev.target.closest('#popover-upper-ray')) { - if (el.popoverUpperRay) el.popoverUpperRay.hidden = true; - } - if (!ev.target.closest('#btn-lower-ray') && !ev.target.closest('#popover-lower-ray')) { - if (el.popoverLowerRay) el.popoverLowerRay.hidden = true; + // Clicking empty canvas deselects active branch and closes canvas inspector + el.svg.addEventListener('click', (ev) => { + const target = ev.target; + if (target === el.svg || target.id === 'rail-svg' || target.classList?.contains('svg-guide-line') || target.classList?.contains('svg-spine-line') || target.classList?.contains('dot-grid-canvas')) { + state.selectedBranchId = null; + state.selectedNodeSha = null; + if (el.canvasInspector) el.canvasInspector.hidden = true; + if (onRenderSVG) onRenderSVG(); } }); } export function renderRayPopovers(callbacks = {}) { - const { onSelectBranch } = callbacks; const snap = state.snapshot; if (!snap) return; - // 1. Üst Ray: Açık PR'lar ve Remote Dallar - const upperBranches = (snap.branches || []).filter((b) => b.hemisphere === 'upper' && b.state === 'open'); - if (el.upperRayCount) { - el.upperRayCount.textContent = upperBranches.length > 0 ? String(upperBranches.length) : ''; - } - if (el.upperRayBody) { - if (upperBranches.length === 0) { - el.upperRayBody.innerHTML = '
Üst rayda şu an açık PR veya uzak dal bulunmuyor.
'; - } else { - el.upperRayBody.innerHTML = upperBranches.map((b) => { - const prTxt = b.pr ? `PR #${b.pr.number} · ${b.pr.reviewState}` : 'Remote Dal'; - const ciTxt = b.pr?.ci?.state ? ` · CI: ${b.pr.ci.state}` : ''; - return ` -
-
-
${esc(b.name)}
-
${esc(prTxt)}${esc(ciTxt)}
-
- İncele -
- `; - }).join(''); - - el.upperRayBody.querySelectorAll('.ray-item').forEach((item) => { - item.addEventListener('click', () => { - const bId = item.getAttribute('data-branch-id'); - if (onSelectBranch) onSelectBranch(bId); - if (el.popoverUpperRay) el.popoverUpperRay.hidden = true; - }); - }); - } - } - - // 2. Alt Ray: Yerel Dallar ve Kaydedilmemiş Çalışma Alanı + const upperCount = (snap.branches || []).filter((b) => b.hemisphere === 'upper' && b.state === 'open').length; const lowerBranches = (snap.branches || []).filter((b) => b.hemisphere === 'lower' && b.state === 'open'); const dirtyCount = snap.repo?.dirtyCount || 0; const lowerTotal = lowerBranches.length + (dirtyCount > 0 ? 1 : 0); - if (el.lowerRayCount) { - el.lowerRayCount.textContent = lowerTotal > 0 ? String(lowerTotal) : ''; - } - if (el.lowerRayBody) { - let itemsHtml = ''; - if (dirtyCount > 0) { - itemsHtml += ` -
-
-
✏️ Kaydedilmemiş Çalışma Alanı
-
${dirtyCount} dosya bekliyor · Commit stüdyosu
-
- Taslak -
- `; - } - lowerBranches.forEach((b) => { - if (b.id === 'local-wip-working-tree') return; - const headTxt = b.isHead ? 'HEAD · Aktif' : `↑${b.aheadMain || 0} / ↓${b.behindMain || 0}`; - itemsHtml += ` -
-
-
${esc(b.name)}
-
${headTxt}
-
- Seç -
- `; - }); - if (!itemsHtml) { - el.lowerRayBody.innerHTML = '
Alt rayda açık yerel dal veya bekleyen değişiklik yok.
'; - } else { - el.lowerRayBody.innerHTML = itemsHtml; - el.lowerRayBody.querySelectorAll('.ray-item').forEach((item) => { - item.addEventListener('click', () => { - const bId = item.getAttribute('data-branch-id'); - if (onSelectBranch) onSelectBranch(bId); - if (el.popoverLowerRay) el.popoverLowerRay.hidden = true; - }); - }); - } - } + if (el.upperRayCount) el.upperRayCount.textContent = upperCount > 0 ? String(upperCount) : ''; + if (el.lowerRayCount) el.lowerRayCount.textContent = lowerTotal > 0 ? String(lowerTotal) : ''; } diff --git a/web/modules/inspector.js b/web/modules/inspector.js index 6870675..d08daee 100644 --- a/web/modules/inspector.js +++ b/web/modules/inspector.js @@ -101,6 +101,9 @@ export function renderInspector(callbacks = {}) { if (state.selectedNodeSha) { const node = snap.nodes.find((n) => n.shortSha === state.selectedNodeSha); if (node) { + if (el.canvasInspector) el.canvasInspector.hidden = false; + if (el.canvasInspectorTitle) el.canvasInspectorTitle.textContent = `Commit ${node.shortSha}`; + el.detail.innerHTML = `
@@ -122,6 +125,12 @@ export function renderInspector(callbacks = {}) {
🔒 main omurgasındaki commit mesajları tarihçe güvenliği için kilitlidir.
`; + document.getElementById('canvas-inspector-close')?.addEventListener('click', () => { + state.selectedNodeSha = null; + state.selectedBranchId = null; + if (el.canvasInspector) el.canvasInspector.hidden = true; + if (callbacks.onSelectNode) callbacks.onSelectNode(null); + }); document.getElementById('act-node-diff')?.addEventListener('click', () => { if (onOpenDiff) onOpenDiff(node.sha || node.shortSha, 'commit'); }); @@ -209,21 +218,25 @@ export function renderInspector(callbacks = {}) { const b = snap.branches.find((x) => x.id === state.selectedBranchId); if (!b) { - el.detail.innerHTML = ` - ${proposalHtml} -
-

İncelemek için bir parabol eğrisine, commit düğümüne veya radar uyarısına tıklayın.

-

İpucu: Üst raydaki açık PR'lar uzaktaki dalları, alt raydaki mor eğriler yerel dalları temsil eder.

-
- `; if (snap.pendingProposal) { + if (el.canvasInspector) el.canvasInspector.hidden = false; + if (el.canvasInspectorTitle) el.canvasInspectorTitle.textContent = '🤖 AI Commit & PR Önerisi'; + el.detail.innerHTML = proposalHtml; + document.getElementById('canvas-inspector-close')?.addEventListener('click', () => { + if (el.canvasInspector) el.canvasInspector.hidden = true; + }); wireProposalActions(onApplySnapshot); + return; } + if (el.canvasInspector) el.canvasInspector.hidden = true; + el.detail.innerHTML = ''; return; } const isOpen = b.state === 'open'; const isVirtualWip = b.id === 'local-wip-working-tree'; + if (el.canvasInspector) el.canvasInspector.hidden = false; + if (el.canvasInspectorTitle) el.canvasInspectorTitle.textContent = isVirtualWip ? '✏️ Çalışma Alanı (Taslak)' : b.name; const hasConflict = Boolean(b.conflict?.hasConflict && !b.conflict.resolved); const isRemoteOnly = !b.hasLocal && b.hasRemote && isOpen; const isLive = snap.repo.mode === 'live'; @@ -780,6 +793,12 @@ export function renderInspector(callbacks = {}) { document.getElementById('act-fix-ci')?.addEventListener('click', () => { if (onFixCI) onFixCI(b.id); }); + document.getElementById('canvas-inspector-close')?.addEventListener('click', () => { + state.selectedBranchId = null; + state.selectedNodeSha = null; + if (el.canvasInspector) el.canvasInspector.hidden = true; + if (callbacks.onSelectBranch) callbacks.onSelectBranch(null); + }); document.getElementById('act-delete')?.addEventListener('click', (ev) => { if (onDeleteBranch) onDeleteBranch(b.id, ev.currentTarget); }); diff --git a/web/modules/state.js b/web/modules/state.js index 19648ab..5b47bf0 100644 --- a/web/modules/state.js +++ b/web/modules/state.js @@ -48,10 +48,9 @@ export function initElements() { 'add-proj-cancel', 'btn-start-tour', 'tour-backdrop', 'tour-card', 'tour-step-badge', 'tour-step-title', 'tour-step-body', 'tour-prev-btn', 'tour-next-btn', 'tour-dots', 'tour-close-btn', - 'btn-upper-ray', 'btn-lower-ray', 'popover-upper-ray', 'popover-lower-ray', - 'upper-ray-popover-body', 'lower-ray-popover-body', 'upper-ray-pill-count', 'lower-ray-pill-count', - 'close-upper-ray', 'close-lower-ray', - 'btn-canvas-sync', 'canvas-sync-dot', 'canvas-sync-text', 'dock-copy-btn' + 'btn-upper-ray', 'btn-lower-ray', 'upper-ray-pill-count', 'lower-ray-pill-count', + 'btn-canvas-sync', 'canvas-sync-dot', 'canvas-sync-text', 'dock-copy-btn', + 'canvas-inspector', 'canvas-inspector-close', 'canvas-inspector-title' ]; ids.forEach((id) => { @@ -159,14 +158,12 @@ export function initElements() { el.btnUpperRay = el['btn-upper-ray']; el.btnLowerRay = el['btn-lower-ray']; - el.popoverUpperRay = el['popover-upper-ray']; - el.popoverLowerRay = el['popover-lower-ray']; - el.upperRayBody = el['upper-ray-popover-body']; - el.lowerRayBody = el['lower-ray-popover-body']; el.upperRayCount = el['upper-ray-pill-count']; el.lowerRayCount = el['lower-ray-pill-count']; - el.closeUpperRay = el['close-upper-ray']; - el.closeLowerRay = el['close-lower-ray']; + + el.canvasInspector = el['canvas-inspector']; + el.canvasInspectorClose = el['canvas-inspector-close']; + el.canvasInspectorTitle = el['canvas-inspector-title']; return el; } diff --git a/web/tasarim.css b/web/tasarim.css index 76a795f..9a92686 100644 --- a/web/tasarim.css +++ b/web/tasarim.css @@ -560,12 +560,15 @@ body { color: var(--emerald); } -/* Main Workspace */ +/* Main Workspace - 100% Full Canvas */ .workspace { - display: grid; - grid-template-columns: minmax(0, 1fr) 370px; + display: flex; + flex-direction: column; height: 100%; min-height: 0; + width: 100%; + position: relative; + overflow: hidden; } .canvas-pane { @@ -2464,15 +2467,8 @@ body { transform: translateY(8px); } -@media (max-width: 1080px) { - .workspace { - grid-template-columns: 1fr; - grid-template-rows: 58% 42%; - } - .inspector-pane { - border-left: 0; - border-top: 1px solid var(--border); - } +.inspector-pane { + display: none !important; } /* Inspector Merge Strategy, Edit Forms, Lock Note & Suggested Command */ @@ -3296,3 +3292,108 @@ body { background: var(--sky); color: #fff; } + +/* ============================================================================= + CANVAS-FIRST BAĞIMSIZ TEŞHİS VE AKSİYON KARTI (INSPECTOR OVERLAY) + ============================================================================= */ + +.canvas-inspector-overlay { + position: absolute; + top: 48px; + right: 18px; + width: 440px; + max-width: calc(100vw - 36px); + max-height: calc(100% - 64px); + background: rgba(18, 22, 28, 0.95); + backdrop-filter: blur(16px); + -webkit-backdrop-filter: blur(16px); + border: 1px solid var(--border-strong); + border-radius: var(--radius-lg); + box-shadow: 0 20px 50px rgba(0, 0, 0, 0.65), 0 0 0 1px rgba(255, 255, 255, 0.06); + display: flex; + flex-direction: column; + z-index: 45; + overflow: hidden; + animation: canvasCardSlideIn 0.2s cubic-bezier(0.16, 1, 0.3, 1); +} + +@keyframes canvasCardSlideIn { + from { + opacity: 0; + transform: translateX(18px) scale(0.98); + } + to { + opacity: 1; + transform: translateX(0) scale(1); + } +} + +.canvas-inspector-overlay[hidden] { + display: none !important; +} + +.canvas-inspector-head { + display: flex; + align-items: center; + justify-content: space-between; + padding: 10px 14px; + background: var(--surface); + border-bottom: 1px solid var(--border); +} + +.canvas-inspector-title-row { + display: flex; + align-items: center; + gap: 8px; + overflow: hidden; +} + +.canvas-inspector-icon { + font-size: 14px; +} + +.canvas-inspector-title { + font-size: 13px; + font-weight: 700; + color: var(--text); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.canvas-inspector-body { + flex: 1; + overflow-y: auto; + padding: 14px; + display: flex; + flex-direction: column; + gap: 12px; +} + +/* SVG Ray Labels */ +.svg-ray-label { + font-family: var(--mono); + font-size: 10px; + font-weight: 700; + letter-spacing: 0.8px; + user-select: none; + pointer-events: none; +} + +.svg-ray-label.upper { + fill: rgba(88, 166, 255, 0.45); +} + +.svg-ray-label.lower { + fill: rgba(188, 140, 255, 0.45); +} + +.svg-ray-label.spine { + fill: rgba(63, 185, 80, 0.45); +} + +.hemi-pill.active { + background: var(--surface-3); + border-color: var(--border-strong); + box-shadow: 0 0 10px rgba(88, 166, 255, 0.2); +}