diff --git a/cpp00/ex01/includes/phonebook.hpp b/cpp00/ex01/includes/phonebook.hpp index a9d936f..009a359 100644 --- a/cpp00/ex01/includes/phonebook.hpp +++ b/cpp00/ex01/includes/phonebook.hpp @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/17 14:56:49 by rparodi #+# #+# */ -/* Updated: 2024/10/18 12:18:04 by rparodi ### ########.fr */ +/* Updated: 2024/10/18 16:02:09 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -21,8 +21,7 @@ #include #include "color.hpp" -#define ERROR 1 -#define NO_ERROR 0 +#define MENU CLR_BLUE << "ADD" << CLR_RESET << ":\tAdding a new contact" << std::endl << CLR_BLUE << "SEARCH" << CLR_RESET << ":\tSearching a contact in the list" << std::endl << CLR_BLUE << "EXIT" << CLR_RESET << ":\texit the program" << std::endl std::string get_input(const char *str); @@ -47,8 +46,8 @@ class PhoneBook public: void add(); void search(); + Contact array_contact[8]; private: - Contact _array_contact[8]; }; diff --git a/cpp00/ex01/sources/main.cpp b/cpp00/ex01/sources/main.cpp index 422d4a9..23f689a 100644 --- a/cpp00/ex01/sources/main.cpp +++ b/cpp00/ex01/sources/main.cpp @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/17 14:55:18 by rparodi #+# #+# */ -/* Updated: 2024/10/18 12:19:07 by rparodi ### ########.fr */ +/* Updated: 2024/10/18 15:58:15 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -38,19 +38,19 @@ std::string get_input(const char *err_msg) int main() { std::string input; - Contact array_contact[8]; + PhoneBook phonebook; size_t i = 0; while (true) { + std::cout << MENU << std::endl; input = get_input("SELECT MENU [main.cpp:38]"); - if (strcmp(input.c_str(), "ADD")) + if (strcmp(input.c_str(), "ADD") == 0) { - std::cout << "adding" << std::endl; - array_contact[i].init_new(i); + phonebook.array_contact[i].init_new(i); i++; } - if (strcmp(input.c_str(), "EXIT")) + if (strcmp(input.c_str(), "EXIT") == 0) exit(1); } } diff --git a/cpp00/ex01/sources/phonebook.cpp b/cpp00/ex01/sources/phonebook.cpp index 330c264..592fb7d 100644 --- a/cpp00/ex01/sources/phonebook.cpp +++ b/cpp00/ex01/sources/phonebook.cpp @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/17 15:09:21 by rparodi #+# #+# */ -/* Updated: 2024/10/17 16:44:08 by rparodi ### ########.fr */ +/* Updated: 2024/10/18 15:55:41 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,19 +15,41 @@ void Contact::init_new(int id) { _id = id; + std::cout << "First Name:\t"; _first_name = get_input("first_name [phonebook.cpp:18]"); + std::cout << "Last Name:\t"; _last_name = get_input("last_name [phonebook.cpp:19]"); + std::cout << "Nickname:\t"; _nickname = get_input("nickname [phonebook.cpp:20]"); + std::cout << "Number:\t"; _number = get_input("number [phonebook.cpp:21]"); + std::cout << "Secret:\t"; _secret = get_input("secret [phonebook.cpp:22]"); + Contact::print(); } void Contact::print() { - std::cout << "|" << std::setw(10) << _id << "|"; - std::cout << "|" << std::setw(10) << _first_name << "|"; - std::cout << "|" << std::setw(10) << _last_name << "|"; - std::cout << "|" << std::setw(10) << _nickname << "|"; - std::cout << "|" << std::setw(10) << _number << "|"; - std::cout << "|" << std::setw(10) << _secret << "|"; + std::cout << "|" << std::setw(10) << _id; + if (_first_name.length() > 10) + std::cout << "|" << std::setw(10) << _first_name.substr(0, 9) << "."; + else + std::cout << "|" << std::setw(10) << _first_name; + if (_last_name.length() > 10) + std::cout << "|" << std::setw(10) << _last_name.substr(0, 9) << "."; + else + std::cout << "|" << std::setw(10) << _last_name; + if (_nickname.length() > 10) + std::cout << "|" << std::setw(10) << _nickname.substr(0, 9) << "."; + else + std::cout << "|" << std::setw(10) << _nickname; + if (_number.length() > 10) + std::cout << "|" << std::setw(10) << _number.substr(0, 9) << "."; + else + std::cout << "|" << std::setw(10) << _number; + if (_secret.length() > 10) + std::cout << "|" << std::setw(10) << _secret.substr(0, 9) << "."; + else + std::cout << "|" << std::setw(10) << _secret; + std::cout << "|" << std::endl; }