add ignoressl toggling

.gitignore

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

Makefile

@@ -1,8 +1,8 @@
 # Compiler and flags
 CPPC = g++
-CPPC_FLAGS = -std=c++23 -s -O3 -lncurses -lcurl -lmenu -lpanel -Wall -Wextra 
+CPPC_FLAGS = -std=c++23 -s -O3 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
 # Debug flags:
-# CPPC_FLAGS = -ggdb -std=c++23 -lncurses -lcurl -lmenu -lpanel -Wall -Wextra
+# CPPC_FLAGS = -ggdb -std=c++23 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
 
 
 SRC_PATH := src
@@ -35,4 +35,4 @@ $(OBJ_PATH)/%.o: $(SRC_PATH)/%.cpp
 clean:
 	rm -fr build
 
-.PHONY: all clean make-build-dir
+.PHONY: all clean install

README.md

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

src/color.h

@@ -1,3 +1,7 @@
+
+// Header guard
+#ifndef RESET
+
 #define RESET   "\033[0m"
 #define BLACK   "\033[30m"      /* Black */
 #define RED     "\033[31m"      /* Red */
@@ -15,3 +19,5 @@
 #define BOLDMAGENTA "\033[1m\033[35m"      /* Bold Magenta */
 #define BOLDCYAN    "\033[1m\033[36m"      /* Bold Cyan */
 #define BOLDWHITE   "\033[1m\033[37m"      /* Bold White */
+
+#endif

src/const.h

@@ -0,0 +1,6 @@
+#ifndef VERSION
+
+#define VERSION "0.5"
+#define NAME "bakatui"
+
+#endif

src/flags.cpp

@@ -0,0 +1,24 @@
+#include "const.h"
+#include <iostream>
+#include "helper_funcs.h"
+#include <cstdio>
+
+void PrintHelp() {
+    std::cout << "Usage: " << NAME << " [OPTIONS]" << "\n"
+    << "-h        Show this help menu\n"
+    << "-V        Show version\n"
+    << "-v        verbose mode\n"
+    << "-L        Force new login\n"
+    << "-S        Ignore SSL cert validity\n";
+    safe_exit(0);
+  }
+  
+void PrintVersion() {
+    std::cout << NAME" " << VERSION"\n" << "License GPLv3: GNU GPL version 3 <https://gnu.org/licenses/gpl.html>.\n";
+    safe_exit(0);
+  }
+
+void DeleteLogin(std::string savedir_path) {
+    std::remove((savedir_path + "/authfile").c_str());
+    std::remove((savedir_path + "/urlfile").c_str());
+}

src/flags.h

@@ -0,0 +1,10 @@
+#include <string>
+// header guard
+#ifndef _ba_fl_hg_
+#define _ba_fl_hg_
+
+void PrintHelp();
+void PrintVersion();
+void DeleteLogin(std::string savedir_path);
+
+#endif

src/helper_funcs.cpp

@@ -1,10 +1,14 @@
+#include "helper_funcs.h"
+#include "color.h"
 #include "net.h"
+#include <codecvt>
 #include <csignal>
 #include <curses.h>
 #include <dirent.h>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
+#include <locale>
 #include <string>
 #include <termios.h>
 #include <unistd.h>
@@ -26,7 +30,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 +38,7 @@ void safe_exit(int code) {
   }
 
   curl_easy_cleanup(curl);
+  endwin();
 
   exit(code);
 }
@@ -42,32 +47,44 @@ 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");
+  std::string home = std::getenv("HOME");
-  savedir_path.append("/.local/share/bakatui");
+  if (home.empty()) {
-
+    std::cerr << RED "[ERROR] " RESET << "HOME environment variable not set.\n";
-  DIR *savedir = opendir(savedir_path.c_str());
+    safe_exit(EXIT_FAILURE);
-  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 authfile_path = std::string(savedir_path) + "/auth";
+  std::string savedir_path = home;
+  savedir_path.append("/.local/share/bakatui");
+
+  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);
-    authfile >> data;
+    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;
   }
