oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Swap the start building and login buttons (#39576)

Browse Source 
New onboarding screen:

<img width="1027" height="700" alt="Screenshot 2025-10-05 at 10 38
57 PM"
src="https://github.com/user-attachments/assets/5dc49e53-68e7-4559-8ce0-1bada629781d"
/>


This PR also adds a new telemetry event: `Welcome Start Building
Clicked`

Release Notes:

- N/A
This commit is contained in:
Mikayla Maki
2025-10-06 05:55:57 +00:00
committed by GitHub
parent 0f0974f105
commit f9919f9214
2 changed files with 67 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/onboarding/src/onboarding.rs
+66 -80
View File
@@ -357,8 +357,6 @@ impl Onboarding {
}
fn render_nav(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let ai_setup_page = matches!(self.selected_page, SelectedPage::AiSetup);
v_flex()
.h_full()
.w(rems_from_px(220.))
@@ -398,106 +396,94 @@ impl Onboarding {
.children(self.render_nav_buttons(window, cx)),
)
.map(|this| {
let keybinding = KeyBinding::for_action_in(
&Finish,
&self.focus_handle,
window,
cx,
)
.map(|kb| kb.size(rems_from_px(12.)));
if ai_setup_page {
if let Some(user) = self.user_store.read(cx).current_user() {
this.child(
ButtonLike::new("start_building")
.style(ButtonStyle::Outlined)
.size(ButtonSize::Medium)
v_flex()
.gap_1()
.child(
h_flex()
.ml_1()
.ml_2()
.gap_2()
.max_w_full()
.w_full()
.justify_between()
.child(Label::new("Start Building"))
.children(keybinding),
.child(Avatar::new(user.avatar_uri.clone()))
.child(
Label::new(user.github_login.clone())
.truncate(),
),
)
.on_click(|_, window, cx| {
window.dispatch_action(Finish.boxed_clone(), cx);
}),
.child(
ButtonLike::new("open_account")
.size(ButtonSize::Medium)
.child(
h_flex()
.ml_1()
.w_full()
.justify_between()
.child(Label::new("Open Account"))
.children(
KeyBinding::for_action_in(
&OpenAccount,
&self.focus_handle,
window,
cx,
)
.map(|kb| {
kb.size(rems_from_px(12.))
}),
),
)
.on_click(|_, window, cx| {
window.dispatch_action(
OpenAccount.boxed_clone(),
cx,
);
}),
),
)
} else {
this.child(
ButtonLike::new("skip_all")
ButtonLike::new("sign_in")
.size(ButtonSize::Medium)
.child(
h_flex()
.ml_1()
.w_full()
.justify_between()
.child(
Label::new("Skip All").color(Color::Muted),
)
.children(keybinding),
.child(Label::new("Sign In"))
.children(
KeyBinding::for_action_in(
&SignIn,
&self.focus_handle,
window,
cx,
)
.map(|kb| kb.size(rems_from_px(12.))),
),
)
.on_click(|_, window, cx| {
window.dispatch_action(Finish.boxed_clone(), cx);
telemetry::event!("Welcome Sign In Clicked");
window.dispatch_action(SignIn.boxed_clone(), cx);
}),
)
}
}),
),
)
.child(
if let Some(user) = self.user_store.read(cx).current_user() {
v_flex()
.gap_1()
.child(
h_flex()
.ml_2()
.gap_2()
.max_w_full()
.w_full()
.child(Avatar::new(user.avatar_uri.clone()))
.child(Label::new(user.github_login.clone()).truncate()),
)
.child(
ButtonLike::new("open_account")
.size(ButtonSize::Medium)
.child(
h_flex()
.ml_1()
.w_full()
.justify_between()
.child(Label::new("Open Account"))
.children(
KeyBinding::for_action_in(
&OpenAccount,
&self.focus_handle,
window,
cx,
)
.map(|kb| kb.size(rems_from_px(12.))),
),
)
.on_click(|_, window, cx| {
window.dispatch_action(OpenAccount.boxed_clone(), cx);
}),
)
.into_any_element()
} else {
Button::new("sign_in", "Sign In")
.full_width()
.style(ButtonStyle::Outlined)
.size(ButtonSize::Medium)
.key_binding(
KeyBinding::for_action_in(&SignIn, &self.focus_handle, window, cx)
.map(|kb| kb.size(rems_from_px(12.))),
)
.on_click(|_, window, cx| {
telemetry::event!("Welcome Sign In Clicked");
window.dispatch_action(SignIn.boxed_clone(), cx);
})
.into_any_element()
},
)
.child({
Button::new("start_building", "Start Building")
.full_width()
.style(ButtonStyle::Outlined)
.size(ButtonSize::Medium)
.key_binding(
KeyBinding::for_action_in(&Finish, &self.focus_handle, window, cx)
.map(|kb| kb.size(rems_from_px(12.))),
)
.on_click(|_, window, cx| {
telemetry::event!("Welcome Start Building Clicked");
window.dispatch_action(Finish.boxed_clone(), cx);
})
})
}
fn on_finish(_: &Finish, _: &mut Window, cx: &mut App) {
crates/paths/src/paths.rs
+1 -1
View File
@@ -65,7 +65,7 @@ pub fn set_custom_data_dir(dir: &str) -> &'static PathBuf {
}
CUSTOM_DATA_DIR.get_or_init(|| {
let mut path = PathBuf::from(dir);
if path.is_relative() {
if path.is_relative() && path.exists() {
let abs_path = path
.canonicalize()
.expect("failed to canonicalize custom data directory's path to an absolute path");