version 0.8

This reverts commit 50ef8d9fda.

Makefile

@@ -1,7 +1,7 @@
 # Compiler and flags
 CPPC = g++
-CPPC_FLAGS = -std=c++23 -s -O3 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
-DEBUG_FLAGS = -ggdb -std=c++23 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
+CPPC_FLAGS = -std=c++23 -s -O3 -lncursesw -lcurl -lmenuw -lpanel -Wall -Wextra -Wno-write-strings
+DEBUG_FLAGS = -ggdb -std=c++23 -lncursesw -lcurl -lmenuw -lpanel -Wall -Wextra -Wno-write-strings
 
 
 SRC_PATH := src
@@ -29,10 +29,13 @@ $(BIN_PATH)/bakatui: $(OBJ_FILES)
 	$(CPPC) $(CPPC_FLAGS) $^ -o $@
 
 
-$(OBJ_PATH)/%.o: $(SRC_PATH)/%.cpp
+$(OBJ_PATH)/%.o: $(SRC_PATH)/%.cpp $(SRC_PATH)/%.h
 	$(CPPC) $(CPPC_FLAGS) -c $< -o $@
 
 
+install:
+	@install -vpm 755 -o root -g root $(BIN_PATH)/bakatui /usr/bin/
+
 clean:
 	rm -fr build
 

src/const.h

@@ -1,7 +1,7 @@
 #include <string_view>
 #ifndef VERSION
 
