Skip to content

FinceptTerminal is a modern finance application offering advanced market analytics, investment research, and economic data tools, designed for interactive exploration and data-driven decision-making in a user-friendly environment.

header/footer update

tilakpatel2234879daaed58
diff --git a/.github/workflows/test-setup.yml b/.github/workflows/test-setup.yml
index bcc0bd0f5..0f12d9942 100644
--- a/.github/workflows/test-setup.yml
+++ b/.github/workflows/test-setup.yml
@@ -1,16 +1,6 @@
name: Test Setup Scripts
on:
- push:
- paths:
- - 'setup.sh'
- - 'setup.bat'
- - 'fincept-qt/CMakeLists.txt'
- pull_request:
- paths:
- - 'setup.sh'
- - 'setup.bat'
- - 'fincept-qt/CMakeLists.txt'
workflow_dispatch:
jobs:
@@ -45,21 +35,39 @@ jobs:
with:
version: "6.8.3"
arch: ${{ runner.os == 'Windows' && 'win64_msvc2022_64' || 'clang_64' }}
- modules: "qtcharts qtwebsockets"
+ modules: "qtcharts qtwebsockets qtsql"
cache: true
- # ── Linux / macOS — run setup.sh --ci ──────────────────
- - name: Run setup.sh --ci (Linux/macOS)
- if: runner.os != 'Windows'
+ # ── Linux — install deps and build directly ─────────────
+ - name: Build (Linux)
+ if: runner.os == 'Linux'
+ run: |
+ sudo apt-get update -qq
+ sudo apt-get install -y \
+ cmake g++ python3 python3-pip \
+ qt6-base-dev libqt6charts6-dev qt6-tools-dev \
+ libqt6sql6-sqlite libqt6websockets6-dev \
+ libgl1-mesa-dev libglu1-mesa-dev pkg-config
+ cd fincept-qt
+ cmake -B build -DCMAKE_BUILD_TYPE=Release
+ cmake --build build --parallel
+
+ # ── macOS — run setup.sh --ci ───────────────────────────
+ - name: Build (macOS)
+ if: runner.os == 'macOS'
run: |
chmod +x setup.sh
./setup.sh --ci
- # ── Windows — run setup.bat --ci ───────────────────────
- - name: Run setup.bat --ci (Windows)
+ # ── Windows — build using MSVC environment ──────────────
+ - name: Build (Windows)
if: runner.os == 'Windows'
shell: cmd
- run: setup.bat --ci
+ run: |
+ call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+ cd fincept-qt
+ cmake -B build -DCMAKE_BUILD_TYPE=Release
+ cmake --build build --config Release --parallel
# ── Verify binary exists ────────────────────────────────
- name: Verify binary
diff --git a/fincept-qt/src/auth/AuthApi.cpp b/fincept-qt/src/auth/AuthApi.cpp
index abae1b9dc..493f168ca 100644
--- a/fincept-qt/src/auth/AuthApi.cpp
+++ b/fincept-qt/src/auth/AuthApi.cpp
@@ -14,12 +14,42 @@ void AuthApi::request(const QString& method, const QString& endpoint,
const QJsonObject& body, Callback cb) {
auto& http = fincept::HttpClient::instance();
- auto handle = [cb](fincept::Result<QJsonDocument> result) {
+ auto handle = [cb, endpoint](fincept::Result<QJsonDocument> result) {
if (result.is_err()) {
- cb({false, {}, QString::fromStdString(result.error()), 0});
+ QString err = QString::fromStdString(result.error());
+ // Extract HTTP status from "HTTP_NNN" sentinel set by HttpClient
+ int status = 0;
+ if (err.startsWith("HTTP_")) {
+ status = err.mid(5).toInt();
+ }
+ // Build a meaningful error message from the status
+ QString msg;
+ switch (status) {
+ case 401: msg = "Session expired. Please log in again."; break;
+ case 403: msg = "Access denied."; break;
+ case 404: msg = "Resource not found."; break;
+ case 422: msg = "Invalid request data."; break;
+ case 500: msg = "Server error. Please try again."; break;
+ default: msg = status > 0
+ ? QString("Request failed (HTTP %1)").arg(status)
+ : "Network error. Check your connection.";
+ }
+ cb({false, {}, msg, status});
return;
}
- cb({true, result.value().object(), {}, 200});
+
+ auto doc = result.value();
+ auto obj = doc.object();
+
+ // Detect API-level failures: {success: false, message: "..."}
+ if (obj.contains("success") && !obj["success"].toBool()) {
+ QString msg = obj.value("message").toString(
+ obj.value("detail").toString("Request failed"));
+ cb({false, obj, msg, 200});
+ return;
+ }
+
+ cb({true, obj, {}, 200});
};
if (method == "GET") http.get(endpoint, handle);
diff --git a/fincept-qt/src/auth/AuthManager.cpp b/fincept-qt/src/auth/AuthManager.cpp
index 7863312e8..2464c5992 100644
--- a/fincept-qt/src/auth/AuthManager.cpp
+++ b/fincept-qt/src/auth/AuthManager.cpp
@@ -112,24 +112,36 @@ void AuthManager::initialize() {
void AuthManager::validate_saved_session(const SessionData& saved) {
Q_UNUSED(saved);
AuthApi::instance().validate_session_server([this](ApiResponse r) {
- if (!r.success) {
- LOG_WARN("Auth", "Session validation failed — clearing");
+ // 401/403 → session truly expired, must re-login
+ if (!r.success && (r.status_code == 401 || r.status_code == 403)) {
+ LOG_WARN("Auth", "Session expired (HTTP " + QString::number(r.status_code) + ") — clearing");
clear_session();
set_loading(false);
emit auth_state_changed();
return;
}
+ // Network/server error (500, 0) → treat as transient, keep session alive
+ // and proceed to dashboard; worst case the next API call will fail
+ if (!r.success) {
+ LOG_WARN("Auth", "Session validation network error — restoring session anyway");
+ session_.authenticated = true;
+ set_loading(false);
+ emit auth_state_changed();
+ return;
+ }
+
+ // Success — also check explicit valid=false from response body
auto data = unwrap_data(r.data);
if (data.contains("valid") && !data["valid"].toBool()) {
- LOG_WARN("Auth", "Session invalid (valid=false)");
+ LOG_WARN("Auth", "Session invalid (valid=false) — clearing");
clear_session();
set_loading(false);
emit auth_state_changed();
return;
}
- // Session valid — refresh profile
+ // Session valid — refresh profile then proceed
fetch_user_profile(session_.api_key);
});
}
diff --git a/fincept-qt/src/auth/SessionGuard.cpp b/fincept-qt/src/auth/SessionGuard.cpp
index 2b8a88941..9daba3171 100644
--- a/fincept-qt/src/auth/SessionGuard.cpp
+++ b/fincept-qt/src/auth/SessionGuard.cpp
@@ -33,32 +33,38 @@ void SessionGuard::stop() {
void SessionGuard::check_pulse() {
const auto& s = AuthManager::instance().session();
- if (!s.authenticated || s.api_key.isEmpty() || s.session_token.isEmpty()) return;
+ if (!s.authenticated || s.api_key.isEmpty()) return;
if (is_checking_) return;
is_checking_ = true;
- // HttpClient already has tokens set — no need to pass api_key
AuthApi::instance().session_pulse([this](ApiResponse r) {
is_checking_ = false;
+ // 401/403 → session definitively expired
if (!r.success && (r.status_code == 401 || r.status_code == 403)) {
- LOG_WARN("SessionGuard", "Session expired (401/403) — logging out");
+ LOG_WARN("SessionGuard", QString("Session expired (HTTP %1) — logging out").arg(r.status_code));
stop();
+ emit session_expired();
AuthManager::instance().logout();
return;
}
- if (r.success) {
- auto data = r.data;
- if (data.contains("data") && data["data"].isObject()) {
- data = data["data"].toObject();
- }
- if (data.contains("valid") && !data["valid"].toBool()) {
- LOG_WARN("SessionGuard", "Session invalid (valid=false) — logging out");
- stop();
- AuthManager::instance().logout();
- }
+ // Network/server error → don't log out, just skip this pulse
+ if (!r.success) {
+ LOG_DEBUG("SessionGuard", "Pulse network error — skipping");
+ return;
+ }
+
+ // Explicit valid=false in response body
+ auto data = r.data;
+ if (data.contains("data") && data["data"].isObject())
+ data = data["data"].toObject();
+ if (data.contains("valid") && !data["valid"].toBool()) {
+ LOG_WARN("SessionGuard", "Session invalid (valid=false) — logging out");
+ stop();
+ emit session_expired();
+ AuthManager::instance().logout();
}
});
}
diff --git a/fincept-qt/src/auth/SessionGuard.h b/fincept-qt/src/auth/SessionGuard.h
index b30f0e54d..33461df16 100644
--- a/fincept-qt/src/auth/SessionGuard.h
+++ b/fincept-qt/src/auth/SessionGuard.h
@@ -15,6 +15,9 @@ public:
void start();
void stop();
+signals:
+ void session_expired();
+
private slots:
void check_pulse();
diff --git a/fincept-qt/src/auth/UserApi.cpp b/fincept-qt/src/auth/UserApi.cpp
index 53b3a1266..0d8502493 100644
--- a/fincept-qt/src/auth/UserApi.cpp
+++ b/fincept-qt/src/auth/UserApi.cpp
@@ -16,10 +16,34 @@ void UserApi::request(const QString& method, const QString& endpoint,
auto handle = [cb](fincept::Result<QJsonDocument> result) {
if (result.is_err()) {
- cb({false, {}, QString::fromStdString(result.error()), 500});
+ QString err = QString::fromStdString(result.error());
+ int status = 0;
+ if (err.startsWith("HTTP_"))
+ status = err.mid(5).toInt();
+ QString msg;
+ switch (status) {
+ case 401: msg = "Session expired. Please log in again."; break;
+ case 403: msg = "Access denied."; break;
+ case 404: msg = "Resource not found."; break;
+ case 422: msg = "Invalid request data."; break;
+ case 500: msg = "Server error. Please try again."; break;
+ default: msg = status > 0
+ ? QString("Request failed (HTTP %1)").arg(status)
+ : "Network error. Check your connection.";
+ }
+ cb({false, {}, msg, status});
return;
}
- cb({true, result.value().object(), {}, 200});
+
+ auto obj = result.value().object();
+ if (obj.contains("success") && !obj["success"].toBool()) {
+ QString msg = obj.value("message").toString(
+ obj.value("detail").toString("Request failed"));
+ cb({false, obj, msg, 200});
+ return;
+ }
+
+ cb({true, obj, {}, 200});
};
if (method == "GET") http.get(endpoint, handle);
@@ -86,7 +110,7 @@ void UserApi::subscribe_to_database(const QString& db_name, Callback cb) {
// ── Payment ──────────────────────────────────────────────────────────────────
-void UserApi::get_user_subscription(Callback cb) { request("GET", "/cashfree/subscription", {}, cb); }
+void UserApi::get_user_subscription(Callback cb) { request("GET", "/user/subscriptions", {}, cb); }
void UserApi::get_payment_history(int page, int limit, Callback cb) {
request("GET", QString("/user/transactions?page=%1&limit=%2").arg(page).arg(limit), {}, cb);
diff --git a/fincept-qt/src/network/http/HttpClient.cpp b/fincept-qt/src/network/http/HttpClient.cpp
index b294b8393..858a0ef8f 100644
--- a/fincept-qt/src/network/http/HttpClient.cpp
+++ b/fincept-qt/src/network/http/HttpClient.cpp
@@ -35,20 +35,15 @@ void HttpClient::handle_reply(QNetworkReply* reply, JsonCallback callback) {
QByteArray data = reply->readAll();
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
- // Try to parse JSON even on HTTP errors (API returns JSON error bodies)
QJsonParseError parse_err;
QJsonDocument doc = QJsonDocument::fromJson(data, &parse_err);
if (reply->error() != QNetworkReply::NoError) {
- // If we got valid JSON, return it as success=true so callers can inspect
- if (parse_err.error == QJsonParseError::NoError) {
- LOG_WARN("HTTP", QString("HTTP %1: %2").arg(status).arg(reply->url().toString()));
- cb(Result<QJsonDocument>::ok(doc));
- } else {
- LOG_ERROR("HTTP", QString("HTTP %1 error: %2 — %3")
- .arg(status).arg(reply->url().toString()).arg(reply->errorString()));
- cb(Result<QJsonDocument>::err(reply->errorString().toStdString()));
- }
+ LOG_WARN("HTTP", QString("HTTP %1: %2 — %3")
+ .arg(status).arg(reply->url().toString()).arg(reply->errorString()));
+ // Return error so callers can distinguish HTTP failures from success
+ cb(Result<QJsonDocument>::err(
+ QString("HTTP_%1").arg(status).toStdString()));
return;
}
diff --git a/fincept-qt/src/screens/about/AboutScreen.cpp b/fincept-qt/src/screens/about/AboutScreen.cpp
index bc0b9492b..29c0829ed 100644
--- a/fincept-qt/src/screens/about/AboutScreen.cpp
+++ b/fincept-qt/src/screens/about/AboutScreen.cpp
@@ -87,24 +87,6 @@ AboutScreen::AboutScreen(QWidget* parent) : QWidget(parent) {
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
- // ── Header bar ───────────────────────────────────────────────────────────
- {
- auto* hdr = new QWidget;
- hdr->setFixedHeight(56);
- hdr->setStyleSheet("background: #1a1a1a; border-bottom: 2px solid #ea580c;");
- auto* hl = new QVBoxLayout(hdr);
- hl->setContentsMargins(16, 8, 16, 8);
- hl->setSpacing(4);
- auto* title = new QLabel("About & Legal Information");
- title->setStyleSheet("color: #ffffff; font-size: 16px; font-weight: bold;"
- " background: transparent; font-family: 'Consolas','Courier New',monospace;");
- auto* sub = new QLabel("Version details, license terms, and contact information");
- sub->setStyleSheet("color: #6b7280; font-size: 11px; background: transparent;"
- " font-family: 'Consolas','Courier New',monospace;");
- hl->addWidget(title);
- hl->addWidget(sub);
- root->addWidget(hdr);
- }
// ── Scrollable content ────────────────────────────────────────────────────
auto* scroll = new QScrollArea;
diff --git a/fincept-qt/src/screens/dashboard/DashboardStatusBar.cpp b/fincept-qt/src/screens/dashboard/DashboardStatusBar.cpp
index d6f291a95..d8ec133ca 100644
--- a/fincept-qt/src/screens/dashboard/DashboardStatusBar.cpp
+++ b/fincept-qt/src/screens/dashboard/DashboardStatusBar.cpp
@@ -6,9 +6,9 @@
namespace fincept::screens {
DashboardStatusBar::DashboardStatusBar(QWidget* parent) : QWidget(parent) {
- setFixedHeight(22);
+ setFixedHeight(24);
setStyleSheet(QString("background: %1; border-top: 1px solid %2;")
- .arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
start_time_ = QDateTime::currentMSecsSinceEpoch();
@@ -16,103 +16,77 @@ DashboardStatusBar::DashboardStatusBar(QWidget* parent) : QWidget(parent) {
hl->setContentsMargins(12, 0, 12, 0);
hl->setSpacing(0);
- // ── Left status ──
+ static const auto lbl = [](const QString& text, const char* color, bool bold = false) {
+ auto* l = new QLabel(text);
+ l->setStyleSheet(QString(
+ "color: %1; font-size: 11px; %2 background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(color, bold ? "font-weight: bold; " : ""));
+ return l;
+ };
+ static const auto sep = [&]() {
+ return lbl("|", ui::colors::BORDER_MED);
+ };
+
+ // ── Left: version, session, layout, feeds ──
auto* left = new QWidget;
+ left->setStyleSheet("background: transparent;");
auto* ll = new QHBoxLayout(left);
ll->setContentsMargins(0, 0, 0, 0);
ll->setSpacing(8);
- auto lbl_style = QString("font-size: 9px; background: transparent; font-family: Consolas;");
-
- auto* version = new QLabel("FINCEPT TERMINAL v4.0.0");
- version->setStyleSheet(QString("color: %1; font-weight: bold; %2").arg(ui::colors::AMBER, lbl_style));
- ll->addWidget(version);
-
- auto* sep1 = new QLabel("|");
- sep1->setStyleSheet(QString("color: %1; %2").arg(ui::colors::BORDER_MED, lbl_style));
- ll->addWidget(sep1);
+ ll->addWidget(lbl("v4.0.0", ui::colors::TEXT_SECONDARY, true));
+ ll->addWidget(sep());
- auto* sess = new QLabel("SESSION:");
- sess->setStyleSheet(QString("color: %1; %2").arg(ui::colors::TEXT_SECONDARY, lbl_style));
- ll->addWidget(sess);
+ struct Feed { const char* label; const char* color; };
+ constexpr Feed feeds[] = {
+ {"EQ", ui::colors::POSITIVE}, {"FX", ui::colors::POSITIVE},
+ {"CM", ui::colors::WARNING}, {"FI", ui::colors::POSITIVE},
+ {"CR", ui::colors::POSITIVE},
+ };
+ for (auto& f : feeds) {
+ ll->addWidget(lbl(f.label, f.color, true));
+ }
+ ll->addWidget(sep());
+ ll->addWidget(lbl("SESSION:", ui::colors::TEXT_SECONDARY));
uptime_label_ = new QLabel("00:00:00");
- uptime_label_->setStyleSheet(QString("color: %1; font-weight: bold; %2").arg(ui::colors::CYAN, lbl_style));
+ uptime_label_->setStyleSheet(QString(
+ "color: %1; font-size: 11px; font-weight: bold; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::CYAN));
ll->addWidget(uptime_label_);
- auto* sep2 = new QLabel("|");
- sep2->setStyleSheet(QString("color: %1; %2").arg(ui::colors::BORDER_MED, lbl_style));
- ll->addWidget(sep2);
-
- auto* layout_lbl = new QLabel("LAYOUT:");
- layout_lbl->setStyleSheet(QString("color: %1; %2").arg(ui::colors::TEXT_SECONDARY, lbl_style));
- ll->addWidget(layout_lbl);
-
+ ll->addWidget(sep());
+ ll->addWidget(lbl("LAYOUT:", ui::colors::TEXT_SECONDARY));
layout_label_ = new QLabel("ACTIVE");
- layout_label_->setStyleSheet(QString("color: %1; font-weight: bold; %2").arg(ui::colors::POSITIVE, lbl_style));
+ layout_label_->setStyleSheet(QString(
+ "color: %1; font-size: 11px; font-weight: bold; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::POSITIVE));
ll->addWidget(layout_label_);
- auto* sep3 = new QLabel("|");
- sep3->setStyleSheet(QString("color: %1; %2").arg(ui::colors::BORDER_MED, lbl_style));
- ll->addWidget(sep3);
-
- auto* feeds_lbl = new QLabel("FEEDS:");
- feeds_lbl->setStyleSheet(QString("color: %1; %2").arg(ui::colors::TEXT_SECONDARY, lbl_style));
- ll->addWidget(feeds_lbl);
-
+ ll->addWidget(sep());
+ ll->addWidget(lbl("FEEDS:", ui::colors::TEXT_SECONDARY));
feeds_label_ = new QLabel("CONNECTED");
- feeds_label_->setStyleSheet(QString("color: %1; font-weight: bold; %2").arg(ui::colors::POSITIVE, lbl_style));
- ll->addWidget(feeds_lbl);
+ feeds_label_->setStyleSheet(QString(
+ "color: %1; font-size: 11px; font-weight: bold; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::POSITIVE));
ll->addWidget(feeds_label_);
hl->addWidget(left);
hl->addStretch();
- // ── Center: Feed quality indicators ──
- auto* center = new QWidget;
- auto* cl = new QHBoxLayout(center);
- cl->setContentsMargins(0, 0, 0, 0);
- cl->setSpacing(8);
-
- struct Feed { const char* label; const char* color; };
- Feed feeds[] = {
- {"EQ", ui::colors::POSITIVE}, {"FX", ui::colors::POSITIVE},
- {"CM", ui::colors::WARNING}, {"CR", ui::colors::POSITIVE},
- {"FI", ui::colors::POSITIVE},
- };
-
- for (auto& f : feeds) {
- cl->addWidget(build_feed_indicator(f.label, f.color));
- }
-
- hl->addWidget(center);
- hl->addStretch();
-
- // ── Right status ──
+ // ── Right: mem, latency, ready ──
auto* right = new QWidget;
+ right->setStyleSheet("background: transparent;");
auto* rl = new QHBoxLayout(right);
rl->setContentsMargins(0, 0, 0, 0);
rl->setSpacing(8);
- auto* mem = new QLabel("MEM: OPTIMAL");
- mem->setStyleSheet(QString("color: %1; %2").arg(ui::colors::CYAN, lbl_style));
- rl->addWidget(mem);
-
- auto* sep4 = new QLabel("|");
- sep4->setStyleSheet(QString("color: %1; %2").arg(ui::colors::BORDER_MED, lbl_style));
- rl->addWidget(sep4);
-
- auto* lat = new QLabel("LAT: 12ms");
- lat->setStyleSheet(QString("color: %1; %2").arg(ui::colors::POSITIVE, lbl_style));
- rl->addWidget(lat);
-
- auto* sep5 = new QLabel("|");
- sep5->setStyleSheet(QString("color: %1; %2").arg(ui::colors::BORDER_MED, lbl_style));
- rl->addWidget(sep5);
-
- auto* ready = new QLabel("READY");
- ready->setStyleSheet(QString("color: %1; font-weight: bold; %2").arg(ui::colors::AMBER, lbl_style));
- rl->addWidget(ready);
+ rl->addWidget(lbl("MEM: OPTIMAL", ui::colors::CYAN));
+ rl->addWidget(sep());
+ rl->addWidget(lbl("LAT: 12ms", ui::colors::POSITIVE));
+ rl->addWidget(sep());
+ rl->addWidget(lbl("● READY", ui::colors::POSITIVE, true));
hl->addWidget(right);
@@ -132,34 +106,20 @@ void DashboardStatusBar::update_uptime() {
.arg(s, 2, 10, QChar('0')));
}
-QWidget* DashboardStatusBar::build_feed_indicator(const QString& label, const QString& color) {
- auto* w = new QWidget;
- auto* hl = new QHBoxLayout(w);
- hl->setContentsMargins(0, 0, 0, 0);
- hl->setSpacing(3);
-
- auto* dot = new QLabel;
- dot->setFixedSize(4, 4);
- dot->setStyleSheet(QString("background: %1; border-radius: 2px;").arg(color));
- hl->addWidget(dot);
-
- auto* lbl = new QLabel(label);
- lbl->setStyleSheet(QString("color: %1; font-size: 8px; font-weight: bold; background: transparent;").arg(color));
- hl->addWidget(lbl);
-
- return w;
-}
-
void DashboardStatusBar::set_widget_count(int count) {
layout_label_->setText(count > 0 ? "ACTIVE" : "EMPTY");
- layout_label_->setStyleSheet(QString("color: %1; font-weight: bold; font-size: 9px; background: transparent; font-family: Consolas;")
+ layout_label_->setStyleSheet(QString(
+ "color: %1; font-size: 11px; font-weight: bold; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
.arg(count > 0 ? ui::colors::POSITIVE : ui::colors::TEXT_SECONDARY));
}
void DashboardStatusBar::set_connected(bool connected) {
connected_ = connected;
feeds_label_->setText(connected ? "CONNECTED" : "DISCONNECTED");
- feeds_label_->setStyleSheet(QString("color: %1; font-weight: bold; font-size: 9px; background: transparent; font-family: Consolas;")
+ feeds_label_->setStyleSheet(QString(
+ "color: %1; font-size: 11px; font-weight: bold; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
.arg(connected ? ui::colors::POSITIVE : ui::colors::NEGATIVE));
}
diff --git a/fincept-qt/src/screens/dashboard/DashboardStatusBar.h b/fincept-qt/src/screens/dashboard/DashboardStatusBar.h
index d76586180..77e1a1679 100644
--- a/fincept-qt/src/screens/dashboard/DashboardStatusBar.h
+++ b/fincept-qt/src/screens/dashboard/DashboardStatusBar.h
@@ -16,7 +16,6 @@ public:
private:
void update_uptime();
- QWidget* build_feed_indicator(const QString& label, const QString& color);
QLabel* uptime_label_ = nullptr;
QLabel* layout_label_ = nullptr;
diff --git a/fincept-qt/src/screens/dashboard/DashboardToolBar.cpp b/fincept-qt/src/screens/dashboard/DashboardToolBar.cpp
index e41d19091..1b769eaa0 100644
--- a/fincept-qt/src/screens/dashboard/DashboardToolBar.cpp
+++ b/fincept-qt/src/screens/dashboard/DashboardToolBar.cpp
@@ -5,10 +5,10 @@
namespace fincept::screens {
DashboardToolBar::DashboardToolBar(QWidget* parent) : QWidget(parent) {
- setFixedHeight(32);
+ setFixedHeight(26);
setStyleSheet(QString(
- "background: %1; border-bottom: 2px solid %2;")
- .arg(ui::colors::BG_RAISED, ui::colors::AMBER));
+ "background: %1; border-bottom: 1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* hl = new QHBoxLayout(this);
hl->setContentsMargins(12, 0, 12, 0);
@@ -16,61 +16,69 @@ DashboardToolBar::DashboardToolBar(QWidget* parent) : QWidget(parent) {
// ── Left: Terminal Identity ──
auto* left = new QWidget;
+ left->setStyleSheet("background: transparent;");
auto* ll = new QHBoxLayout(left);
ll->setContentsMargins(0, 0, 0, 0);
ll->setSpacing(8);
- auto* terminal_icon = new QLabel(QChar(0x25A0)); // ■
- terminal_icon->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent;").arg(ui::colors::AMBER));
- ll->addWidget(terminal_icon);
-
- auto* brand = new QLabel("FINCEPT");
- brand->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: bold; letter-spacing: 1px; background: transparent;").arg(ui::colors::AMBER));
+ auto* brand = new QLabel("■ FINCEPT");
+ brand->setStyleSheet(QString(
+ "color: %1; font-size: 11px; font-weight: bold; letter-spacing: 1px; "
+ "background: transparent; font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER));
ll->addWidget(brand);
auto* sub = new QLabel("TERMINAL");
- sub->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;").arg(ui::colors::TEXT_TERTIARY));
+ sub->setStyleSheet(QString(
+ "color: %1; font-size: 11px; font-weight: bold; "
+ "background: transparent; font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_TERTIARY));
ll->addWidget(sub);
// Separator
- auto* sep1 = new QLabel;
- sep1->setFixedSize(1, 16);
- sep1->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_MED));
+ auto* sep1 = new QLabel("|");
+ sep1->setStyleSheet(QString(
+ "color: %1; font-size: 11px; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::BORDER_MED));
ll->addWidget(sep1);
- // Connection status
- status_dot_ = new QLabel;
- status_dot_->setFixedSize(6, 6);
- status_dot_->setStyleSheet(QString("background: %1; border-radius: 3px;").arg(ui::colors::POSITIVE));
- ll->addWidget(status_dot_);
-
- status_text_ = new QLabel("LIVE");
- status_text_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;").arg(ui::colors::POSITIVE));
+ // Connection status — text-only, no dot, no border-radius
+ status_text_ = new QLabel("● LIVE");
+ status_text_->setStyleSheet(QString(
+ "color: %1; font-size: 11px; font-weight: bold; "
+ "background: transparent; font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::POSITIVE));
ll->addWidget(status_text_);
- auto* sep2 = new QLabel;
- sep2->setFixedSize(1, 16);
- sep2->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_MED));
+ auto* sep2 = new QLabel("|");
+ sep2->setStyleSheet(QString(
+ "color: %1; font-size: 11px; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::BORDER_MED));
ll->addWidget(sep2);
- // Clock
- auto* clock_icon = new QLabel(QChar(0x25CB)); // ○
- clock_icon->setStyleSheet(QString("color: %1; font-size: 10px; background: transparent;").arg(ui::colors::WARNING));
- ll->addWidget(clock_icon);
-
clock_label_ = new QLabel;
- clock_label_->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;").arg(ui::colors::WARNING));
+ clock_label_->setStyleSheet(QString(
+ "color: %1; font-size: 11px; "
+ "background: transparent; font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_SECONDARY));
ll->addWidget(clock_label_);
update_clock();
- auto* sep3 = new QLabel;
- sep3->setFixedSize(1, 16);
- sep3->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_MED));
+ auto* sep3 = new QLabel("|");
+ sep3->setStyleSheet(QString(
+ "color: %1; font-size: 11px; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::BORDER_MED));
ll->addWidget(sep3);
// Widget count
widget_count_ = new QLabel("0 WIDGETS");
- widget_count_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;").arg(ui::colors::CYAN));
+ widget_count_->setStyleSheet(QString(
+ "color: %1; font-size: 11px; font-weight: bold; "
+ "background: transparent; font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::CYAN));
ll->addWidget(widget_count_);
hl->addWidget(left);
@@ -78,56 +86,67 @@ DashboardToolBar::DashboardToolBar(QWidget* parent) : QWidget(parent) {
// ── Right: Action buttons ──
auto* right = new QWidget;
+ right->setStyleSheet("background: transparent;");
auto* rl = new QHBoxLayout(right);
rl->setContentsMargins(0, 0, 0, 0);
- rl->setSpacing(6);
+ rl->setSpacing(4);
- auto btn_style = [](const char* border_color, const char* text_color) {
+ static const auto btn_style = [](const char* border_color, const char* text_color) {
return QString(
- "QPushButton { background: transparent; border: 1px solid %1; color: %2; "
- "padding: 3px 10px; font-size: 9px; font-weight: bold; font-family: Consolas; }"
- "QPushButton:hover { border-color: %3; color: #e5e5e5; }")
- .arg(border_color, text_color, ui::colors::AMBER);
+ "QPushButton { background: #111111; border: 1px solid %1; color: %2; "
+ "padding: 0 10px; font-size: 11px; font-weight: bold; "
+ "font-family: 'Consolas','Courier New',monospace; }"
+ "QPushButton:hover { background: #161616; color: #e5e5e5; border-color: #333333; }")
+ .arg(border_color, text_color);
};
auto btn_primary = QString(
- "QPushButton { background: %1; border: 1px solid %1; color: %2; "
- "padding: 3px 10px; font-size: 9px; font-weight: bold; font-family: Consolas; }"
- "QPushButton:hover { background: #e8860a; }")
- .arg(ui::colors::AMBER, ui::colors::BG_BASE);
+ "QPushButton { background: rgba(217,119,6,0.1); border: 1px solid %1; color: %2; "
+ "padding: 0 10px; font-size: 11px; font-weight: bold; "
+ "font-family: 'Consolas','Courier New',monospace; }"
+ "QPushButton:hover { background: %2; color: #080808; }")
+ .arg(ui::colors::AMBER_DIM, ui::colors::AMBER);
auto btn_danger = QString(
- "QPushButton { background: transparent; border: 1px solid %1; color: %1; "
- "padding: 3px 10px; font-size: 9px; font-weight: bold; font-family: Consolas; }"
- "QPushButton:hover { border-color: %1; background: rgba(220,38,38,0.1); }")
+ "QPushButton { background: rgba(220,38,38,0.1); border: 1px solid #7f1d1d; color: %1; "
+ "padding: 0 10px; font-size: 11px; font-weight: bold; "
+ "font-family: 'Consolas','Courier New',monospace; }"
+ "QPushButton:hover { background: %1; color: #e5e5e5; }")
.arg(ui::colors::NEGATIVE);
compact_btn_ = new QPushButton("COMPACT");
- compact_btn_->setStyleSheet(btn_style(ui::colors::BORDER_MED, ui::colors::TEXT_SECONDARY));
+ compact_btn_->setFixedHeight(20);
+ compact_btn_->setStyleSheet(btn_style(ui::colors::BORDER_DIM, ui::colors::TEXT_SECONDARY));
connect(compact_btn_, &QPushButton::clicked, this, &DashboardToolBar::toggle_compact_clicked);
rl->addWidget(compact_btn_);
pulse_btn_ = new QPushButton("PULSE");
- pulse_btn_->setStyleSheet(btn_style(ui::colors::BORDER_MED, ui::colors::TEXT_SECONDARY));
+ pulse_btn_->setFixedHeight(20);
+ pulse_btn_->setStyleSheet(btn_style(ui::colors::BORDER_DIM, ui::colors::TEXT_SECONDARY));
connect(pulse_btn_, &QPushButton::clicked, this, &DashboardToolBar::toggle_pulse_clicked);
rl->addWidget(pulse_btn_);
- auto* sep4 = new QLabel;
- sep4->setFixedSize(1, 20);
- sep4->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_MED));
+ auto* sep4 = new QLabel("|");
+ sep4->setStyleSheet(QString(
+ "color: %1; font-size: 11px; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::BORDER_MED));
rl->addWidget(sep4);
auto* add_btn = new QPushButton("+ ADD");
+ add_btn->setFixedHeight(20);
add_btn->setStyleSheet(btn_primary);
connect(add_btn, &QPushButton::clicked, this, &DashboardToolBar::add_widget_clicked);
rl->addWidget(add_btn);
auto* save_btn = new QPushButton("SAVE");
- save_btn->setStyleSheet(btn_style(ui::colors::BORDER_MED, ui::colors::TEXT_SECONDARY));
+ save_btn->setFixedHeight(20);
+ save_btn->setStyleSheet(btn_style(ui::colors::BORDER_DIM, ui::colors::TEXT_SECONDARY));
connect(save_btn, &QPushButton::clicked, this, &DashboardToolBar::save_layout_clicked);
rl->addWidget(save_btn);
auto* reset_btn = new QPushButton("RESET");
+ reset_btn->setFixedHeight(20);
reset_btn->setStyleSheet(btn_danger);
connect(reset_btn, &QPushButton::clicked, this, &DashboardToolBar::reset_layout_clicked);
rl->addWidget(reset_btn);
@@ -150,15 +169,13 @@ void DashboardToolBar::set_widget_count(int count) {
void DashboardToolBar::set_connected(bool connected) {
connected_ = connected;
- if (connected) {
- status_dot_->setStyleSheet(QString("background: %1; border-radius: 3px;").arg(ui::colors::POSITIVE));
- status_text_->setText("LIVE");
- status_text_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;").arg(ui::colors::POSITIVE));
- } else {
- status_dot_->setStyleSheet(QString("background: %1; border-radius: 3px;").arg(ui::colors::NEGATIVE));
- status_text_->setText("OFFLINE");
- status_text_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;").arg(ui::colors::NEGATIVE));
- }
+ const char* color = connected ? ui::colors::POSITIVE : ui::colors::NEGATIVE;
+ const char* label = connected ? "● LIVE" : "○ OFFLINE";
+ status_text_->setText(label);
+ status_text_->setStyleSheet(QString(
+ "color: %1; font-size: 11px; font-weight: bold; "
+ "background: transparent; font-family: 'Consolas','Courier New',monospace;")
+ .arg(color));
}
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/dashboard/DashboardToolBar.h b/fincept-qt/src/screens/dashboard/DashboardToolBar.h
index 723718c66..a43173364 100644
--- a/fincept-qt/src/screens/dashboard/DashboardToolBar.h
+++ b/fincept-qt/src/screens/dashboard/DashboardToolBar.h
@@ -27,7 +27,6 @@ private:
void update_clock();
QLabel* clock_label_ = nullptr;
- QLabel* status_dot_ = nullptr;
QLabel* status_text_ = nullptr;
QLabel* widget_count_ = nullptr;
QPushButton* pulse_btn_ = nullptr;
diff --git a/fincept-qt/src/screens/support/SupportScreen.cpp b/fincept-qt/src/screens/support/SupportScreen.cpp
index ddfe903a7..2a414de82 100644
--- a/fincept-qt/src/screens/support/SupportScreen.cpp
+++ b/fincept-qt/src/screens/support/SupportScreen.cpp
@@ -107,38 +107,6 @@ SupportScreen::SupportScreen(QWidget* parent) : QWidget(parent) {
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
- // ── Header bar ───────────────────────────────────────────────────────────
- {
- auto* hdr = new QWidget;
- hdr->setFixedHeight(44);
- hdr->setStyleSheet("background: #1a1a1a; border-bottom: 2px solid #ea580c;");
- auto* hl = new QHBoxLayout(hdr);
- hl->setContentsMargins(16, 8, 16, 8);
- hl->setSpacing(12);
-
- auto* title = new QLabel("Support Center");
- title->setStyleSheet("color: #ffffff; font-size: 16px; font-weight: bold;"
- " background: transparent; font-family: 'Consolas','Courier New',monospace;");
- hl->addWidget(title);
- hl->addStretch();
-
- hl->addWidget(mono_label("TICKETS:", ui::colors::TEXT_TERTIARY, 11));
- stat_total_ = mono_label("0", ui::colors::CYAN, 11, true);
- hl->addWidget(stat_total_);
-
- hl->addWidget(mono_label("|", ui::colors::TEXT_TERTIARY, 11));
- hl->addWidget(mono_label("OPEN:", ui::colors::TEXT_TERTIARY, 11));
- stat_open_ = mono_label("0", "#ca8a04", 11, true);
- hl->addWidget(stat_open_);
-
- hl->addWidget(mono_label("|", ui::colors::TEXT_TERTIARY, 11));
- hl->addWidget(mono_label("RESOLVED:", ui::colors::TEXT_TERTIARY, 11));
- stat_resolved_ = mono_label("0", ui::colors::POSITIVE, 11, true);
- hl->addWidget(stat_resolved_);
-
- root->addWidget(hdr);
- }
-
// ── Toolbar ──────────────────────────────────────────────────────────────
{
auto* bar = new QWidget;
@@ -171,6 +139,19 @@ SupportScreen::SupportScreen(QWidget* parent) : QWidget(parent) {
bl->addStretch();
+ bl->addWidget(mono_label("TICKETS:", ui::colors::TEXT_TERTIARY, 11));
+ stat_total_ = mono_label("0", ui::colors::CYAN, 11, true);
+ bl->addWidget(stat_total_);
+ bl->addWidget(mono_label("|", ui::colors::TEXT_TERTIARY, 11));
+ bl->addWidget(mono_label("OPEN:", ui::colors::TEXT_TERTIARY, 11));
+ stat_open_ = mono_label("0", "#ca8a04", 11, true);
+ bl->addWidget(stat_open_);
+ bl->addWidget(mono_label("|", ui::colors::TEXT_TERTIARY, 11));
+ bl->addWidget(mono_label("RESOLVED:", ui::colors::TEXT_TERTIARY, 11));
+ stat_resolved_ = mono_label("0", ui::colors::POSITIVE, 11, true);
+ bl->addWidget(stat_resolved_);
+ bl->addWidget(mono_label("|", ui::colors::TEXT_TERTIARY, 11));
+
status_dot_ = new QLabel("●");
status_dot_->setStyleSheet(QString(
"color: %1; font-size: 14px; background: transparent;").arg(ui::colors::POSITIVE));
diff --git a/setup.bat b/setup.bat
index 60f6e3ffa..e1a3673e4 100644
--- a/setup.bat
+++ b/setup.bat
@@ -63,12 +63,24 @@ echo OK
echo [4/5] Checking C++ compiler (MSVC)...
where cl >nul 2>&1
if errorlevel 1 (
- echo ERROR: MSVC compiler not found in PATH.
- echo Install Visual Studio 2022 with "Desktop development with C++" workload:
- echo https://visualstudio.microsoft.com/
- echo Then re-run from "Developer Command Prompt for VS 2022".
- if "!CI_MODE!"=="false" pause
- exit /b 1
+ :: Try to activate VS 2022 environment automatically
+ set "VCVARS="
+ if exist "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" (
+ set "VCVARS=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+ ) else if exist "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" (
+ set "VCVARS=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
+ ) else if exist "C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvars64.bat" (
+ set "VCVARS=C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvars64.bat"
+ )
+ if defined VCVARS (
+ echo Activating VS 2022 environment...
+ call "!VCVARS!"
+ ) else (
+ echo MSVC not found. Install Visual Studio 2022 with "Desktop development with C++":
+ echo https://visualstudio.microsoft.com/
+ if "!CI_MODE!"=="false" pause
+ exit /b 1
+ )
)
echo OK
diff --git a/setup.sh b/setup.sh
index af46d62fc..d92a27c56 100644
--- a/setup.sh
+++ b/setup.sh
@@ -43,7 +43,7 @@ if [ "$PLATFORM" = "linux" ]; then
sudo apt-get update -qq
sudo apt-get install -y \
git cmake g++ python3 python3-pip \
- qt6-base-dev qt6-charts-dev qt6-tools-dev \
+ qt6-base-dev libqt6charts6-dev qt6-tools-dev \
libqt6sql6-sqlite libqt6websockets6-dev \
libgl1-mesa-dev libglu1-mesa-dev \
pkg-config