Skip to content

Commit 62d666e

Browse files
iulianpascalauiulianpascalau
committed
Merge branch 'rc/v1.4' into integrate-xrypto-payment-1-0-9
# Conflicts: # go.mod # go.sum
2 parents 01cede1 + 71ba193 commit 62d666e

File tree

3 files changed

+47
-7
lines changed

3 files changed

+47
-7
lines changed

‎frontend/src/Dashboard.tsx‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useEffect, useState } from 'react';
22
import { getAccessKey, clearAuth, getUserInfo, parseJwt, type User as AuthUser } from './auth';
33
import { useNavigate } from 'react-router-dom';
4-
import { LogOut, Key, Users, Copy, Trash2, Shield, Loader, Plus, User, Pencil, RotateCcw, ChevronLeft, ChevronRight, ArrowUpDown, ArrowUp, ArrowDown, Check, X as XIcon, UserCog, BookOpen, ExternalLink, Zap, AlertTriangle, CreditCard, Wallet } from 'lucide-react';
4+
import { LogOut, Key, Users, Copy, Trash2, Shield, Loader, Plus, User, Pencil, RotateCcw, ChevronLeft, ChevronRight, ChevronUp, ArrowUpDown, ArrowUp, ArrowDown, Check, X as XIcon, UserCog, BookOpen, ExternalLink, Zap, AlertTriangle, CreditCard, Wallet } from 'lucide-react';
55
import axios from 'axios';
66

77

@@ -1180,8 +1180,28 @@ export const Dashboard = () => {
11801180
<ExternalLink size={18} />
11811181
</a>
11821182
<div className="text-center w-full border-t border-white/5 pt-6">
1183-
<p style={{ fontSize: '0.8rem' }} className="text-slate-500">
1184-
Build {appInfo.version} | <a href="https://github.com/iulianpascalau/mx-epoch-proxy-go" className="hover:text-slate-400 underline decoration-slate-600 underline-offset-2" target="_blank" rel="noopener noreferrer">Solution</a>
1183+
<p style={{ fontSize: '0.8rem' }} className="text-slate-500 flex items-center justify-center gap-1">
1184+
Build {appInfo.version} |
1185+
<div className="relative group inline-block ml-1">
1186+
<button className="hover:text-slate-300 underline decoration-slate-600 underline-offset-2 flex items-center gap-1 transition-colors">
1187+
Source Code <ChevronUp size={12} />
1188+
</button>
1189+
<div className="absolute bottom-full left-1/2 -translate-x-1/2 mb-2 w-56 bg-slate-900/95 border border-slate-700/50 backdrop-blur-xl rounded-lg shadow-2xl opacity-0 invisible group-hover:visible group-hover:opacity-100 transition-all duration-200 transform origin-bottom z-50 flex flex-col">
1190+
<div className="px-4 py-2 border-b border-white/5 text-[10px] uppercase font-bold text-slate-500 tracking-wider">
1191+
Repositories
1192+
</div>
1193+
<a href="https://github.com/iulianpascalau/mx-epoch-proxy-go" target="_blank" rel="noopener noreferrer" className="px-4 py-3 hover:bg-indigo-500/10 hover:text-indigo-300 text-slate-300 text-xs text-left transition-colors flex items-center gap-2">
1194+
<span className="w-1.5 h-1.5 rounded-full bg-indigo-500"></span> Epoch Proxy (Go)
1195+
</a>
1196+
<a href="https://github.com/iulianpascalau/mx-crypto-payments" target="_blank" rel="noopener noreferrer" className="px-4 py-3 hover:bg-emerald-500/10 hover:text-emerald-300 text-slate-300 text-xs text-left transition-colors flex items-center gap-2">
1197+
<span className="w-1.5 h-1.5 rounded-full bg-emerald-500"></span> Crypto Payments (Go)
1198+
</a>
1199+
<a href="https://github.com/iulianpascalau/mx-credits-contract-rs" target="_blank" rel="noopener noreferrer" className="px-4 py-3 hover:bg-amber-500/10 hover:text-amber-300 text-slate-300 text-xs text-left transition-colors flex items-center gap-2 rounded-b-lg">
1200+
<span className="w-1.5 h-1.5 rounded-full bg-amber-500"></span> Credits Contract (Rust)
1201+
</a>
1202+
<div className="absolute -bottom-1 left-1/2 -translate-x-1/2 w-2 h-2 bg-slate-900 border-r border-b border-slate-700/50 transform rotate-45"></div>
1203+
</div>
1204+
</div>
11851205
</p>
11861206
</div>
11871207

‎frontend/src/Login.tsx‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState, useEffect } from 'react';
22
import { setAuth } from './auth';
33
import { useNavigate, Link, useLocation } from 'react-router-dom';
4-
import { Lock, User } from 'lucide-react';
4+
import { Lock, User, ChevronUp } from 'lucide-react';
55

