add warning to README

.gitignore

@@ -3,4 +3,5 @@
 compile_commands.json
 core*
 build
-test-data
+test-data
+log

README.md

@@ -3,3 +3,6 @@
 
 > ### Dependencies:
 > [nlohmann-json](https://github.com/nlohmann/json)  
+
+> [!IMPORTANT]  
+> Only marks work right now

src/const.h

@@ -0,0 +1 @@
+#define VERSION "0.5"

src/helper_funcs.cpp

@@ -8,6 +8,7 @@
 #include <string>
 #include <termios.h>
 #include <unistd.h>
+#include "color.h"
 
 void safe_exit(int code) {
   switch (code) {
@@ -26,7 +27,7 @@ void safe_exit(int code) {
 
   case SIGSEGV:
     std::cerr << "\nreceived SIGSEGV(segmentaiton fault) exiting...\nIf this "
-                 "repeats please report it as bug\n";
+                 "repeats please report it as a bug\n";
     break;
 
   default:
@@ -34,6 +35,7 @@ void safe_exit(int code) {
   }
 
   curl_easy_cleanup(curl);
+  endwin();
 
   exit(code);
 }
@@ -42,35 +44,45 @@ std::string bool_to_string(bool bool_in) { return bool_in ? "true" : "false"; }
 
 std::string SoRAuthFile(bool save, std::string data) {
 
-  std::string savedir_path = std::getenv("HOME");
-  savedir_path.append("/.local/share/bakatui");
+    std::string home = std::getenv("HOME");
+    if (home.empty()) {
+        std::cerr << RED "[ERROR] " RESET << "HOME environment variable not set.\n";
+        safe_exit(EXIT_FAILURE);
+    }
 
-  DIR *savedir = opendir(savedir_path.c_str());
-  if (savedir) {
-    /* Directory exists. */
-    closedir(savedir);
-  } else if (ENOENT == errno) {
-    /* Directory does not exist. */
-    std::filesystem::create_directories(savedir_path);
-  } else {
-    /* opendir() failed for some other reason. */
-    std::cerr << "cannot access ~/.local/share/bakatui\n";
-    safe_exit(100);
-  }
+    std::string savedir_path = home;
+    savedir_path.append("/.local/share/bakatui");
 
-  std::string authfile_path = std::string(savedir_path) + "/auth";
 
-  if (save) {
-    std::ofstream authfile(authfile_path);
-    authfile << data;
-    authfile.close();
-    return "";
-  } else {
-    std::ifstream authfile(authfile_path);
-    authfile >> data;
-    authfile.close();
-    return data;
-  }
+    if (!std::filesystem::exists(savedir_path)) {
+        if (!std::filesystem::create_directories(savedir_path)) {
+            std::cerr << RED "[ERROR] " RESET << "Failed to create directory: " << savedir_path << "\n";
+            safe_exit(EXIT_FAILURE);
+        }
+    }
+
+    std::string authfile_path = savedir_path + "/auth";
+
+    if (save) {
+        std::ofstream authfile(authfile_path);
+        if (!authfile.is_open()) {
+            std::cerr << RED "[ERROR] " RESET << "Failed to open auth file for writing.\n";
+            safe_exit(EXIT_FAILURE);
+        }
+        authfile << data;
+        authfile.close();
+        return "";
+    } else {
+        std::ifstream authfile(authfile_path);
+        if (!authfile.is_open()) {
+            std::cerr << RED "[ERROR] " RESET << "Failed to open auth file for reading.\n";
+            safe_exit(EXIT_FAILURE);
+        }
+        data.assign((std::istreambuf_iterator<char>(authfile)), 
+                    std::istreambuf_iterator<char>());
+        authfile.close();
+        return data;
+    }
 }
 
 void get_input_and_login() {
@@ -109,4 +121,21 @@ void print_in_middle(WINDOW *win, int starty, int startx, int width,
   mvwprintw(win, y, x, "%s", string);
   wattroff(win, color);
   refresh();
+}
+
+
+const std::string WHITESPACE = " \n\r\t\f\v";
+ 
+std::string ltrim(const std::string &s) {
+    size_t start = s.find_first_not_of(WHITESPACE);
+    return (start == std::string::npos) ? "" : s.substr(start);
+}
+ 
+std::string rtrim(const std::string &s) {
+    size_t end = s.find_last_not_of(WHITESPACE);
+    return (end == std::string::npos) ? "" : s.substr(0, end + 1);
+}
+ 
+std::string rm_tr_le_whitespace(const std::string &s) {
+    return rtrim(ltrim(s));
 }

src/helper_funcs.h

@@ -5,4 +5,5 @@ std::string bool_to_string(bool bool_in);
 std::string SoRAuthFile(bool save, std::string data);
 void get_input_and_login();
 void print_in_middle(WINDOW *win, int starty, int startx, int width,
-                     char *string, chtype color);
+                     char *string, chtype color);
+std::string rm_tr_le_whitespace(const std::string &s);

src/main.cpp

@@ -25,8 +25,8 @@ int main(int argc, char **argv) {
   // error signal handlers
   signal(SIGSEGV, safe_exit);
 
-  marks_page();
-  /*
+  // marks_page();
+  
 
   {
     std::string savedir_path = std::getenv("HOME");
@@ -64,6 +64,6 @@ int main(int argc, char **argv) {
     get_input_and_login();
   }
   main_menu();
-  */
+  
   return 0;
 }

src/main_menu.cpp

@@ -6,13 +6,18 @@
 #include <curses.h>
 #include <menu.h>
 
+#include "marks.h"
+
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 #define CTRLD 4
 
 char *choices[] = {
-    "login",    "Grades",  "shedule", "Komens",
+    "login",    "Marks",  "shedule", "Komens",
     "Homework", "Absence", "Exit",    (char *)NULL,
 };
+void (*choicesFuncs[])() = {
+  nullptr, marks_page, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
+};
 
 void main_menu() {
   ITEM **my_items;
@@ -85,11 +90,11 @@ void main_menu() {
       menu_driver(my_menu, REQ_UP_ITEM);
       break;
     case 10: // ENTER
-      move(20, 0);
-      clrtoeol();
-      mvprintw(20, 0, "Item selected is : %s",
-               item_name(current_item(my_menu)));
+    clear();
+      choicesFuncs[item_index(current_item(my_menu))]();
       pos_menu_cursor(my_menu);
+      refresh();
+      wrefresh(my_menu_win);
       break;
     }
     wrefresh(my_menu_win);

src/marks.cpp

@@ -1,13 +1,20 @@
 #include "marks.h"
 #include "helper_funcs.h"
+#include <cstddef>
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
 #include <curses.h>
+#include <format>
 #include <fstream>
+#include <iostream>
 #include <menu.h>
 #include <nlohmann/json.hpp>
 #include <panel.h>
+#include <string>
+#include <algorithm>
+#include "net.h"
+#include "color.h"
 
 using nlohmann::json;
 
@@ -40,15 +47,20 @@ SOFTWARE.
 #define NLINES 10
 #define NCOLS 40
 
+#define DEFAULT_X_OFFSET 10
+#define DEFAULT_Y_OFFSET 2
+
+#define DEFAULT_PADDING 4
+
 void init_wins(WINDOW **wins, int n, json marks_json);
-void win_show(WINDOW *win, char *label, int label_color);
+void win_show(WINDOW *win, char *label, int label_color, int width, int height,
+              json marks_json, int SubjectIndex);
 
 void marks_page() {
-
   // DONT FORGET TO UNCOMMENT
-  // json resp_from_api = bakaapi::get_grades();
-  std::ifstream f("test-data/marks2.json");
-  json resp_from_api = json::parse(f);
+  json resp_from_api = bakaapi::get_grades();
+  // std::ifstream f("test-data/marks3.json");
+  // json resp_from_api = json::parse(f);
 
   WINDOW **my_wins;
   size_t size_my_wins = resp_from_api["Subjects"].size();
@@ -69,46 +81,76 @@ void marks_page() {
   noecho();
   keypad(stdscr, TRUE);
 
+  std::clog << COLS << " " << LINES << std::endl;
+
   /* Initialize all the colors */
-  for (size_t i = 0; i < 8; i++) {
+  for (uint8_t i = 0; i < 8; i++) {
     init_pair(i, i, COLOR_BLACK);
   }
 
   init_wins(my_wins, resp_from_api["Subjects"].size(), resp_from_api);
 
-  for (size_t i = 0; i < size_my_panels; i++) {
-    /* Attach a panel to each window Order is bottom up */
-    my_panels[i] = new_panel(my_wins[i]);
-
-    /* Set up the user pointers to the next panel */
-    if ((i + 1) < size_my_panels) {
-      set_panel_userptr(my_panels[i], my_panels[(i + 1)]);
-    } else {
-      set_panel_userptr(my_panels[i], my_panels[0]);
-    }
+  // store all original window position
+  int *original_y = new int[size_my_wins];
+  int *original_x = new int[size_my_wins];
+  for (size_t i = 0; i < size_my_wins; ++i) {
+    getbegyx(my_wins[i], original_y[i], original_x[i]);
   }
 
-  // Update the stacking order.
-  update_panels();
+  // Attach panels
+  for (size_t i = 0; i < size_my_panels; i++) {
+    my_panels[i] = new_panel(my_wins[i]);
+    set_panel_userptr(my_panels[i], 
+      (i + 1 < size_my_panels) ? my_panels[i+1] : my_panels[0]);
+  }
 
-  /* Show it on the screen */
+  update_panels();
   attron(COLOR_PAIR(4));
-  mvprintw(LINES - 2, 0, "Use tab to browse through the windows (F1 to Exit)");
+  mvprintw(LINES - 2, 0, "Arrows/j/k to scroll | F1 to exit");
   attroff(COLOR_PAIR(4));
   doupdate();
 
-  top = my_panels[2];
+  top = my_panels[size_my_panels - 1];
+  long y_offset = 0;
+
+  // Main loop
   while ((ch = getch()) != KEY_F(1)) {
+    bool needs_update = false;
+    
     switch (ch) {
-    case 9:
-      top = (PANEL *)panel_userptr(top);
-      top_panel(top);
-      break;
+      case KEY_UP:
+      case 'k': // Vim-style up
+        y_offset--;
+        needs_update = true;
+        break;
+
+      case KEY_DOWN:
+      case 'j': // Vim-style down
+        y_offset++;
+        needs_update = true;
+        break;
+    }
+
+    // Update window positions if scrolled
+    if (needs_update) {
+      for (size_t i = 0; i < size_my_panels; ++i) {
+        int new_y = original_y[i] - y_offset;
+        int new_x = original_x[i];
+        move_panel(my_panels[i], new_y, new_x);
+      }
+      
+      update_panels();
+      doupdate();
     }
-    update_panels();
-    doupdate();
   }
+
+  // Cleanup
   endwin();
+  clear();
+  delete[] my_wins;
+  delete[] my_panels;
+  delete[] original_y;
+  delete[] original_x;
 }
 
 /* Put all the windows */
@@ -116,32 +158,62 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
   int x, y, i;
   char label[1500];
 
-  y = 2;
-  x = 10;
+  y = DEFAULT_Y_OFFSET;
+  x = DEFAULT_X_OFFSET;
   uint8_t curent_color = 0;
-  for (i = 0; i < n; ++i) {
-    wins[i] = newwin(NLINES, NCOLS, y, x);
-    {
-      std::string sub_name = marks_json["Subjects"][i]["Subject"]["Name"];
-      std::string sub_avg_s = marks_json["Subjects"][i]["AverageText"];
 
-      sprintf(label, "%s - avg: %s", sub_name.c_str(), sub_avg_s.c_str());
+  int MaxHight = 0;
+  // this loop true subjects
+  for (i = 0; i < n; ++i) {
+
+    // Calculate label and max_text_length to determine window width
+    std::string sub_name = marks_json["Subjects"][i]["Subject"]["Name"];
+    // DEBUG
+    // std::clog << BLUE"[LOG]" << RESET" procesing subject: " << sub_name << "\n";
+    std::string sub_avg_s = marks_json["Subjects"][i]["AverageText"];
+    sprintf(label, "%s - avg: %s", sub_name.c_str(), sub_avg_s.c_str());
+
+    size_t max_text_length = strlen(label);
+    for (int j = 0; j < marks_json["Subjects"][i]["Marks"].size(); j++) {
+      std::string caption = rm_tr_le_whitespace(marks_json["Subjects"][i]["Marks"][j]["Caption"]);
+      std::string theme = rm_tr_le_whitespace(marks_json["Subjects"][i]["Marks"][j]["Theme"]);
+      caption = rm_tr_le_whitespace(caption);
+      theme = rm_tr_le_whitespace(theme);
+      max_text_length =
+          std::max({max_text_length, caption.length(), theme.length()});
     }
-    curent_color++;
-    if (curent_color >= 7) {
-      curent_color = 1;
+
+    int width = max_text_length + DEFAULT_PADDING;
+
+    // hanndle windows overflowing off screen
+    if (x + width > COLS) {
+      x = DEFAULT_X_OFFSET;
+      y += MaxHight + 2;
+      MaxHight = 0;
     }
-    win_show(wins[i], label, curent_color);
-    x += 40;
+
+    if (marks_json["Subjects"][i]["Marks"].size() * 2 + DEFAULT_PADDING >
+        MaxHight) {
+      MaxHight =
+          marks_json["Subjects"][i]["Marks"].size() * 2 + DEFAULT_PADDING;
+    }
+
+    wins[i] = newwin(NLINES, NCOLS, y, x);
+    win_show(wins[i], label, curent_color + 1, width,
+             marks_json["Subjects"][i]["Marks"].size() * 2 + DEFAULT_PADDING,
+             marks_json, i);
+
+    curent_color = (curent_color + 1) % 7;
+    x += width + 5;
   }
 }
 
 /* Show the window with a border and a label */
-void win_show(WINDOW *win, char *label, int label_color) {
-  int startx, starty, height, width;
-  height = 20;
+void win_show(WINDOW *win, char *label, int label_color, int width, int height,
+              json marks_json, int SubjectIndex) {
+  int startx, starty;
 
-  wresize(win, height, strlen(label) + 4);
+  wresize(win, height, width);
 
   getbegyx(win, starty, startx);
   getmaxyx(win, height, width);
@@ -152,4 +224,26 @@ void win_show(WINDOW *win, char *label, int label_color) {
   mvwaddch(win, 2, width - 1, ACS_RTEE);
 
   print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
+
+  char CaptionBuf[1500];
+  char ThemeBuf[1500];
+  std::string Caption;
+  int AdditionalOffset = 0;
+  for (size_t i = 0; i < marks_json["Subjects"][SubjectIndex]["Marks"].size();
+       i++) {
+    Caption = marks_json["Subjects"][SubjectIndex]["Marks"][i]["Caption"];
+    Caption = rm_tr_le_whitespace(Caption);
+	  Caption.append(std::format(" - {{{}}} [{}]",marks_json["Subjects"][SubjectIndex]["Marks"][i]["MarkText"].get<std::string>(),marks_json["Subjects"][SubjectIndex]["Marks"][i]["Weight"].get<int>()));
+    strncpy(CaptionBuf, Caption.c_str(), sizeof(CaptionBuf)-1);
+    print_in_middle(win, 3 + i + AdditionalOffset, 0, width, CaptionBuf,COLOR_PAIR(label_color));
+
+    strncpy(ThemeBuf,
+            rm_tr_le_whitespace(marks_json["Subjects"][SubjectIndex]["Marks"][i]["Theme"]
+                .get<std::string>())
+                .c_str(),
+            sizeof(ThemeBuf)-1);
+    print_in_middle(win, 3 + i + 1 + AdditionalOffset, 0, width, ThemeBuf,
+                    COLOR_PAIR(label_color));
+    AdditionalOffset++;
+  }
 }

src/net.cpp

@@ -2,6 +2,7 @@
 #include "color.h"
 #include "helper_funcs.h"
 #include "main.h"
+#include <cerrno>
 #include <cmath>
 #include <cstddef>
 #include <cstdlib>
@@ -15,9 +16,18 @@
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
 #include <string>
+#include "const.h"
 
 using nlohmann::json;
 
+// metods
+enum {
+  GET,
+  POST,
+};
+
+std::string access_token;
+
 CURL *curl = curl_easy_init();
 
 // Callback function to write data into a std::string
@@ -29,12 +39,17 @@ size_t WriteCallback(void *contents, size_t size, size_t nmemb,
 }
 
 std::tuple<std::string, int> send_curl_request(std::string endpoint,
-                                               std::string type,
+                                               uint8_t type,
                                                std::string req_data) {
   std::string response;
   std::string url = baka_api_url + endpoint;
+  if (type == GET) {
+    url.append("?" + req_data);
+  }
 
   if (curl) {
+    // DEBUG
+    // std::clog << BLUE"[LOG]" << RESET" sending to endpoint: " << url << "\n";
     curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
@@ -43,15 +58,24 @@ std::tuple<std::string, int> send_curl_request(std::string endpoint,
     curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
     curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
 
-    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, req_data.c_str());
-
+    
     struct curl_slist *headers = NULL;
-    headers = curl_slist_append(
-        headers, "Content-Type: application/x-www-form-urlencoded");
+    headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded");
+    headers = curl_slist_append(headers, std::format("User-Agent: bakatui/{}", VERSION).c_str());
+
     curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 
-    if (type == "POST") {
-      curl_easy_setopt(curl, CURLOPT_POST, 1L);
+    switch (type) {
+      case GET:
+        curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+        break;
+      case POST:
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, req_data.c_str());
+        curl_easy_setopt(curl, CURLOPT_POST, 1L);
+        break;
+      default:
+        std::cerr << RED "[ERROR] " << RESET "invalid metod\n";
+        safe_exit(EINVAL);
     }
 
   } else {
@@ -63,21 +87,19 @@ std::tuple<std::string, int> send_curl_request(std::string endpoint,
   int http_code = 0;
   curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
 
-  curl_easy_cleanup(curl); // Cleanup
+  
 
   return {response, http_code};
 }
 namespace bakaapi {
 
-std::string access_token;
-
 void login(std::string username, std::string password) {
 
   std::string req_data =
       std::format("client_id=ANDR&grant_type=password&username={}&password={}",
                   username, password);
 
-  auto [response, http_code] = send_curl_request("api/login", "POST", req_data);
+  auto [response, http_code] = send_curl_request("api/login", POST, req_data);
   if (http_code != 200) {
     std::cerr << RED "[ERROR] " << RESET << "login failed " << http_code
               << " is non 200 response\n";
@@ -106,6 +128,8 @@ void login(std::string username, std::string password) {
 }
 
 void refresh_access_token() {
+  // DEBUG
+  std::clog << "refreshing access token please wait...\n";
 
   json authfile_parsed = json::parse(SoRAuthFile(false, ""));
 
@@ -116,7 +140,9 @@ void refresh_access_token() {
                   "token&refresh_token={}",
                   refresh_token);
 
-  auto [response, http_code] = send_curl_request("api/login", "POST", req_data);
+  // DEBUG
+  std::clog << "calling send_curl_request() with folowing req_data\n" << req_data << std::endl; 
+  auto [response, http_code] = send_curl_request("api/login", POST, req_data);
   if (http_code != 200) {
     std::cerr << RED "[ERROR] " << RESET << http_code
               << "is non 200 response\n";
@@ -139,9 +165,11 @@ json get_grades() {
       std::format("Authorization=Bearer&access_token={}",
                   access_token);
 
-    auto [response, http_code] = send_curl_request("api/3/marks", "GET", req_data);
+    auto [response, http_code] = send_curl_request("api/3/marks", GET, req_data);
 
     if(http_code != 200) {
+      // DEBUG
+      std::clog << "Failed geting marks code: " << http_code << "\nrequest: " << req_data <<"\nresponse: " << response << std::endl;
       refresh_access_token();
     }