cleanup

Author: ArmaanCPro

cli/src/cli.cpp

@@ -19,8 +19,8 @@ int main()
     while (isRunning)
     {
         pwdGen.SetPolicy(policy);
-        std::cout << "0. Exit 1. Set length\n2. Set use lowercase\n3. Set use uppercase\n4. Set use numbers"
-                     "\n5. Set use symbols\n6. Generate password\n7. Hash password\n\n\nEnter your choice: " << std::flush;
+        std::cout << "0. Exit\n1. Set length\n2. Set use lowercase\n3. Set use uppercase\n4. Set use numbers"
+                     "\n5. Set use symbols\n6. Generate password\n7. Hash password\n\nEnter your choice: " << std::flush;
 
         int choice = 0;
         std::cin >> choice;

gui/src/main.cpp

@@ -78,7 +78,7 @@ class MyFrame : public wxFrame
         // horizontal sizer holding the slider and label
         wxBoxSizer* sliderSizer = new wxBoxSizer(wxHORIZONTAL);
 
-        passwordLenText = new wxTextCtrl(panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(100, 25));
+        passwordLenText = new wxTextCtrl(panel, wxID_ANY, "10", wxDefaultPosition, wxSize(100, 25));
         passwordLenText->SetForegroundColour(lightText);
         passwordLenText->SetBackgroundColour(darkControlBg);
         sliderSizer->Add(passwordLenText, 0, wxALL, 5);
@@ -97,6 +97,7 @@ class MyFrame : public wxFrame
 
         // Create the text field.
         wxTextCtrl* excludedCharsTextCtrl = new wxTextCtrl(panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(100, 25));
+        excludedCharsTextCtrl->SetFocus();
         excludedCharsTextCtrl->SetBackgroundColour(darkControlBg);
         excludedCharsTextCtrl->SetForegroundColour(lightText);
 
@@ -141,9 +142,8 @@ class MyFrame : public wxFrame
         generateBtn->SetForegroundColour(lightText);
         generateSizer->Add(generateBtn, 0, wxALL, 5);
 
-        // Read-only text field for the generated password. passwordText is a member
-        passwordText = new wxTextCtrl(panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(250, 25),
-            wxTE_READONLY);
+        // text field for the generated password. passwordText is a member
+        passwordText = new wxTextCtrl(panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(250, 25));
         passwordText->SetBackgroundColour(darkControlBg);
         passwordText->SetForegroundColour(lightText);
         generateSizer->Add(passwordText, 0, wxALL, 5);
@@ -303,6 +303,13 @@ class MyFrame : public wxFrame
 
         saveBtn->Bind(wxEVT_BUTTON, [&](wxCommandEvent& event)
         {
+            if (hashText->GetValue().empty())
+            {
+                std::cerr << "Hash text is empty!" << std::endl;
+                wxLogError("Hash text is empty!");
+                return;
+            }
+
             try
             {
                 SQLite::Statement insertQuery(db, "INSERT INTO passwords (hash) VALUES (?)");