66
export const Login = () => {
77
const [username, setUsername] = useState('');
@@ -121,8 +121,28 @@ export const Login = () => {
121121
</form>
122122

123123
<div className="mt-6 text-center">
124-
<p style={{ fontSize: '0.8rem' }} className="text-slate-500">
125-
Build {version} | <a href="https://github.com/iulianpascalau/mx-epoch-proxy-go" className="hover:text-slate-400 underline decoration-slate-600 underline-offset-2" target="_blank" rel="noopener noreferrer">Solution</a>
124+
<p style={{ fontSize: '0.8rem' }} className="text-slate-500 flex items-center justify-center gap-1">
125+
Build {version} |
126+
<div className="relative group inline-block ml-1">
127+
<button className="hover:text-slate-300 underline decoration-slate-600 underline-offset-2 flex items-center gap-1 transition-colors">
128+
Source Code <ChevronUp size={12} />
129+
</button>
130+
<div className="absolute bottom-full left-1/2 -translate-x-1/2 mb-2 w-56 bg-slate-900/95 border border-slate-700/50 backdrop-blur-xl rounded-lg shadow-2xl opacity-0 invisible group-hover:visible group-hover:opacity-100 transition-all duration-200 transform origin-bottom z-50 flex flex-col">
131+
<div className="px-4 py-2 border-b border-white/5 text-[10px] uppercase font-bold text-slate-500 tracking-wider">
132+
Repositories
133+
</div>
134+
<a href="https://github.com/iulianpascalau/mx-epoch-proxy-go" target="_blank" rel="noopener noreferrer" className="px-4 py-3 hover:bg-indigo-500/10 hover:text-indigo-300 text-slate-300 text-xs text-left transition-colors flex items-center gap-2">
135+
<span className="w-1.5 h-1.5 rounded-full bg-indigo-500"></span> Epoch Proxy (Go)
136+
</a>
137+
<a href="https://github.com/iulianpascalau/mx-crypto-payments" target="_blank" rel="noopener noreferrer" className="px-4 py-3 hover:bg-emerald-500/10 hover:text-emerald-300 text-slate-300 text-xs text-left transition-colors flex items-center gap-2">
138+
<span className="w-1.5 h-1.5 rounded-full bg-emerald-500"></span> Crypto Payments (Go)
139+
</a>
140+
<a href="https://github.com/iulianpascalau/mx-credits-contract-rs" target="_blank" rel="noopener noreferrer" className="px-4 py-3 hover:bg-amber-500/10 hover:text-amber-300 text-slate-300 text-xs text-left transition-colors flex items-center gap-2 rounded-b-lg">
141+
<span className="w-1.5 h-1.5 rounded-full bg-amber-500"></span> Credits Contract (Rust)
142+
</a>
143+
<div className="absolute -bottom-1 left-1/2 -translate-x-1/2 w-2 h-2 bg-slate-900 border-r border-b border-slate-700/50 transform rotate-45"></div>
144+
</div>
145+
</div>
126146
</p>
127147
</div>
128148
</div>

‎services/proxy/SPECS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ The **Crypto Payments Service** allows users to top up their account
126126
credits using MultiversX native EGLD token. This functionality is decoupled into a
127127
standalone microservice for security reasons.
128128

129-
- **Project Repository**: [Crypto Payments Service Source](https://github.com/iulianpascalau/mx-crypto-payments)
129+
- **Project Repository**: [Crypto Payments Service Source](https://github.com/iulianpascalau/mx-crypto-payments-go)
130130
- **Credits Smart Contract**: [Smart Contract Source](https://github.com/iulianpascalau/mx-credits-contract-rs)
131131

132132
### Funcationality

0 commit comments

Comments
 (0)