-#define VERSION "0.7"
+#define VERSION "0.8"
 #define NAME "bakatui"
 
 inline constexpr auto hash_djb2a(const std::string_view sv) {
@@ -16,4 +16,4 @@ inline constexpr auto operator"" _sh(const char *str, size_t len) {
   return hash_djb2a(std::string_view{str, len});
 }
 
-#endif
+#endif

src/helper_funcs.cpp

@@ -1,6 +1,9 @@
 #include "helper_funcs.h"
 #include "color.h"
+#include "main.h"
+#include "memory.h"
 #include "net.h"
+#include <algorithm>
 #include <codecvt>
 #include <csignal>
 #include <curses.h>
@@ -10,10 +13,13 @@
 #include <iostream>
 #include <locale>
 #include <panel.h>
+#include <regex>
 #include <string>
 #include <termios.h>
 #include <unistd.h>
-#include "main.h"
+#include <vector>
+
+std::vector<allocation> *current_allocated;
 
 void safe_exit(int code) {
   switch (code) {
@@ -38,6 +44,7 @@ void safe_exit(int code) {
   default:
     break;
   }
+  delete_all(current_allocated);
 
   curl_easy_cleanup(curl);
   endwin();
@@ -152,9 +159,11 @@ void wprint_in_middle(WINDOW *win, int starty, int startx, int width,
   x = startx + (int)temp;
   wattron(win, color);
   if (mvwaddwstr(win, y, x, string) == ERR) {
-    if(config.verbose){
-    std::wcerr << RED"[ERROR]"<< RESET" wprint_in_middle failed to print " << string << "\n";
-  }}
+    if (config.verbose) {
+      std::wcerr << RED "[ERROR]" << RESET " wprint_in_middle failed to print "
+                 << string << "\n";
+    }
+  }
   wattroff(win, color);
   refresh();
 }
@@ -192,7 +201,7 @@ std::wstring wrm_tr_le_whitespace(const std::wstring &s) {
 }
 
 // Conversion utilities
-char *wchar_to_char(wchar_t *src) {
+char *wchar_to_char(const wchar_t *src) {
   if (!src)
     return nullptr;
 
@@ -203,7 +212,7 @@ char *wchar_to_char(wchar_t *src) {
   return dest;
 }
 
-wchar_t *char_to_wchar(char *src) {
+wchar_t *char_to_wchar(const char *src) {
   if (!src)
     return nullptr;
 
@@ -235,3 +244,29 @@ void move_panel_relative(PANEL *panel, int dy, int dx) {
 
   move_panel(panel, new_y, new_x);
 }
+
+std::string html_to_string(std::string html) {
+  { // fix new lines
+    const std::string search = "<br />";
+    const std::string replace = "\n";
+
+    size_t pos = 0;
+    while ((pos = html.find(search, pos)) != std::string::npos) {
+      html.replace(pos, search.length(), replace);
+      pos += replace.length();
+    }
+  }
+
+  {
+    std::regex linkPattern("<a\\s+href=[\"'](.*?)[\"'](.*?)>(.*?)</a>");
+    html = std::regex_replace(html, linkPattern,
+                              "\033]8;;$1\033\\$3\033]8;;\033\\");
+  }
+
+  {
+    std::regex tag("<[^>]*>");
+    html = std::regex_replace(html, tag, "");
+  }
+
+  return html;
+}

src/helper_funcs.h

@@ -1,10 +1,14 @@
+#include "memory.h"
 #include <curses.h>
 #include <string>
+#include <vector>
 
 // header guard
 #ifndef _ba_hf_hg_
 #define _ba_hf_hg_
 
+extern std::vector<allocation> *current_allocated;
+
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 
 void safe_exit(int code);
@@ -23,10 +27,12 @@ void wprint_in_middle(WINDOW *win, int starty, int startx, int width,
 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);
+char *wchar_to_char(const wchar_t *src);
+wchar_t *char_to_wchar(const char *src);
 
 std::wstring string_to_wstring(const std::string &str);
 std::string wstring_to_string(const std::wstring &wstr);
 
+std::string html_to_string(std::string html);
+
 #endif

src/komens.cpp

@@ -0,0 +1,172 @@
+#include "komens.h"
+#include "helper_funcs.h"
+#include "memory.h"
+#include "net.h"
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <curses.h>
+#include <cwchar>
+#include <menu.h>
+#include <nlohmann/json.hpp>
+#include <string>
+#include <vector>
+
+#define WIN_HIGHT 40
+#define DEFAULT_OFSET 4
+
+using nlohmann::json;
+
+std::vector<allocation> komens_allocated;
+
+void insert_content(WINDOW *content_window, size_t i, json &resp_from_api);
+
+void komens_page(koment_type type) {
+  current_allocated = &komens_allocated;
+  json resp_from_api;
+  {
+    /*std::ifstream f("test-data/komens.json");
+    resp_from_api = json::parse(f);
+    f.close();*/
+    const char *types[] = {"/api/3/komens/messages/received",
+                           "/api/3/komens/messages/sent",
+                           "/api/3/komens/messages/noticeboard"};
+
+    const std::string endpoint = types[type];
+    resp_from_api = bakaapi::get_data_from_endpoint(endpoint, POST);
+  }
+
+  /* Initialize curses */
+  setlocale(LC_ALL, "");
+  initscr();
+  start_color();
+  cbreak();
+  noecho();
+  keypad(stdscr, TRUE);
+
+  /* Initialize all the colors */
+  for (uint8_t i = 0; i < 8; i++) {
+    init_pair(i, i, COLOR_BLACK);
+  }
+  size_t num_of_komens = resp_from_api["Messages"].size();
+  ITEM **komens_items = new ITEM *[num_of_komens + 1];
+  komens_allocated.push_back({ITEM_ARRAY, komens_items, num_of_komens});
+
+  char **title_bufs = new char *[num_of_komens];
+  char **name_bufs = new char *[num_of_komens];
+  size_t max_item_lenght;
+  {
+    size_t max_title_lenght = 0;
+    size_t max_name_lenght = 0;
+    size_t tmp_lenght;
+    char tmp_buf[1500];
+    for (size_t i = 0; i < num_of_komens; i++) {
+      wcstombs(tmp_buf,
+               string_to_wstring(
+                   resp_from_api["Messages"][i]["Title"].get<std::string>())
+                   .c_str(),
+               sizeof(tmp_buf));
+
+      tmp_lenght =
+          resp_from_api["Messages"][i]["Title"].get<std::string>().length();
+
+      if (tmp_lenght > max_title_lenght) {
+        max_title_lenght = tmp_lenght;
+      }
+
+      title_bufs[i] = new char[strlen(tmp_buf) + 1];
+      strlcpy(title_bufs[i], tmp_buf, strlen(tmp_buf) + 1);
+      wcstombs(
+          tmp_buf,
+          string_to_wstring(
+              resp_from_api["Messages"][i]["Sender"]["Name"].get<std::string>())
+              .c_str(),
+          sizeof(tmp_buf));
+
+      tmp_lenght = resp_from_api["Messages"][i]["Sender"]["Name"]
+                       .get<std::string>()
+                       .length();
+
+      if (tmp_lenght > max_name_lenght) {
+        max_name_lenght = tmp_lenght;
+      }
+
+      name_bufs[i] = new char[strlen(tmp_buf) + 1];
+      strlcpy(name_bufs[i], tmp_buf, strlen(tmp_buf) + 1);
+
+      komens_items[i] = new_item(title_bufs[i], name_bufs[i]);
+    }
+    max_item_lenght = 3 + max_title_lenght + 1 + max_name_lenght;
+  }
+  komens_items[num_of_komens] = nullptr;
+
+  MENU *komens_choise_menu = new_menu(komens_items);
+  komens_allocated.push_back({MENU_TYPE, komens_choise_menu, 1});
+
+  WINDOW *komens_choise_menu_win =
+      newwin(WIN_HIGHT, max_item_lenght + 1, DEFAULT_OFSET, DEFAULT_OFSET);
+  komens_allocated.push_back({WINDOW_TYPE, komens_choise_menu_win, 1});
+
+  set_menu_win(komens_choise_menu, komens_choise_menu_win);
+  set_menu_sub(komens_choise_menu,
+               derwin(komens_choise_menu_win, WIN_HIGHT - 10, max_item_lenght,
+                      DEFAULT_OFSET - 1, DEFAULT_OFSET - 3));
+  set_menu_format(komens_choise_menu, WIN_HIGHT - 5, 1);
+
+  set_menu_mark(komens_choise_menu, " * ");
+
+  box(komens_choise_menu_win, 0, 0);
+
+  wprint_in_middle(komens_choise_menu_win, 1, 0, max_item_lenght, L"Komens",
+                   COLOR_PAIR(1));
+  mvwaddch(komens_choise_menu_win, 2, 0, ACS_LTEE);
+  mvwhline(komens_choise_menu_win, 2, 1, ACS_HLINE, max_item_lenght - 1);
+  mvwaddch(komens_choise_menu_win, 2, max_item_lenght, ACS_RTEE);
+
+  post_menu(komens_choise_menu);
+  wrefresh(komens_choise_menu_win);
+
+  WINDOW *content_window =
+      newwin(WIN_HIGHT, COLS - max_item_lenght - DEFAULT_OFSET - 1,
+             DEFAULT_OFSET, DEFAULT_OFSET + max_item_lenght + 1);
+  komens_allocated.push_back({WINDOW_TYPE, content_window, 1});
+  box(content_window, 0, 0);
+  insert_content(content_window, item_index(current_item(komens_choise_menu)),
+                 resp_from_api);
+  wrefresh(content_window);
+
+  attron(COLOR_PAIR(COLOR_BLUE));
+  mvprintw(LINES - 2, 0,
+           "Use PageUp and PageDown to scoll down or up a page of items");
+  mvprintw(LINES - 1, 0, "Arrow Keys to navigate (F1 to Exit)");
+  attroff(COLOR_PAIR(COLOR_BLUE));
+  refresh();
+
+  int c;
+  while ((c = getch()) != KEY_F(1)) {
+    switch (c) {
+    case KEY_DOWN:
+    case KEY_NPAGE:
+    case 'j':
+      menu_driver(komens_choise_menu, REQ_DOWN_ITEM);
+      break;
+
+    case KEY_UP:
+    case KEY_PPAGE:
+    case 'k':
+      menu_driver(komens_choise_menu, REQ_UP_ITEM);
+      break;
+    }
+    insert_content(content_window, item_index(current_item(komens_choise_menu)),
+                   resp_from_api);
+    wrefresh(content_window);
+    wrefresh(komens_choise_menu_win);
+  }
+  delete_all(&komens_allocated);
+}
+
+void insert_content(WINDOW *content_window, size_t i, json &resp_from_api) {
+  wclear(content_window);
+  mvwprintw(content_window, 0, 0, "%s",
+            html_to_string(resp_from_api.at("Messages")[i]["Text"]).c_str());
+}

src/komens.h

@@ -0,0 +1,9 @@
+#ifndef _ba_ko_hg_
+#define _ba_ko_hg_
+enum koment_type {
+  RECEIVED,
+  SEND,
+  NOTICEBOARD,
+};
+void komens_page(koment_type type);
+#endif

src/komens_menu.cpp

@@ -0,0 +1,106 @@
+#include "komens_menu.h"
+#include "helper_funcs.h"
+#include "komens.h"
+#include "net.h"
+#include <cstdlib>
+#include <cstring>
+#include <curses.h>
+#include <menu.h>
+
+void komens_menu() {
+  wchar_t *choices[] = {
+      L"received", L"sent", L"noticeboard", L"Exit", nullptr,
+  };
+
+  ITEM **my_items;
+  int c;
+  MENU *my_menu;
+  WINDOW *my_menu_win;
+  int n_choices, i;
+
+  /* Initialize curses */
+  setlocale(LC_ALL, "");
+  initscr();
+  start_color();
+  cbreak();
+  noecho();
+  keypad(stdscr, TRUE);
+  init_pair(1, COLOR_RED, COLOR_BLACK);
+  init_pair(2, COLOR_CYAN, COLOR_BLACK);
+
+  /* Create items */
+  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(wchar_to_char(choices[i]), wchar_to_char(choices[i]));
+
+  /* Crate menu */
+  my_menu = new_menu((ITEM **)my_items);
+
+  /* Create the window to be associated with the menu */
+  my_menu_win = newwin(12, 40, 4, 4);
+  keypad(my_menu_win, TRUE);
+
+  /* Set main window and sub window */
+  set_menu_win(my_menu, my_menu_win);
+  set_menu_sub(my_menu, derwin(my_menu_win, 8, 38, 3, 1));
+  set_menu_format(my_menu, 7, 1);
+
+  /* Set menu mark to the string " * " */
+  set_menu_mark(my_menu, " * ");
+
+  /* Print a border around the main window and print a title */
+  box(my_menu_win, 0, 0);
+
+  wprint_in_middle(my_menu_win, 1, 0, 40, L"Komens 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);
+
+  /* Post the menu */
+  post_menu(my_menu);
+  wrefresh(my_menu_win);
+
+  attron(COLOR_PAIR(2));
+  mvprintw(LINES - 2, 0,
+           "Use PageUp and PageDown to scoll down or up a page of items");
+  mvprintw(LINES - 1, 0, "Arrow Keys to navigate (F1 to Exit)");
+  attroff(COLOR_PAIR(2));
+  refresh();
+
+  while ((c = getch()) != KEY_F(1)) {
+    switch (c) {
+    case KEY_DOWN:
+    case KEY_NPAGE:
+    case 'j':
+      menu_driver(my_menu, REQ_DOWN_ITEM);
+      break;
+
+    case KEY_UP:
+    case KEY_PPAGE:
+    case 'k':
+      menu_driver(my_menu, REQ_UP_ITEM);
+      break;
+    case 10: // ENTER
+      clear();
+      if (item_index(current_item(my_menu)) == n_choices - 1) {
+        goto close_menu;
+      }
+      komens_page(static_cast<koment_type>(item_index(current_item(my_menu))));
+      pos_menu_cursor(my_menu);
+      refresh();
+      wrefresh(my_menu_win);
+      break;
+    }
+    wrefresh(my_menu_win);
+  }
+close_menu:
+
+  /* Unpost and free all the memory taken up */
+  unpost_menu(my_menu);
+  free_menu(my_menu);
+  for (i = 0; i < n_choices; ++i)
+    free_item(my_items[i]);
+  endwin();
+}

src/komens_menu.h

@@ -0,0 +1,6 @@
+#ifndef _ba_km_hg_
+#define _ba_km_hg_
+
+void komens_menu();
+
+#endif

src/main_menu.cpp

@@ -1,24 +1,20 @@
 #include "helper_funcs.h"
+#include "komens_menu.h"
+#include "marks.h"
 #include "net.h"
 #include "timetable.h"
-#include <cstddef>
 #include <cstdlib>
 #include <cstring>
 #include <curses.h>
 #include <menu.h>
 
-#include "marks.h"
-
-#define CTRLD 4
-
-wchar_t *choices[] = {
-    L"login",    L"Marks",   L"timetable", L"Komens",
-    L"Homework", L"Absence", L"Exit",      (wchar_t *)NULL,
-};
-void (*choicesFuncs[])() = {nullptr, marks_page, timetable_page, nullptr,
-                            nullptr, nullptr,    nullptr,        nullptr};
-
 void main_menu() {
+  wchar_t *choices[] = {
+      L"login",    L"Marks",   L"timetable", L"Komens",
+      L"Homework", L"Absence", L"Exit",      nullptr,
+  };
+  void (*choicesFuncs[])() = {nullptr, marks_page, timetable_page, komens_menu,
+                              nullptr, nullptr,    nullptr,        nullptr};
   ITEM **my_items;
   int c;
   MENU *my_menu;
@@ -79,19 +75,21 @@ void main_menu() {
   while ((c = getch()) != KEY_F(1)) {
     switch (c) {
     case KEY_DOWN:
-      menu_driver(my_menu, REQ_DOWN_ITEM);
-      break;
-    case KEY_UP:
-      menu_driver(my_menu, REQ_UP_ITEM);
-      break;
     case KEY_NPAGE:
+    case 'j':
       menu_driver(my_menu, REQ_DOWN_ITEM);
       break;
+
+    case KEY_UP:
     case KEY_PPAGE:
+    case 'k':
       menu_driver(my_menu, REQ_UP_ITEM);
       break;
     case 10: // ENTER
       clear();
+      if (item_index(current_item(my_menu)) == n_choices - 1) {
+        goto close_menu;
+      }
       choicesFuncs[item_index(current_item(my_menu))]();
       pos_menu_cursor(my_menu);
       refresh();
@@ -100,6 +98,7 @@ void main_menu() {
     }
     wrefresh(my_menu_win);
   }
+close_menu:
 
   /* Unpost and free all the memory taken up */
   unpost_menu(my_menu);
@@ -107,4 +106,4 @@ void main_menu() {
   for (i = 0; i < n_choices; ++i)
     free_item(my_items[i]);
   endwin();
-}
+}

src/marks.cpp

@@ -1,5 +1,6 @@
 #include "marks.h"
 #include "helper_funcs.h"
+#include "memory.h"
 #include "net.h"
 #include <algorithm>
 #include <cstddef>
@@ -12,6 +13,7 @@
 #include <nlohmann/json.hpp>
 #include <panel.h>
 #include <string>
+#include <vector>
 
 using nlohmann::json;
 
@@ -27,23 +29,26 @@ using nlohmann::json;
 
 #define DEFAULT_PADDING 4
 
+std::vector<allocation> marks_allocated;
+
 void init_wins(WINDOW **wins, int n, json marks_json);
 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_data_from_endpoint("api/3/marks");
-  // std::ifstream f("test-data/marks3.json");
-  // json resp_from_api = json::parse(f);
-
-  WINDOW **my_wins;
+  current_allocated = &marks_allocated;
+  json resp_from_api;
+  {
+    std::string endpoint = "api/3/marks";
+    resp_from_api = bakaapi::get_data_from_endpoint(endpoint, GET);
+  }
   size_t size_my_wins = resp_from_api["Subjects"].size();
-  my_wins = new (std::nothrow) WINDOW *[size_my_wins];
+  WINDOW **my_wins = new (std::nothrow) WINDOW *[size_my_wins];
+  marks_allocated.push_back({WINDOW_ARRAY, my_wins, size_my_wins});
 
-  PANEL **my_panels;
   size_t size_my_panels = resp_from_api["Subjects"].size();
-  my_panels = new (std::nothrow) PANEL *[size_my_panels];
+  PANEL **my_panels = new (std::nothrow) PANEL *[size_my_panels];
+  marks_allocated.push_back({PANEL_ARRAY, my_panels, size_my_panels});
 
   // trows compiler warning for some reason but cannot be removed
   PANEL *top;
@@ -66,7 +71,9 @@ void marks_page() {
 
   // store all original window position
   int *original_y = new int[size_my_wins];
+  marks_allocated.push_back({GENERIC_ARRAY, original_y, size_my_wins});
   int *original_x = new int[size_my_wins];
+  marks_allocated.push_back({GENERIC_ARRAY, original_x, size_my_wins});
   for (size_t i = 0; i < size_my_wins; ++i) {
     getbegyx(my_wins[i], original_y[i], original_x[i]);
   }
@@ -121,10 +128,7 @@ void marks_page() {
   // Cleanup
   endwin();
   clear();
-  delete[] my_wins;
-  delete[] my_panels;
-  delete[] original_y;
-  delete[] original_x;
+  delete_all(&marks_allocated);
 }
 
 /* Put all the windows */
@@ -153,7 +157,9 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
              wsub_name.c_str(), wsub_avg_s.c_str());
 
     size_t max_text_length = wcslen(label);
-    for (unsigned int j = 0; j < static_cast<unsigned int>(marks_json["Subjects"][i]["Marks"].size()); j++) {
+    for (unsigned int j = 0; j < static_cast<unsigned int>(
+                                     marks_json["Subjects"][i]["Marks"].size());
+         j++) {
       std::string caption =
           rm_tr_le_whitespace(marks_json["Subjects"][i]["Marks"][j]["Caption"]);
       std::string theme =
@@ -178,7 +184,10 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
       MaxHight = 0;
     }
 
-    if (static_cast<unsigned int>(marks_json["Subjects"][i]["Marks"].size()) * 2 + DEFAULT_PADDING > MaxHight) {
+    if (static_cast<unsigned int>(marks_json["Subjects"][i]["Marks"].size()) *
+                2 +
+            DEFAULT_PADDING >
+        MaxHight) {
       MaxHight =
           marks_json["Subjects"][i]["Marks"].size() * 2 + DEFAULT_PADDING;
     }
@@ -196,8 +205,9 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
 /* Show the window with a border and a label */
 void win_show(WINDOW *win, wchar_t *label, int label_color, int width,
               int height, json marks_json, int SubjectIndex) {
-  
-  // is the compiler smoking weed or something, why is it thinking starty is not used ??
+
+  // is the compiler smoking weed or something, why is it thinking starty is not
+  // used ??
   int startx, starty;
 
   wresize(win, height, width);

src/memory.cpp

@@ -0,0 +1,59 @@
+#include "memory.h"
+#include "color.h"
+#include <iostream>
+#include <ncurses.h>
+#include <panel.h>
+
+void delete_all(std::vector<allocation> *allocated) {
+  if (allocated == nullptr) {
+    return;
+  }
+  for (long long i = allocated->size() - 1; i >= 0; i--) {
+    switch (allocated->at(i).type) {
+    case WINDOW_ARRAY: {
+      WINDOW **windows = static_cast<WINDOW **>(allocated->at(i).ptr);
+      for (std::size_t j = 0; j < allocated->at(i).size; j++) {
+        delwin(windows[j]);
+      }
+      delete[] windows;
+      break;
+    }
+    case PANEL_ARRAY: {
+      PANEL **panels = static_cast<PANEL **>(allocated->at(i).ptr);
+      for (std::size_t j = 0; j < allocated->at(i).size; j++) {
+        del_panel(panels[j]);
+      }
+      delete[] panels;
+      break;
+    }
+    case ITEM_ARRAY: {
+      ITEM **items = static_cast<ITEM **>(allocated->at(i).ptr);
+      for (std::size_t j = 0; j < allocated->at(i).size; j++) {
+        free_item(items[j]);
+      }
+      delete[] items;
+      break;
+    }
+    case GENERIC_ARRAY:
+      delete[] static_cast<char *>(allocated->at(i).ptr);
+      break;
+    case WINDOW_TYPE:
+      delwin(static_cast<WINDOW *>(allocated->at(i).ptr));
+      break;
+    case PANEL_TYPE:
+      del_panel(static_cast<PANEL *>(allocated->at(i).ptr));
+      break;
+    case MENU_TYPE:
+      free_menu(static_cast<MENU *>(allocated->at(i).ptr));
+      break;
+    case GENERIC_TYPE:
+      delete static_cast<char *>(allocated->at(i).ptr);
+      break;
+    default:
+      std::cerr << RED "[!!CRITICAL!!]" << RESET " Unknown allocation type"
+                << "\n";
+      break;
+    }
+    allocated->pop_back();
+  }
+}

src/memory.h

@@ -0,0 +1,26 @@
+// header guard
+#ifndef _ba_me_hg_
+#define _ba_me_hg_
+
+#include <cstddef>
+#include <menu.h>
+#include <vector>
+enum AllocationType {
+  WINDOW_ARRAY,
+  PANEL_ARRAY,
+  ITEM_ARRAY,
+  GENERIC_ARRAY,
+  WINDOW_TYPE,
+  PANEL_TYPE,
+  MENU_TYPE,
+  GENERIC_TYPE
+};
+
+struct allocation {
+  AllocationType type;
+  void *ptr;
+  std::size_t size;
+};
+
+void delete_all(std::vector<allocation> *allocated);
+#endif

src/net.cpp

@@ -20,12 +20,6 @@
 
 using nlohmann::json;
 
-// metods
-enum {
-  GET,
-  POST,
-};
-
 std::string access_token;
 
 CURL *curl = curl_easy_init();
@@ -38,8 +32,8 @@ size_t WriteCallback(void *contents, size_t size, size_t nmemb,
   return totalSize;
 }
 
-std::tuple<std::string, int>
-send_curl_request(std::string endpoint, uint8_t type, std::string req_data) {
+std::tuple<std::string, int> send_curl_request(std::string endpoint, metod type,
+                                               std::string req_data) {
   std::string response;
   std::string url = baka_api_url + endpoint;
   if (type == GET) {
@@ -47,8 +41,6 @@ send_curl_request(std::string endpoint, uint8_t type, std::string 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);
@@ -123,14 +115,11 @@ void login(std::string username, std::string password) {
   json resp_parsed = json::parse(response);
 
   access_token = resp_parsed["access_token"];
-
-  // DEBUG
-  std::cout << "access token: " << access_token << std::endl;
 }
 
 void refresh_access_token() {
-  if(config.verbose) {
-  std::clog << "refreshing access token please wait...\n";
+  if (config.verbose) {
+    std::clog << "refreshing access token please wait...\n";
   }
 
   json authfile_parsed = json::parse(SoRAuthFile(false, ""));
@@ -142,9 +131,6 @@ void refresh_access_token() {
                   "token&refresh_token={}",
                   refresh_token);
 
-  // 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
@@ -167,19 +153,19 @@ void is_access_token_empty() {
 }
 
 // supports all endpoints that only require access_token
-json get_data_from_endpoint(std::string endpoint) {
+json get_data_from_endpoint(const std::string &endpoint, metod metod,
+                            std::string additional_data) {
   is_access_token_empty();
-  access_token_refreshed:
+access_token_refreshed:
   std::string req_data =
       std::format("Authorization=Bearer&access_token={}", access_token);
+  if (!additional_data.empty()) {
+    req_data.append(std::format("&{}", additional_data));
+  }
 
-  auto [response, http_code] = send_curl_request(endpoint, GET, req_data);
+  auto [response, http_code] = send_curl_request(endpoint, metod, 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();
     goto access_token_refreshed;
   }

src/net.h

@@ -5,12 +5,19 @@
 #ifndef _ba_ne_hg_
 #define _ba_ne_hg_
 
+// metods
+enum metod {
+  GET,
+  POST,
+};
+
 using nlohmann::json;
 
 extern CURL *curl;
 namespace bakaapi {
 void login(std::string username, std::string password);
 void refresh_access_token();
-json get_data_from_endpoint(std::string endpoint);
+json get_data_from_endpoint(const std::string &endpoint, metod metod,
+                            std::string additional_data = "");
 } // namespace bakaapi
 #endif

src/timetable.cpp

@@ -2,24 +2,32 @@
 #include "color.h"
 #include "const.h"
 #include "helper_funcs.h"
+#include "memory.h"
 #include "net.h"
 #include "types.h"
+#include <bits/chrono.h>
 #include <cstdint>
+#include <cstdio>
+#include <ctime>
 #include <curses.h>
 #include <cwchar>
+#include <iomanip>
 #include <iostream>
 #include <ncurses.h>
 #include <nlohmann/json.hpp>
 #include <panel.h>
+#include <sstream>
 #include <string>
 #include <sys/types.h>
 #include <vector>
 
 using nlohmann::json;
-#define BOTTOM_PADDING 3
+#define BOTTOM_PADDING 5
 
 #define DEFAULT_OFFSET 3
 
+std::vector<allocation> timetable_allocated;
+
 const wchar_t *day_abriviations[] = {nullptr, L"Mo", L"Tu", L"We",
                                      L"Th",   L"Fr", L"Sa", L"Su"};
 
@@ -80,11 +88,20 @@ json *find_atom_by_indexes(json &resp_from_api, uint8_t day_index,
 }
 
 void timetable_page() {
-  // DONT FORGET TO UNCOMMENT
+  current_allocated = &timetable_allocated;
+  auto dateSelected = std::chrono::system_clock::now();
+reload_for_new_week:
+  std::time_t date_time_t = std::chrono::system_clock::to_time_t(dateSelected);
+  std::tm local_time = *std::localtime(&date_time_t);
+
+  std::stringstream date_stringstream;
+  date_stringstream << std::put_time(&local_time, "%Y-%m-%d");
+
+  std::string date_string = "date=" + date_stringstream.str();
+  std::string endpoint = "api/3/timetable/actual";
+
   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);*/
+      bakaapi::get_data_from_endpoint(endpoint, GET, date_string);
 
   // this may be unnecessary but i dont have enaugh data to test it
   // it sorts the hours by start time
@@ -95,6 +112,8 @@ void timetable_page() {
 
     Id_and_Start_time *temp_hour_sorting_array =
         new Id_and_Start_time[resp_from_api["Hours"].size()];
+    timetable_allocated.push_back({GENERIC_ARRAY, temp_hour_sorting_array,
+                                   resp_from_api["Hours"].size()});
 
     for (uint8_t i = 0; i < resp_from_api["Hours"].size(); i++) {
       temp_hour_sorting_array[i] = std::make_tuple(
@@ -139,6 +158,7 @@ void timetable_page() {
     }
 
     delete[] temp_hour_sorting_array;
+    timetable_allocated.pop_back();
   }
 
   // some lambda dark magic
@@ -178,7 +198,11 @@ void timetable_page() {
   const uint16_t cell_height = (LINES - BOTTOM_PADDING) / num_of_days;
 
   WINDOW **day_windows = new WINDOW *[num_of_days];
+  timetable_allocated.push_back({WINDOW_ARRAY, day_windows, num_of_days});
+
   WINDOW **lesson_windows = new WINDOW *[num_of_columns];
+  timetable_allocated.push_back({WINDOW_ARRAY, lesson_windows, num_of_columns});
+
   std::vector<std::vector<WINDOW *>> cells(
       num_of_days, std::vector<WINDOW *>(num_of_columns));
 
@@ -240,12 +264,64 @@ void timetable_page() {
 
       selector_windows[i] =
           newwin(1, 1, DEFAULT_OFFSET + y_offset, DEFAULT_OFFSET + x_offset);
+      timetable_allocated.push_back({WINDOW_TYPE, selector_windows[i], 1});
+
       selector_panels[i] = new_panel(selector_windows[i]);
+      timetable_allocated.push_back({PANEL_TYPE, selector_panels[i], 1});
+
       wattron(selector_windows[i], COLOR_PAIR(COLOR_RED));
       mvwaddch(selector_windows[i], 0, 0, corners[i]);
       wattroff(selector_windows[i], COLOR_PAIR(COLOR_RED));
     }
   }
+  attron(COLOR_PAIR(COLOR_BLUE));
+  mvprintw(LINES - 2, 0,
+           "Arrows/hjkl to select | ENTER to show info | p/n to select weeks "
+           "|F1 to exit");
+  {
+    std::tm end_week = local_time;
+    std::tm start_week = local_time;
+
+    // Convert tm_wday (0-6) to API day format (1-7)
+    int current_wday = (local_time.tm_wday == 0) ? 7 : local_time.tm_wday;
+
+    // Get days of week from API (1-7 format where Monday is 1)
+    uint8_t start_day = resp_from_api["Days"][0]["DayOfWeek"].get<uint8_t>();
+    uint8_t end_day =
+        resp_from_api["Days"][resp_from_api["Days"].size() - 1]["DayOfWeek"]
+            .get<uint8_t>();
+
+    // Calculate days back to start day (handles week wraparound)
+    int days_back = (current_wday >= start_day)
+                        ? (current_wday - start_day)
+                        : (current_wday + 7 - start_day);
+
+    // Calculate days forward to end day (handles week wraparound)
+    int days_forward = (current_wday <= end_day) ? (end_day - current_wday)
+                                                 : (end_day + 7 - current_wday);
+
+    // Adjust dates
+    start_week.tm_mday -= days_back;
+    end_week.tm_mday += days_forward;
+
+    // Normalize the dates
+    std::mktime(&start_week);
+    std::mktime(&end_week);
+
+    // Format the dates as strings
+    std::stringstream start_week_strstream, end_week_strstream;
+    start_week_strstream << std::put_time(&start_week, "%d.%m.%Y");
+    end_week_strstream << std::put_time(&end_week, "%d.%m.%Y");
+
+    // kern. developer approved ↓↓
+    mvprintw(LINES - 2,
+             COLS - (start_week_strstream.str().length() + 3 +
+                     end_week_strstream.str().length()),
+             "%s",
+             (start_week_strstream.str() + " - " + end_week_strstream.str())
+                 .c_str());
+  }
+  attroff(COLOR_PAIR(COLOR_BLUE));
 
   update_panels();
   doupdate();
@@ -300,6 +376,13 @@ void timetable_page() {
     case 'l':
       selected_cell.x++;
       break;
+    case 'p':
+    case 'n':
+      (ch == 'p') ? dateSelected = dateSelected - std::chrono::days(7)
+                  : dateSelected = dateSelected + std::chrono::days(7);
+      delete_all(&timetable_allocated);
+      goto reload_for_new_week;
+      break;
     case 10: // ENTER
       json *atom = find_atom_by_indexes(resp_from_api, selected_cell.y,
                                         selected_cell.x, HourIdLookupTable);
@@ -402,6 +485,11 @@ void timetable_page() {
       mvwaddwstr(infobox_window, 6, 1, Theme.c_str());
       wattroff(infobox_window, COLOR_PAIR(COLOR_CYAN));
 
+      wattron(infobox_window, COLOR_PAIR(COLOR_BLUE));
+      mvwaddstr(infobox_window, getmaxy(infobox_window) - 2, 1,
+                "Press any key to close");
+      wattroff(infobox_window, COLOR_PAIR(COLOR_BLUE));
+
       top_panel(infobox_panel);
       update_panels();
       doupdate();
@@ -441,8 +529,8 @@ void timetable_page() {
       }
     }
   }
-  delete[] day_windows;
-  delete[] lesson_windows;
+  delete_all(&timetable_allocated);
+  clear();
   endwin();
 }
 
@@ -589,4 +677,4 @@ void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
       }
     }
   }
-}
+}