This splits notedeck into crates, separating the browser chrome and individual apps: * notedeck: binary file, browser chrome * notedeck_columns: our columns app * enostr: same as before We still need to do more work to cleanly separate the chrome apis from the app apis. Soon I will create notedeck-notebook to see what makes sense to be shared between the apps. Some obvious ones that come to mind: 1. ImageCache We will likely want to move this to the notedeck crate, as most apps will want some kind of image cache. In web browsers, web pages do not need to worry about this, so we will likely have to do something similar 2. Ndb Since NdbRef is threadsafe and Ndb is an Arc<NdbRef>, it can be safely copied to each app. This will simplify things. In the future we might want to create an abstraction over this? Maybe each app shouldn't have access to the same database... we assume the data in DBs are all public anyways, but if we have unwrapped giftwraps that could be a problem. 3. RelayPool / Subscription Manager The browser should probably maintain these. Then apps can use ken's high level subscription manager api and not have to worry about connection pool details 4. Accounts Accounts and key management should be handled by the chrome. Apps should only have a simple signer interface. That's all for now, just something to think about! Signed-off-by: William Casarin <jb55@jb55.com>
165 lines
4.7 KiB
Rust
165 lines
4.7 KiB
Rust
use crate::app_style::NotedeckTextStyle;
|
|
use crate::key_parsing::AcquireKeyError;
|
|
use crate::login_manager::AcquireKeyState;
|
|
use crate::ui::{Preview, PreviewConfig, View};
|
|
use egui::TextEdit;
|
|
use egui::{Align, Button, Color32, Frame, InnerResponse, Margin, RichText, Vec2};
|
|
use enostr::Keypair;
|
|
|
|
pub struct AccountLoginView<'a> {
|
|
manager: &'a mut AcquireKeyState,
|
|
}
|
|
|
|
pub enum AccountLoginResponse {
|
|
CreateNew,
|
|
LoginWith(Keypair),
|
|
}
|
|
|
|
impl<'a> AccountLoginView<'a> {
|
|
pub fn new(state: &'a mut AcquireKeyState) -> Self {
|
|
AccountLoginView { manager: state }
|
|
}
|
|
|
|
pub fn ui(&mut self, ui: &mut egui::Ui) -> InnerResponse<Option<AccountLoginResponse>> {
|
|
Frame::none()
|
|
.outer_margin(12.0)
|
|
.show(ui, |ui| self.show(ui))
|
|
}
|
|
|
|
fn show(&mut self, ui: &mut egui::Ui) -> Option<AccountLoginResponse> {
|
|
ui.vertical(|ui| {
|
|
ui.vertical_centered(|ui| {
|
|
ui.add_space(32.0);
|
|
ui.label(login_title_text());
|
|
});
|
|
|
|
ui.horizontal(|ui| {
|
|
ui.label(login_textedit_info_text());
|
|
});
|
|
|
|
ui.vertical_centered_justified(|ui| {
|
|
ui.add(login_textedit(self.manager));
|
|
|
|
self.loading_and_error(ui);
|
|
|
|
if ui.add(login_button()).clicked() {
|
|
self.manager.apply_acquire();
|
|
}
|
|
});
|
|
|
|
ui.horizontal(|ui| {
|
|
ui.label(
|
|
RichText::new("New to Nostr?")
|
|
.color(ui.style().visuals.noninteractive().fg_stroke.color)
|
|
.text_style(NotedeckTextStyle::Body.text_style()),
|
|
);
|
|
|
|
if ui
|
|
.add(Button::new(RichText::new("Create Account")).frame(false))
|
|
.clicked()
|
|
{
|
|
self.manager.should_create_new();
|
|
}
|
|
});
|
|
});
|
|
|
|
if self.manager.check_for_create_new() {
|
|
return Some(AccountLoginResponse::CreateNew);
|
|
}
|
|
|
|
if let Some(keypair) = self.manager.check_for_successful_login() {
|
|
return Some(AccountLoginResponse::LoginWith(keypair));
|
|
}
|
|
None
|
|
}
|
|
|
|
fn loading_and_error(&mut self, ui: &mut egui::Ui) {
|
|
ui.add_space(8.0);
|
|
|
|
ui.vertical_centered(|ui| {
|
|
if self.manager.is_awaiting_network() {
|
|
ui.add(egui::Spinner::new());
|
|
}
|
|
});
|
|
|
|
if let Some(err) = self.manager.check_for_error() {
|
|
show_error(ui, err);
|
|
}
|
|
|
|
ui.add_space(8.0);
|
|
}
|
|
}
|
|
|
|
fn show_error(ui: &mut egui::Ui, err: &AcquireKeyError) {
|
|
ui.horizontal(|ui| {
|
|
let error_label = match err {
|
|
AcquireKeyError::InvalidKey => {
|
|
egui::Label::new(RichText::new("Invalid key.").color(ui.visuals().error_fg_color))
|
|
}
|
|
AcquireKeyError::Nip05Failed(e) => {
|
|
egui::Label::new(RichText::new(e).color(ui.visuals().error_fg_color))
|
|
}
|
|
};
|
|
ui.add(error_label.truncate());
|
|
});
|
|
}
|
|
|
|
fn login_title_text() -> RichText {
|
|
RichText::new("Login")
|
|
.text_style(NotedeckTextStyle::Heading2.text_style())
|
|
.strong()
|
|
}
|
|
|
|
fn login_textedit_info_text() -> RichText {
|
|
RichText::new("Enter your key")
|
|
.strong()
|
|
.text_style(NotedeckTextStyle::Body.text_style())
|
|
}
|
|
|
|
fn login_button() -> Button<'static> {
|
|
Button::new(
|
|
RichText::new("Login now — let's do this!")
|
|
.text_style(NotedeckTextStyle::Body.text_style())
|
|
.strong(),
|
|
)
|
|
.fill(Color32::from_rgb(0xF8, 0x69, 0xB6)) // TODO: gradient
|
|
.min_size(Vec2::new(0.0, 40.0))
|
|
}
|
|
|
|
fn login_textedit(manager: &mut AcquireKeyState) -> TextEdit {
|
|
manager.get_acquire_textedit(|text| {
|
|
egui::TextEdit::singleline(text)
|
|
.hint_text(
|
|
RichText::new("Enter your public key (npub), nostr address (e.g. vrod@damus.io), or private key (nsec) here...")
|
|
.text_style(NotedeckTextStyle::Body.text_style()),
|
|
)
|
|
.vertical_align(Align::Center)
|
|
.min_size(Vec2::new(0.0, 40.0))
|
|
.margin(Margin::same(12.0))
|
|
})
|
|
}
|
|
|
|
mod preview {
|
|
use super::*;
|
|
|
|
pub struct AccountLoginPreview {
|
|
manager: AcquireKeyState,
|
|
}
|
|
|
|
impl View for AccountLoginPreview {
|
|
fn ui(&mut self, ui: &mut egui::Ui) {
|
|
AccountLoginView::new(&mut self.manager).ui(ui);
|
|
}
|
|
}
|
|
|
|
impl Preview for AccountLoginView<'_> {
|
|
type Prev = AccountLoginPreview;
|
|
|
|
fn preview(cfg: PreviewConfig) -> Self::Prev {
|
|
let _ = cfg;
|
|
let manager = AcquireKeyState::new();
|
|
AccountLoginPreview { manager }
|
|
}
|
|
}
|
|
}
|