Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
use uuid::Uuid;
|
||||
use warp_core::user_preferences::GetUserPreferences;
|
||||
use galaxy_core::user_preferences::GetUserPreferences;
|
||||
|
||||
/// Key used to persist the anonymous id to user defaults. We use "ExperimentId" as the key
|
||||
/// since we use the persisted id to determine experiment groups, and we want to avoid
|
||||
|
||||
@@ -7,12 +7,12 @@ use std::time::Duration;
|
||||
use anyhow::{anyhow, Result};
|
||||
use settings::Setting as _;
|
||||
use uuid::Uuid;
|
||||
use warp_core::channel::ChannelState;
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warp_graphql::mutations::create_anonymous_user::{
|
||||
use galaxy_core::channel::ChannelState;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_graphql::mutations::create_anonymous_user::{
|
||||
AnonymousUserType, CreateAnonymousUserResult,
|
||||
};
|
||||
use warpui::{clipboard::ClipboardContent, Entity, ModelContext, SingletonEntity, UpdateModel};
|
||||
use galaxyui::{clipboard::ClipboardContent, Entity, ModelContext, SingletonEntity, UpdateModel};
|
||||
|
||||
use super::auth_state::{AuthState, PersistAction};
|
||||
use super::auth_view_modal::{AuthRedirectPayload, AuthViewVariant};
|
||||
@@ -453,18 +453,18 @@ impl AuthManager {
|
||||
// TODO(alokedesai): Investigate a more robust way of handling events
|
||||
// that don't get flushed to Rudderstack outside of this event specifically.
|
||||
async move {
|
||||
warpui::telemetry::record_identify_user_event(
|
||||
galaxyui::telemetry::record_identify_user_event(
|
||||
user_id.as_string(),
|
||||
anonymous_id.clone(),
|
||||
warpui::time::get_current_time(),
|
||||
galaxyui::time::get_current_time(),
|
||||
);
|
||||
warpui::telemetry::record_event(
|
||||
galaxyui::telemetry::record_event(
|
||||
Some(user_id.as_string()),
|
||||
anonymous_id,
|
||||
TelemetryEvent::Login.name().into(),
|
||||
TelemetryEvent::Login.payload(),
|
||||
TelemetryEvent::Login.contains_ugc(),
|
||||
warpui::time::get_current_time(),
|
||||
galaxyui::time::get_current_time(),
|
||||
);
|
||||
|
||||
// Note that this snapshot might get overwritten to disabled after the server fetch.
|
||||
@@ -483,7 +483,7 @@ impl AuthManager {
|
||||
|
||||
// Once the user is authenticated, attempt to report the sandbox that Warp is running in, if any.
|
||||
ctx.spawn(
|
||||
async { warp_isolation_platform::detect() },
|
||||
async { galaxy_isolation_platform::detect() },
|
||||
|_, platform, ctx| {
|
||||
if let Some(platform) = platform {
|
||||
send_telemetry_from_ctx!(
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use serde::{Deserialize, Serialize};
|
||||
use warp_graphql::scalars::time::ServerTimestamp;
|
||||
use warpui::AppContext;
|
||||
use warpui_extras::secure_storage::{self, AppContextExt};
|
||||
use galaxy_graphql::scalars::time::ServerTimestamp;
|
||||
use galaxyui::AppContext;
|
||||
use galaxyui_extras::secure_storage::{self, AppContextExt};
|
||||
|
||||
use crate::auth::{
|
||||
user::{AnonymousUserType, FirebaseAuthTokens, PersonalObjectLimits, UserMetadata},
|
||||
|
||||
@@ -81,7 +81,7 @@ fn test_serialize_persisted_user() {
|
||||
}
|
||||
|
||||
/// Test serializing and deserializing persisted user data.
|
||||
/// See warpui_extras::secure_storage::linux_test.rs for Linux-specific tests.
|
||||
/// See galaxyui_extras::secure_storage::linux_test.rs for Linux-specific tests.
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg_attr(windows, ignore = "passes locally but not in CI on Windows")]
|
||||
#[test]
|
||||
@@ -93,9 +93,9 @@ fn test_windows_user_persistence() {
|
||||
};
|
||||
use crate::ServerApiProvider;
|
||||
use chrono::DateTime;
|
||||
use warp_core::channel::ChannelState;
|
||||
use warpui::{App, SingletonEntity};
|
||||
use warpui_extras::secure_storage;
|
||||
use galaxy_core::channel::ChannelState;
|
||||
use galaxyui::{App, SingletonEntity};
|
||||
use galaxyui_extras::secure_storage;
|
||||
|
||||
App::test((), |mut app| async move {
|
||||
app.add_singleton_model(|_ctx| ServerApiProvider::new_for_test());
|
||||
@@ -104,7 +104,7 @@ fn test_windows_user_persistence() {
|
||||
app.add_singleton_model(|ctx| {
|
||||
secure_storage::register_with_dir(
|
||||
ChannelState::data_domain().as_str(),
|
||||
warp_core::paths::state_dir(),
|
||||
galaxy_core::paths::state_dir(),
|
||||
ctx,
|
||||
);
|
||||
AuthManager::new_for_test(ctx)
|
||||
|
||||
@@ -10,7 +10,7 @@ use crate::auth::{
|
||||
};
|
||||
use crate::server::server_api::auth::UserAuthenticationError;
|
||||
use crate::ServerApiProvider;
|
||||
use warpui::{App, SingletonEntity};
|
||||
use galaxyui::{App, SingletonEntity};
|
||||
|
||||
fn initialize_app(app: &mut App) {
|
||||
app.add_singleton_model(|_ctx| ServerApiProvider::new_for_test());
|
||||
@@ -181,7 +181,7 @@ fn test_log_out_clears_pending_auth_state() {
|
||||
// routes to `PersistedUser::remove_from_secure_storage`. That requires
|
||||
// a `SecureStorage` singleton, so register a no-op one for this test.
|
||||
app.update(|ctx| {
|
||||
warpui_extras::secure_storage::register_noop("warp_test", ctx);
|
||||
galaxyui_extras::secure_storage::register_noop("warp_test", ctx);
|
||||
});
|
||||
|
||||
AuthManager::handle(&app).update(&mut app, |auth_manager, ctx| {
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
use crate::appearance::Appearance;
|
||||
use crate::util::color::lighten;
|
||||
use warp_core::ui::builder::UiBuilder;
|
||||
use warp_core::ui::color::darken;
|
||||
use warpui::keymap::FixedBinding;
|
||||
use galaxy_core::ui::builder::UiBuilder;
|
||||
use galaxy_core::ui::color::darken;
|
||||
use galaxyui::keymap::FixedBinding;
|
||||
|
||||
use crate::modal::MODAL_CORNER_RADIUS;
|
||||
use warp_core::ui::color::blend::Blend;
|
||||
use warpui::accessibility::{AccessibilityContent, WarpA11yRole};
|
||||
use warpui::color::ColorU;
|
||||
use warpui::elements::{
|
||||
use galaxy_core::ui::color::blend::Blend;
|
||||
use galaxyui::accessibility::{AccessibilityContent, WarpA11yRole};
|
||||
use galaxyui::color::ColorU;
|
||||
use galaxyui::elements::{
|
||||
ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Fill, Flex, Icon,
|
||||
MouseStateHandle, ParentElement, Radius, Shrinkable,
|
||||
};
|
||||
use warpui::fonts::Weight;
|
||||
use warpui::ui_components::button::ButtonVariant;
|
||||
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
|
||||
use warpui::{
|
||||
use galaxyui::fonts::Weight;
|
||||
use galaxyui::ui_components::button::ButtonVariant;
|
||||
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
|
||||
use galaxyui::{
|
||||
AppContext, Element, Entity, FocusContext, SingletonEntity, TypedActionView, View, ViewContext,
|
||||
};
|
||||
|
||||
@@ -64,7 +64,7 @@ pub struct AuthOverrideWarningBody {
|
||||
}
|
||||
|
||||
pub fn init(app: &mut AppContext) {
|
||||
use warpui::keymap::macros::*;
|
||||
use galaxyui::keymap::macros::*;
|
||||
|
||||
app.register_fixed_bindings([FixedBinding::new(
|
||||
"enter",
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
use pathfinder_color::ColorU;
|
||||
|
||||
use warp_core::ui::appearance::Appearance;
|
||||
use warpui::elements::Container;
|
||||
use warpui::elements::Fill;
|
||||
use warpui::FocusContext;
|
||||
use warpui::SingletonEntity;
|
||||
use warpui::TypedActionView;
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxyui::elements::Container;
|
||||
use galaxyui::elements::Fill;
|
||||
use galaxyui::FocusContext;
|
||||
use galaxyui::SingletonEntity;
|
||||
use galaxyui::TypedActionView;
|
||||
|
||||
use crate::auth::auth_override_warning_body::AuthOverrideWarningBody;
|
||||
use crate::auth::auth_view_modal::AuthRedirectPayload;
|
||||
use crate::modal::Modal;
|
||||
use crate::root_view::unthemed_window_border;
|
||||
|
||||
use warpui::elements::ChildView;
|
||||
use warpui::ui_components::components::{Coords, UiComponentStyles};
|
||||
use warpui::{AppContext, Element, Entity, View, ViewContext, ViewHandle};
|
||||
use galaxyui::elements::ChildView;
|
||||
use galaxyui::ui_components::components::{Coords, UiComponentStyles};
|
||||
use galaxyui::{AppContext, Element, Entity, View, ViewContext, ViewHandle};
|
||||
|
||||
use super::auth_manager::AuthManager;
|
||||
use super::auth_manager::AuthManagerEvent;
|
||||
|
||||
@@ -7,9 +7,9 @@ use anyhow::anyhow;
|
||||
use chrono::{DateTime, Duration, Utc};
|
||||
use parking_lot::RwLock;
|
||||
use uuid::Uuid;
|
||||
use warp_core::channel::{Channel, ChannelState};
|
||||
use warp_graphql::object_permissions::OwnerType;
|
||||
use warpui::{AppContext, Entity, SingletonEntity};
|
||||
use galaxy_core::channel::{Channel, ChannelState};
|
||||
use galaxy_graphql::object_permissions::OwnerType;
|
||||
use galaxyui::{AppContext, Entity, SingletonEntity};
|
||||
|
||||
use crate::{
|
||||
cloud_object::{GenericStringObjectFormat, JsonObjectType, ObjectType},
|
||||
@@ -466,8 +466,8 @@ impl AuthState {
|
||||
}
|
||||
}
|
||||
|
||||
// Adapter for the [`warp_managed_secrets`] crate, which needs to access the current user.
|
||||
impl warp_managed_secrets::ActorProvider for AuthState {
|
||||
// Adapter for the [`galaxy_managed_secrets`] crate, which needs to access the current user.
|
||||
impl galaxy_managed_secrets::ActorProvider for AuthState {
|
||||
fn actor_uid(&self) -> Option<String> {
|
||||
self.user_id().map(|uid| uid.as_string())
|
||||
}
|
||||
|
||||
@@ -14,11 +14,11 @@ use crate::{
|
||||
|
||||
use anyhow::anyhow;
|
||||
use lazy_static::lazy_static;
|
||||
use warp_core::{
|
||||
use galaxy_core::{
|
||||
features::FeatureFlag,
|
||||
ui::{appearance::DEFAULT_COMMAND_PALETTE_FONT_SIZE, builder::UiBuilder},
|
||||
};
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
accessibility::{AccessibilityContent, WarpA11yRole},
|
||||
clipboard::ClipboardContent,
|
||||
color::ColorU,
|
||||
@@ -65,7 +65,7 @@ lazy_static! {
|
||||
}
|
||||
|
||||
pub fn init(app: &mut AppContext) {
|
||||
use warpui::keymap::macros::*;
|
||||
use galaxyui::keymap::macros::*;
|
||||
|
||||
app.register_fixed_bindings([FixedBinding::new(
|
||||
"enter",
|
||||
|
||||
@@ -7,30 +7,30 @@ use anyhow::{anyhow, Result};
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use url::Url;
|
||||
use warp_core::errors::ErrorExt;
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warpui::elements::ChildAnchor;
|
||||
use warpui::elements::Container;
|
||||
use warpui::elements::Fill;
|
||||
use warpui::elements::HighlightedHyperlink;
|
||||
use warpui::elements::MouseStateHandle;
|
||||
use warpui::elements::OffsetPositioning;
|
||||
use warpui::elements::ParentAnchor;
|
||||
use warpui::elements::ParentElement;
|
||||
use warpui::elements::ParentOffsetBounds;
|
||||
use warpui::elements::Stack;
|
||||
use warpui::keymap::FixedBinding;
|
||||
use warpui::AppContext;
|
||||
use warpui::FocusContext;
|
||||
use warpui::SingletonEntity;
|
||||
use warpui::TypedActionView;
|
||||
use galaxy_core::errors::ErrorExt;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxyui::elements::ChildAnchor;
|
||||
use galaxyui::elements::Container;
|
||||
use galaxyui::elements::Fill;
|
||||
use galaxyui::elements::HighlightedHyperlink;
|
||||
use galaxyui::elements::MouseStateHandle;
|
||||
use galaxyui::elements::OffsetPositioning;
|
||||
use galaxyui::elements::ParentAnchor;
|
||||
use galaxyui::elements::ParentElement;
|
||||
use galaxyui::elements::ParentOffsetBounds;
|
||||
use galaxyui::elements::Stack;
|
||||
use galaxyui::keymap::FixedBinding;
|
||||
use galaxyui::AppContext;
|
||||
use galaxyui::FocusContext;
|
||||
use galaxyui::SingletonEntity;
|
||||
use galaxyui::TypedActionView;
|
||||
|
||||
use crate::auth::auth_view_body::AuthViewBody;
|
||||
use crate::modal::Modal;
|
||||
use std::collections::HashMap;
|
||||
use warpui::elements::ChildView;
|
||||
use warpui::ui_components::components::{Coords, UiComponentStyles};
|
||||
use warpui::{Element, Entity, View, ViewContext, ViewHandle};
|
||||
use galaxyui::elements::ChildView;
|
||||
use galaxyui::ui_components::components::{Coords, UiComponentStyles};
|
||||
use galaxyui::{Element, Entity, View, ViewContext, ViewHandle};
|
||||
|
||||
use super::auth_manager::AuthManager;
|
||||
use super::auth_manager::AuthManagerEvent;
|
||||
@@ -39,10 +39,10 @@ use super::auth_view_body::AuthViewBodyEvent;
|
||||
use super::credentials::RefreshToken;
|
||||
use super::login_failure_notification::{self, LoginFailureReason};
|
||||
use super::UserUid;
|
||||
use warpui::actions::StandardAction;
|
||||
use galaxyui::actions::StandardAction;
|
||||
|
||||
pub fn init(app: &mut AppContext) {
|
||||
use warpui::keymap::macros::*;
|
||||
use galaxyui::keymap::macros::*;
|
||||
|
||||
app.register_fixed_bindings([
|
||||
// Bindings for paste require the StandardAction and CustomAction binding to work on all platforms.
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use warp_core::channel::ChannelState;
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warp_core::ui::{
|
||||
use galaxy_core::channel::ChannelState;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_core::ui::{
|
||||
appearance::Appearance,
|
||||
builder::UiBuilder,
|
||||
color::{darken, lighten},
|
||||
theme::ColorScheme,
|
||||
};
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
assets::asset_cache::AssetSource,
|
||||
elements::{
|
||||
Border, CacheOption, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Fill,
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
//! When using Firebase, this is an OAuth2 refresh token.
|
||||
//! * [`AuthToken`], which is a short-lived token that's included in all other server requests.
|
||||
//! When using Firebase, this is an OAuth2 access token.
|
||||
use warp_graphql::object_permissions::OwnerType;
|
||||
use galaxy_graphql::object_permissions::OwnerType;
|
||||
|
||||
use super::user::FirebaseAuthTokens;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use std::borrow::Cow;
|
||||
|
||||
use pathfinder_color::ColorU;
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Align, Border, ConstrainedBox, Container, CornerRadius, Flex, ParentElement, Shrinkable,
|
||||
},
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Border, ConstrainedBox, Container, CrossAxisAlignment, Flex, FormattedTextElement,
|
||||
HighlightedHyperlink, Icon, MouseStateHandle, ParentElement, Shrinkable,
|
||||
@@ -151,7 +151,7 @@ pub fn render<A: Action + Clone>(
|
||||
}
|
||||
|
||||
mod styles {
|
||||
use warpui::elements::{CornerRadius, Radius};
|
||||
use galaxyui::elements::{CornerRadius, Radius};
|
||||
|
||||
pub const NOTIFICATION_CONTAINER_PADDING: f32 = 8.;
|
||||
pub const NOTIFICATION_CONTAINER_CORNER_RADIUS: CornerRadius =
|
||||
|
||||
+16
-16
@@ -16,21 +16,21 @@ use onboarding::slides::{layout, slide_content};
|
||||
use onboarding::{OnboardingIntention, AI_FEATURES, WARP_DRIVE_FEATURES};
|
||||
use pathfinder_color::ColorU;
|
||||
use ui_components::{button, Component as _, Options as _};
|
||||
use warp_core::features::FeatureFlag;
|
||||
use warp_core::ui::theme::color::internal_colors;
|
||||
use warp_core::ui::Icon;
|
||||
use warpui::clipboard::ClipboardContent;
|
||||
use warpui::elements::{
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_core::ui::theme::color::internal_colors;
|
||||
use galaxy_core::ui::Icon;
|
||||
use galaxyui::clipboard::ClipboardContent;
|
||||
use galaxyui::elements::{
|
||||
Align, Border, CacheOption, ClippedScrollStateHandle, ConstrainedBox, Container, CornerRadius,
|
||||
CrossAxisAlignment, Dismiss, Fill, Flex, FormattedTextElement, HighlightedHyperlink, Image,
|
||||
MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning, ParentElement, Radius,
|
||||
Shrinkable, Stack,
|
||||
};
|
||||
use warpui::fonts::Weight;
|
||||
use warpui::keymap::{FixedBinding, Keystroke};
|
||||
use warpui::text_layout::TextAlignment;
|
||||
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
|
||||
use warpui::{
|
||||
use galaxyui::fonts::Weight;
|
||||
use galaxyui::keymap::{FixedBinding, Keystroke};
|
||||
use galaxyui::text_layout::TextAlignment;
|
||||
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
|
||||
use galaxyui::{
|
||||
actions::StandardAction, AppContext, Element, Entity, FocusContext, SingletonEntity,
|
||||
TypedActionView, UpdateModel, View, ViewContext, ViewHandle,
|
||||
};
|
||||
@@ -38,7 +38,7 @@ use warpui::{
|
||||
use std::cell::Cell;
|
||||
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use warpui::elements::{ChildAnchor, ParentAnchor, ParentOffsetBounds};
|
||||
use galaxyui::elements::{ChildAnchor, ParentAnchor, ParentOffsetBounds};
|
||||
|
||||
const TOS_URL: &str = "https://www.warp.dev/terms-of-service";
|
||||
|
||||
@@ -47,7 +47,7 @@ const TOS_URL: &str = "https://www.warp.dev/terms-of-service";
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
pub fn init(app: &mut AppContext) {
|
||||
use warpui::keymap::macros::*;
|
||||
use galaxyui::keymap::macros::*;
|
||||
|
||||
app.register_fixed_bindings([
|
||||
FixedBinding::new(
|
||||
@@ -758,7 +758,7 @@ impl LoginSlideView {
|
||||
} else {
|
||||
// First call (narrow layout fallback): placeholder.
|
||||
editor_rendered.set(true);
|
||||
Container::new(warpui::elements::Empty::new().finish())
|
||||
Container::new(galaxyui::elements::Empty::new().finish())
|
||||
.with_padding_top(12.)
|
||||
.with_padding_bottom(12.)
|
||||
.with_padding_left(16.)
|
||||
@@ -955,7 +955,7 @@ impl LoginSlideView {
|
||||
AI_FEATURES
|
||||
};
|
||||
for &item in feature_items {
|
||||
let icon_el = ConstrainedBox::new(Icon::X.to_warpui_icon(feature_x_fill).finish())
|
||||
let icon_el = ConstrainedBox::new(Icon::X.to_galaxyui_icon(feature_x_fill).finish())
|
||||
.with_width(16.)
|
||||
.with_height(16.)
|
||||
.finish();
|
||||
@@ -1109,13 +1109,13 @@ impl View for LoginSlideView {
|
||||
);
|
||||
let overlay_opacity = (100u8).saturating_sub(img.opacity);
|
||||
stack.add_child(
|
||||
warpui::elements::Rect::new()
|
||||
galaxyui::elements::Rect::new()
|
||||
.with_background(theme.background().with_opacity(overlay_opacity))
|
||||
.finish(),
|
||||
);
|
||||
} else {
|
||||
stack.add_child(
|
||||
Container::new(warpui::elements::Empty::new().finish())
|
||||
Container::new(galaxyui::elements::Empty::new().finish())
|
||||
.with_background(theme.background())
|
||||
.finish(),
|
||||
);
|
||||
|
||||
+3
-3
@@ -33,10 +33,10 @@ pub use auth_state::AuthStateProvider;
|
||||
use itertools::Itertools;
|
||||
pub use login_failure_notification::LoginFailureReason;
|
||||
pub use user_uid::UserUid;
|
||||
use warpui::modals::{AlertDialogWithCallbacks, ModalButton};
|
||||
use galaxyui::modals::{AlertDialogWithCallbacks, ModalButton};
|
||||
|
||||
use warp_core::user_preferences::GetUserPreferences as _;
|
||||
use warpui::{AppContext, SingletonEntity};
|
||||
use galaxy_core::user_preferences::GetUserPreferences as _;
|
||||
use galaxyui::{AppContext, SingletonEntity};
|
||||
|
||||
use crate::cloud_object::model::persistence::CloudModel;
|
||||
use crate::focus_running_window_and_show_native_modal;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
use super::auth_manager::AuthManager;
|
||||
use crate::{appearance::Appearance, auth::login_error_modal::LoginErrorModal};
|
||||
use warpui::elements::{Align, MouseStateHandle, Shrinkable};
|
||||
use warpui::ui_components::button::ButtonVariant;
|
||||
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
|
||||
use warpui::{AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
|
||||
use galaxyui::elements::{Align, MouseStateHandle, Shrinkable};
|
||||
use galaxyui::ui_components::button::ButtonVariant;
|
||||
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
|
||||
use galaxyui::{AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum NeedsSsoLinkViewAction {
|
||||
|
||||
@@ -19,17 +19,17 @@ use crate::util::bindings::CustomAction;
|
||||
|
||||
use pathfinder_color::ColorU;
|
||||
use ui_components::{button, Component as _, Options as _};
|
||||
use warp_core::ui::theme::color::internal_colors;
|
||||
use warpui::elements::{
|
||||
use galaxy_core::ui::theme::color::internal_colors;
|
||||
use galaxyui::elements::{
|
||||
Align, Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Dismiss, Fill,
|
||||
Flex, FormattedTextElement, HighlightedHyperlink, MainAxisAlignment, MainAxisSize,
|
||||
MouseStateHandle, ParentElement, Radius, Shrinkable, Stack,
|
||||
};
|
||||
use warpui::fonts::Weight;
|
||||
use warpui::keymap::{FixedBinding, Keystroke};
|
||||
use warpui::text_layout::TextAlignment;
|
||||
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
|
||||
use warpui::{
|
||||
use galaxyui::fonts::Weight;
|
||||
use galaxyui::keymap::{FixedBinding, Keystroke};
|
||||
use galaxyui::text_layout::TextAlignment;
|
||||
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
|
||||
use galaxyui::{
|
||||
actions::StandardAction, AppContext, Element, Entity, FocusContext, SingletonEntity,
|
||||
TypedActionView, View, ViewContext, ViewHandle,
|
||||
};
|
||||
@@ -38,7 +38,7 @@ const MODAL_WIDTH: f32 = 460.;
|
||||
const AUTH_TOKEN_INPUT_BORDER_RADIUS: Radius = Radius::Pixels(4.);
|
||||
|
||||
pub fn init(app: &mut AppContext) {
|
||||
use warpui::keymap::macros::*;
|
||||
use galaxyui::keymap::macros::*;
|
||||
app.register_fixed_bindings([
|
||||
FixedBinding::new(
|
||||
"enter",
|
||||
@@ -250,7 +250,7 @@ impl View for PasteAuthTokenModalView {
|
||||
let close_button = ui_builder
|
||||
.close_button(24., self.close_mouse_state.clone())
|
||||
.build()
|
||||
.on_click(|ctx: &mut warpui::EventContext, _, _| {
|
||||
.on_click(|ctx: &mut galaxyui::EventContext, _, _| {
|
||||
ctx.dispatch_typed_action(PasteAuthTokenModalAction::Cancel);
|
||||
})
|
||||
.finish();
|
||||
@@ -401,7 +401,7 @@ impl View for PasteAuthTokenModalView {
|
||||
// Dim backdrop with click-to-dismiss behavior (matches the mockup).
|
||||
let mut stack = Stack::new();
|
||||
stack.add_child(
|
||||
Container::new(warpui::elements::Empty::new().finish())
|
||||
Container::new(galaxyui::elements::Empty::new().finish())
|
||||
.with_background_color(ColorU::new(0, 0, 0, 179))
|
||||
.finish(),
|
||||
);
|
||||
|
||||
+13
-13
@@ -2,11 +2,11 @@ use crate::server::datetime_ext::DateTimeExt;
|
||||
use anyhow::{anyhow, Result};
|
||||
use chrono::{DateTime, FixedOffset};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use warp_graphql::{queries::get_user::FirebaseProfile, scalars::time::ServerTimestamp};
|
||||
use galaxy_graphql::{queries::get_user::FirebaseProfile, scalars::time::ServerTimestamp};
|
||||
|
||||
use super::UserUid;
|
||||
|
||||
pub use warp_server_client::auth::{TEST_USER_EMAIL, TEST_USER_UID};
|
||||
pub use galaxy_server_client::auth::{TEST_USER_EMAIL, TEST_USER_UID};
|
||||
|
||||
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
|
||||
pub enum AnonymousUserType {
|
||||
@@ -26,9 +26,9 @@ pub enum PrincipalType {
|
||||
ServiceAccount,
|
||||
}
|
||||
|
||||
impl From<warp_graphql::queries::get_user::PrincipalType> for PrincipalType {
|
||||
fn from(value: warp_graphql::queries::get_user::PrincipalType) -> Self {
|
||||
use warp_graphql::queries::get_user::PrincipalType as GqlPrincipalType;
|
||||
impl From<galaxy_graphql::queries::get_user::PrincipalType> for PrincipalType {
|
||||
fn from(value: galaxy_graphql::queries::get_user::PrincipalType) -> Self {
|
||||
use galaxy_graphql::queries::get_user::PrincipalType as GqlPrincipalType;
|
||||
match value {
|
||||
GqlPrincipalType::User => PrincipalType::User,
|
||||
GqlPrincipalType::ServiceAccount => PrincipalType::ServiceAccount,
|
||||
@@ -36,18 +36,18 @@ impl From<warp_graphql::queries::get_user::PrincipalType> for PrincipalType {
|
||||
}
|
||||
}
|
||||
|
||||
impl TryFrom<warp_graphql::mutations::create_anonymous_user::AnonymousUserType>
|
||||
impl TryFrom<galaxy_graphql::mutations::create_anonymous_user::AnonymousUserType>
|
||||
for AnonymousUserType
|
||||
{
|
||||
type Error = anyhow::Error;
|
||||
fn try_from(
|
||||
value: warp_graphql::mutations::create_anonymous_user::AnonymousUserType,
|
||||
value: galaxy_graphql::mutations::create_anonymous_user::AnonymousUserType,
|
||||
) -> Result<Self, Self::Error> {
|
||||
match value {
|
||||
warp_graphql::mutations::create_anonymous_user::AnonymousUserType::NativeClientAnonymousUser => Ok(AnonymousUserType::NativeClientAnonymousUser),
|
||||
warp_graphql::mutations::create_anonymous_user::AnonymousUserType::NativeClientAnonymousUserFeatureGated => Ok(AnonymousUserType::NativeClientAnonymousUserFeatureGated),
|
||||
warp_graphql::mutations::create_anonymous_user::AnonymousUserType::WebClientAnonymousUser => Ok(AnonymousUserType::WebClientAnonymousUser),
|
||||
warp_graphql::mutations::create_anonymous_user::AnonymousUserType::Other(_) => {
|
||||
galaxy_graphql::mutations::create_anonymous_user::AnonymousUserType::NativeClientAnonymousUser => Ok(AnonymousUserType::NativeClientAnonymousUser),
|
||||
galaxy_graphql::mutations::create_anonymous_user::AnonymousUserType::NativeClientAnonymousUserFeatureGated => Ok(AnonymousUserType::NativeClientAnonymousUserFeatureGated),
|
||||
galaxy_graphql::mutations::create_anonymous_user::AnonymousUserType::WebClientAnonymousUser => Ok(AnonymousUserType::WebClientAnonymousUser),
|
||||
galaxy_graphql::mutations::create_anonymous_user::AnonymousUserType::Other(_) => {
|
||||
Err(anyhow!("could not convert unknown anonymous user type"))
|
||||
},
|
||||
}
|
||||
@@ -61,12 +61,12 @@ pub struct PersonalObjectLimits {
|
||||
pub workflow_limit: usize,
|
||||
}
|
||||
|
||||
impl TryFrom<warp_graphql::queries::get_user::AnonymousUserPersonalObjectLimits>
|
||||
impl TryFrom<galaxy_graphql::queries::get_user::AnonymousUserPersonalObjectLimits>
|
||||
for PersonalObjectLimits
|
||||
{
|
||||
type Error = anyhow::Error;
|
||||
fn try_from(
|
||||
value: warp_graphql::queries::get_user::AnonymousUserPersonalObjectLimits,
|
||||
value: galaxy_graphql::queries::get_user::AnonymousUserPersonalObjectLimits,
|
||||
) -> Result<Self, Self::Error> {
|
||||
Ok(Self {
|
||||
env_var_limit: value.env_var_limit as usize,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use super::*;
|
||||
use anyhow::Result;
|
||||
use warp_graphql::queries::get_user::FirebaseProfile;
|
||||
use galaxy_graphql::queries::get_user::FirebaseProfile;
|
||||
|
||||
#[test]
|
||||
fn test_parse_user_profile() -> Result<()> {
|
||||
|
||||
@@ -1 +1 @@
|
||||
pub use warp_server_client::auth::user_uid::*;
|
||||
pub use galaxy_server_client::auth::user_uid::*;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use anyhow::anyhow;
|
||||
use wasm_bindgen::prelude::*;
|
||||
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
ui_components::components::UiComponent as _, AppContext, Element, Entity, SingletonEntity,
|
||||
View, ViewContext,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user