diff --git a/src/ui/activities/auth_activity/callbacks.rs b/src/ui/activities/auth_activity/callbacks.rs
deleted file mode 100644
index db4bf1e..0000000
--- a/src/ui/activities/auth_activity/callbacks.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-//! ## AuthActivity
-//!
-//! `auth_activity` is the module which implements the authentication activity
-
-/*
-*
-* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com
-*
-* This file is part of "TermSCP"
-*
-* TermSCP is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* TermSCP is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with TermSCP. If not, see .
-*
-*/
-
-use super::{AuthActivity, InputForm};
-
-impl AuthActivity {
- /// ### callback_nothing_to_do
- ///
- /// Self titled
- pub(super) fn callback_nothing_to_do(&mut self) {}
-
- /// ### callback_quit
- ///
- /// Self titled
- pub(super) fn callback_quit(&mut self) {
- self.quit = true;
- }
-
- /// ### callback_del_bookmark
- ///
- /// Callback which deletes recent or bookmark based on current form
- pub(super) fn callback_del_bookmark(&mut self) {
- match self.input_form {
- InputForm::Bookmarks => self.del_bookmark(self.bookmarks_idx),
- InputForm::Recents => self.del_recent(self.recents_idx),
- _ => { /* Nothing to do */ }
- }
- }
-
- /// ### callback_save_bookmark
- ///
- /// Callback used to save bookmark with name
- pub(super) fn callback_save_bookmark(&mut self, input: String) {
- if !input.is_empty() {
- self.save_bookmark(input);
- }
- }
-}
diff --git a/src/ui/activities/auth_activity/input.rs b/src/ui/activities/auth_activity/input.rs
deleted file mode 100644
index 45df77f..0000000
--- a/src/ui/activities/auth_activity/input.rs
+++ /dev/null
@@ -1,495 +0,0 @@
-//! ## AuthActivity
-//!
-//! `auth_activity` is the module which implements the authentication activity
-
-/*
-*
-* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com
-*
-* This file is part of "TermSCP"
-*
-* TermSCP is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* TermSCP is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with TermSCP. If not, see .
-*
-*/
-
-use super::{
- AuthActivity, DialogCallback, DialogYesNoOption, FileTransferProtocol, InputEvent, InputField,
- InputForm, Popup,
-};
-
-use crossterm::event::{KeyCode, KeyModifiers};
-use tui::style::Color;
-
-impl AuthActivity {
- /*
- /// ### handle_input_event
- ///
- /// Handle input event, based on current input mode
- pub(super) fn handle_input_event(&mut self, ev: &InputEvent) {
- let popup: Option = match &self.popup {
- Some(ptype) => Some(ptype.clone()),
- _ => None,
- };
- match &self.popup {
- None => self.handle_input_event_mode_form(ev),
- Some(_) => {
- if let Some(ptype) = popup {
- self.handle_input_event_mode_popup(ev, ptype)
- }
- }
- }
- }
- */
-
- /// ### handle_input_event_mode_form
- ///
- /// Handler for input event when in form mode
- fn handle_input_event_mode_form(&mut self, ev: &InputEvent) {
- match self.input_form {
- InputForm::AuthCredentials => self.handle_input_event_mode_form_auth(ev),
- InputForm::Bookmarks => self.handle_input_event_mode_form_bookmarks(ev),
- InputForm::Recents => self.handle_input_event_mode_form_recents(ev),
- }
- }
-
- /// ### handle_input_event_mode_form_auth
- ///
- /// Handle input event when input mode is Form and Tab is Auth
- fn handle_input_event_mode_form_auth(&mut self, ev: &InputEvent) {
- if let InputEvent::Key(key) = ev {
- match key.code {
- KeyCode::Esc => {
- // Show quit dialog
- self.popup = Some(Popup::YesNo(
- String::from("Are you sure you want to quit termscp?"),
- AuthActivity::callback_quit,
- AuthActivity::callback_nothing_to_do,
- ));
- }
- KeyCode::Tab => self.input_form = InputForm::Bookmarks, // Move to bookmarks
- KeyCode::Enter => {
- // Handle submit
- // Check form
- // Check address
- if self.address.is_empty() {
- self.popup =
- Some(Popup::Alert(Color::Red, String::from("Invalid address")));
- return;
- }
- // Check port
- // Convert port to number
- match self.port.parse::() {
- Ok(val) => {
- if val > 65535 {
- self.popup = Some(Popup::Alert(
- Color::Red,
- String::from("Specified port must be in range 0-65535"),
- ));
- return;
- }
- }
- Err(_) => {
- self.popup = Some(Popup::Alert(
- Color::Red,
- String::from("Specified port is not a number"),
- ));
- return;
- }
- }
- // Save recent
- self.save_recent();
- // Everything OK, set enter
- self.submit = true;
- }
- KeyCode::Backspace => {
- // Pop last char
- match self.selected_field {
- InputField::Address => {
- let _ = self.address.pop();
- }
- InputField::Password => {
- let _ = self.password.pop();
- }
- InputField::Username => {
- let _ = self.username.pop();
- }
- InputField::Port => {
- let _ = self.port.pop();
- }
- _ => { /* Nothing to do */ }
- };
- }
- KeyCode::Up => {
- // Move item up
- self.selected_field = match self.selected_field {
- InputField::Address => InputField::Password, // End of list (wrap)
- InputField::Port => InputField::Address,
- InputField::Protocol => InputField::Port,
- InputField::Username => InputField::Protocol,
- InputField::Password => InputField::Username,
- }
- }
- KeyCode::Down => {
- // Move item down
- self.selected_field = match self.selected_field {
- InputField::Address => InputField::Port,
- InputField::Port => InputField::Protocol,
- InputField::Protocol => InputField::Username,
- InputField::Username => InputField::Password,
- InputField::Password => InputField::Address, // End of list (wrap)
- }
- }
- KeyCode::Char(ch) => {
- // Check if Ctrl is enabled
- if key.modifiers.intersects(KeyModifiers::CONTROL) {
- // If 'S', save bookmark as...
- match ch {
- 'H' | 'h' => {
- // Show help
- self.popup = Some(Popup::Help);
- }
- 'C' | 'c' => {
- // Show setup
- self.setup = true;
- }
- 'S' | 's' => {
- // Default choice option to no
- self.choice_opt = DialogYesNoOption::No;
- // Save bookmark as...
- self.popup = Some(Popup::SaveBookmark);
- }
- _ => { /* Nothing to do */ }
- }
- } else {
- match self.selected_field {
- InputField::Address => self.address.push(ch),
- InputField::Password => self.password.push(ch),
- InputField::Username => self.username.push(ch),
- InputField::Port => {
- // Value must be numeric
- if ch.is_numeric() {
- self.port.push(ch);
- }
- }
- _ => { /* Nothing to do */ }
- }
- }
- }
- KeyCode::Left => {
- // If current field is Protocol handle event... (move element left)
- if self.selected_field == InputField::Protocol {
- self.protocol = match self.protocol {
- FileTransferProtocol::Sftp => FileTransferProtocol::Ftp(true), // End of list (wrap)
- FileTransferProtocol::Scp => FileTransferProtocol::Sftp,
- FileTransferProtocol::Ftp(ftps) => match ftps {
- false => FileTransferProtocol::Scp,
- true => FileTransferProtocol::Ftp(false),
- },
- };
- }
- }
- KeyCode::Right => {
- // If current field is Protocol handle event... ( move element right )
- if self.selected_field == InputField::Protocol {
- self.protocol = match self.protocol {
- FileTransferProtocol::Sftp => FileTransferProtocol::Scp,
- FileTransferProtocol::Scp => FileTransferProtocol::Ftp(false),
- FileTransferProtocol::Ftp(ftps) => match ftps {
- false => FileTransferProtocol::Ftp(true),
- true => FileTransferProtocol::Sftp, // End of list (wrap)
- },
- };
- }
- }
- _ => { /* Nothing to do */ }
- }
- }
- }
-
- /// ### handle_input_event_mode_form_bookmarks
- ///
- /// Handle input event when input mode is Form and Tab is Bookmarks
- fn handle_input_event_mode_form_bookmarks(&mut self, ev: &InputEvent) {
- if let InputEvent::Key(key) = ev {
- match key.code {
- KeyCode::Esc => {
- // Show quit dialog
- self.popup = Some(Popup::YesNo(
- String::from("Are you sure you want to quit termscp?"),
- AuthActivity::callback_quit,
- AuthActivity::callback_nothing_to_do,
- ));
- }
- KeyCode::Tab => self.input_form = InputForm::AuthCredentials, // Move to Auth credentials
- KeyCode::Right => self.input_form = InputForm::Recents, // Move to recents
- KeyCode::Up => {
- // Move bookmarks index up
- if self.bookmarks_idx > 0 {
- self.bookmarks_idx -= 1;
- } else if let Some(bookmarks_cli) = &self.bookmarks_client {
- // Put to last index (wrap)
- self.bookmarks_idx = bookmarks_cli.iter_bookmarks().count() - 1;
- }
- }
- KeyCode::Down => {
- if let Some(bookmarks_cli) = &self.bookmarks_client {
- let size: usize = bookmarks_cli.iter_bookmarks().count();
- // Check if can move down
- if self.bookmarks_idx + 1 >= size {
- // Move bookmarks index down
- self.bookmarks_idx = 0;
- } else {
- // Set index to first element (wrap)
- self.bookmarks_idx += 1;
- }
- }
- }
- KeyCode::Delete => {
- // Ask if user wants to delete bookmark
- self.popup = Some(Popup::YesNo(
- String::from("Are you sure you want to delete the selected bookmark?"),
- AuthActivity::callback_del_bookmark,
- AuthActivity::callback_nothing_to_do,
- ));
- }
- KeyCode::Enter => {
- // Load bookmark
- self.load_bookmark(self.bookmarks_idx);
- // Set input form to Auth
- self.input_form = InputForm::AuthCredentials;
- // Set input field to password (very comfy)
- self.selected_field = InputField::Password;
- }
- KeyCode::Char(ch) => match ch {
- 'C' | 'c' => {
- // Show setup
- self.setup = true;
- }
- 'E' | 'e' => {
- // Ask if user wants to delete bookmark; NOTE: same as
- self.popup = Some(Popup::YesNo(
- String::from("Are you sure you want to delete the selected bookmark?"),
- AuthActivity::callback_del_bookmark,
- AuthActivity::callback_nothing_to_do,
- ));
- }
- 'H' | 'h' => {
- // Show help
- self.popup = Some(Popup::Help);
- }
- 'S' | 's' => {
- // Default choice option to no
- self.choice_opt = DialogYesNoOption::No;
- // Save bookmark as...
- self.popup = Some(Popup::SaveBookmark);
- }
- _ => { /* Nothing to do */ }
- },
- _ => { /* Nothing to do */ }
- }
- }
- }
-
- /// ### handle_input_event_mode_form_recents
- ///
- /// Handle input event when input mode is Form and Tab is Recents
- fn handle_input_event_mode_form_recents(&mut self, ev: &InputEvent) {
- if let InputEvent::Key(key) = ev {
- match key.code {
- KeyCode::Esc => {
- // Show quit dialog
- self.popup = Some(Popup::YesNo(
- String::from("Are you sure you want to quit termscp?"),
- AuthActivity::callback_quit,
- AuthActivity::callback_nothing_to_do,
- ));
- }
- KeyCode::Tab => self.input_form = InputForm::AuthCredentials, // Move to Auth credentials
- KeyCode::Left => self.input_form = InputForm::Bookmarks, // Move to bookmarks
- KeyCode::Up => {
- // Move bookmarks index up
- if self.recents_idx > 0 {
- self.recents_idx -= 1;
- } else if let Some(bookmarks_cli) = &self.bookmarks_client {
- // Put to last index (wrap)
- self.recents_idx = bookmarks_cli.iter_recents().count() - 1;
- }
- }
- KeyCode::Down => {
- if let Some(bookmarks_cli) = &self.bookmarks_client {
- let size: usize = bookmarks_cli.iter_recents().count();
- // Check if can move down
- if self.recents_idx + 1 >= size {
- // Move bookmarks index down
- self.recents_idx = 0;
- } else {
- // Set index to first element (wrap)
- self.recents_idx += 1;
- }
- }
- }
- KeyCode::Delete => {
- // Ask if user wants to delete bookmark
- self.popup = Some(Popup::YesNo(
- String::from("Are you sure you want to delete the selected host?"),
- AuthActivity::callback_del_bookmark,
- AuthActivity::callback_nothing_to_do,
- ));
- }
- KeyCode::Enter => {
- // Load bookmark
- self.load_recent(self.recents_idx);
- // Set input form to Auth
- self.input_form = InputForm::AuthCredentials;
- // Set input field to password (very comfy)
- self.selected_field = InputField::Password;
- }
- KeyCode::Char(ch) => match ch {
- 'C' | 'c' => {
- // Show setup
- self.setup = true;
- }
- 'E' | 'e' => {
- // Ask if user wants to delete bookmark; NOTE: same as
- self.popup = Some(Popup::YesNo(
- String::from("Are you sure you want to delete the selected host?"),
- AuthActivity::callback_del_bookmark,
- AuthActivity::callback_nothing_to_do,
- ));
- }
- 'H' | 'h' => {
- // Show help
- self.popup = Some(Popup::Help);
- }
- 'S' | 's' => {
- // Default choice option to no
- self.choice_opt = DialogYesNoOption::No;
- // Save bookmark as...
- self.popup = Some(Popup::SaveBookmark);
- }
- _ => { /* Nothing to do */ }
- },
- _ => { /* Nothing to do */ }
- }
- }
- }
-
- /// ### handle_input_event_mode_text
- ///
- /// Handler for input event when in popup mode
- fn handle_input_event_mode_popup(&mut self, ev: &InputEvent, ptype: Popup) {
- match ptype {
- Popup::Alert(_, _) => self.handle_input_event_mode_popup_alert(ev),
- Popup::Help => self.handle_input_event_mode_popup_help(ev),
- Popup::SaveBookmark => self.handle_input_event_mode_popup_save_bookmark(ev),
- Popup::YesNo(_, yes_cb, no_cb) => {
- self.handle_input_event_mode_popup_yesno(ev, yes_cb, no_cb)
- }
- }
- }
-
- /// ### handle_input_event_mode_popup_alert
- ///
- /// Handle input event when the input mode is popup, and popup type is alert
- fn handle_input_event_mode_popup_alert(&mut self, ev: &InputEvent) {
- // Only enter should be allowed here
- if let InputEvent::Key(key) = ev {
- if matches!(key.code, KeyCode::Esc | KeyCode::Enter) {
- self.popup = None; // Hide popup
- }
- }
- }
-
- /// ### handle_input_event_mode_popup_help
- ///
- /// Input event handler for popup help
- fn handle_input_event_mode_popup_help(&mut self, ev: &InputEvent) {
- // If enter, close popup
- if let InputEvent::Key(key) = ev {
- if matches!(key.code, KeyCode::Esc | KeyCode::Enter) {
- // Set input mode back to form
- self.popup = None;
- }
- }
- }
-
- /// ### handle_input_event_mode_popup_save_bookmark
- ///
- /// Input event handler for SaveBookmark popup
- fn handle_input_event_mode_popup_save_bookmark(&mut self, ev: &InputEvent) {
- // If enter, close popup, otherwise push chars to input
- if let InputEvent::Key(key) = ev {
- match key.code {
- KeyCode::Esc => {
- // Abort input
- // Clear current input text
- self.input_txt.clear();
- // Set mode back to form
- self.popup = None;
- // Reset choice option to yes
- self.choice_opt = DialogYesNoOption::Yes;
- }
- KeyCode::Enter => {
- // Submit
- let input_text: String = self.input_txt.clone();
- // Clear current input text
- self.input_txt.clear();
- // Set mode back to form BEFORE CALLBACKS!!! Callback can then overwrite this, clever uh?
- self.popup = None;
- // Call cb
- self.callback_save_bookmark(input_text);
- // Reset choice option to yes
- self.choice_opt = DialogYesNoOption::Yes;
- }
- KeyCode::Left => self.choice_opt = DialogYesNoOption::Yes, // Move yes/no with arrows
- KeyCode::Right => self.choice_opt = DialogYesNoOption::No, // Move yes/no with arrows
- KeyCode::Char(ch) => self.input_txt.push(ch),
- KeyCode::Backspace => {
- let _ = self.input_txt.pop();
- }
- _ => { /* Nothing to do */ }
- }
- }
- }
-
- /// ### handle_input_event_mode_popup_yesno
- ///
- /// Input event handler for popup alert
- fn handle_input_event_mode_popup_yesno(
- &mut self,
- ev: &InputEvent,
- yes_cb: DialogCallback,
- no_cb: DialogCallback,
- ) {
- // If enter, close popup, otherwise move dialog option
- if let InputEvent::Key(key) = ev {
- match key.code {
- KeyCode::Enter => {
- // @! Set input mode to Form BEFORE CALLBACKS!!! Callback can then overwrite this, clever uh?
- self.popup = None;
- // Check if user selected yes or not
- match self.choice_opt {
- DialogYesNoOption::No => no_cb(self),
- DialogYesNoOption::Yes => yes_cb(self),
- }
- // Reset choice option to yes
- self.choice_opt = DialogYesNoOption::Yes;
- }
- KeyCode::Right => self.choice_opt = DialogYesNoOption::No, // Set to NO
- KeyCode::Left => self.choice_opt = DialogYesNoOption::Yes, // Set to YES
- _ => { /* Nothing to do */ }
- }
- }
- }
-}
diff --git a/src/ui/activities/auth_activity/mod.rs b/src/ui/activities/auth_activity/mod.rs
index 8a58fb4..de3461f 100644
--- a/src/ui/activities/auth_activity/mod.rs
+++ b/src/ui/activities/auth_activity/mod.rs
@@ -25,10 +25,9 @@
// Sub modules
mod bookmarks;
-mod callbacks; // REMOVE
-mod input; // REMOVE
-mod layout; // REMOVE
+mod layout; // TOREM: this
mod update;
+mod view;
// Dependencies
extern crate crossterm;
@@ -69,7 +68,6 @@ const COMPONENT_RADIO_BOOKMARK_DEL_RECENT: &str = "RADIO_DELETE_RECENT";
const COMPONENT_RADIO_BOOKMARK_SAVE_PWD: &str = "RADIO_SAVE_PASSWORD";
const COMPONENT_BOOKMARKS_LIST: &str = "BOOKMARKS_LIST";
const COMPONENT_RECENTS_LIST: &str = "RECENTS_LIST";
-const COMPONENT_RADIO_OPT_SAVE_BOOKMARK: &str = "RADIO_OPT_SAVE_BOOKMARK";
/// ### InputField
///
@@ -265,6 +263,8 @@ impl Activity for AuthActivity {
}
// If check for updates is enabled, check for updates
self.check_for_updates();
+ // Initialize view
+ self.init();
}
/// ### on_draw
@@ -280,13 +280,14 @@ impl Activity for AuthActivity {
if let Ok(Some(event)) = self.context.as_ref().unwrap().input_hnd.read_event() {
// Set redraw to true
self.redraw = true;
- // Handle event
- self.handle_input_event(event);
+ // Handle event on view and update
+ let msg = self.view.on(event);
+ self.update(msg);
}
// Redraw if necessary
if self.redraw {
- // Draw
- self.draw();
+ // View
+ self.view();
// Set redraw to false
self.redraw = false;
}
diff --git a/src/ui/activities/auth_activity/update.rs b/src/ui/activities/auth_activity/update.rs
index 83b3462..5182177 100644
--- a/src/ui/activities/auth_activity/update.rs
+++ b/src/ui/activities/auth_activity/update.rs
@@ -91,14 +91,6 @@ const MSG_KEY_CTRL_S: Msg = Msg::OnKey(KeyEvent {
// -- update
impl AuthActivity {
- /// ### handle_input_event
- ///
- /// Handle input event, based on current input mode
- pub(super) fn handle_input_event(&mut self, ev: InputEvent) {
- // Call update passing the return value from on
- let msg = self.view.on(ev);
- self.update(msg);
- }
/// ### update
///
diff --git a/src/ui/activities/auth_activity/view.rs b/src/ui/activities/auth_activity/view.rs
new file mode 100644
index 0000000..10a23f1
--- /dev/null
+++ b/src/ui/activities/auth_activity/view.rs
@@ -0,0 +1,80 @@
+//! ## AuthActivity
+//!
+//! `auth_activity` is the module which implements the authentication activity
+
+/*
+*
+* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com
+*
+* This file is part of "TermSCP"
+*
+* TermSCP is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* TermSCP is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with TermSCP. If not, see .
+*
+*/
+
+// Locals
+use super::{AuthActivity, Context};
+use crate::ui::layout::components::{
+ bookmark_list::BookmarkList, input::Input, radio_group::RadioGroup, table::Table, text::Text,
+};
+use crate::ui::layout::props::{
+ PropValue, Props, PropsBuilder, TextParts, TextSpan, TextSpanBuilder,
+};
+use crate::utils::fmt::align_text_center;
+// Ext
+use std::string::ToString;
+use tui::{
+ layout::{Constraint, Corner, Direction, Layout, Rect},
+ style::{Color, Modifier, Style},
+ widgets::{Block, BorderType, Borders, Clear, List, ListItem, ListState, Paragraph, Tabs},
+};
+use unicode_width::UnicodeWidthStr;
+
+impl AuthActivity {
+ /// ### init
+ ///
+ /// Initialize view, mounting all startup components inside the view
+ pub fn init(&mut self) {
+ // Header
+ self.view.mount(super::COMPONENT_TEXT_HEADER, Box::new(
+ Text::new(
+ PropsBuilder::default().with_foreground(Color::White).with_texts(
+ TextParts::new(None, Some(vec![TextSpan::from(" _____ ____ ____ ____ \n|_ _|__ _ __ _ __ ___ / ___| / ___| _ \\ \n | |/ _ \\ '__| '_ ` _ \\\\___ \\| | | |_) |\n | | __/ | | | | | | |___) | |___| __/ \n |_|\\___|_| |_| |_| |_|____/ \\____|_| \n")]))
+ ).bold().build()
+ )
+ ));
+ // Footer
+ self.view.mount(super::COMPONENT_TEXT_FOOTER, Box::new(
+ Text::new(
+ PropsBuilder::default().with_foreground(Color::White).with_texts(
+ TextParts::new(None, Some(vec![
+ TextSpanBuilder::new("Press ").bold().build(),
+ TextSpanBuilder::new("").bold().with_foreground(Color::Cyan).build(),
+ TextSpanBuilder::new(" to show keybindings; ").bold().build(),
+ TextSpanBuilder::new("").bold().with_foreground(Color::Cyan).build(),
+ TextSpanBuilder::new(" to enter setup").bold().build(),
+ ]))
+ ).build()
+ )
+ ));
+ }
+
+ /// ### view
+ ///
+ /// Display view on canvas
+ pub fn view(&mut self) {
+
+ }
+
+}