Merge (#181)

Author: Nighty3098

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "src/CodeKeeper/3rdParty/qmarkdowntextedit"]
 	path = src/CodeKeeper/3rdParty/qmarkdowntextedit
-	url = https://github.com/pbek/qmarkdowntextedit
+	url = https://github.com/pbek/qmarkdowntextedit

CodeKeeper

@@ -6,7 +6,7 @@ YELLOW="\e[1;33m"
 RED="\e[1;31m"
 RESET="\e[0m"
 
-bash clang_format.sh
+#bash clang_format.sh
 
 # Change to the CodeKeeper source directory
 echo -e "${GREEN}Navigating to the CodeKeeper source directory...${RESET}"

build.sh

@@ -38,6 +38,7 @@ HEADERS += \
     settingswindow.h \
     syncwindow.h \
     commandPalette.h \
+    custom/clickableLabel/clickableLabel.h \
     custom/circleProgressbar/ProgressCircle.h \
     custom/circleChart/CircleChart.h \
     custom/ColorValueDisplay/ColorValueDisplay.h

src/CodeKeeper/CodeKeeper

@@ -203,7 +203,7 @@ void AccountWindow::setImageFromUrl(const QString &url, QLabel *label)
 void AccountWindow::get_image_url(const QString &username, QLabel *label)
 {
     QNetworkAccessManager *manager = new QNetworkAccessManager(this);
-    QUrl url("https://api.github.com/users/" + git_user);
+    QUrl url("https://api.github.com/users/" + username);
 
     QUrlQuery query;
     query.addQueryItem("login", username);
@@ -216,6 +216,13 @@ void AccountWindow::get_image_url(const QString &username, QLabel *label)
     request.setRawHeader("Accept", "application/vnd.github.v3+json");
 
     QNetworkReply *reply = manager->get(request);
+
+    connect(reply, &QNetworkReply::errorOccurred, [=](QNetworkReply::NetworkError error) {
+        qWarning() << "Network error occurred:" << error;
+        qWarning() << "Error string:" << reply->errorString();
+        reply->deleteLater();
+    });
+
     QObject::connect(reply, &QNetworkReply::finished, [=]() {
         if (reply->error())
         {
@@ -224,10 +231,17 @@ void AccountWindow::get_image_url(const QString &username, QLabel *label)
             return;
         }
 
+        if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200)
+        {
+            qWarning() << "HTTP error:" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+            reply->deleteLater();
+            return;
+        }
+
         QJsonDocument doc = QJsonDocument::fromJson(reply->readAll());
         QJsonObject obj = doc.object();
 
-        qDebug() << obj["avatar_url"].toString();
+        qDebug() << "Avatar URL:" << obj["avatar_url"].toString();
 
         setImageFromUrl(obj["avatar_url"].toString(), label);
 

src/CodeKeeper/CodeKeeper.pro

@@ -2,6 +2,7 @@
 
 #include <QHBoxLayout>
 #include <QtWidgets>
+#include <qt/QtWidgets/qgridlayout.h>
 
 #include "accountFunc/functional.cpp"
 #include "custom/ColorValueDisplay/ColorValueDisplay.h"
@@ -19,7 +20,7 @@ AccountWindow::AccountWindow(QWidget *parent) : QMainWindow{parent}
     setCentralWidget(centralWidget);
 
     mainLayout = new QGridLayout(centralWidget);
-    setMinimumSize(800, 670);
+    setFixedSize(800, 670);
 
     globalSettings = new QSettings("CodeKeeper", "CodeKeeper");
 
@@ -38,7 +39,8 @@ AccountWindow::AccountWindow(QWidget *parent) : QMainWindow{parent}
     langsTitle->setAlignment(Qt::AlignCenter);
 
     profilePicture = new QLabel();
-    profilePicture->setText(tr("Loading..."));
+    profilePicture->setAlignment(Qt::AlignCenter);
+    profilePicture->setPixmap(QPixmap(":/user.png").scaled(250, 250, Qt::KeepAspectRatio, Qt::SmoothTransformation));
     profilePicture->setFixedSize(300, 300);
     profilePicture->setStyleSheet("border-radius: 145px;");
 
@@ -128,12 +130,12 @@ AccountWindow::AccountWindow(QWidget *parent) : QMainWindow{parent}
 
     QVBoxLayout *statsLayout = new QVBoxLayout();
     statsLayout->setSpacing(20);
-    statsLayout->addWidget(tasksTitle, Qt::AlignHCenter);
+    statsLayout->addWidget(tasksTitle, Qt::AlignHCenter | Qt::AlignBottom);
     statsLayout->addLayout(tasksStatsLayout);
-    statsLayout->addWidget(projectTitle, Qt::AlignHCenter);
+    statsLayout->addWidget(projectTitle, Qt::AlignHCenter | Qt::AlignBottom);
     statsLayout->addLayout(projectsStatsLayout);
-    statsLayout->addWidget(langsTitle, Qt::AlignHCenter);
-    statsLayout->addWidget(langsCard, Qt::AlignCenter);
+    // statsLayout->addWidget(langsTitle, Qt::AlignHCenter);
+    // statsLayout->addWidget(langsCard, Qt::AlignCenter);
 
     statsWidget = new QWidget();
     statsWidget->setFixedSize(350, 600);
@@ -144,6 +146,7 @@ AccountWindow::AccountWindow(QWidget *parent) : QMainWindow{parent}
     gitProfileLayout->addWidget(profilePicture, Qt::AlignCenter);
     gitProfileLayout->addWidget(profileInfo, Qt::AlignCenter);
 
+    /*
     QThread *GitLangsStatsThread = new QThread;
     QObject::connect(GitLangsStatsThread, &QThread::started, this, [this]() {
         auto gitLangsWidget = this->gitLangsWidget;
@@ -186,8 +189,11 @@ AccountWindow::AccountWindow(QWidget *parent) : QMainWindow{parent}
             langsTitle->hide();
         }
     });
+
     GitLangsStatsThread->start();
 
+    */
+
     QThread *styleThread = new QThread;
     QObject::connect(styleThread, &QThread::started, this, [this]() {
         setFontStyle();

src/CodeKeeper/accountFunc/functional.cpp

@@ -9,6 +9,10 @@
 #include <QObject>
 #include <QtWidgets>
 
+#include <QCache>
+#include <QSettings>
+#include <QDateTime>
+
 class AccountWindow : public QMainWindow
 {
     Q_OBJECT
@@ -32,6 +36,8 @@ class AccountWindow : public QMainWindow
     bool isAutoSyncB;
     bool isCustomTheme;
 
+    QCache<QString, QPixmap> imageCache;
+
   private:
     QHBoxLayout *langsStatsLayout;
     QHBoxLayout *GitLangsStatsLayout;

src/CodeKeeper/accountwindow.cpp

@@ -0,0 +1,102 @@
+#include <QLabel>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QPixmap>
+
+class ClickableLabel : public QLabel
+{
+    Q_OBJECT
+  public:
+    explicit ClickableLabel(const QString &text, QWidget *parent = nullptr) : QLabel(parent), m_text(text)
+    {
+        setFixedHeight(25);
+        setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+        m_pixmap.load(":/expand.png");
+        m_pixmapSize = QSize(20, 20);
+        m_textColor = Qt::black;
+    }
+
+    void setCustomStyleSheet(const QString &styleSheet)
+    {
+        QLabel::setStyleSheet(styleSheet);
+        updateFontSize();
+        updateTextColor();
+    }
+
+    void setPixmapSize(int size)
+    {
+        m_pixmapSize = QSize(size, size);
+        m_pixmap = m_pixmap.scaled(m_pixmapSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        update();
+    }
+
+  signals:
+    void clicked();
+
+  protected:
+    void mousePressEvent(QMouseEvent *event) override
+    {
+        emit clicked();
+        QLabel::mousePressEvent(event);
+    }
+
+    void paintEvent(QPaintEvent *event) override
+    {
+        QLabel::paintEvent(event);
+
+        QPainter painter(this);
+        int pixmapWidth = m_pixmap.width();
+        int pixmapHeight = m_pixmap.height();
+        painter.drawPixmap(5, (height() - pixmapHeight) / 2, m_pixmap);
+
+        painter.setPen(m_textColor);
+
+        int textX = pixmapWidth + 10;
+        painter.drawText(textX, height() / 2 + painter.fontMetrics().height() / 4, m_text);
+    }
+
+  private:
+    QString m_text;
+    QPixmap m_pixmap;
+    QSize m_pixmapSize;
+    QColor m_textColor;
+
+    void updateFontSize()
+    {
+        QStringList styleList = styleSheet().split(';');
+        for (const QString &style : styleList)
+        {
+            if (style.contains("font-size:"))
+            {
+                QString fontSizeStr = style.split(':').last().trimmed();
+                bool ok;
+                int fontSize = fontSizeStr.split(' ').first().toInt(&ok);
+                if (ok)
+                {
+                    QFont font = this->font();
+                    font.setPointSize(fontSize);
+                    setFont(font);
+                }
+                break;
+            }
+        }
+    }
+
+    void updateTextColor()
+    {
+        QStringList styleList = styleSheet().split(';');
+        for (const QString &style : styleList)
+        {
+            if (style.contains("color:"))
+            {
+                QString colorStr = style.split(':').last().trimmed();
+                QColor color(colorStr);
+                if (color.isValid())
+                {
+                    m_textColor = color;
+                }
+                break;
+            }
+        }
+    }
+};