CRITICAL FIX (Slika 11, 12): /api/v2/auth/me alias + frontend fix
Bug: crm_v2.html, admin_users.html, ostali pozivali /api/v2/auth/me
koji ne postoji u backendu (postoji /api/auth/me bez v2).
401 redirect na /login?reason=unauthorized iako Damir prijavljen.
Fix:
- Frontend: replace /api/v2/auth/me → /api/auth/me u svim file-ovima
- Backend: dodan defensive alias @app.get('/api/v2/auth/me')
This commit is contained in:
+53
-6
@@ -33,13 +33,60 @@ body { font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif
|
||||
.topbar a:hover { opacity:1; background:rgba(255,255,255,.1); }
|
||||
.topbar #me { padding:4px 10px; background:rgba(0,0,0,.2); border-radius:14px; font-size:11px; }
|
||||
|
||||
.tabs { display:flex; background:var(--bg2); border-bottom:1px solid var(--rim); padding:0 18px; flex-wrap:wrap; }
|
||||
/* === CRM v2 redesign — sticky tabs, ERP-style (RUSH-4 / 2026-05-05) === */
|
||||
.tabs { display:flex; background:var(--bg2); border-bottom:1px solid var(--rim);
|
||||
padding:0 18px; gap:2px; overflow-x:auto; overflow-y:hidden;
|
||||
position:sticky; top:0; z-index:6; white-space:nowrap;
|
||||
scrollbar-width:thin; scrollbar-color:var(--rim) transparent; }
|
||||
.tabs::-webkit-scrollbar { height:4px; }
|
||||
.tabs::-webkit-scrollbar-thumb { background:var(--rim); }
|
||||
.tab { padding:11px 16px; cursor:pointer; color:var(--t2); border-bottom:2px solid transparent;
|
||||
font-weight:500; user-select:none; font-size:12px; }
|
||||
font-weight:600; user-select:none; font-size:12px; flex:0 0 auto; transition:all .15s; }
|
||||
.tab:hover { color:var(--t1); }
|
||||
.tab.active { color:var(--pgz-blue); border-bottom-color:var(--pgz-blue); background:var(--bg3); }
|
||||
.tab.active { color:var(--pgz-gold); border-bottom-color:var(--pgz-gold); background:var(--bg3); }
|
||||
.tab .count { background:var(--bg3); color:var(--t2); padding:1px 7px; border-radius:9px; font-size:10px; margin-left:6px; }
|
||||
.tab.active .count { background:var(--pgz-blue); color:#fff; }
|
||||
.tab.active .count { background:var(--pgz-gold); color:#000; }
|
||||
|
||||
/* === Card grid for Accounts/Contacts/Leads/Opps === */
|
||||
.cgrid { display:grid; grid-template-columns:repeat(auto-fill,minmax(280px,1fr)); gap:12px; margin-top:6px; }
|
||||
.ccard { background:var(--bg2); border:1px solid var(--rim); border-radius:8px; padding:12px 13px;
|
||||
cursor:pointer; transition:all .15s; position:relative; }
|
||||
.ccard:hover { border-color:var(--pgz-gold); transform:translateY(-1px); box-shadow:0 4px 12px rgba(0,0,0,.3); }
|
||||
.ccard-h { font-weight:700; font-size:13px; color:var(--t1); margin-bottom:4px; padding-right:24px; line-height:1.25; }
|
||||
.ccard-sub { font-size:11px; color:var(--t2); margin-bottom:8px; }
|
||||
.ccard-row { display:flex; justify-content:space-between; font-size:11px; color:var(--t2); padding:3px 0; border-top:1px solid rgba(255,255,255,.04); }
|
||||
.ccard-row:first-of-type { border-top:0; }
|
||||
.ccard-row strong { color:var(--t1); font-weight:600; }
|
||||
.ccard-actions { position:absolute; top:8px; right:8px; display:flex; gap:4px; }
|
||||
.ccard-actions button { padding:2px 7px; font-size:11px; }
|
||||
|
||||
/* === Email template card grid === */
|
||||
.tcard { background:var(--bg2); border:1px solid var(--rim); border-radius:8px; padding:12px 13px; cursor:pointer; transition:all .15s; }
|
||||
.tcard:hover { border-color:var(--pgz-gold); }
|
||||
.tcard-code { font-family:var(--mono); font-size:10px; color:var(--pgz-gold); text-transform:uppercase; letter-spacing:.5px; }
|
||||
.tcard-naziv { font-weight:700; font-size:13px; color:var(--t1); margin:4px 0; }
|
||||
.tcard-cat { font-size:10px; color:var(--t3); text-transform:uppercase; letter-spacing:.4px; margin-bottom:6px; }
|
||||
.tcard-snip { font-size:11px; color:var(--t2); line-height:1.4; max-height:54px; overflow:hidden; border-top:1px solid var(--rim); padding-top:6px; }
|
||||
|
||||
/* === Export dropdown === */
|
||||
.exp { position:relative; display:inline-block; }
|
||||
.exp-btn { background:var(--bg3); border:1px solid var(--rim); color:var(--t1); padding:6px 11px;
|
||||
border-radius:4px; cursor:pointer; font-size:12px; font-family:inherit; }
|
||||
.exp-btn:hover { border-color:var(--pgz-gold); color:var(--pgz-gold); }
|
||||
.exp-menu { display:none; position:absolute; right:0; top:calc(100% + 3px); background:var(--bg2);
|
||||
border:1px solid var(--rim); border-radius:5px; min-width:140px; z-index:20;
|
||||
box-shadow:0 4px 12px rgba(0,0,0,.5); overflow:hidden; }
|
||||
.exp-menu.on { display:block; }
|
||||
.exp-menu button { display:block; width:100%; text-align:left; background:transparent; border:0;
|
||||
color:var(--t1); padding:8px 12px; cursor:pointer; font-size:12px; font-family:inherit; }
|
||||
.exp-menu button:hover { background:var(--bg3); color:var(--pgz-gold); }
|
||||
|
||||
@media print {
|
||||
.topbar, .tabs, .toolbar, footer, #toast, .modal, .ccard-actions, .exp { display:none !important; }
|
||||
body, .main { background:#fff !important; color:#000 !important; overflow:visible !important; height:auto !important; }
|
||||
.ccard, .tcard, .card { background:#fff !important; color:#000 !important; border:1px solid #999 !important; break-inside:avoid; }
|
||||
table th, table td { color:#000 !important; border-color:#999 !important; }
|
||||
}
|
||||
|
||||
.main { padding:14px 18px; height:calc(100vh - 50px - 36px); overflow:auto; }
|
||||
.tab-c { display:none; }
|
||||
@@ -580,7 +627,7 @@ function switchTab(name) {
|
||||
async function loadMe() {
|
||||
try {
|
||||
const tok = getToken();
|
||||
const me = await fetch('/sport/api/v2/auth/me', {headers:{'Authorization':'Bearer '+tok}}).then(r=>r.json());
|
||||
const me = await fetch('/sport/api/auth/me', {headers:{'Authorization':'Bearer '+tok}}).then(r=>r.json());
|
||||
document.getElementById('me').textContent = (me.email || me.full_name || 'user');
|
||||
} catch { document.getElementById('me').textContent='?'; }
|
||||
}
|
||||
@@ -1234,7 +1281,7 @@ async function delCase(id) {
|
||||
let CURRENT_USER = null;
|
||||
async function ensureMe() {
|
||||
if (CURRENT_USER) return CURRENT_USER;
|
||||
const candidates = ['/sport/api/auth/me', '/sport/api/v2/auth/me', '/sport/api/v2/me'];
|
||||
const candidates = ['/sport/api/auth/me', '/sport/api/auth/me', '/sport/api/v2/me'];
|
||||
for (const url of candidates) {
|
||||
try {
|
||||
const r = await fetch(url, {headers:{'Authorization':'Bearer '+TOKEN}});
|
||||
|
||||
+31
-3
@@ -113,6 +113,12 @@ button,input,select{font-family:inherit;font-size:inherit;outline:none}
|
||||
.player-card .badge{font-size:9px;padding:2px 5px;border-radius:3px;background:var(--bg4);color:var(--t1);text-transform:uppercase;font-weight:600}
|
||||
.player-card .badge.repr{background:var(--pgz-gold);color:var(--bg0)}
|
||||
.player-card .badge.hoo{background:var(--pgz-blue2);color:#fff}
|
||||
/* RUSH-2 2026-05-05: small inline avatar (left of name) */
|
||||
.player-card .pn-row{display:flex;align-items:center;gap:8px}
|
||||
.player-card .pn-row .pn{flex:1;min-width:0}
|
||||
.rush2-avatar{display:inline-flex;align-items:center;justify-content:center;border-radius:50%;overflow:hidden;background:var(--bg3);border:1px solid var(--rim);flex-shrink:0;color:var(--pgz-gold);font-weight:800;letter-spacing:.5px}
|
||||
.rush2-avatar img{width:100%;height:100%;object-fit:cover;display:block}
|
||||
.rush2-avatar.r2a-fb{background:linear-gradient(135deg,#1a1f2e,#2a3046);color:var(--pgz-gold)}
|
||||
|
||||
table{width:100%;border-collapse:collapse;font-size:12px}
|
||||
table th{background:var(--bg3);color:var(--t2);text-transform:uppercase;font-size:10px;letter-spacing:.5px;padding:8px 10px;text-align:left;border-bottom:1px solid var(--rim);font-weight:700}
|
||||
@@ -2112,17 +2118,39 @@ function renderSportasiGrid(rows){
|
||||
if(!rows.length) return '<div class="empty">Nema rezultata</div>';
|
||||
return '<div class="grid-player">'+rows.map(c => buildPlayerCard(c)).join('')+'</div>';
|
||||
}
|
||||
// RUSH-2 (2026-05-05): avatarUrl + avatarHTML helpers. Small circular avatar
|
||||
// to the left of the name in player cards (per Damir slika 6 spec).
|
||||
// Author: Damir Radulić (dradulic@outlook.com / damir@rinet.one)
|
||||
function avatarUrl(c){
|
||||
if(!c) return null;
|
||||
const u = c.slika_url || c.avatar || c.photo_url;
|
||||
if(!u) return null;
|
||||
if(/^https?:/i.test(u)) return u;
|
||||
if(u.startsWith('/')) return u;
|
||||
return '/sport/uploads/avatars/'+u;
|
||||
}
|
||||
function avatarHTML(c, sizePx){
|
||||
const sz = sizePx || 36;
|
||||
const initials = (((c.ime||'?')[0]||'?')+((c.prezime||'?')[0]||'?')).toUpperCase();
|
||||
const url = avatarUrl(c);
|
||||
if(url){
|
||||
return '<span class="rush2-avatar" style="width:'+sz+'px;height:'+sz+'px;font-size:'+Math.round(sz*0.4)+'px"><img src="'+esc(url)+'" alt="" onerror="this.style.display=\'none\';this.parentElement.classList.add(\'r2a-fb\');this.parentElement.innerHTML=\''+initials+'\'"></span>';
|
||||
}
|
||||
return '<span class="rush2-avatar r2a-fb" style="width:'+sz+'px;height:'+sz+'px;font-size:'+Math.round(sz*0.4)+'px">'+initials+'</span>';
|
||||
}
|
||||
function buildPlayerCard(c){
|
||||
const initials = (((c.ime||'?')[0]||'?')+((c.prezime||'?')[0]||'?')).toUpperCase();
|
||||
const photo = c.slika_url ? '<img src="'+esc(c.slika_url)+'" alt="" onerror="this.style.display=\'none\';if(this.parentElement)this.parentElement.innerHTML=\'<div class=\\\'no\\\'>'+initials+'</div>\'">' : '<div class="no">'+initials+'</div>';
|
||||
const photoSrc = avatarUrl(c) || c.slika_url;
|
||||
const photo = photoSrc ? '<img src="'+esc(photoSrc)+'" alt="" onerror="this.style.display=\'none\';if(this.parentElement)this.parentElement.innerHTML=\'<div class=\\\'no\\\'>'+initials+'</div>\'">' : '<div class="no">'+initials+'</div>';
|
||||
const hooCat = c.hoo_kategorija || c.kategorija_hoo;
|
||||
const smallAv = avatarHTML(c, 32);
|
||||
return `
|
||||
<div class="player-card" onclick="openSportas(${c.id})">
|
||||
<div class="ph">${photo}</div>
|
||||
<div class="pb">
|
||||
<div class="pn">${(window.pgzBadgePrefix?window.pgzBadgePrefix(c,'sportas'):'')}${esc(c.ime||'')} ${esc(c.prezime||'')}</div>
|
||||
<div class="pn-row">${smallAv}<div class="pn">${(window.pgzBadgePrefix?window.pgzBadgePrefix(c,'sportas'):'')}${esc(c.ime||'')} ${esc(c.prezime||'')}</div></div>
|
||||
<div class="pp">${txt(c.sport,'—')} · ${txt(c.pozicija,'')}</div>
|
||||
<div class="pk">${txt(c.klub_naziv_godisnjak,'')}</div>
|
||||
<div class="pk">${txt(c.klub_naziv_godisnjak||c.klub_naziv,'')}</div>
|
||||
<div class="badges">
|
||||
${c.reprezentativac?'<span class="badge repr">REPR</span>':''}
|
||||
${hooCat?'<span class="badge hoo">HOO '+esc(hooCat)+'</span>':''}
|
||||
|
||||
Reference in New Issue
Block a user