fix SEGFAULT when nullptr

Makefile

@@ -1,8 +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:
+DEBUG_FLAGS = -ggdb -std=c++23 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
-# CPPC_FLAGS = -ggdb -std=c++23 -lncursesw -lcurl -lmenu -lpanel -Wall -Wextra -Wno-write-strings
 
 
 SRC_PATH := src
@@ -11,16 +10,18 @@ BIN_PATH := build/bin
 
 
 SRC_FILES := $(shell find $(SRC_PATH) -name '*.cpp')
-# Generate corresponding object file paths by replacing src/ with build/obj/
 OBJ_FILES := $(patsubst $(SRC_PATH)/%.cpp,$(OBJ_PATH)/%.o,$(SRC_FILES))
 
 
 all: make-build-dir $(BIN_PATH)/bakatui
 
 
+debug: CPPC_FLAGS = $(DEBUG_FLAGS)
+debug: make-build-dir $(BIN_PATH)/bakatui
+
+
 make-build-dir:
 	mkdir -p $(OBJ_PATH)
-	mkdir -p $(OBJ_PATH)/marks
 	mkdir -p $(BIN_PATH)
 
 
@@ -32,7 +33,10 @@ $(OBJ_PATH)/%.o: $(SRC_PATH)/%.cpp
 	$(CPPC) $(CPPC_FLAGS) -c $< -o $@
 
 
+install:
+	@install -vpm 755 -o root -g root $(BIN_PATH)/bakatui /usr/bin/
+
 clean:
 	rm -fr build
 
-.PHONY: all clean install
+.PHONY: all clean install debug

README.md

@@ -3,11 +3,12 @@
 
 > ### Dependencies:
 > [nlohmann-json](https://github.com/nlohmann/json)  
+> ncurses  
 
 > [!IMPORTANT]  
 > Only folowing works:
 > - [x] Login  
 > - [x] Marks  
-> - [-] Timetable  
+> - [x] Timetable  
 > - [ ] Komens  
 > - [ ] Absence

src/const.h

@@ -1,7 +1,7 @@
 #include <string_view>
 #ifndef VERSION
 
-#define VERSION "0.6"
+#define VERSION "0.7.2"
 #define NAME "bakatui"
 
 inline constexpr auto hash_djb2a(const std::string_view sv) {

src/helper_funcs.cpp

@@ -1,5 +1,7 @@
 #include "helper_funcs.h"
 #include "color.h"
+#include "main.h"
+#include "memory.h"
 #include "net.h"
 #include <codecvt>
 #include <csignal>
@@ -13,7 +15,9 @@
 #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 +42,7 @@ void safe_exit(int code) {
   default:
     break;
   }
+  delete_all(current_allocated);
 
   curl_easy_cleanup(curl);
   endwin();
@@ -152,9 +157,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){
+    if (config.verbose) {
-    std::wcerr << RED"[ERROR]"<< RESET" wprint_in_middle failed to print " << string << "\n";
+      std::wcerr << RED "[ERROR]" << RESET " wprint_in_middle failed to print "
-  }}
+                 << string << "\n";
+    }
+  }
   wattroff(win, color);
   refresh();
 }

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);

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
+  current_allocated = &marks_allocated;
-  json resp_from_api = bakaapi::get_data_from_endpoint("api/3/marks");
+  json resp_from_api;
-  // std::ifstream f("test-data/marks3.json");
+  {
-  // json resp_from_api = json::parse(f);
+    std::string endpoint = "api/3/marks";
-
+    resp_from_api = bakaapi::get_data_from_endpoint(endpoint);
-  WINDOW **my_wins;
+  }
   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_all(&marks_allocated);