@@ -87,6 +104,7 @@ void get_input_and_login() {
   bakaapi::login(username, password);
 }
 
+// Original function
 void print_in_middle(WINDOW *win, int starty, int startx, int width,
                      char *string, chtype color) {
   int length, x, y;
@@ -110,3 +128,93 @@ void print_in_middle(WINDOW *win, int starty, int startx, int width,
   wattroff(win, color);
   refresh();
 }
+
+// Wide character version
+void wprint_in_middle(WINDOW *win, int starty, int startx, int width,
+                      wchar_t *string, chtype color) {
+  int length, x, y;
+  float temp;
+
+  if (win == NULL)
+    win = stdscr;
+  getyx(win, y, x);
+  if (startx != 0)
+    x = startx;
+  if (starty != 0)
+    y = starty;
+  if (width == 0)
+    width = 80;
+
+  length = wcslen(string);
+  temp = (width - length) / 2;
+  x = startx + (int)temp;
+  wattron(win, color);
+  mvwaddwstr(win, y, x, string);
+  wattroff(win, color);
+  refresh();
+}
+
+const std::string WHITESPACE = " \n\r\t\f\v";
+const std::wstring WWHITESPACE = L" \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));
+}
+
+// Wide character versions
+std::wstring wltrim(const std::wstring &s) {
+  size_t start = s.find_first_not_of(WWHITESPACE);
+  return (start == std::wstring::npos) ? L"" : s.substr(start);
+}
+
+std::wstring wrtrim(const std::wstring &s) {
+  size_t end = s.find_last_not_of(WWHITESPACE);
+  return (end == std::wstring::npos) ? L"" : s.substr(0, end + 1);
+}
+
+std::wstring wrm_tr_le_whitespace(const std::wstring &s) {
+  return wrtrim(wltrim(s));
+}
+
+// Conversion utilities
+char *wchar_to_char(wchar_t *src) {
+  if (!src)
+    return nullptr;
+
+  size_t len = wcslen(src) + 1; // +1 for null terminator
+  char *dest = new char[len * MB_CUR_MAX];
+
+  std::wcstombs(dest, src, len * MB_CUR_MAX);
+  return dest;
+}
+
+wchar_t *char_to_wchar(char *src) {
+  if (!src)
+    return nullptr;
+
+  size_t len = strlen(src) + 1; // +1 for null terminator
+  wchar_t *dest = new wchar_t[len];
+
+  std::mbstowcs(dest, src, len);
+  return dest;
+}
+
+std::wstring string_to_wstring(const std::string &str) {
+  std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
+  return converter.from_bytes(str);
+}
+
+std::string wstring_to_string(const std::wstring &wstr) {
+  std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
+  return converter.to_bytes(wstr);
+}

src/helper_funcs.h

@@ -1,8 +1,30 @@
 #include <curses.h>
 #include <string>
+
+// header guard
+#ifndef _ba_hf_hg_
+#define _ba_hf_hg_
+
 void safe_exit(int code);
 std::string bool_to_string(bool bool_in);
 std::string SoRAuthFile(bool save, std::string data);
 void get_input_and_login();
+
+// Original functions
 void print_in_middle(WINDOW *win, int starty, int startx, int width,
                      char *string, chtype color);
+std::string rm_tr_le_whitespace(const std::string &s);
+
+// Wide character support functions
+void wprint_in_middle(WINDOW *win, int starty, int startx, int width,
+                      wchar_t *string, chtype color);
+std::wstring wrm_tr_le_whitespace(const std::wstring &s);
+
+// Conversion utilities
+char *wchar_to_char(wchar_t *src);
+wchar_t *char_to_wchar(char *src);
+
+std::wstring string_to_wstring(const std::string &str);
+std::string wstring_to_string(const std::wstring &wstr);
+
+#endif

src/main.cpp

@@ -2,9 +2,9 @@
 #include "color.h"
 #include "helper_funcs.h"
 #include "main_menu.h"
