Skip to content

Commit e2bea63

Browse files
mearvkmearvk
committed
Science Commit 5.
1 parent 86ebe81 commit e2bea63

52 files changed

Lines changed: 1066 additions & 56 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/Defined/servlets/servlet/src/main/webapp/css/style.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ body { font-family:var(--font); background:var(--bg-dark); color:var(--text); li
1919
a { color:var(--accent-hover); text-decoration:none; transition:color 0.2s; }
2020
a:hover { color:var(--accent); }
2121
.nav { position:sticky; top:0; z-index:100; background:rgba(26,26,26,0.92); backdrop-filter:blur(12px); border-bottom:1px solid var(--border); padding:0 2rem; }
22-
.nav-inner { max-width:var(--max-width); margin:0 auto; display:flex; align-items:center; height:64px; justify-content:space-between; }
22+
.nav-inner { max-width:var(--max-width); margin:0 auto; display:flex; align-items:center; height:64px; justify-content:center; gap:2rem; flex-wrap:wrap; }
2323
.nav-brand { font-size:1.125rem; font-weight:700; color:var(--text); letter-spacing:-0.02em; }
2424
.nav-links { list-style:none; display:flex; gap:1.5rem; }
2525
.nav-links a { font-size:0.875rem; color:var(--text-muted); }

‎modules/Defined/servlets/servlet/src/main/webapp/index.jsp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
<li><a href="protocols.jsp">Protocols</a></li>
3434
<li><a href="status.jsp">Status</a></li>
3535
</ul>
36-
<div class="nav-actions">
37-
<a href="categories.jsp" class="nav-cta">View Categories →</a>
38-
</div>
3936
</div></nav>
4037

4138
<section class="hero">

‎modules/bitcoin/servlets/servlet/src/main/webapp/account.jsp‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,15 @@
9494
<li><a href="status.jsp">Status</a></li>
9595
</ul>
9696
<div class="nav-actions">
97-
<% if (sessionUser != null) { %>
98-
<span style="font-size:0.8rem;color:var(--accent);margin-right:8px;">₿ <%= sessionUser %></span>
97+
<% if (__admin) { %>
98+
<span style="font-size:0.75rem;color:#f59e0b;margin-right:4px;">&#9733; Admin</span>
99+
<a href="admin.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
100+
<% } else if (__user != null) { %>
101+
<span style="font-size:0.8rem;color:var(--accent);margin-right:6px;"><%= __user %></span>
99102
<a href="account.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
100103
<% } else { %>
101-
<a href="account.jsp" class="nav-cta">Login →</a>
104+
<a href="account.jsp" class="nav-cta">Login</a>
105+
<a href="admin.jsp" class="nav-cta" style="border-color:#f59e0b;color:#f59e0b;">Admin</a>
102106
<% } %>
103107
</div>
104108
</div></nav>

‎modules/bitcoin/servlets/servlet/src/main/webapp/admin.jsp‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
2+
<%
3+
String __user = (String) session.getAttribute("btc_username");
4+
Boolean __admin = (Boolean) session.getAttribute("btc_admin");
5+
if (__admin == null) __admin = false;
6+
%>
27
<!DOCTYPE html>
38
<html lang="en">
49
<head>
@@ -21,6 +26,18 @@
2126
<li><a href="admin.jsp" class="active">Admin</a></li>
2227
<li><a href="status.jsp">Status</a></li>
2328
</ul>
29+
<div class="nav-actions">
30+
<% if (__admin) { %>
31+
<span style="font-size:0.75rem;color:#f59e0b;margin-right:4px;">&#9733; Admin</span>
32+
<a href="admin.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
33+
<% } else if (__user != null) { %>
34+
<span style="font-size:0.8rem;color:var(--accent);margin-right:6px;"><%= __user %></span>
35+
<a href="account.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
36+
<% } else { %>
37+
<a href="account.jsp" class="nav-cta">Login</a>
38+
<a href="admin.jsp" class="nav-cta" style="border-color:#f59e0b;color:#f59e0b;">Admin</a>
39+
<% } %>
40+
</div>
2441
</div></nav>
2542

2643
<section class="hero"><div class="hero-inner">

‎modules/bitcoin/servlets/servlet/src/main/webapp/css/style.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
body { font-family:var(--font); background:var(--bg-dark); color:var(--text); line-height:1.6; -webkit-font-smoothing:antialiased; }
1919
a { color:var(--accent-hover); text-decoration:none; transition:color 0.2s; }
2020
a:hover { color:var(--accent); }
21-
.nav { position:sticky; top:0; z-index:100; background:rgba(26,22,16,0.92); backdrop-filter:blur(12px); border-bottom:1px solid var(--border); padding:0 2rem; }
21+
.nav { position:relative; position:sticky; top:0; z-index:100; background:rgba(26,22,16,0.92); backdrop-filter:blur(12px); border-bottom:1px solid var(--border); padding:0 2rem; }
2222
.nav-inner { max-width:var(--max-width); margin:0 auto; display:flex; align-items:center; height:64px; justify-content:center; gap:2rem; flex-wrap:wrap; }
2323
.nav-brand { font-size:1.125rem; font-weight:700; color:var(--accent); letter-spacing:-0.02em; }
2424
.nav-links { list-style:none; display:flex; gap:1.5rem; }
@@ -55,3 +55,4 @@ code { background:var(--bg-card); padding:0.15rem 0.4rem; border-radius:4px; fon
5555
border-radius:var(--radius); padding:0.6rem 0.75rem; font-size:0.875rem; font-family:var(--font);
5656
}
5757
.form-group textarea { min-height:120px; resize:vertical; font-family:var(--font-mono); }
58+
.nav-actions { position:absolute; right:2rem; top:50%; transform:translateY(-50%); display:flex; align-items:center; gap:0.5rem; }

‎modules/bitcoin/servlets/servlet/src/main/webapp/index.jsp‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
pw.println("QUIT");
1414
} catch (Exception e) { statusData = "Backend offline"; }
1515
%>
16+
<%
17+
String __user = (String) session.getAttribute("btc_username");
18+
Boolean __admin = (Boolean) session.getAttribute("btc_admin");
19+
if (__admin == null) __admin = false;
20+
%>
1621
<!DOCTYPE html>
1722
<html lang="en">
1823
<head>
@@ -36,7 +41,16 @@
3641
<li><a href="status.jsp">Status</a></li>
3742
</ul>
3843
<div class="nav-actions">
39-
<a href="wallets.jsp" class="nav-cta">Wallets →</a>
44+
<% if (__admin) { %>
45+
<span style="font-size:0.75rem;color:#f59e0b;margin-right:4px;">&#9733; Admin</span>
46+
<a href="admin.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
47+
<% } else if (__user != null) { %>
48+
<span style="font-size:0.8rem;color:var(--accent);margin-right:6px;"><%= __user %></span>
49+
<a href="account.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
50+
<% } else { %>
51+
<a href="account.jsp" class="nav-cta">Login</a>
52+
<a href="admin.jsp" class="nav-cta" style="border-color:#f59e0b;color:#f59e0b;">Admin</a>
53+
<% } %>
4054
</div>
4155
</div></nav>
4256

‎modules/bitcoin/servlets/servlet/src/main/webapp/profile.jsp‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,15 @@
4646
<li><a href="status.jsp">Status</a></li>
4747
</ul>
4848
<div class="nav-actions">
49-
<% if (sessionUser != null) { %>
50-
<span style="font-size:0.8rem;color:var(--accent);margin-right:8px;">₿ <%= sessionUser %></span>
49+
<% if (__admin) { %>
50+
<span style="font-size:0.75rem;color:#f59e0b;margin-right:4px;">&#9733; Admin</span>
51+
<a href="admin.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
52+
<% } else if (__user != null) { %>
53+
<span style="font-size:0.8rem;color:var(--accent);margin-right:6px;"><%= __user %></span>
5154
<a href="account.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
5255
<% } else { %>
53-
<a href="account.jsp" class="nav-cta">Login →</a>
56+
<a href="account.jsp" class="nav-cta">Login</a>
57+
<a href="admin.jsp" class="nav-cta" style="border-color:#f59e0b;color:#f59e0b;">Admin</a>
5458
<% } %>
5559
</div>
5660
</div></nav>

‎modules/bitcoin/servlets/servlet/src/main/webapp/status.jsp‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
pw.println("QUIT");
1414
} catch (Exception e) { statusData = "Backend offline: " + e.getMessage(); }
1515
%>
16+
<%
17+
String __user = (String) session.getAttribute("btc_username");
18+
Boolean __admin = (Boolean) session.getAttribute("btc_admin");
19+
if (__admin == null) __admin = false;
20+
%>
1621
<!DOCTYPE html>
1722
<html lang="en">
1823
<head>
@@ -35,6 +40,18 @@
3540
<li><a href="admin.jsp">Admin</a></li>
3641
<li><a href="status.jsp" class="active">Status</a></li>
3742
</ul>
43+
<div class="nav-actions">
44+
<% if (__admin) { %>
45+
<span style="font-size:0.75rem;color:#f59e0b;margin-right:4px;">&#9733; Admin</span>
46+
<a href="admin.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
47+
<% } else if (__user != null) { %>
48+
<span style="font-size:0.8rem;color:var(--accent);margin-right:6px;"><%= __user %></span>
49+
<a href="account.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
50+
<% } else { %>
51+
<a href="account.jsp" class="nav-cta">Login</a>
52+
<a href="admin.jsp" class="nav-cta" style="border-color:#f59e0b;color:#f59e0b;">Admin</a>
53+
<% } %>
54+
</div>
3855
</div></nav>
3956

4057
<section class="hero"><div class="hero-inner">

‎modules/bitcoin/servlets/servlet/src/main/webapp/transactions.jsp‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
2+
<%
3+
String __user = (String) session.getAttribute("btc_username");
4+
Boolean __admin = (Boolean) session.getAttribute("btc_admin");
5+
if (__admin == null) __admin = false;
6+
%>
27
<!DOCTYPE html>
38
<html lang="en">
49
<head>
@@ -21,6 +26,18 @@
2126
<li><a href="admin.jsp">Admin</a></li>
2227
<li><a href="status.jsp">Status</a></li>
2328
</ul>
29+
<div class="nav-actions">
30+
<% if (__admin) { %>
31+
<span style="font-size:0.75rem;color:#f59e0b;margin-right:4px;">&#9733; Admin</span>
32+
<a href="admin.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
33+
<% } else if (__user != null) { %>
34+
<span style="font-size:0.8rem;color:var(--accent);margin-right:6px;"><%= __user %></span>
35+
<a href="account.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
36+
<% } else { %>
37+
<a href="account.jsp" class="nav-cta">Login</a>
38+
<a href="admin.jsp" class="nav-cta" style="border-color:#f59e0b;color:#f59e0b;">Admin</a>
39+
<% } %>
40+
</div>
2441
</div></nav>
2542

2643
<section class="hero"><div class="hero-inner">

‎modules/bitcoin/servlets/servlet/src/main/webapp/wallets.jsp‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
pw.println("QUIT");
1414
} catch (Exception e) { statusData = "Backend offline: " + e.getMessage(); }
1515
%>
16+
<%
17+
String __user = (String) session.getAttribute("btc_username");
18+
Boolean __admin = (Boolean) session.getAttribute("btc_admin");
19+
if (__admin == null) __admin = false;
20+
%>
1621
<!DOCTYPE html>
1722
<html lang="en">
1823
<head>
@@ -35,6 +40,18 @@
3540
<li><a href="admin.jsp">Admin</a></li>
3641
<li><a href="status.jsp">Status</a></li>
3742
</ul>
43+
<div class="nav-actions">
44+
<% if (__admin) { %>
45+
<span style="font-size:0.75rem;color:#f59e0b;margin-right:4px;">&#9733; Admin</span>
46+
<a href="admin.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
47+
<% } else if (__user != null) { %>
48+
<span style="font-size:0.8rem;color:var(--accent);margin-right:6px;"><%= __user %></span>
49+
<a href="account.jsp?action=logout" class="nav-cta" style="border-color:#dc2626;color:#dc2626;">Logout</a>
50+
<% } else { %>
51+
<a href="account.jsp" class="nav-cta">Login</a>
52+
<a href="admin.jsp" class="nav-cta" style="border-color:#f59e0b;color:#f59e0b;">Admin</a>
53+
<% } %>
54+
</div>
3855
</div></nav>
3956

4057
<section class="hero"><div class="hero-inner">

0 commit comments

Comments
 (0)