-  delete[] my_panels;
-  delete[] original_y;
-  delete[] original_x;
 }
 
 /* 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;
     }
@@ -197,7 +206,8 @@ 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) {
 
-  // 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,48 @@
+#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 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 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,23 @@
+// header guard
+#ifndef _ba_me_hg_
+#define _ba_me_hg_
+
+#include <cstddef>
+#include <vector>
+enum AllocationType {
+  WINDOW_ARRAY,
+  PANEL_ARRAY,
+  GENERIC_ARRAY,
+  WINDOW_TYPE,
+  PANEL_TYPE,
+  GENERIC_TYPE
+};
+
+struct allocation {
+  AllocationType type;
+  void *ptr;
+  std::size_t size;
+};
+
+void delete_all(std::vector<allocation> *allocated);
+#endif

src/net.cpp

@@ -21,7 +21,7 @@
 using nlohmann::json;
 
 // metods
-enum {
+enum metod {
   GET,
   POST,
 };
@@ -38,8 +38,8 @@ size_t WriteCallback(void *contents, size_t size, size_t nmemb,
   return totalSize;
 }
 
-std::tuple<std::string, int>
+std::tuple<std::string, int> send_curl_request(std::string endpoint, metod 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) {
@@ -47,8 +47,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,13 +121,10 @@ 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) {
+  if (config.verbose) {
     std::clog << "refreshing access token please wait...\n";
   }
 
@@ -142,9 +137,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 +159,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(std::string &endpoint,
+                            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);
 
   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

@@ -11,6 +11,6 @@ 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(std::string &endpoint, std::string data = "");
 } // namespace bakaapi
 #endif

src/timetable.cpp

@@ -2,36 +2,46 @@
 #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"};
 
-void draw_days(WINDOW**& day_windows, uint16_t cell_height,uint8_t num_of_days, json &resp_from_api);
+void draw_days(WINDOW **&day_windows, uint16_t cell_height, uint8_t num_of_days,
+               json &resp_from_api);
 
-void draw_lessons(WINDOW**& lesson_windows, uint8_t num_of_columns, uint16_t cell_width, std::vector<uint8_t> &HourIdLookupTable, json &resp_from_api);
+void draw_lessons(WINDOW **&lesson_windows, uint8_t num_of_columns,
+                  uint16_t cell_width, std::vector<uint8_t> &HourIdLookupTable,
+                  json &resp_from_api);
 
 void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
                 uint16_t cell_width, uint16_t cell_height,
                 std::vector<std::vector<WINDOW *>> &cells,
-                   std::vector<uint8_t> &HourIdLookupTable,
+                std::vector<uint8_t> &HourIdLookupTable, json &resp_from_api);
-                   json &resp_from_api);
 
 uint8_t hour_id_to_index(const std::vector<uint8_t> &HourIdLookupTable,
                          uint8_t id) {
@@ -78,10 +88,19 @@ json *find_atom_by_indexes(json &resp_from_api, uint8_t day_index,
 }
 
 void timetable_page() {
-  // DONT FORGET TO UNCOMMENT
+  current_allocated = &timetable_allocated;
-  json resp_from_api = bakaapi::get_data_from_endpoint("api/3/timetable/actual");
+  auto dateSelected = std::chrono::system_clock::now();
-  /*std::ifstream f("test-data/timetable.json");
+reload_for_new_week:
-  json resp_from_api = json::parse(f);*/
+  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(endpoint, date_string);
 
   // this may be unnecessary but i dont have enaugh data to test it
   // it sorts the hours by start time
@@ -92,6 +111,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(
@@ -136,6 +157,7 @@ void timetable_page() {
     }
 
     delete[] temp_hour_sorting_array;
+    timetable_allocated.pop_back();
   }
 
   // some lambda dark magic
@@ -175,7 +197,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));
 
@@ -184,14 +210,17 @@ void timetable_page() {
     day_windows[i] = newwin(cell_height, DEFAULT_OFFSET,
                             i * cell_height + DEFAULT_OFFSET, 0);
   }
-  draw_days(day_windows, cell_height,num_of_days, resp_from_api);
-
 
+  // init cell windows
   for (uint8_t i = 0; i < num_of_columns; i++) {
     lesson_windows[i] =
         newwin(DEFAULT_OFFSET, cell_width, 0, i * cell_width + DEFAULT_OFFSET);
   }
