Merge (#180)

- [🌊 Updated README.md](53aec29) - [Update README.md](bd759e3) - [🚀 Fix](d45e8ad) - [✨ Updated sh scripts](d1a7694) - [▶ Fix](88a25ec)
Nighty3098 · Dec 7, 2024 · 8297a59 · 8297a59
2 parents 090d165 + 88a25ec
commit 8297a59
Show file tree

Hide file tree

Showing 9 changed files with 123 additions and 105 deletions.
diff --git a/CodeKeeper b/CodeKeeper
diff --git a/README.md b/README.md
@@ -1,44 +1,52 @@
-<div class="header" align="center">
-    <h1 align="center">CodeKeeper</h1>
-    <h3 align="center">Projects manager for developers</h3>
-    <br><br>
-    <img src="imgs/1.png" />
-    <br><br>
-</div>
+<div align="center">
+
+# **`☘️ CodeKeeper`**
+### *Projects manager for developers*
+![](imgs/1.png)
+
+<br>
+
+<a href="LICENSE.md"><kbd> <br>**License**<br><br> </kbd></a>
+<a href="doc/Shortcuts.md"><kbd> <br>**Shortcuts**<br><br> </kbd></a>
+<a href="doc/Installation.md"><kbd> <br>**Installation**<br><br> </kbd></a>
+<a href="doc/Tweaks.md"><kbd> <br>**Tweaks**<br><br> </kbd></a>
+<a href="doc/Screenshots.md"><kbd> <br>**Screenshots**<br><br> </kbd></a>
 
+<br>
+
+---
+
+<br>
+
+![](https://img.shields.io/github/forks/Nighty3098/CodeKeeper?style=for-the-badge&color=9dc3ea&logoColor=D9E0EE&labelColor=1c1c29)
+![](https://img.shields.io/github/downloads/Nighty3098/CodeKeeper/total?style=for-the-badge&color=e0ea9d&logoColor=D9E0EE&labelColor=171b22)
+![](https://img.shields.io/github/stars/Nighty3098/CodeKeeper?style=for-the-badge&color=eed49f&logoColor=D9E0EE&labelColor=1c1c29)
 <br><br>
-<div align="center">
-    <a href="./LICENSE.md"><img  class="badge" src="https://img.shields.io/github/license/Nighty3098/CodeKeeper?style=for-the-badge&color=a6e0b8&logoColor=ffffff&labelColor=1c1c29"  height="23px" style="border-radius: 5px;"/></a><br>
-    <img class="badge" src="https://img.shields.io/github/issues-pr/Nighty3098/CodeKeeper?style=for-the-badge&color=ef9f9c&logoColor=85e185&labelColor=1c1c29" height="23px" style="border-radius: 5px;" />
-    <img class="badge" src="https://img.shields.io/github/release/Nighty3098/CodeKeeper?style=for-the-badge&color=7589d5&logoColor=ffffff&labelColor=1c1c29" height="23px" style="border-radius: 5px;"/>
-    <img class="badge" src="https://img.shields.io/github/issues/Nighty3098/CodeKeeper?style=for-the-badge&color=dbb6ed&logoColor=ffffff&labelColor=1c1c29"  height="23px" style="border-radius: 5px;"/>
-    <img class="badge" src="https://img.shields.io/github/downloads/Nighty3098/CodeKeeper/total?style=for-the-badge&color=e0ea9d&logoColor=D9E0EE&labelColor=171b22" height="23px" style="border-radius: 5px;"/>
-    <img src="https://img.shields.io/github/commit-activity/t/Nighty3098/CodeKeeper?style=for-the-badge&color=a6e0b8&logoColor=D9E0EE&labelColor=171b22" height="23px" style="border-radius: 5px;"/>
-    <img src="https://img.shields.io/github/languages/count/Nighty3098/CodeKeeper?style=for-the-badge&color=ea9de7&logoColor=D9E0EE&labelColor=171b22" height="23px" style="border-radius: 5px;"/>
-    <img class="badge" src="https://img.shields.io/github/stars/Nighty3098/CodeKeeper?style=for-the-badge&color=eed49f&logoColor=D9E0EE&labelColor=1c1c29" height="23px" style="border-radius: 5px;"/>
-    <img class="badge" src="https://img.shields.io/github/forks/Nighty3098/CodeKeeper?style=for-the-badge&color=9dc3ea&logoColor=D9E0EE&labelColor=1c1c29"  height="23px" style="border-radius: 5px;"/>
-    <br><br><br>
-    <img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_cpp.png?raw=true" height="40px" />
-    <img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_c.png?raw=true" height="40px" />
-    <img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_qt.png?raw=true" height="40px" />
-    <img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_sqlite.png?raw=true" height="40px" />
-    <img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_git.png?raw=true" height="40px" />
-    <img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_api.png?raw=true" height="40px" />
-    <img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_codekeeper.png?raw=true" height="40px" />
-    <br><br>
-    If you have found bugs in our product or have suggestions, please write about them:
-    <br><br>
-    <a href="https://t.me/DXS_TechSupport_bot"><kbd> <br>Tech Support<br> </kbd></a>  <a href="https://discord.gg/tnHSEc2cZv"><kbd> <br>Discord server<br> </kbd></a>
-    <br><br>
-    </a>  <a href="[https://discord.gg/tnHSEc2cZv](https://github.com/Nighty3098/CodeKeeper/issues/132)"><kbd> <br>Official project roadmap<br> </kbd></a>
-    <br><br><br>
-    <a href="doc/Shortcuts.md"><kbd> <br> ~ Shortcuts ~ <br> </kbd></a> <a href="doc/Installation.md"><kbd> <br> ~ Installation ~ <br> </kbd></a> <a href="doc/Tweaks.md"><kbd> <br> ~ Tweaks ~ <br> </kbd></a> <a href="doc/Screenshots.md"><kbd> <br> ~ Screenshots ~ <br> </kbd></a>
-</div>
+<img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_cpp.png?raw=true" height="45px" />
+<img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_c.png?raw=true" height="45px" />
+<img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_qt.png?raw=true" height="45px" />
+<img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_sqlite.png?raw=true" height="45px" />
+<img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_git.png?raw=true" height="45px" />
+
+<br>
+
+---
+
+***🛠️ If you have found bugs in our product or have suggestions, please write about them:***
+
+[![Discord](https://img.shields.io/discord/1238858182403559505.svg?label=Discord&logo=Discord&style=for-the-badge&color=f5a7a0&logoColor=FFFFFF&labelColor=1c1c29)](https://discord.gg/6xEc5WFK)
+<br><br>
+<a href="https://t.me/Night3098" target="blank"><img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_telegram.png?raw=true" width="45px"/></a>
+<a href="https://discord.gg/#9707" target="blank"><img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_discord.png?raw=true" width="45px"/></a>
+<a href="https://www.reddit.com/user/DEVELOPER0x31/" target="blank"><img src="https://github.com/Nighty3098/DevIcons/blob/main/badges/badges_reddit.png?raw=true" width="45px"/></a>
+<br><br>
+
+---
+
+### **`💵 Support me`**
+<img src="imgs/toncoin.png" width="45px"/>
+<br>
+
+***`UQCF-sPDO0QqkNtvy5CKSvYWEsZS6l7vzaytV36oYM0SNhKt`***
 
-<div align="center">
-    <br><br><br>
-    <h3>Support me</h3>
-    <img src="imgs/toncoin.png" width="40px"/>
-    <br>
-    <kbd><br>UQCF-sPDO0QqkNtvy5CKSvYWEsZS6l7vzaytV36oYM0SNhKt<br></kbd>
 </div>
diff --git a/build.sh b/build.sh
@@ -6,6 +6,8 @@ YELLOW="\e[1;33m"
 RED="\e[1;31m"
 RESET="\e[0m"
 
+bash clang_format.sh
+
 # Change to the CodeKeeper source directory
 echo -e "${GREEN}Navigating to the CodeKeeper source directory...${RESET}"
 cd src/CodeKeeper/ || { echo -e "${RED}Error: Failed to change directory to src/CodeKeeper.${RESET}"; exit 1; }

diff --git a/clang_format.sh b/clang_format.sh
@@ -1,6 +1,15 @@
 #!/bin/bash
 
+GREEN="\e[1;32m"
+YELLOW="\e[1;33m"
+RED="\e[1;31m"
+RESET="\e[0m"
+
 find . -type f -name "*.cpp" | while read -r file; do
-    clang-format -i "$file"
-    echo "Formatted $file"
+    if clang-format -i "$file"; then
+        printf "${GREEN}Formatted: %s${RESET}\n" "$file"
+    else
+        printf "${RED}Failed to format: %s${RESET}\n" "$file"
+        exit 1
+    fi
 done
diff --git a/rm_cache.sh b/rm_cache.sh
@@ -1,56 +1,56 @@
 #!/bin/bash
 
-rm -rf src/CodeKeeper/.qt/
-rm -rf src/CodeKeeper/.qtc_clangd
-rm -rf src/CodeKeeper/build
-rm src/CodeKeeper/CodeKeeper.pro.user
-rm src/CodeKeeper/CodeKeeper.pro.user.1f90c22
-rm src/CodeKeeper/main.o
-rm src/CodeKeeper/Makefile
-rm src/CodeKeeper/markdownhighlighter.o
-rm src/CodeKeeper/moc_linenumberarea.cpp
-rm src/CodeKeeper/moc_linenumberarea.o
-rm src/CodeKeeper/moc_mainwindow.cpp
-rm src/CodeKeeper/moc_mainwindow.o
-rm src/CodeKeeper/moc_markdownhighlighter.cpp
-rm src/CodeKeeper/moc_markdownhighlighter.o
-rm src/CodeKeeper/moc_predefs.h
-rm src/CodeKeeper/moc_qmarkdowntextedit.cpp
-rm src/CodeKeeper/moc_qmarkdowntextedit.o
-rm src/CodeKeeper/moc_qplaintexteditsearchwidget.cpp
-rm src/CodeKeeper/moc_qplaintexteditsearchwidget.o
-rm src/CodeKeeper/moc_settingswindow.cpp
-rm src/CodeKeeper/moc_settingswindow.o
-rm src/CodeKeeper/moc_syncwindow.cpp
-rm src/CodeKeeper/moc_syncwindow.o
-rm src/CodeKeeper/qmake_qmake_immediate.qrc
-rm src/CodeKeeper/qmarkdowntextedit.o
-rm src/CodeKeeper/qownlanguagedata.o
-rm src/CodeKeeper/qplaintexteditsearchwidget.o
-rm src/CodeKeeper/qrc_media.cpp
-rm src/CodeKeeper/qrc_media.o
-rm src/CodeKeeper/qrc_qmake_qmake_immediate.cpp
-rm src/CodeKeeper/qrc_qmake_qmake_immediate.o
-rm src/CodeKeeper/qrc_resources.cpp
-rm src/CodeKeeper/qrc_resources.o
-rm src/CodeKeeper/settings.json
-rm src/CodeKeeper/settingswindow.o
-rm src/CodeKeeper/syncwindow.o
-rm src/CodeKeeper/ui_qplaintexteditsearchwidget.h
-rm src/CodeKeeper/accountwindow.o
-rm src/CodeKeeper/moc_accountwindow.cpp
-rm src/CodeKeeper/moc_accountwindow.o
-rm src/CodeKeeper/object_script.CodeKeeper.Debug
-rm src/CodeKeeper/object_script.CodeKeeper.Release
-rm src/CodeKeeper/CircledProgressBar.o
-rm src/CodeKeeper/moc_CircledProgressBar.o
-rm src/CodeKeeper/moc_CircledProgressBar.cpp
-rm src/CodeKeeper/moc_ProgressCircle.cpp
-rm src/CodeKeeper/moc_ProgressCircle.o
-rm src/CodeKeeper/ProgressCircle.o
-rm src/CodeKeeper/moc_CircleChart.cpp
-rm src/CodeKeeper/moc_ColorValueDisplay.cpp
-rm src/CodeKeeper/moc_CircleChart.o
-rm src/CodeKeeper/moc_ColorValueDisplay.o
+rm -rf src/CodeKeeper/.qt/ \
+       src/CodeKeeper/.qtc_clangd \
+       src/CodeKeeper/build \
+       src/CodeKeeper/CodeKeeper.pro.user \
+       src/CodeKeeper/CodeKeeper.pro.user.1f90c22 \
+       src/CodeKeeper/main.o \
+       src/CodeKeeper/Makefile \
+       src/CodeKeeper/markdownhighlighter.o \
+       src/CodeKeeper/moc_linenumberarea.cpp \
+       src/CodeKeeper/moc_linenumberarea.o \
+       src/CodeKeeper/moc_mainwindow.cpp \
+       src/CodeKeeper/moc_mainwindow.o \
+       src/CodeKeeper/moc_markdownhighlighter.cpp \
+       src/CodeKeeper/moc_markdownhighlighter.o \
+       src/CodeKeeper/moc_predefs.h \
+       src/CodeKeeper/moc_qmarkdowntextedit.cpp \
+       src/CodeKeeper/moc_qmarkdowntextedit.o \
+       src/CodeKeeper/moc_qplaintexteditsearchwidget.cpp \
+       src/CodeKeeper/moc_qplaintexteditsearchwidget.o \
+       src/CodeKeeper/moc_settingswindow.cpp \
+       src/CodeKeeper/moc_settingswindow.o \
+       src/CodeKeeper/moc_syncwindow.cpp \
+       src/CodeKeeper/moc_syncwindow.o \
+       src/CodeKeeper/qmake_qmake_immediate.qrc \
+       src/CodeKeeper/qmarkdowntextedit.o \
+       src/CodeKeeper/qownlanguagedata.o \
+       src/CodeKeeper/qplaintexteditsearchwidget.o \
+       src/CodeKeeper/qrc_media.cpp \
+       src/CodeKeeper/qrc_media.o \
+       src/CodeKeeper/qrc_qmake_qmake_immediate.cpp \
+       src/CodeKeeper/qrc_qmake_qmake_immediate.o \
+       src/CodeKeeper/qrc_resources.cpp \
+       src/CodeKeeper/qrc_resources.o \
+       src/CodeKeeper/settings.json \
+       src/CodeKeeper/settingswindow.o \
+       src/CodeKeeper/syncwindow.o \
+       src/CodeKeeper/ui_qplaintexteditsearchwidget.h \
+       src/CodeKeeper/accountwindow.o \
+       src/CodeKeeper/moc_accountwindow.cpp \
+       src/CodeKeeper/moc_accountwindow.o \
+       src/CodeKeeper/object_script.CodeKeeper.Debug \
+       src/CodeKeeper/object_script.CodeKeeper.Release \
+       src/CodeKeeper/CircledProgressBar.o \
+       src/CodeKeeper/moc_CircledProgressBar.o \
+       src/CodeKeeper/moc_CircledProgressBar.cpp \
+       src/CodeKeeper/moc_ProgressCircle.cpp \
+       src/CodeKeeper/moc_ProgressCircle.o \
+       src/CodeKeeper/ProgressCircle.o \
+       src/CodeKeeper/moc_CircleChart.cpp \
+       src/CodeKeeper/moc_ColorValueDisplay.cpp \
+       src/CodeKeeper/moc_CircleChart.o \
+       src/CodeKeeper/moc_ColorValueDisplay.o
 
 echo "Done!"
diff --git a/src/CodeKeeper/CodeKeeper b/src/CodeKeeper/CodeKeeper
diff --git a/src/CodeKeeper/keeperFunc/projectsFunc.cpp b/src/CodeKeeper/keeperFunc/projectsFunc.cpp
@@ -22,9 +22,9 @@ void MainWindow::activateProjectContextMenu(const QPoint &pos, QListWidget *list
     if (isCustomTheme)
     {
         submenu->setStyleSheet("QMenu {"
-                               "    background-color: #2b3d4c;"
+                               "    background-color: #505a6a;"
                                "    color: #fff;"
-                               "    border: 1px solid #fff;"
+                               "    border: 0px solid #fff;"
                                "    border-radius: 10px;"
                                "}"
                                "QMenu::separator {"

diff --git a/src/CodeKeeper/keeperFunc/tasksFunc.cpp b/src/CodeKeeper/keeperFunc/tasksFunc.cpp
@@ -9,9 +9,9 @@ void MainWindow::activateTasksContextMenu(const QPoint &pos, QListWidget *listWi
     if (isCustomTheme)
     {
         submenu->setStyleSheet("QMenu {"
-                               "    background-color: #2b3d4c;"
+                               "    background-color: #505a6a;"
                                "    color: #fff;"
-                               "    border: 1px solid #fff;"
+                               "    border: 0px solid #fff;"
                                "    border-radius: 10px;"
                                "}"
                                "QMenu::separator {"

diff --git a/src/CodeKeeper/sql_db/tasksDB.cpp b/src/CodeKeeper/sql_db/tasksDB.cpp
@@ -14,8 +14,7 @@ void MainWindow::create_tasks_connection()
                   "task TEXT,"
                   "status VARCHAR(50),"
                   "createdTime VARCHAR(50),"
-                  "projectLink TEXT"
-                  ");";
+                  "projectLink TEXT);";
 
     if (!query.exec(str))
     {
@@ -118,7 +117,7 @@ void MainWindow::loadTasks()
 
     QSqlQuery query;
 
-    query.exec("SELECT * FROM tasks");
+    query.exec("SELECT * FROM tasks ORDER BY createdTime DESC");
     while (query.next())
     {
         int id = query.value("id").toInt();
@@ -129,18 +128,17 @@ void MainWindow::loadTasks()
         QString text = task + "\n――――――――――――――\n" + createdTime;
 
         QListWidgetItem *item = new QListWidgetItem(text);
-
         item->setData(Qt::UserRole, id);
 
         if (status == "IncompleteTasks")
         {
             incompleteTasks->addItem(item);
         }
-        if (status == "InprocessTasks")
+        else if (status == "InprocessTasks")
         {
             inprocessTasks->addItem(item);
         }
-        if (status == "CompleteTasks")
+        else if (status == "CompleteTasks")
         {
             completeTasks->addItem(item);
         }
@@ -162,7 +160,8 @@ QString MainWindow::getProjectByTask(QString *task, QString *status)
     }
 
     QSqlQuery query;
-    query.prepare("SELECT projectLink FROM tasks WHERE task = :task AND status = :status");
+    query.prepare(
+        "SELECT projectLink FROM tasks WHERE task = :task AND status = :status ORDER BY createdTime DESC LIMIT 1");
 
     query.bindValue(":task", *task);
     query.bindValue(":status", *status);