From 15cbaaf60a232543ab2c5f444336d5a3971e6f34 Mon Sep 17 00:00:00 2001 From: Petre Chitashvili Date: Sun, 13 Jul 2025 14:48:23 +0400 Subject: [PATCH 1/3] fix: prevent duplicate workflow runs on PR branches - Changed workflow triggers to only run on push to main and PRs to main - This prevents duplicate runs when pushing to a PR branch - Previously both push and pull_request events would trigger for PR branches --- .github/workflows/build-and-test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 32fdfc4..4a7f496 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -1,9 +1,10 @@ name: Build and Test -# Run on PRs and pushes to any branch +# Run on PRs to main and direct pushes to main +# This avoids duplicate runs when pushing to a PR branch on: push: - branches: [ '**' ] + branches: [ main ] pull_request: branches: [ main ] From 5f0c8aca3fdbc72fde505a3c3dac6716ad128cdb Mon Sep 17 00:00:00 2001 From: Petre Chitashvili Date: Sun, 13 Jul 2025 22:02:18 +0400 Subject: [PATCH 2/3] feat: Complete navigation system overhaul with new features - Add comprehensive navigation structure with collapsible sections - Create placeholder pages for all planned features (Bitcoin, Fiat, Education, Tools) - Implement real-time Bitcoin price ticker in navigation footer - Add Bitcoin service for price fetching and caching - Enhance UI with modern styling, animations, and Georgian language support - Fix navigation icon alignment issues for better visual consistency - Replace PNG favicon with SVG version - Update main layout and improve responsive design *Collaboration by Claude* --- Layout/MainLayout.razor | 224 ++++++++++++++--- Layout/MainLayout.razor.css | 2 +- Layout/NavMenu.razor | 229 ++++++++++++++++-- Layout/NavMenu.razor.css | 367 +++++++++++++++++++++++----- Models/Bitcoin.cs | 32 +++ Pages/Alerts.razor | 8 + Pages/BitcoinBasics.razor | 8 + Pages/BtcPrice.razor | 8 + Pages/CurrencyConverter.razor | 8 + Pages/DcaCalculator.razor | 8 + Pages/Economics.razor | 8 + Pages/Halving.razor | 8 + Pages/HistoricalRates.razor | 16 +- Pages/Index.razor | 443 +++++++++++++++++++++++++++++++--- Pages/Inflation.razor | 8 + Pages/Mining.razor | 8 + Pages/MoneyHistory.razor | 8 + Pages/Portfolio.razor | 8 + Pages/PurchasingPower.razor | 5 +- Program.cs | 1 + Services/BitcoinService.cs | 72 ++++++ wwwroot/css/app.css | 309 +++++++++++++++++++++--- wwwroot/favicon.png | Bin 1148 -> 0 bytes wwwroot/favicon.svg | 10 + wwwroot/index.html | 28 ++- 25 files changed, 1622 insertions(+), 204 deletions(-) create mode 100644 Models/Bitcoin.cs create mode 100644 Pages/Alerts.razor create mode 100644 Pages/BitcoinBasics.razor create mode 100644 Pages/BtcPrice.razor create mode 100644 Pages/CurrencyConverter.razor create mode 100644 Pages/DcaCalculator.razor create mode 100644 Pages/Economics.razor create mode 100644 Pages/Halving.razor create mode 100644 Pages/Inflation.razor create mode 100644 Pages/Mining.razor create mode 100644 Pages/MoneyHistory.razor create mode 100644 Pages/Portfolio.razor create mode 100644 Services/BitcoinService.cs delete mode 100644 wwwroot/favicon.png create mode 100644 wwwroot/favicon.svg diff --git a/Layout/MainLayout.razor b/Layout/MainLayout.razor index b4f1ca1..0c3bd16 100644 --- a/Layout/MainLayout.razor +++ b/Layout/MainLayout.razor @@ -1,7 +1,16 @@ @inherits LayoutComponentBase @inject IJSRuntime JSRuntime -
+
+
₿
+
₿
+
₿
+
₿
+
₿
+
₿
+
₿
+
₿
+
@@ -27,6 +36,7 @@ } diff --git a/Layout/MainLayout.razor.css b/Layout/MainLayout.razor.css index ecf25e5..2adc955 100644 --- a/Layout/MainLayout.razor.css +++ b/Layout/MainLayout.razor.css @@ -52,7 +52,7 @@ main { } .sidebar { - width: 250px; + width: 280px; height: 100vh; position: sticky; top: 0; diff --git a/Layout/NavMenu.razor b/Layout/NavMenu.razor index e47617c..53d2671 100644 --- a/Layout/NavMenu.razor +++ b/Layout/NavMenu.razor @@ -1,6 +1,14 @@ -
+@using InGeorgianLari.Services +@using InGeorgianLari.Models +@inject IBitcoinService BitcoinService +@implements IDisposable + +
- ₾ ლარის კურსი + + ₿ + ფული + @@ -9,26 +17,178 @@
+ + +
+ @if (bitcoinPrice != null) + { +
+
1₿
+
+
$@bitcoinPrice.PriceUsd.ToString("N0")
+
₾@bitcoinPrice.PriceGel.ToString("N0")
+
+
+ } + else + { +
+ იტვირთება... +
+ } +
@code { private bool collapseNavMenu = true; + private HashSet expandedSections = new HashSet() { "lari" }; + private BitcoinPrice? bitcoinPrice; + private Timer? refreshTimer; private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; @@ -36,4 +196,45 @@ { collapseNavMenu = !collapseNavMenu; } + + private void ToggleSection(string section) + { + if (expandedSections.Contains(section)) + { + expandedSections.Remove(section); + } + else + { + expandedSections.Add(section); + } + } + + protected override async Task OnInitializedAsync() + { + await LoadBitcoinPrice(); + + // Refresh Bitcoin price every second + refreshTimer = new Timer(async _ => + { + await LoadBitcoinPrice(); + await InvokeAsync(StateHasChanged); + }, null, TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1)); + } + + private async Task LoadBitcoinPrice() + { + try + { + bitcoinPrice = await BitcoinService.GetCurrentPriceAsync(); + } + catch (Exception ex) + { + Console.WriteLine($"Error loading Bitcoin price: {ex.Message}"); + } + } + + public void Dispose() + { + refreshTimer?.Dispose(); + } } \ No newline at end of file diff --git a/Layout/NavMenu.razor.css b/Layout/NavMenu.razor.css index 40aa875..0431223 100644 --- a/Layout/NavMenu.razor.css +++ b/Layout/NavMenu.razor.css @@ -1,3 +1,4 @@ +/* Enhanced sexy navigation menu styling */ .navbar-toggler { appearance: none; cursor: pointer; @@ -24,115 +25,374 @@ .navbar-toggler:hover { background-color: var(--card-light); - border-color: var(--primary); + border-color: #F7931A; + transform: scale(1.05); } .top-row { height: 4rem; - background-color: var(--card); - border-bottom: 1px solid var(--border); + background: linear-gradient(135deg, rgba(26, 26, 26, 0.95) 0%, rgba(36, 36, 36, 0.95) 100%); + backdrop-filter: blur(20px); + border-bottom: 1px solid rgba(247, 147, 26, 0.2); display: flex; align-items: center; padding: 0 1.5rem; + box-shadow: 0 2px 20px rgba(0, 0, 0, 0.3); } .navbar-brand { - font-size: 1.25rem; + font-size: 1.1rem; font-weight: 600; color: var(--text) !important; text-decoration: none; display: flex; align-items: center; gap: 0.5rem; + transition: all 0.3s ease; } -.navbar-brand:hover { - color: var(--primary) !important; +.brand-icon { + font-size: 1.5rem; + color: #F7931A; + animation: pulse 2s ease-in-out infinite; + flex-shrink: 0; +} + +.brand-text { + background: linear-gradient(120deg, #F7931A 0%, #FFA500 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + background-clip: text; + font-weight: 700; +} + +.navbar-brand:hover .brand-icon { + transform: rotate(20deg) scale(1.1); } .bi { - display: inline-block; - width: 1.25rem; - height: 1.25rem; - margin-right: 0.75rem; - vertical-align: middle; - font-size: 1.25rem; + display: inline-flex; + width: 1.125rem; + height: 1.125rem; + margin-right: 0.5rem; + font-size: 1.125rem; + flex-shrink: 0; + align-items: center; + justify-content: center; + /* Adjust vertical position to align with text baseline */ + position: relative; + top: -1px; } .nav-scrollable { - padding: 1rem 0.5rem; + padding: 1rem; + height: calc(100vh - 4rem); + overflow-y: auto; + overflow-x: hidden; + display: flex; + flex-direction: column; } .nav { display: flex; flex-direction: column; - gap: 0.25rem; + gap: 0.5rem; + flex: 1; + overflow: visible; +} + +/* Section styling */ +.nav-section { + margin: 0 0 0.5rem 0; + border-radius: 12px; + overflow: hidden; + background: rgba(30, 30, 30, 0.5); + border: 1px solid rgba(255, 255, 255, 0.05); + transition: all 0.3s ease; +} + +.nav-section:hover { + background: rgba(35, 35, 35, 0.6); + border-color: rgba(247, 147, 26, 0.2); +} + +.nav-section-header { + padding: 1rem; + cursor: pointer; + display: flex; + align-items: center; + gap: 0.75rem; + transition: all 0.3s ease; + position: relative; + overflow: hidden; +} + +.nav-section-header::before { + content: ''; + position: absolute; + left: -100%; + top: 0; + width: 100%; + height: 100%; + background: linear-gradient(90deg, transparent 0%, rgba(247, 147, 26, 0.1) 50%, transparent 100%); + transition: left 0.5s ease; } +.nav-section-header:hover::before { + left: 100%; +} + +.nav-section-header:hover { + padding-left: 1.25rem; +} + +.section-icon { + font-size: 1.5rem; + color: #F7931A; + transition: all 0.3s ease; +} + +.nav-section-header:hover .section-icon { + transform: scale(1.2) rotate(5deg); + filter: drop-shadow(0 0 8px rgba(247, 147, 26, 0.5)); +} + +.section-title { + flex: 1; + font-weight: 600; + font-size: 0.9rem; + color: var(--text); +} + +.section-toggle { + font-size: 0.875rem; + color: var(--text-light); + transition: all 0.3s ease; +} + +.nav-section-content { + max-height: 0; + overflow: hidden; + transition: max-height 0.4s cubic-bezier(0.4, 0, 0.2, 1); +} + +.nav-section-content.expanded { + max-height: 500px; + overflow: hidden; + padding: 0 0 0.5rem 0; +} + +/* Nav items */ .nav-item { font-size: 0.95rem; + padding: 0 0.5rem; + margin: 0.25rem 0; } .nav-item ::deep .nav-link { color: var(--text-light); background: transparent; border: 2px solid transparent; - border-radius: 12px; - padding: 0.75rem 1rem; + border-radius: 8px; + padding: 0.6rem 0.75rem; display: flex; align-items: center; - width: 100%; + width: calc(100% - 4px); + margin: 0 2px; transition: all 0.3s ease; text-decoration: none; position: relative; overflow: hidden; + min-height: 42px; + box-sizing: border-box; } -.nav-item ::deep .nav-link::before { +/* Removed left border to prevent cutoff */ + +.nav-item ::deep .nav-link::after { content: ''; position: absolute; left: 0; top: 0; - width: 4px; + width: 100%; height: 100%; - background: var(--primary); - transform: translateX(-100%); - transition: transform 0.3s ease; + background: linear-gradient(90deg, rgba(247, 147, 26, 0.1) 0%, transparent 50%); + opacity: 0; + transition: opacity 0.3s ease; } .nav-item ::deep .nav-link:hover { - background-color: var(--card-light); + background-color: rgba(40, 40, 40, 0.8); color: var(--text); - border-color: var(--border); - transform: translateX(4px); + border-color: rgba(247, 147, 26, 0.3); } -.nav-item ::deep .nav-link:hover::before { - transform: translateX(0); +/* Removed hover effect for left border */ + +.nav-item ::deep .nav-link:hover::after { + opacity: 1; +} + +.nav-item ::deep .nav-link:hover .bi { + transform: scale(1.1); + color: #F7931A; } .nav-item ::deep a.active { - background-color: var(--primary); + background: linear-gradient(135deg, #F7931A 0%, #FFA500 100%); color: white !important; - border-color: var(--primary); + border-color: transparent; font-weight: 600; + box-shadow: 0 4px 20px rgba(247, 147, 26, 0.3); + transform: none; } .nav-item ::deep a.active:hover { - background-color: var(--primary); - transform: none; + transform: translateX(0); + box-shadow: 0 6px 25px rgba(247, 147, 26, 0.4); } .nav-item ::deep a.active .bi { filter: brightness(0) invert(1); } -.nav-scrollable { - display: none; +/* Ensure nav link text wraps properly */ +.nav-item ::deep .nav-link span:not(.bi) { + flex: 1; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + line-height: 1.5; + padding-top: 0.0625rem; + font-size: 0.8rem; +} + +/* Bitcoin ticker footer */ +.nav-footer { + margin-top: auto; + padding: 1rem; + border-top: 1px solid rgba(255, 255, 255, 0.1); +} + +.btc-ticker { + background: linear-gradient(135deg, rgba(247, 147, 26, 0.1) 0%, rgba(255, 165, 0, 0.05) 100%); + border: 1px solid rgba(247, 147, 26, 0.3); + border-radius: 12px; + padding: 1rem; + display: flex; + flex-direction: row; + align-items: center; + gap: 1rem; + position: relative; + overflow: hidden; +} + +.ticker-symbol { + font-size: 1.5rem; + font-weight: 700; + color: #F7931A; + flex-shrink: 0; +} + +.ticker-rates { + display: flex; + flex-direction: column; + gap: 0.25rem; + flex: 1; + text-align: right; } -.collapse:checked ~ .nav-scrollable { - display: block; +.btc-ticker::before { + content: '₿'; + position: absolute; + right: -10px; + top: -10px; + font-size: 3rem; + color: rgba(247, 147, 26, 0.1); + transform: rotate(15deg); +} + +.ticker-label { + font-size: 0.875rem; + color: var(--text-light); + font-weight: 500; +} + +.ticker-price { + font-size: 1.25rem; + font-weight: 700; + line-height: 1.3; +} + +.ticker-rates .ticker-price:first-child { + color: #A8D26D !important; /* Yellow-green for USD */ + text-shadow: 0 0 10px rgba(168, 210, 109, 0.5); +} + +.ticker-rates .ticker-price:last-child { + color: #FF7043 !important; /* Deeper coral-orange for GEL */ + text-shadow: 0 0 10px rgba(255, 112, 67, 0.5); +} + +.ticker-change { + font-size: 0.875rem; + font-weight: 600; + display: flex; + align-items: center; + gap: 0.25rem; +} + +.ticker-change.positive { + color: #10B981; +} + +.ticker-change.negative { + color: #EF4444; +} + +/* Animations */ +@keyframes pulse { + 0%, 100% { + opacity: 1; + transform: scale(1); + } + 50% { + opacity: 0.8; + transform: scale(1.05); + } +} + +@keyframes priceGlow { + 0%, 100% { + text-shadow: 0 0 10px rgba(247, 147, 26, 0.5); + } + 50% { + text-shadow: 0 0 20px rgba(247, 147, 26, 0.8); + } +} + +/* Scrollbar styling */ +.nav-scrollable::-webkit-scrollbar { + width: 6px; +} + +.nav-scrollable::-webkit-scrollbar-track { + background: rgba(30, 30, 30, 0.5); + border-radius: 3px; +} + +.nav-scrollable::-webkit-scrollbar-thumb { + background: linear-gradient(180deg, #F7931A 0%, #FFA500 100%); + border-radius: 3px; +} + +.nav-scrollable::-webkit-scrollbar-thumb:hover { + background: linear-gradient(180deg, #FFA500 0%, #F7931A 100%); +} + +/* Mobile responsiveness */ +.collapse:not(:checked) ~ .nav-scrollable { + display: none !important; } @media (min-width: 641px) { @@ -142,34 +402,23 @@ .collapse, .nav-scrollable { - display: block !important; + display: flex !important; } - +} + +@media (max-width: 640px) { .nav-scrollable { + position: fixed; + top: 4rem; + left: 0; + width: 100%; height: calc(100vh - 4rem); - overflow-y: auto; - } - - .nav-scrollable::-webkit-scrollbar { - width: 6px; + background: rgba(26, 26, 26, 0.98); + backdrop-filter: blur(20px); + z-index: 999; } - .nav-scrollable::-webkit-scrollbar-track { - background: var(--card); - } - - .nav-scrollable::-webkit-scrollbar-thumb { - background: var(--border); - border-radius: 3px; - } - - .nav-scrollable::-webkit-scrollbar-thumb:hover { - background: var(--text-light); - } -} - -@media (max-width: 640px) { - .collapse:not(:checked) ~ .nav-scrollable { - display: none !important; + .nav-section { + margin: 0.5rem; } } \ No newline at end of file diff --git a/Models/Bitcoin.cs b/Models/Bitcoin.cs new file mode 100644 index 0000000..d1fefca --- /dev/null +++ b/Models/Bitcoin.cs @@ -0,0 +1,32 @@ +using System.Text.Json.Serialization; + +namespace InGeorgianLari.Models; + +// Model for blockchain.info ticker API response +public record BitcoinTickerResponse(Dictionary Currencies); + +public record BitcoinCurrencyData +{ + [JsonPropertyName("15m")] + public decimal FifteenMinutes { get; init; } + + [JsonPropertyName("last")] + public decimal Last { get; init; } + + [JsonPropertyName("buy")] + public decimal Buy { get; init; } + + [JsonPropertyName("sell")] + public decimal Sell { get; init; } + + [JsonPropertyName("symbol")] + public string Symbol { get; init; } = string.Empty; +} + +// Simplified model for UI consumption +public record BitcoinPrice +{ + public decimal PriceUsd { get; init; } + public decimal PriceGel { get; init; } + public DateTime LastUpdated { get; init; } +} \ No newline at end of file diff --git a/Pages/Alerts.razor b/Pages/Alerts.razor new file mode 100644 index 0000000..8ee586d --- /dev/null +++ b/Pages/Alerts.razor @@ -0,0 +1,8 @@ +@page "/alerts" + +ფასის შეტყობინებები + +
+

ფასის შეტყობინებები

+

ეს გვერდი მალე დაემატება...

+
\ No newline at end of file diff --git a/Pages/BitcoinBasics.razor b/Pages/BitcoinBasics.razor new file mode 100644 index 0000000..7d2edda --- /dev/null +++ b/Pages/BitcoinBasics.razor @@ -0,0 +1,8 @@ +@page "/bitcoin-basics" + +ბიტკოინის საფუძვლები + +
+

ბიტკოინის საფუძვლები

+

ეს გვერდი მალე დაემატება...

+
\ No newline at end of file diff --git a/Pages/BtcPrice.razor b/Pages/BtcPrice.razor new file mode 100644 index 0000000..09c807c --- /dev/null +++ b/Pages/BtcPrice.razor @@ -0,0 +1,8 @@ +@page "/btc-price" + +ბიტკოინის ფასის ისტორია + +
+

ბიტკოინის ფასის ისტორია

+

ეს გვერდი მალე დაემატება...

+
\ No newline at end of file diff --git a/Pages/CurrencyConverter.razor b/Pages/CurrencyConverter.razor new file mode 100644 index 0000000..179ff61 --- /dev/null +++ b/Pages/CurrencyConverter.razor @@ -0,0 +1,8 @@ +@page "/currency-converter" + +ვალუტის კონვერტორი + +
+

ვალუტის კონვერტორი

+

ეს გვერდი მალე დაემატება...

+
\ No newline at end of file diff --git a/Pages/DcaCalculator.razor b/Pages/DcaCalculator.razor new file mode 100644 index 0000000..0604156 --- /dev/null +++ b/Pages/DcaCalculator.razor @@ -0,0 +1,8 @@ +@page "/dca-calculator" + +DCA კალკულატორი + +
+

DCA კალკულატორი

+

ეს გვერდი მალე დაემატება...

+
\ No newline at end of file diff --git a/Pages/Economics.razor b/Pages/Economics.razor new file mode 100644 index 0000000..41e8851 --- /dev/null +++ b/Pages/Economics.razor @@ -0,0 +1,8 @@ +@page "/economics" + +ეკონომიკის საფუძვლები + +
+

ეკონომიკის საფუძვლები

+

ეს გვერდი მალე დაემატება...

+
\ No newline at end of file diff --git a/Pages/Halving.razor b/Pages/Halving.razor new file mode 100644 index 0000000..ce1a2d0 --- /dev/null +++ b/Pages/Halving.razor @@ -0,0 +1,8 @@ +@page "/halving" + +ბიტკოინის ჰალვინგის ტაიმერი + +
+

ბიტკოინის ჰალვინგის ტაიმერი

+

ეს გვერდი მალე დაემატება...

+
\ No newline at end of file diff --git a/Pages/HistoricalRates.razor b/Pages/HistoricalRates.razor index 94ff772..c43cd3f 100644 --- a/Pages/HistoricalRates.razor +++ b/Pages/HistoricalRates.razor @@ -326,8 +326,9 @@ } .period-btn.active { - background: var(--primary); - color: white; + background: #2A2A2A; + color: var(--text); + border: 1px solid rgba(100, 50, 12, 0.3); } .comparison-toggle { @@ -428,14 +429,17 @@ } .bitcoin-card { - background: linear-gradient(135deg, #F7931A 0%, #FF9500 100%); - border: none; + background: linear-gradient(135deg, #1A1A1A 0%, #252525 100%); + border: 1px solid rgba(100, 50, 12, 0.2); + } + + .bitcoin-card h3 { + color: rgba(247, 147, 26, 0.7) !important; } - .bitcoin-card h3, .bitcoin-card .stat-value, .bitcoin-card .stat-change { - color: white !important; + color: var(--text) !important; } .insights-section { diff --git a/Pages/Index.razor b/Pages/Index.razor index c9106b7..db3086b 100644 --- a/Pages/Index.razor +++ b/Pages/Index.razor @@ -2,15 +2,16 @@ @using InGeorgianLari.Models @using InGeorgianLari.Services @inject IExchangeRateService ExchangeRateService +@inject IBitcoinService BitcoinService @inject IJSRuntime JSRuntime -ლარის კონვერტორი +ლარის ეროვნული ბანკის კურსი -
+

- 🇬🇪 - ლარის კონვერტორი + ₿ + ბიტკოინი ლარში

@if (error) @@ -99,6 +100,7 @@ bool chartNeedsUpdate = false; // Track when chart needs updating ExchangeRatesResponse? rates; List? historicalRates; + BitcoinPrice? bitcoinPrice; // Only USD, EUR, and GBP List availableRates => rates?.Rates.Where(r => r.Code == "USD" || r.Code == "EUR" || r.Code == "GBP").ToList() ?? new(); @@ -132,7 +134,14 @@ loading = true; error = false; - rates = await ExchangeRateService.GetCurrentRatesAsync(); + // Load both exchange rates and Bitcoin price in parallel + var ratesTask = ExchangeRateService.GetCurrentRatesAsync(); + var bitcoinTask = BitcoinService.GetCurrentPriceAsync(); + + await Task.WhenAll(ratesTask, bitcoinTask); + + rates = ratesTask.Result; + bitcoinPrice = bitcoinTask.Result; loading = false; error = rates == null; @@ -232,17 +241,21 @@ \ No newline at end of file diff --git a/Pages/Inflation.razor b/Pages/Inflation.razor new file mode 100644 index 0000000..d49ed4e --- /dev/null +++ b/Pages/Inflation.razor @@ -0,0 +1,8 @@ +@page "/inflation" + +ინფლაციის ტრეკერი + +
+

ინფლაციის ტრეკერი

+

ეს გვერდი მალე დაემატება...

+
\ No newline at end of file diff --git a/Pages/Mining.razor b/Pages/Mining.razor new file mode 100644 index 0000000..8e4719b --- /dev/null +++ b/Pages/Mining.razor @@ -0,0 +1,8 @@ +@page "/mining" + +ბიტკოინის მაინინგის სტატისტიკა + +
+

ბიტკოინის მაინინგის სტატისტიკა

+

ეს გვერდი მალე დაემატება...

+
\ No newline at end of file diff --git a/Pages/MoneyHistory.razor b/Pages/MoneyHistory.razor new file mode 100644 index 0000000..bce0d6d --- /dev/null +++ b/Pages/MoneyHistory.razor @@ -0,0 +1,8 @@ +@page "/money-history" + +ფულის ისტორია + +
+

ფულის ისტორია

+

ეს გვერდი მალე დაემატება...

+
\ No newline at end of file diff --git a/Pages/Portfolio.razor b/Pages/Portfolio.razor new file mode 100644 index 0000000..d629360 --- /dev/null +++ b/Pages/Portfolio.razor @@ -0,0 +1,8 @@ +@page "/portfolio" + +პორტფოლიოს ტრეკერი + +
+

პორტფოლიოს ტრეკერი

+

ეს გვერდი მალე დაემატება...

+
\ No newline at end of file diff --git a/Pages/PurchasingPower.razor b/Pages/PurchasingPower.razor index 45b8f27..6b57924 100644 --- a/Pages/PurchasingPower.razor +++ b/Pages/PurchasingPower.razor @@ -465,8 +465,9 @@ } .insight-card.highlight .insight-number { - background: linear-gradient(135deg, #F7931A 0%, #FF9500 100%); - color: white; + background: linear-gradient(135deg, #1A1A1A 0%, #252525 100%); + color: var(--text); + border: 1px solid rgba(100, 50, 12, 0.2); } .insight-card h4 { diff --git a/Program.cs b/Program.cs index 465cb09..533a76c 100644 --- a/Program.cs +++ b/Program.cs @@ -10,5 +10,6 @@ // Configure HttpClient for BOG API builder.Services.AddScoped(sp => new HttpClient()); builder.Services.AddScoped(); +builder.Services.AddScoped(); await builder.Build().RunAsync(); diff --git a/Services/BitcoinService.cs b/Services/BitcoinService.cs new file mode 100644 index 0000000..1db159b --- /dev/null +++ b/Services/BitcoinService.cs @@ -0,0 +1,72 @@ +using System.Text.Json; +using InGeorgianLari.Models; + +namespace InGeorgianLari.Services; + +public interface IBitcoinService +{ + Task GetCurrentPriceAsync(); +} + +public class BitcoinService(HttpClient httpClient, IExchangeRateService exchangeRateService) : IBitcoinService +{ + private const string BlockchainApiUrl = "https://blockchain.info/ticker"; + private BitcoinPrice? _cachedPrice; + private DateTime _lastFetchTime = DateTime.MinValue; + private readonly TimeSpan _cacheExpiration = TimeSpan.FromSeconds(5); // Cache for 5 seconds + + public async Task GetCurrentPriceAsync() + { + try + { + // Return cached price if still valid + if (_cachedPrice != null && DateTime.UtcNow - _lastFetchTime < _cacheExpiration) + { + return _cachedPrice; + } + + // Get Bitcoin price in USD from blockchain.info + var response = await httpClient.GetStringAsync(BlockchainApiUrl); + var bitcoinData = JsonSerializer.Deserialize>(response); + + if (bitcoinData == null || !bitcoinData.ContainsKey("USD")) + { + Console.WriteLine("[BitcoinService] No USD data found in blockchain.info response"); + return null; + } + + var btcUsd = bitcoinData["USD"].Last; + Console.WriteLine($"[BitcoinService] BTC/USD: {btcUsd}"); + + // Get USD to GEL rate from National Bank of Georgia + var exchangeRates = await exchangeRateService.GetCurrentRatesAsync(); + var usdToGel = exchangeRates?.Rates?.FirstOrDefault(r => r.Code == "USD"); + + if (usdToGel == null) + { + Console.WriteLine("[BitcoinService] No USD/GEL rate found"); + return null; + } + + // Calculate BTC to GEL + // USD rate from NBG is for 1 USD, so we multiply directly + var btcGel = btcUsd * usdToGel.Rate; + Console.WriteLine($"[BitcoinService] BTC/GEL: {btcGel} (USD/GEL rate: {usdToGel.Rate})"); + + _cachedPrice = new BitcoinPrice + { + PriceUsd = btcUsd, + PriceGel = btcGel, + LastUpdated = DateTime.UtcNow + }; + _lastFetchTime = DateTime.UtcNow; + + return _cachedPrice; + } + catch (Exception ex) + { + Console.WriteLine($"[BitcoinService] Error: {ex.Message}"); + return null; + } + } +} \ No newline at end of file diff --git a/wwwroot/css/app.css b/wwwroot/css/app.css index 7c60d9f..feb4a3d 100644 --- a/wwwroot/css/app.css +++ b/wwwroot/css/app.css @@ -1,13 +1,24 @@ /* Dark mode theme for Georgian Lari Converter */ :root { - --background: #0F0F0F; - --card: #1A1A1A; - --card-light: #252525; + --background: #0A0A0A; + --card: #141414; + --card-light: #1F1F1F; --text: #E5E5E5; --text-light: #A0A0A0; --border: #2A2A2A; - --primary: #FF5C5C; + --primary: #F7931A; + --primary-dark: #E67E00; + --primary-light: #FFA500; --secondary: #4A90E2; + --accent: #FF8C00; + --bitcoin-gold: #FFD700; + --dark-pink: #1A0A14; + --dark-pink-subtle: rgba(40, 10, 25, 0.3); + --dark-pink-faint: rgba(60, 15, 35, 0.15); + --dark-orange: #2A1A0A; + --dark-orange-glow: rgba(247, 147, 26, 0.15); + --dark-orange-subtle: rgba(180, 90, 20, 0.25); + --dark-orange-deep: #1F1208; } html, body { @@ -30,9 +41,18 @@ a, .btn-link { } .btn-primary { - color: #fff; - background-color: var(--primary); - border-color: var(--primary); + color: var(--text); + background: linear-gradient(135deg, var(--dark-orange), var(--dark-orange-deep)); + border: 1px solid var(--dark-orange-glow); + box-shadow: 0 2px 10px var(--dark-orange-glow); + transition: all 0.3s ease; +} + +.btn-primary:hover { + background: linear-gradient(135deg, rgba(255, 140, 0, 0.2), rgba(247, 147, 26, 0.15)); + border-color: rgba(255, 140, 0, 0.3); + box-shadow: 0 4px 20px rgba(255, 140, 0, 0.3); + transform: translateY(-2px); } .btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus { @@ -125,10 +145,13 @@ a, .btn-link { left: -50%; width: 200%; height: 200%; - background: radial-gradient(circle at 20% 50%, rgba(255, 92, 92, 0.05) 0%, transparent 50%), - radial-gradient(circle at 80% 80%, rgba(74, 144, 226, 0.05) 0%, transparent 50%), - radial-gradient(circle at 50% 50%, rgba(247, 147, 26, 0.03) 0%, transparent 50%); + background: + radial-gradient(circle at 20% 50%, rgba(255, 140, 0, 0.2) 0%, transparent 50%), + radial-gradient(circle at 80% 80%, rgba(247, 147, 26, 0.15) 0%, transparent 50%), + radial-gradient(circle at 50% 50%, rgba(255, 165, 0, 0.12) 0%, transparent 50%), + radial-gradient(circle at 30% 80%, rgba(220, 110, 30, 0.18) 0%, transparent 40%); animation: bgFloat 20s ease-in-out infinite; + filter: blur(40px); } .loading-particles { @@ -143,15 +166,17 @@ a, .btn-link { position: absolute; width: 4px; height: 4px; - background: rgba(255, 92, 92, 0.5); + background: rgba(60, 15, 35, 0.4); border-radius: 50%; animation: floatParticle 15s linear infinite; + box-shadow: 0 0 8px rgba(60, 15, 35, 0.3); } .loading-particles::after { - background: rgba(74, 144, 226, 0.5); + background: rgba(247, 147, 26, 0.3); animation-delay: -7.5s; animation-duration: 20s; + box-shadow: 0 0 8px rgba(247, 147, 26, 0.2); } .loading-content { @@ -162,7 +187,7 @@ a, .btn-link { .loading-logo { margin-bottom: 2rem; - height: 120px; + height: 240px; display: flex; align-items: center; justify-content: center; @@ -170,8 +195,8 @@ a, .btn-link { .currency-animation { position: relative; - width: 120px; - height: 120px; + width: 240px; /* Increased to fully contain orbiting elements */ + height: 240px; /* Increased to fully contain orbiting elements */ } .currency-item { @@ -183,10 +208,16 @@ a, .btn-link { justify-content: center; font-size: 2rem; font-weight: bold; + line-height: 1; border-radius: 50%; background: var(--card); border: 2px solid var(--border); animation: orbitCurrency 8s linear infinite; + /* Center the orbit origin */ + top: 50%; + left: 50%; + margin-top: -30px; /* Half of height */ + margin-left: -30px; /* Half of width */ } .currency-item.usd { @@ -226,7 +257,7 @@ a, .btn-link { position: relative; width: 80px; height: 80px; - margin: 0 auto 2rem; + margin: 0 auto 3rem; } .pulse-ring { @@ -261,10 +292,10 @@ a, .btn-link { @keyframes orbitCurrency { 0% { - transform: rotate(0deg) translateX(60px) rotate(0deg); + transform: rotate(0deg) translateX(90px) rotate(0deg); } 100% { - transform: rotate(360deg) translateX(60px) rotate(-360deg); + transform: rotate(360deg) translateX(90px) rotate(-360deg); } } @@ -422,7 +453,9 @@ code { .nav-link.active { color: var(--text) !important; - background-color: var(--primary) !important; + background: linear-gradient(135deg, rgba(255, 140, 0, 0.2), rgba(247, 147, 26, 0.15)) !important; + border-left: 3px solid var(--primary); + box-shadow: 0 0 15px var(--dark-orange-glow); } .main { @@ -472,6 +505,7 @@ code { overflow: hidden; } +/* Dark gradient layers with orange and pink tones */ .animated-bg::before { content: ''; position: absolute; @@ -479,12 +513,19 @@ code { left: -50%; width: 200%; height: 200%; - background: radial-gradient(circle at 20% 50%, rgba(255, 92, 92, 0.03) 0%, transparent 50%), - radial-gradient(circle at 80% 80%, rgba(74, 144, 226, 0.03) 0%, transparent 50%), - radial-gradient(circle at 40% 20%, rgba(247, 147, 26, 0.02) 0%, transparent 50%); - animation: bgFloat 20s ease-in-out infinite; -} - + background: + radial-gradient(circle at 20% 50%, var(--dark-orange-glow) 0%, transparent 40%), + radial-gradient(circle at 80% 80%, var(--dark-orange-subtle) 0%, transparent 50%), + radial-gradient(circle at 60% 30%, var(--dark-pink-subtle) 0%, transparent 35%), + radial-gradient(circle at 40% 70%, rgba(200, 100, 25, 0.08) 0%, transparent 45%), + radial-gradient(circle at 15% 85%, var(--dark-orange-glow) 0%, transparent 40%), + radial-gradient(circle at 90% 20%, rgba(180, 90, 20, 0.1) 0%, transparent 35%); + animation: bgFloat 45s ease-in-out infinite; + filter: blur(60px); + opacity: 0.8; +} + +/* Dark orange pattern overlay */ .animated-bg::after { content: ''; position: absolute; @@ -492,21 +533,23 @@ code { left: 0; width: 100%; height: 100%; - background: + background-image: repeating-linear-gradient( - 0deg, + 45deg, transparent, - transparent 2px, - rgba(255, 255, 255, 0.01) 2px, - rgba(255, 255, 255, 0.01) 4px + transparent 120px, + var(--dark-orange-glow) 120px, + var(--dark-orange-glow) 121px ), repeating-linear-gradient( - 90deg, + -45deg, transparent, - transparent 2px, - rgba(255, 255, 255, 0.01) 2px, - rgba(255, 255, 255, 0.01) 4px + transparent 120px, + rgba(180, 90, 20, 0.05) 120px, + rgba(180, 90, 20, 0.05) 121px ); + opacity: 0.5; + animation: patternSlide 90s linear infinite; } /* Floating particles */ @@ -526,17 +569,30 @@ code { filter: blur(0.5px); animation: particleFloat linear infinite; opacity: 0; + box-shadow: 0 0 10px currentColor; } @keyframes bgFloat { 0%, 100% { - transform: translate(0, 0) rotate(0deg); + transform: translate(0, 0) rotate(0deg) scale(1); + } + 25% { + transform: translate(-30px, -30px) rotate(2deg) scale(1.1); } - 33% { - transform: translate(-20px, -20px) rotate(1deg); + 50% { + transform: translate(40px, -20px) rotate(-1deg) scale(1.05); } - 66% { - transform: translate(20px, -10px) rotate(-1deg); + 75% { + transform: translate(-20px, 30px) rotate(1deg) scale(1.15); + } +} + +@keyframes patternSlide { + 0% { + transform: translate(0, 0); + } + 100% { + transform: translate(100px, 100px); } } @@ -563,9 +619,184 @@ code { } } +/* Mobile-specific optimizations */ +@media (max-width: 768px) { + /* Reduce particle count on mobile */ + .particle:nth-child(even) { + display: none; + } + + /* Optimize animations for mobile performance */ + .animated-bg::before { + animation-duration: 40s; + } + + /* Touch-friendly tap targets */ + button, a, input, select { + min-height: 44px; + min-width: 44px; + } + + /* Better mobile scrolling */ + body { + -webkit-overflow-scrolling: touch; + } + + /* Prevent horizontal scroll */ + html, body { + overflow-x: hidden; + } + + /* Mobile-friendly font sizes */ + body { + font-size: 16px; + } + + /* Improve readability on small screens */ + p, li { + line-height: 1.6; + } +} + +/* Landscape mobile adjustments */ +@media (max-height: 600px) and (orientation: landscape) { + .converter-card { + max-height: 90vh; + overflow-y: auto; + } + + .chart-container { + height: 200px !important; + } +} + +/* Bright orange floating Bitcoin symbols - the future is bright! */ +.bitcoin-float { + position: fixed; + font-size: 24px; + color: rgba(255, 140, 0, 0.4); + font-weight: 700; + animation: bitcoinDrift 40s linear infinite, orangePulse 8s ease-in-out infinite; + pointer-events: none; + user-select: none; + z-index: -1; + text-shadow: 0 0 10px rgba(255, 140, 0, 0.3); +} + +.bitcoin-float::before { + content: '₿'; +} + +@keyframes bitcoinDrift { + 0% { + transform: translateY(110vh) translateX(0) rotate(0deg); + opacity: 0; + } + 10% { + opacity: 0.4; + } + 90% { + opacity: 0.4; + } + 100% { + transform: translateY(-10vh) translateX(80px) rotate(180deg); + opacity: 0; + } +} + +@keyframes orangePulse { + 0%, 100% { + opacity: 0.3; + transform: scale(1); + } + 50% { + opacity: 0.6; + transform: scale(1.1); + } +} + /* Page-specific backgrounds */ .page-container { position: relative; min-height: 100vh; background: transparent; +} + +/* Bitcoin section styles */ +.bitcoin-section { + margin: 2rem 0; + padding: 1.5rem; + background: var(--card-light); + border-radius: 12px; + border: 1px solid var(--border); +} + +.bitcoin-section h3 { + font-size: 1.25rem; + margin: 0 0 1rem 0; + color: var(--bitcoin-gold); + font-weight: 600; +} + +.bitcoin-prices { + display: flex; + gap: 1rem; + flex-wrap: wrap; +} + +.bitcoin-price-card { + flex: 1; + min-width: 150px; + background: var(--card); + border: 1px solid var(--border); + border-radius: 8px; + padding: 1rem; + display: flex; + flex-direction: column; + align-items: center; + transition: transform 0.2s ease, border-color 0.2s ease; +} + +.bitcoin-price-card:hover { + transform: translateY(-2px); + border-color: var(--primary); +} + +.bitcoin-price-card .currency-flag { + font-size: 2rem; + margin-bottom: 0.5rem; +} + +.bitcoin-price-card .bitcoin-price { + font-size: 1.5rem; + font-weight: 700; + color: var(--text); + margin-bottom: 0.25rem; +} + +.bitcoin-price-card .currency-label { + font-size: 0.875rem; + color: var(--text-light); + font-weight: 500; +} + +/* Responsive adjustments for Bitcoin section */ +@media (max-width: 640px) { + .bitcoin-section { + margin: 1.5rem 0; + padding: 1rem; + } + + .bitcoin-prices { + gap: 0.75rem; + } + + .bitcoin-price-card { + min-width: 120px; + padding: 0.75rem; + } + + .bitcoin-price-card .bitcoin-price { + font-size: 1.25rem; + } } \ No newline at end of file diff --git a/wwwroot/favicon.png b/wwwroot/favicon.png deleted file mode 100644 index 8422b59695935d180d11d5dbe99653e711097819..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1148 zcmV-?1cUpDP)9h26h2-Cs%i*@Moc3?#6qJID|D#|3|2Hn7gTIYEkr|%Xjp);YgvFmB&0#2E2b=| zkVr)lMv9=KqwN&%obTp-$<51T%rx*NCwceh-E+=&e(oLO`@Z~7gybJ#U|^tB2Pai} zRN@5%1qsZ1e@R(XC8n~)nU1S0QdzEYlWPdUpH{wJ2Pd4V8kI3BM=)sG^IkUXF2-j{ zrPTYA6sxpQ`Q1c6mtar~gG~#;lt=s^6_OccmRd>o{*=>)KS=lM zZ!)iG|8G0-9s3VLm`bsa6e ze*TlRxAjXtm^F8V`M1%s5d@tYS>&+_ga#xKGb|!oUBx3uc@mj1%=MaH4GR0tPBG_& z9OZE;->dO@`Q)nr<%dHAsEZRKl zedN6+3+uGHejJp;Q==pskSAcRcyh@6mjm2z-uG;s%dM-u0*u##7OxI7wwyCGpS?4U zBFAr(%GBv5j$jS@@t@iI8?ZqE36I^4t+P^J9D^ELbS5KMtZ z{Qn#JnSd$15nJ$ggkF%I4yUQC+BjDF^}AtB7w348EL>7#sAsLWs}ndp8^DsAcOIL9 zTOO!!0!k2`9BLk25)NeZp7ev>I1Mn={cWI3Yhx2Q#DnAo4IphoV~R^c0x&nw*MoIV zPthX?{6{u}sMS(MxD*dmd5rU(YazQE59b|TsB5Tm)I4a!VaN@HYOR)DwH1U5y(E)z zQqQU*B%MwtRQ$%x&;1p%ANmc|PkoFJZ%<-uq%PX&C!c-7ypis=eP+FCeuv+B@h#{4 zGx1m0PjS~FJt}3mdt4c!lel`1;4W|03kcZRG+DzkTy|7-F~eDsV2Tx!73dM0H0CTh zl)F-YUkE1zEzEW(;JXc|KR5{ox%YTh{$%F$a36JP6Nb<0%#NbSh$dMYF-{ z1_x(Vx)}fs?5_|!5xBTWiiIQHG<%)*e=45Fhjw_tlnmlixq;mUdC$R8v#j( zhQ$9YR-o%i5Uc`S?6EC51!bTRK=Xkyb<18FkCKnS2;o*qlij1YA@-nRpq#OMTX&RbL<^2q@0qja!uIvI;j$6>~k@IMwD42=8$$!+R^@5o6HX(*n~ + + + + + + + + ₾ + \ No newline at end of file diff --git a/wwwroot/index.html b/wwwroot/index.html index 0def76b..15aa914 100644 --- a/wwwroot/index.html +++ b/wwwroot/index.html @@ -4,10 +4,11 @@ - ლარის კონვერტორი - USD/EUR/GBP to GEL - + ფული - ციფრული ვალუტა და ტრადიციული ფინანსები + - + + @@ -30,7 +31,7 @@
₿
-

ლარის კონვერტორი

+

ფული

@@ -563,16 +564,17 @@

ლარის კონვერტორი

// Clear existing particles container.innerHTML = ''; - // Colorful particle colors + // Dark orange and pink particle colors const colors = [ - 'rgba(139, 92, 246, 0.6)', // Purple - 'rgba(236, 72, 153, 0.6)', // Pink - 'rgba(34, 197, 94, 0.6)', // Green - 'rgba(251, 191, 36, 0.6)', // Yellow - 'rgba(59, 130, 246, 0.6)', // Blue - 'rgba(239, 68, 68, 0.6)', // Red - 'rgba(16, 185, 129, 0.6)', // Teal - 'rgba(245, 158, 11, 0.6)' // Orange + 'rgba(247, 147, 26, 0.25)', // Bitcoin orange + 'rgba(255, 140, 0, 0.2)', // Dark orange + 'rgba(255, 165, 0, 0.15)', // Orange + 'rgba(180, 90, 20, 0.3)', // Deep orange + 'rgba(200, 100, 25, 0.25)', // Burnt orange + 'rgba(60, 15, 35, 0.2)', // Dark pink + 'rgba(220, 110, 30, 0.2)', // Amber orange + 'rgba(160, 80, 20, 0.25)', // Brown orange + 'rgba(240, 120, 20, 0.15)' // Bright dark orange ]; // Create particles From e6cc9120b745a2b02daf498fe4469ac87af92d1c Mon Sep 17 00:00:00 2001 From: Petre Chitashvili Date: Sun, 13 Jul 2025 22:05:02 +0400 Subject: [PATCH 3/3] chore: add screenshots folder to .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 248f8eb..67ce05f 100644 --- a/.gitignore +++ b/.gitignore @@ -385,4 +385,4 @@ FodyWeavers.xsd *.sln.iml # macOS -.DS_Store \ No newline at end of file +.DS_Storescreenshots/