-	draw_lessons(lesson_windows, num_of_columns, cell_width, HourIdLookupTable, resp_from_api);
+  draw_lessons(lesson_windows, num_of_columns, cell_width, HourIdLookupTable,
+               resp_from_api);
+  // days have to be drawn after lessons for some reason i actualy have no idea
+  // why
+  draw_days(day_windows, cell_height, num_of_days, resp_from_api);
 
   // init the cell windows
   for (uint8_t i = 0; i < num_of_days; i++) {
@@ -234,12 +263,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();
@@ -261,8 +342,9 @@ void timetable_page() {
       refresh();
 
       // Redraw everithing
-			draw_days(day_windows, cell_height,num_of_days, resp_from_api);
+      draw_days(day_windows, cell_height, num_of_days, resp_from_api);
-			draw_lessons(lesson_windows, num_of_columns, cell_width, HourIdLookupTable, resp_from_api);
+      draw_lessons(lesson_windows, num_of_columns, cell_width,
+                   HourIdLookupTable, resp_from_api);
       draw_cells(num_of_columns, num_of_days, cell_width, cell_height, cells,
                  HourIdLookupTable, resp_from_api);
 
@@ -293,6 +375,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);
@@ -329,14 +418,14 @@ void timetable_page() {
         }
       }
 
-			std::wstring Teacher= L"";
+      std::wstring Teacher = L"";
       try {
         Teacher = get_data_for_atom(resp_from_api, atom, "Teachers",
                                     "TeacherId", "Name");
-			} catch(...) {
+      } catch (...) {
         __asm__("nop");
       }
-      Teacher.insert(0,L"Teacher: ");
+      Teacher.insert(0, L"Teacher: ");
 
       std::wstring Groups = L"";
       try {
@@ -358,28 +447,31 @@ void timetable_page() {
       Groups = wrm_tr_le_whitespace(Groups);
       Groups.insert(0, L"Groups: ");
 
-      std::wstring Room= L"";
+      std::wstring Room = L"";
       try {
-        Room = get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId", "Name");
+        Room =
-        if(Room.empty()) {
+            get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId", "Name");
-          Room = get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId", "Abbrev");;
+        if (Room.empty()) {
+          Room = get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId",
+                                   "Abbrev");
+          ;
         }
       } catch (...) {
         __asm__("nop");
       }
       Room.insert(0, L"Room: ");
 
-      std::wstring Theme= L"";
+      std::wstring Theme = L"";
       try {
-        Theme = wrm_tr_le_whitespace(string_to_wstring(atom->at("Theme").get<std::string>()));
+        Theme = wrm_tr_le_whitespace(
+            string_to_wstring(atom->at("Theme").get<std::string>()));
       } catch (...) {
         __asm__("nop");
       }
       Theme.insert(0, L"Theme: ");
 
-      wprint_in_middle(
+      wprint_in_middle(infobox_window, 1, 0, getmaxx(infobox_window),
-        infobox_window, 1, 0, getmaxx(infobox_window), Caption.c_str(),
+                       Caption.c_str(), COLOR_PAIR(COLOR_CYAN));
-        COLOR_PAIR(COLOR_CYAN));
 
       // printing out of order to reduce wattro* directives
       wattron(infobox_window, COLOR_PAIR(COLOR_YELLOW));
@@ -392,7 +484,10 @@ 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();
@@ -422,8 +517,8 @@ void timetable_page() {
                      DEFAULT_OFFSET + y_offset + selected_cell.y * cell_height,
                      DEFAULT_OFFSET + x_offset + selected_cell.x * cell_width);
         }
-        draw_cells(num_of_columns, num_of_days, cell_width, cell_height,
+        draw_cells(num_of_columns, num_of_days, cell_width, cell_height, cells,
-                      cells, HourIdLookupTable, resp_from_api);
+                   HourIdLookupTable, resp_from_api);
         update_panels();
         doupdate();
 
@@ -433,23 +528,28 @@ void timetable_page() {
       }
     }
   }
-  delete[] day_windows;
+  delete_all(&timetable_allocated);
-  delete[] lesson_windows;
+  clear();
   endwin();
 }
 
