add basic timetable

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

@@ -1 +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.h

@@ -1,5 +1,10 @@
 #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);
@@ -7,3 +12,5 @@ void get_input_and_login();
 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);
+
+#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);

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

@@ -12,7 +12,7 @@
 #define CTRLD 4
 
 char *choices[] = {
-    "login",    "Marks",  "shedule", "Komens",
+    "login",    "Marks",  "timetable", "Komens",
     "Homework", "Absence", "Exit",    (char *)NULL,
 };
 void (*choicesFuncs[])() = {

src/main_menu.h

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

src/marks.cpp

@@ -6,7 +6,6 @@
 #include <cstring>
 #include <curses.h>
 #include <format>
-#include <fstream>
 #include <iostream>
 #include <menu.h>
 #include <nlohmann/json.hpp>
@@ -14,7 +13,6 @@
 #include <string>
 #include <algorithm>
 #include "net.h"
-#include "color.h"
 
 using nlohmann::json;
 
@@ -58,7 +56,7 @@ 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_data_from_endpoint("api/3/marks");
   // std::ifstream f("test-data/marks3.json");
   // json resp_from_api = json::parse(f);
 
@@ -106,7 +104,7 @@ void marks_page() {
 
   update_panels();
   attron(COLOR_PAIR(4));
-  mvprintw(LINES - 2, 0, "Arrows/j/k to scroll | F1 to exit");
+  mvprintw(LINES - 2, 0, "Arrows/j/k to scroll | F1 to exit | {mark} [weight]");
   attroff(COLOR_PAIR(4));
   doupdate();
 
@@ -233,7 +231,10 @@ void win_show(WINDOW *win, char *label, int label_color, int width, int height,
        i++) {
     Caption = marks_json["Subjects"][SubjectIndex]["Marks"][i]["Caption"];
     Caption = rm_tr_le_whitespace(Caption);
-	  Caption.append(std::format(" - {{{}}} [{}]",marks_json["Subjects"][SubjectIndex]["Marks"][i]["MarkText"].get<std::string>(),marks_json["Subjects"][SubjectIndex]["Marks"][i]["Weight"].get<int>()));
+	  Caption.append(std::format(" - {{{}}} [{}]",
+      marks_json["Subjects"][SubjectIndex]["Marks"][i]["MarkText"]
+      .get<std::string>(),marks_json["Subjects"][SubjectIndex]["Marks"][i]["Weight"].get<int>()));
+      
     strncpy(CaptionBuf, Caption.c_str(), sizeof(CaptionBuf)-1);
     print_in_middle(win, 3 + i + AdditionalOffset, 0, width, CaptionBuf,COLOR_PAIR(label_color));
 

src/marks.h

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

src/net.cpp

@@ -155,21 +155,25 @@ 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"];
   }
+} 
+
+// 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("api/3/marks", GET, req_data);
+    auto [response, http_code] = send_curl_request(endpoint, GET, req_data);
 
     if(http_code != 200) {
       // DEBUG
-      std::clog << "Failed geting marks code: " << http_code << "\nrequest: " << req_data <<"\nresponse: " << response << std::endl;
+      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,32 @@
+#include "timetable.h"
+#include <cstdint>
+#include <nlohmann/json.hpp>
+#include "net.h"
+#include <fstream>
+
+using nlohmann::json;
+
+#define NLINES 10
+#define NCOLS 40
+
+#define DEFAULT_X_OFFSET 10
+#define DEFAULT_Y_OFFSET 2
+
+#define DEFAULT_PADDING 4
+
+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
+
+    uint8_t column_number = 0;
+    for(uint8_t i = 0; i < resp_from_api["Days"].size(); i++) {
+        (resp_from_api["Days"][i]["Atoms"].size() > column_number) ? (column_number = resp_from_api["Days"][i]["Atoms"].size());
+    }
+    
+    
+
+}

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