src/helper_funcs.cpp

@@ -8,7 +8,6 @@
 #include <string>
 #include <termios.h>
 #include <unistd.h>
-#include "color.h"
 
 void safe_exit(int code) {
   switch (code) {
@@ -27,7 +26,7 @@ void safe_exit(int code) {
 
   case SIGSEGV:
     std::cerr << "\nreceived SIGSEGV(segmentaiton fault) exiting...\nIf this "
-                 "repeats please report it as a bug\n";
+                 "repeats please report it as bug\n";
     break;
 
   default:
@@ -69,16 +68,10 @@ std::string SoRAuthFile(bool save, std::string data) {
     return "";
   } else {
     std::ifstream authfile(authfile_path);
-    if (authfile.is_open()) {
+    authfile >> data;
-        data.assign((std::istreambuf_iterator<char>(authfile)), 
+    authfile.close();
-                    std::istreambuf_iterator<char>());
-        authfile.close();
-    } else {
-        std::cerr << RED "[ERROR] " << RESET << "Failed to open auth file\n";
-        safe_exit(-2);
-    }
     return data;
-}
+  }
 }
 
 void get_input_and_login() {
@@ -87,10 +80,10 @@ void get_input_and_login() {
   std::cin >> username;
   std::string password;
 
-  // password = getpass("enter password: ");
+  password = getpass("enter password: ");
   // DEBUG
-  std::cout << "\nenter password: ";
+  // std::cout << "\nenter password: ";
-  std::cin >> password;
+  // std::cin >> password;
 
   bakaapi::login(username, password);
 }

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

src/marks.cpp

@@ -12,8 +12,6 @@
 #include <nlohmann/json.hpp>
 #include <panel.h>
 #include <string>
-#include <algorithm>
-#include "net.h"
 
 using nlohmann::json;
 
@@ -57,9 +55,9 @@ void win_show(WINDOW *win, char *label, int label_color, int width, int height,
 
 void marks_page() {
   // DONT FORGET TO UNCOMMENT
-  json resp_from_api = bakaapi::get_grades();
+  // json resp_from_api = bakaapi::get_grades();
-  // std::ifstream f("test-data/marks3.json");
+  std::ifstream f("test-data/marks3.json");
-  // json resp_from_api = json::parse(f);
+  json resp_from_api = json::parse(f);
 
   WINDOW **my_wins;
   size_t size_my_wins = resp_from_api["Subjects"].size();
@@ -89,66 +87,41 @@ void marks_page() {
 
   init_wins(my_wins, resp_from_api["Subjects"].size(), resp_from_api);
 
-  // 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]);
-  }
-
-  // Attach panels
   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_panel_userptr(my_panels[i], 
+
-      (i + 1 < size_my_panels) ? my_panels[i+1] : my_panels[0]);
+    /* 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]);
+    }
   }
 
+  // Update the stacking order.
   update_panels();
+
+  /* Show it on the screen */
   attron(COLOR_PAIR(4));
-  mvprintw(LINES - 2, 0, "Arrows/j/k to scroll | F1 to exit");
+  mvprintw(LINES - 2, 0, "Use tab to browse through the windows (F1 to Exit)");
   attroff(COLOR_PAIR(4));
   doupdate();
 
-  top = my_panels[size_my_panels - 1];
+  top = my_panels[resp_from_api["Subjects"].size() - 1];
-  long y_offset = 0;
-
-  // Main loop
   while ((ch = getch()) != KEY_F(1)) {
-    bool needs_update = false;
-    
     switch (ch) {
-      case KEY_UP:
+    case 9:
-      case 'k': // Vim-style up
+      top = (PANEL *)panel_userptr(top);
-        y_offset--;
+      top_panel(top);
-        needs_update = true;
+      break;
-        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();
   delete[] my_wins;
   delete[] my_panels;
-  delete[] original_y;
-  delete[] original_x;
 }
 
 /* Put all the windows */
@@ -170,8 +143,8 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
 
     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 caption = marks_json["Subjects"][i]["Marks"][j]["Caption"];
-      std::string theme = rm_tr_le_whitespace(marks_json["Subjects"][i]["Marks"][j]["Theme"]);
+      std::string theme = marks_json["Subjects"][i]["Marks"][j]["Theme"];
       caption = rm_tr_le_whitespace(caption);
       theme = rm_tr_le_whitespace(theme);
       max_text_length =
@@ -233,15 +206,15 @@ void win_show(WINDOW *win, char *label, int label_color, int width, int height,
         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);
+    strncpy(CaptionBuf, Caption.c_str(), sizeof(CaptionBuf));
     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"]
+            marks_json["Subjects"][SubjectIndex]["Marks"][i]["Theme"]
-                .get<std::string>())
+                .get<std::string>()
                 .c_str(),
-            sizeof(ThemeBuf)-1);
+            sizeof(ThemeBuf));
     print_in_middle(win, 3 + i + 1 + AdditionalOffset, 0, width, ThemeBuf,
                     COLOR_PAIR(label_color));
     AdditionalOffset++;

src/net.cpp

@@ -2,7 +2,6 @@
 #include "color.h"
 #include "helper_funcs.h"
 #include "main.h"
-#include <cerrno>
 #include <cmath>
 #include <cstddef>
 #include <cstdlib>
@@ -19,10 +18,6 @@
 
 using nlohmann::json;
 
-// metods
-#define GET 0
-#define POST 1
-
 CURL *curl = curl_easy_init();
 
 // Callback function to write data into a std::string
@@ -34,7 +29,7 @@ size_t WriteCallback(void *contents, size_t size, size_t nmemb,
 }
 
 std::tuple<std::string, int> send_curl_request(std::string endpoint,
-                                               uint8_t type,
+                                               std::string type,
                                                std::string req_data) {
   std::string response;
   std::string url = baka_api_url + endpoint;
@@ -55,16 +50,8 @@ std::tuple<std::string, int> send_curl_request(std::string endpoint,
         headers, "Content-Type: application/x-www-form-urlencoded");
     curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 
-    switch (type) {
+    if (type == "POST") {
-      case GET:
+      curl_easy_setopt(curl, CURLOPT_POST, 1L);
-        curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-        break;
-      case POST:
-        curl_easy_setopt(curl, CURLOPT_POST, 1L);
-        break;
-      default:
-        std::cerr << RED "[ERROR] " << RESET "invalid metod\n";
-        safe_exit(EINVAL);
     }
 
   } else {
@@ -90,7 +77,7 @@ void login(std::string username, std::string password) {
       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";
@@ -129,7 +116,7 @@ void refresh_access_token() {
                   "token&refresh_token={}",
                   refresh_token);
 
-  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 << http_code
               << "is non 200 response\n";
@@ -152,7 +139,7 @@ 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) {
       refresh_access_token();