-void draw_days(WINDOW**& day_windows, uint16_t cell_height,uint8_t num_of_days, json &resp_from_api) {
+void draw_days(WINDOW **&day_windows, uint16_t cell_height, uint8_t num_of_days,
+               json &resp_from_api) {
   for (uint8_t i = 0; i < num_of_days; i++) {
     // this wont draw left boarder window making it so it looks partially
     // offscreen
     wborder(day_windows[i], ' ', 0, 0, 0, ACS_HLINE, 0, ACS_HLINE, 0);
 
-    mvwaddwstr(day_windows[i], cell_height / 2, 0,day_abriviations[resp_from_api["Days"][i]["DayOfWeek"].get<uint8_t>()]);
+    mvwaddwstr(
+        day_windows[i], cell_height / 2, 0,
+        day_abriviations[resp_from_api["Days"][i]["DayOfWeek"].get<uint8_t>()]);
     wrefresh(day_windows[i]);
   }
 }
 
-void draw_lessons(WINDOW**& lesson_windows, uint8_t num_of_columns, uint16_t cell_width, std::vector<uint8_t> &HourIdLookupTable, json &resp_from_api) {
+void draw_lessons(WINDOW **&lesson_windows, uint8_t num_of_columns,
+                  uint16_t cell_width, std::vector<uint8_t> &HourIdLookupTable,
+                  json &resp_from_api) {
   for (uint8_t i = 0; i < num_of_columns; i++) {
     wborder(lesson_windows[i], 0, 0, ' ', 0, ACS_VLINE, ACS_VLINE, 0, 0);
     std::wstring caption;
@@ -480,12 +580,12 @@ void draw_lessons(WINDOW**& lesson_windows, uint8_t num_of_columns, uint16_t cel
 
   hour_id_found:
 
-    wprint_in_middle(lesson_windows[i], 0, 0, cell_width,
+    wprint_in_middle(lesson_windows[i], 0, 0, cell_width, caption.c_str(),
-                     caption.c_str(), COLOR_PAIR(0));
-    mvwaddwstr(lesson_windows[i], 1, 1, start_time.c_str());
-    print_in_middle(lesson_windows[i], 1, 0, cell_width, "-",
                      COLOR_PAIR(0));
-    mvwaddwstr(lesson_windows[i], 1, cell_width - end_time.length() - 1, end_time.c_str());
+    mvwaddwstr(lesson_windows[i], 1, 1, start_time.c_str());
+    print_in_middle(lesson_windows[i], 1, 0, cell_width, "-", COLOR_PAIR(0));
+    mvwaddwstr(lesson_windows[i], 1, cell_width - end_time.length() - 1,
+               end_time.c_str());
     wrefresh(lesson_windows[i]);
   }
 }
@@ -493,8 +593,7 @@ void draw_lessons(WINDOW**& lesson_windows, uint8_t num_of_columns, uint16_t cel
 void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
                 uint16_t cell_width, uint16_t cell_height,
                 std::vector<std::vector<WINDOW *>> &cells,
-                   std::vector<uint8_t> &HourIdLookupTable,
+                std::vector<uint8_t> &HourIdLookupTable, json &resp_from_api) {
-                   json &resp_from_api) {
   for (uint8_t i = 0; i < num_of_days; i++) {
     for (uint8_t j = 0; j < num_of_columns; j++) {
 
@@ -562,12 +661,11 @@ void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
           __asm__("nop");
         }
 
-        wprint_in_middle(cells[i][j], cell_height / 2,
+        wprint_in_middle(cells[i][j], cell_height / 2, 0, cell_width,
-                         0,
+                         Subject_Abbrev.c_str(), COLOR_PAIR(0));
-                         cell_width, Subject_Abbrev.c_str(),
-                         COLOR_PAIR(0));
         mvwaddwstr(cells[i][j], cell_height - 2,
-                         cell_width - wcslen(Room_Abbrev.c_str()) - 1, Room_Abbrev.c_str());
+                   cell_width - wcslen(Room_Abbrev.c_str()) - 1,
+                   Room_Abbrev.c_str());
 
         mvwaddwstr(cells[i][j], cell_height - 2, 1, Teacher_Abbrev.c_str());
         wrefresh(cells[i][j]);