-#include "marks.h"
 #include "net.h"
 #include <csignal>
+#include <cstdlib>
 #include <curl/curl.h>
 #include <curses.h>
 #include <fstream>
@@ -12,9 +12,13 @@
 #include <regex>
 #include <string>
 #include <unistd.h>
+#include "flags.h"
+#include "types.h"
 
 std::string baka_api_url;
 
+Config config;
+
 int main(int argc, char **argv) {
   // signal handlers
   signal(SIGTERM, safe_exit);
@@ -25,12 +29,23 @@ int main(int argc, char **argv) {
   // error signal handlers
   signal(SIGSEGV, safe_exit);
 
-  marks_page();
-  /*
-
   {
+
     std::string savedir_path = std::getenv("HOME");
     savedir_path.append("/.local/share/bakatui");
+
+    int opt;
+    while ((opt = getopt(argc, argv, "hVvLS:")) != -1) {
+        switch (opt) {
+            case 'h': PrintHelp(); break;
+            case 'V': PrintVersion(); break;
+            case 'v': config.verbose = true; break;
+            case 'L': DeleteLogin(savedir_path); break;
+            case 'S': config.ignoressl = true; break;
+            default: std::cerr << RED"[ERROR]" << RESET" invalid option: " << (char)optopt << "\ntry: -h\n"; safe_exit(EINVAL);
+        }
+    }
+
     std::string urlfile_path = std::string(savedir_path) + "/url";
     std::ifstream urlfile;
     urlfile.open(urlfile_path);
@@ -64,6 +79,6 @@ int main(int argc, char **argv) {
     get_input_and_login();
   }
   main_menu();
-  */
+  
   return 0;
 }

src/main.h

@@ -1,4 +1,11 @@
 #include <curl/curl.h>
 #include <string>
+#include "types.h"
+// header guard
+#ifndef _ba_ma_hg_
+#define _ba_ma_hg_
 
 extern std::string baka_api_url;
+extern Config config;
+
+#endif

src/main_menu.cpp

@@ -1,18 +1,25 @@
 #include "helper_funcs.h"
 #include "net.h"
+#include "timetable.h"
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
 #include <curses.h>
+#include <locale>
 #include <menu.h>
+#include <string>
+
+#include "marks.h"
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 #define CTRLD 4
 
-char *choices[] = {
+wchar_t *choices[] = {
-    "login",    "Grades",  "shedule", "Komens",
+    L"login",    L"Marks",   L"timetable", L"Komens",
-    "Homework", "Absence", "Exit",    (char *)NULL,
+    L"Homework", L"Absence", L"Exit",      (wchar_t *)NULL,
 };
+void (*choicesFuncs[])() = {nullptr, marks_page, timetable_page, nullptr,
+                            nullptr, nullptr,    nullptr,        nullptr};
 
 void main_menu() {
   ITEM **my_items;
@@ -22,6 +29,7 @@ void main_menu() {
   int n_choices, i;
 
   /* Initialize curses */
+  setlocale(LC_ALL, "");
   initscr();
   start_color();
   cbreak();
@@ -34,7 +42,8 @@ void main_menu() {
   n_choices = ARRAY_SIZE(choices);
   my_items = (ITEM **)calloc(n_choices, sizeof(ITEM *));
   for (i = 0; i < n_choices; ++i)
-    my_items[i] = new_item(choices[i], choices[i]);
+    my_items[i] =
+        new_item(wchar_to_char(choices[i]), wchar_to_char(choices[i]));
 
   /* Crate menu */
   my_menu = new_menu((ITEM **)my_items);
@@ -54,7 +63,7 @@ void main_menu() {
   /* Print a border around the main window and print a title */
   box(my_menu_win, 0, 0);
 
-  print_in_middle(my_menu_win, 1, 0, 40, "Main Menu", COLOR_PAIR(1));
+  wprint_in_middle(my_menu_win, 1, 0, 40, L"Main Menu", COLOR_PAIR(1));
   mvwaddch(my_menu_win, 2, 0, ACS_LTEE);
   mvwhline(my_menu_win, 2, 1, ACS_HLINE, 38);
   mvwaddch(my_menu_win, 2, 39, ACS_RTEE);
@@ -85,11 +94,11 @@ void main_menu() {
       menu_driver(my_menu, REQ_UP_ITEM);
       break;
     case 10: // ENTER
-      move(20, 0);
+      clear();
-      clrtoeol();
+      choicesFuncs[item_index(current_item(my_menu))]();
-      mvprintw(20, 0, "Item selected is : %s",
-               item_name(current_item(my_menu)));
       pos_menu_cursor(my_menu);
+      refresh();
+      wrefresh(my_menu_win);
       break;
     }
     wrefresh(my_menu_win);

src/main_menu.h

@@ -1 +1,7 @@
+// header guard
+#ifndef _ba_mm_hg_
+#define _ba_mm_hg_
+
 void main_menu();
+
+#endif

src/marks.cpp

@@ -1,54 +1,43 @@
 #include "marks.h"
 #include "helper_funcs.h"
+#include "net.h"
+#include <algorithm>
+#include <cstddef>
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
 #include <curses.h>
-#include <fstream>
+#include <format>
+#include <iostream>
+#include <locale>
 #include <menu.h>
 #include <nlohmann/json.hpp>
 #include <panel.h>
+#include <string>
 
 using nlohmann::json;
 
-// Thsi code is based on
+// This code is based on
 // https://github.com/tony/NCURSES-Programming-HOWTO-examples/blob/master/16-panels
-/*
+// MIT License (see original file)
-The MIT License (MIT)
-
-Copyright (c) 2016 Tony Narlock
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-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, wchar_t *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();
+  json resp_from_api = bakaapi::get_data_from_endpoint("api/3/marks");
-  std::ifstream f("test-data/marks2.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();
@@ -69,79 +58,151 @@ 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);
 
+  // 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]
-    /* Set up the user pointers to the next panel */
+                                                             : my_panels[0]);
-    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, "Use tab to browse through the windows (F1 to Exit)");
+  mvprintw(LINES - 2, 0, "Arrows/j/k to scroll | F1 to exit | {mark} [weight]");
   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:
+    case KEY_UP:
-      top = (PANEL *)panel_userptr(top);
+    case 'k': // Vim-style up
-      top_panel(top);
+      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();
     }
+  }
+
+  // Cleanup
   endwin();
+  clear();
+  delete[] my_wins;
+  delete[] my_panels;
+  delete[] original_y;
+  delete[] original_x;
 }
 
 /* Put all the windows */
 void init_wins(WINDOW **wins, int n, json marks_json) {
   int x, y, i;
-  char label[1500];
+  wchar_t label[1500];
 
-  y = 2;
+  y = DEFAULT_Y_OFFSET;
-  x = 10;
+  x = DEFAULT_X_OFFSET;
   uint8_t curent_color = 0;
+
+  int MaxHight = 0;
+  // this loop through subjects
   for (i = 0; i < n; ++i) {
-    wins[i] = newwin(NLINES, NCOLS, y, x);
+
-    {
+    // Calculate label and max_text_length to determine window width
     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());
+    // Convert to wchar_t
+    std::wstring wsub_name = string_to_wstring(sub_name);
+    std::wstring wsub_avg_s = string_to_wstring(sub_avg_s);
+
+    // Using swprintf for wide character formatting
+    swprintf(label, sizeof(label) / sizeof(label[0]), L"%ls - avg: %ls",
+             wsub_name.c_str(), wsub_avg_s.c_str());
+
+    size_t max_text_length = wcslen(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"]);
+
+      std::wstring wcaption = string_to_wstring(caption);
+      std::wstring wtheme = string_to_wstring(theme);
+
+      // Some code that does something and fixes some edge cases
+      std::string testCaption = caption + std::format(" {{{}}} [{}]", "X", 0);
+      std::wstring wTestCaption = string_to_wstring(testCaption);
+      max_text_length =
+          std::max({max_text_length, wTestCaption.length(), wtheme.length()});
     }
-    curent_color++;
+
-    if (curent_color >= 7) {
+    int width = max_text_length + DEFAULT_PADDING;
-      curent_color = 1;
+
+    // handle 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) {
+void win_show(WINDOW *win, wchar_t *label, int label_color, int width,
-  int startx, starty, height, width;
+              int height, json marks_json, int SubjectIndex) {
-  height = 20;
+  int startx, starty;
 
-  wresize(win, height, strlen(label) + 4);
+  wresize(win, height, width);
 
   getbegyx(win, starty, startx);
   getmaxyx(win, height, width);
@@ -151,5 +212,49 @@ void win_show(WINDOW *win, char *label, int label_color) {
   mvwhline(win, 2, 1, ACS_HLINE, width - 2);
   mvwaddch(win, 2, width - 1, ACS_RTEE);
 
-  print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
+  wprint_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
+
+  wchar_t CaptionBuf[1500];
+  wchar_t ThemeBuf[1500];
+  std::wstring wCaption;
+  int AdditionalOffset = 0;
+
+  for (size_t i = 0; i < marks_json["Subjects"][SubjectIndex]["Marks"].size();
+       i++) {
+    std::string Caption =
+        marks_json["Subjects"][SubjectIndex]["Marks"][i]["Caption"];
+    Caption = rm_tr_le_whitespace(Caption);
+
+    std::string MarkText =
+        marks_json["Subjects"][SubjectIndex]["Marks"][i]["MarkText"];
+    int Weight = marks_json["Subjects"][SubjectIndex]["Marks"][i]["Weight"];
+
+    // Create formatted string with mark and weight
+    std::string formattedCaption =
+        Caption + std::format(" - {{{}}} [{}]", MarkText, Weight);
+
+    // Convert to wide string
+    wCaption = string_to_wstring(formattedCaption);
+
+    wcsncpy(CaptionBuf, wCaption.c_str(),
+            sizeof(CaptionBuf) / sizeof(CaptionBuf[0]) - 1);
+    CaptionBuf[sizeof(CaptionBuf) / sizeof(CaptionBuf[0]) - 1] =
+        L'\0'; // Ensure null termination
+
+    wprint_in_middle(win, 3 + i + AdditionalOffset, 0, width, CaptionBuf,
+                     COLOR_PAIR(label_color));
+
+    std::string Theme =
+        marks_json["Subjects"][SubjectIndex]["Marks"][i]["Theme"];
+    std::wstring wTheme = string_to_wstring(rm_tr_le_whitespace(Theme));
+
+    wcsncpy(ThemeBuf, wTheme.c_str(),
+            sizeof(ThemeBuf) / sizeof(ThemeBuf[0]) - 1);
+    ThemeBuf[sizeof(ThemeBuf) / sizeof(ThemeBuf[0]) - 1] =
+        L'\0'; // Ensure null termination
+
+    wprint_in_middle(win, 3 + i + 1 + AdditionalOffset, 0, width, ThemeBuf,
+                     COLOR_PAIR(label_color));
+    AdditionalOffset++;
+  }
 }

src/marks.h

@@ -1 +1,5 @@
+// header guard
+#ifndef _ba_mp_hg_
+#define _ba_mp_hg_
 void marks_page();
+#endif

src/net.cpp

@@ -1,7 +1,9 @@
 #include "net.h"
 #include "color.h"
+#include "const.h"
 #include "helper_funcs.h"
 #include "main.h"
+#include <cerrno>
 #include <cmath>
 #include <cstddef>
 #include <cstdlib>
@@ -18,6 +20,14 @@
 
 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
@@ -28,30 +38,47 @@ size_t WriteCallback(void *contents, size_t size, size_t nmemb,
   return totalSize;
 }
 
-std::tuple<std::string, int> send_curl_request(std::string endpoint,
+std::tuple<std::string, int>
-                                               std::string type,
+send_curl_request(std::string endpoint, uint8_t type, std::string req_data) {
-                                               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);
 
+    if (config.ignoressl) {
       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
       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());
+    curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
 
     struct curl_slist *headers = NULL;
     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") {
+    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 +90,17 @@ 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 +129,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 +141,10 @@ 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";
@@ -129,19 +157,26 @@ void refresh_access_token() {
 
   access_token = resp_parsed["access_token"];
 }
-
+void is_access_token_empty() {
-json get_grades() {
   if (access_token.empty()) {
     json authfile_parsed = json::parse(SoRAuthFile(false, ""));
     access_token = authfile_parsed["access_token"];
   }
-      std::string req_data =
+}
-      std::format("Authorization=Bearer&access_token={}",
-                  access_token);
 
-    auto [response, http_code] = send_curl_request("api/3/marks", "GET", req_data);
+// supports all endpoints that only require access_token
+json get_data_from_endpoint(std::string endpoint) {
+  is_access_token_empty();
+  std::string req_data =
+      std::format("Authorization=Bearer&access_token={}", access_token);
+
+  auto [response, http_code] = send_curl_request(endpoint, GET, req_data);
 
   if (http_code != 200) {
+    // DEBUG
+    std::clog << "Failed geting data from endpoint: " << endpoint
+              << " code: " << http_code << "\nrequest: " << req_data
+              << "\nresponse: " << response << std::endl;
     refresh_access_token();
   }
 

src/net.h

@@ -1,6 +1,9 @@
 #include <curl/curl.h>
 #include <nlohmann/json.hpp>
 #include <string>
+// header guard
+#ifndef _ba_ne_hg_
+#define _ba_ne_hg_
 
 using nlohmann::json;
 
@@ -8,5 +11,6 @@ extern CURL *curl;
 namespace bakaapi {
 void login(std::string username, std::string password);
 void refresh_access_token();
-json get_grades();
+json get_data_from_endpoint(std::string endpoint);
 } // namespace bakaapi
+#endif

src/timetable.cpp

@@ -0,0 +1,49 @@
+#include "timetable.h"
+#include "net.h"
+#include <cstdint>
+#include <format>
+#include <fstream>
+#include <iostream>
+#include <locale>
+#include <ncurses.h>
+#include <nlohmann/json.hpp>
+
+using nlohmann::json;
+
+void timetable_page() {
+  // DONT FORGET TO UNCOMMENT
+  // json resp_from_api =
+  // bakaapi::get_data_from_endpoint("api/3/timetable/actual");
+  std::ifstream f("test-data/timetable.json");
+  json resp_from_api = json::parse(f);
+
+  // calculate table size
+  // some lambda dark magic
+  const uint8_t num_of_columns = [&]() -> uint8_t {
+    uint8_t result = 0;
+    for (uint8_t i = 0; i < resp_from_api["Days"].size(); i++) {
+      uint8_t currentSize = resp_from_api["Days"][i]["Atoms"].size();
+      if (currentSize > result) {
+        result = currentSize;
+      }
+    }
+    return result;
+  }();
+
+  const uint8_t num_of_rows = resp_from_api["Days"].size();
+
+  setlocale(LC_ALL, "");
+  /* Initialize curses */
+  initscr();
+  start_color();
+  cbreak();
+  noecho();
+  keypad(stdscr, TRUE);
+
+  // Use wide character printing
+  std::wstring msg = std::format(L"LINES: {} COLS: {}", LINES, COLS);
+  mvaddwstr(0, 0, msg.c_str());
+  refresh();
+  getch(); // Wait for key press
+  endwin();
+}

src/timetable.h

@@ -0,0 +1,6 @@
+// header guard
+#ifndef _ba_ti_hg_
+#define _ba_ti_hg_
+
+void timetable_page();
+#endif

src/types.h

@@ -0,0 +1,9 @@
+// header guard
+#ifndef _ba_ty_hg_
+#define _ba_ty_hg_
+
+struct Config {
+    bool verbose = false;
+    bool ignoressl = false;
+};
+#endif